diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-05-11 10:38:23 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2022-05-11 12:28:53 +0200 |
commit | 1deb1498cdc6455c975e209e3fbc664fbc35a8d4 (patch) | |
tree | 296ab8e31bd26b6cde2df867ac6795436898f8e5 /controller-api | |
parent | 5da68e17038c1b9e2e78a0278a281630018bcb1f (diff) |
Send cloud account on deploy
Diffstat (limited to 'controller-api')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java index ad98197fa93..a35d01f6891 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.controller.api.application.v4.model; import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.CloudAccount; import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.vespa.athenz.api.AthenzDomain; @@ -13,6 +14,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.secrets.TenantSecretSto import java.security.cert.X509Certificate; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.Set; @@ -36,21 +38,9 @@ public class DeploymentData { private final Quota quota; private final List<TenantSecretStore> tenantSecretStores; private final List<X509Certificate> operatorCertificates; + private final Optional<CloudAccount> cloudAccount; private final boolean dryRun; - // TODO: Remove when users have been updated to use constructor below - public DeploymentData(ApplicationId instance, ZoneId zone, byte[] applicationPackage, Version platform, - Set<ContainerEndpoint> containerEndpoints, - Optional<EndpointCertificateMetadata> endpointCertificateMetadata, - Optional<DockerImage> dockerImageRepo, - Optional<AthenzDomain> athenzDomain, - Quota quota, - List<TenantSecretStore> tenantSecretStores, - List<X509Certificate> operatorCertificates) { - this(instance, zone, applicationPackage, platform, containerEndpoints, endpointCertificateMetadata, - dockerImageRepo, athenzDomain, quota, tenantSecretStores, operatorCertificates, false); - } - public DeploymentData(ApplicationId instance, ZoneId zone, byte[] applicationPackage, Version platform, Set<ContainerEndpoint> containerEndpoints, Optional<EndpointCertificateMetadata> endpointCertificateMetadata, @@ -59,7 +49,7 @@ public class DeploymentData { Quota quota, List<TenantSecretStore> tenantSecretStores, List<X509Certificate> operatorCertificates, - boolean dryRun) { + Optional<CloudAccount> cloudAccount, boolean dryRun) { this.instance = requireNonNull(instance); this.zone = requireNonNull(zone); this.applicationPackage = requireNonNull(applicationPackage); @@ -71,6 +61,7 @@ public class DeploymentData { this.quota = quota; this.tenantSecretStores = List.copyOf(requireNonNull(tenantSecretStores)); this.operatorCertificates = List.copyOf(requireNonNull(operatorCertificates)); + this.cloudAccount = Objects.requireNonNull(cloudAccount); this.dryRun = dryRun; } @@ -118,6 +109,10 @@ public class DeploymentData { return operatorCertificates; } + public Optional<CloudAccount> cloudAccount() { + return cloudAccount; + } + public boolean isDryRun() { return dryRun; } } |