Merge pull request #16691 from vespa-engine/ogronnesby/ckms-identity-provider

Use tenant name in secret store names

3 files changed, 7 insertions, 3 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/NoopTenantSecretService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/NoopTenantSecretService.java
index f1721185899..9f273723c9c 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/NoopTenantSecretService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/NoopTenantSecretService.java
@@ -1,12 +1,14 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.secrets;
 
+import com.yahoo.config.provision.TenantName;
+
 /**
  * @author olaa
  */
 public class NoopTenantSecretService implements TenantSecretService {
 
     @Override
-    public void addSecretStore(TenantSecretStore tenantSecretStore, String externalId) {}
+    public void addSecretStore(TenantName tenant, TenantSecretStore tenantSecretStore, String externalId) {}
 
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/TenantSecretService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/TenantSecretService.java
index 42df4796189..bac5a012f79 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/TenantSecretService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/secrets/TenantSecretService.java
@@ -1,11 +1,13 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.secrets;
 
+import com.yahoo.config.provision.TenantName;
+
 /**
  * @author olaa
  */
 public interface TenantSecretService {
 
-    void addSecretStore(TenantSecretStore tenantSecretStore, String externalId);
+    void addSecretStore(TenantName tenant, TenantSecretStore tenantSecretStore, String externalId);
 
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index a1b7807e43f..a53d5bddbfc 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -675,7 +675,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
         }
 
         controller.serviceRegistry().roleService().createTenantPolicy(TenantName.from(tenantName), name, awsId, role);
-        controller.serviceRegistry().tenantSecretService().addSecretStore(tenantSecretStore, externalId);
+        controller.serviceRegistry().tenantSecretService().addSecretStore(tenant.name(), tenantSecretStore, externalId);
         // Store changes
         controller.tenants().lockOrThrow(tenant.name(), LockedTenant.Cloud.class, lockedTenant -> {
             lockedTenant = lockedTenant.withSecretStore(tenantSecretStore);