diff options
| author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-10-26 16:36:10 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-10-27 13:18:20 +0200 |
| commit | abe78abeb5e7ed00dc3a743ca77a13e95fa47ce6 (patch) | |
| tree | 2a4bd85bb288ac1bc8d20ca2153b09eef4f4aaf7 /controller-server/src/main/java/com/yahoo | |
| parent | 15719d50be8f37fdf78f4e6855af26c7d47d0ad8 (diff) | |
Return enclave information for instance in application/v4
Diffstat (limited to 'controller-server/src/main/java/com/yahoo')
2 files changed, 7 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index 7e284a8aef5..902c1803b6b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -670,7 +670,7 @@ public class ApplicationController { } } - private Optional<CloudAccount> decideCloudAccountOf(DeploymentId deployment, DeploymentSpec spec) { + public Optional<CloudAccount> decideCloudAccountOf(DeploymentId deployment, DeploymentSpec spec) { ZoneId zoneId = deployment.zoneId(); Optional<CloudAccount> requestedAccount = spec.instance(deployment.applicationId().instance()) .flatMap(instanceSpec -> instanceSpec.cloudAccount(zoneId.environment(), 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 35483309cae..161e4b30dd9 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 @@ -1814,6 +1814,12 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { application.projectId().ifPresent(i -> response.setString("screwdriverId", String.valueOf(i))); + controller.applications().decideCloudAccountOf(deploymentId, application.deploymentSpec()).ifPresent(cloudAccount -> { + Cursor enclave = response.setObject("enclave"); + enclave.setString("cloudAccount", cloudAccount.value()); + enclave.setString("athensDomain", controller.zoneRegistry().cloudAccountAthenzDomain(cloudAccount).value()); + }); + var instance = application.instances().get(deploymentId.applicationId().instance()); if (instance != null) { if (!instance.rotations().isEmpty() && deployment.zone().environment() == Environment.prod) |