diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-01-23 10:35:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-23 10:35:58 +0100 |
commit | fb298bccf42db5937b933e33d818893c6d888b14 (patch) | |
tree | 904477948265f77a3c80f473c66780f7d0f8ce9a /controller-api | |
parent | 7c160a6145d741f8a1d267f5489f3acfdaf4169b (diff) | |
parent | 70fc87a227a94908c015cf63ee298dfecb8d196f (diff) |
Merge pull request #11900 from vespa-engine/revert-11897-revert-11893-andreer/deploy-with-endpoint-certificate-metadata
Reapply "andreer/deploy with endpoint certificate metadata"
Diffstat (limited to 'controller-api')
2 files changed, 44 insertions, 2 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMetadata.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMetadata.java new file mode 100644 index 00000000000..5838c828a3f --- /dev/null +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMetadata.java @@ -0,0 +1,42 @@ +package com.yahoo.vespa.hosted.controller.api.integration.certificates; + +/** + * This class is used for metadata about an application's endpoint certificate on the controller. + * <p> + * It is a copy of com.yahoo.config.model.api.EndpointCertificateMetadata, but will soon be extended. + * + * @author andreer + */ +public class EndpointCertificateMetadata { + + private final String keyName; + private final String certName; + private final int version; + + public EndpointCertificateMetadata(String keyName, String certName, int version) { + this.keyName = keyName; + this.certName = certName; + this.version = version; + } + + public String keyName() { + return keyName; + } + + public String certName() { + return certName; + } + + public int version() { + return version; + } + + @Override + public String toString() { + return "EndpointCertificateMetadata{" + + "keyName='" + keyName + '\'' + + ", certName='" + certName + '\'' + + ", version=" + version + + '}'; + } +} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java index a009f002954..f8f63df40a9 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java @@ -10,7 +10,7 @@ import com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions; import com.yahoo.vespa.hosted.controller.api.application.v4.model.EndpointStatus; import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; import com.yahoo.vespa.hosted.controller.api.identifiers.Hostname; -import com.yahoo.vespa.hosted.controller.api.integration.certificates.ApplicationCertificate; +import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateMetadata; import com.yahoo.vespa.hosted.controller.api.integration.deployment.TesterCloud; import com.yahoo.vespa.serviceview.bindings.ApplicationView; @@ -32,7 +32,7 @@ public interface ConfigServer { } PreparedApplication deploy(DeploymentId deployment, DeployOptions deployOptions, - Set<ContainerEndpoint> containerEndpoints, ApplicationCertificate applicationCertificate, + Set<ContainerEndpoint> containerEndpoints, Optional<EndpointCertificateMetadata> endpointCertificateMetadata, byte[] content); void restart(DeploymentId deployment, Optional<Hostname> hostname); |