diff options
| author | Øyvind Grønnesby <oyving@yahooinc.com> | 2023-06-12 11:19:17 +0200 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@yahooinc.com> | 2023-06-12 11:19:17 +0200 |
| commit | 9d4fb4f1c84515a59a720e4e82098726352183f8 (patch) | |
| tree | 8c585705eea0b994f52a68549c6b3a3f21399310 /controller-server/src | |
| parent | 39f44c787daa051d8308ce6871e346a61a0d2f8d (diff) | |
Return if a deployment job is in enclave
Diffstat (limited to 'controller-server/src')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java index d1d0fb54eef..544863b708e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java @@ -361,7 +361,15 @@ class JobControllerApiHandlerHelper { "/job/" + job.type().jobName()).normalize(); stepObject.setString("url", baseUriForJob.toString()); stepObject.setString("environment", job.type().environment().value()); - if ( ! job.type().environment().isTest()) stepObject.setString("region", job.type().zone().value()); + if ( ! job.type().environment().isTest()) { + stepObject.setString("region", job.type().zone().value()); + var deployment = application.require(job.application().instance()).deployments().get(job.type().zone()); + var cloudAccount = deployment == null ? null : deployment.cloudAccount(); + if (cloudAccount != null && controller.zoneRegistry().isExternal(cloudAccount)) { + var enclaveObject = stepObject.setObject("enclave"); + enclaveObject.setString("cloudAccount", cloudAccount.value()); + } + } if (job.type().isProduction() && job.type().isDeployment()) { status.deploymentFor(job).ifPresent(deployment -> { |