diff options
author | Morten Tokle <mortent@verizonmedia.com> | 2020-05-13 12:41:47 +0200 |
---|---|---|
committer | Morten Tokle <mortent@verizonmedia.com> | 2020-05-18 10:29:28 +0200 |
commit | efd71d02a2d65c12022b62011ace1ceca7f6ef8a (patch) | |
tree | 262f0f939e65c5a56faa3db2a075c9f27b157f83 /controller-api | |
parent | dfa23cab41d83b7c21a34d199e747fe8e5747ea3 (diff) |
Provision application roles and include in cfg deployment
Diffstat (limited to 'controller-api')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java | 10 |
1 files changed, 9 insertions, 1 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 0afe9347341..a74d1f34da0 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 @@ -5,6 +5,7 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.vespa.athenz.api.AthenzDomain; +import com.yahoo.vespa.hosted.controller.api.integration.aws.ApplicationRoles; import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateMetadata; import com.yahoo.vespa.hosted.controller.api.integration.configserver.ContainerEndpoint; @@ -28,12 +29,14 @@ public class DeploymentData { private final Optional<EndpointCertificateMetadata> endpointCertificateMetadata; private final Optional<DockerImage> dockerImageRepo; private final Optional<AthenzDomain> athenzDomain; + private final Optional<ApplicationRoles> applicationRoles; public DeploymentData(ApplicationId instance, ZoneId zone, byte[] applicationPackage, Version platform, Set<ContainerEndpoint> containerEndpoints, Optional<EndpointCertificateMetadata> endpointCertificateMetadata, Optional<DockerImage> dockerImageRepo, - Optional<AthenzDomain> athenzDomain) { + Optional<AthenzDomain> athenzDomain, + Optional<ApplicationRoles> applicationRoles) { this.instance = requireNonNull(instance); this.zone = requireNonNull(zone); this.applicationPackage = requireNonNull(applicationPackage); @@ -42,6 +45,7 @@ public class DeploymentData { this.endpointCertificateMetadata = requireNonNull(endpointCertificateMetadata); this.dockerImageRepo = requireNonNull(dockerImageRepo); this.athenzDomain = athenzDomain; + this.applicationRoles = applicationRoles; } public ApplicationId instance() { @@ -75,4 +79,8 @@ public class DeploymentData { public Optional<AthenzDomain> athenzDomain() { return athenzDomain; } + + public Optional<ApplicationRoles> applicationRoles() { + return applicationRoles; + } } |