diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-05-10 15:16:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-10 15:16:54 +0200 |
| commit | 37610a9818a990bd6104d5b42c4e195f3106d89b (patch) | |
| tree | 2ed0d5044aeb0f28efaedbf54a73bec8823c9ef2 /controller-api/src/main | |
| parent | 3c43c8d986959713b1200b89f02884c098591b84 (diff) | |
| parent | 75206c19fa16e85b368191241ae56c13e4461e68 (diff) | |
Merge pull request #17801 from vespa-engine/mpolden/include-legacy-endpoint-in-cert
Include legacy endpoint in certificate in public
Diffstat (limited to 'controller-api/src/main')
3 files changed, 10 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java index b5ee78251f0..07da6969b64 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java @@ -34,11 +34,12 @@ public class EndpointCertificateMock implements EndpointCertificateProvider { @Override public List<EndpointCertificateMetadata> listCertificates() { - return Collections.emptyList(); + return List.of(); } @Override public void deleteCertificate(ApplicationId applicationId, EndpointCertificateMetadata endpointCertificateMetadata) { dnsNames.remove(applicationId); } + } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateValidatorImpl.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateValidatorImpl.java index ea92f84f72f..9ce4fccc375 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateValidatorImpl.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateValidatorImpl.java @@ -16,6 +16,9 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; +/** + * @author andreer + */ public class EndpointCertificateValidatorImpl implements EndpointCertificateValidator { private final SecretStore secretStore; private final Clock clock; diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateValidatorMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateValidatorMock.java index 7e89a3becd5..780701b3b77 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateValidatorMock.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateValidatorMock.java @@ -5,7 +5,11 @@ import com.yahoo.config.provision.zone.ZoneId; import java.util.List; +/** + * @author andreer + */ public class EndpointCertificateValidatorMock implements EndpointCertificateValidator { + @Override public void validate( EndpointCertificateMetadata endpointCertificateMetadata, @@ -14,4 +18,5 @@ public class EndpointCertificateValidatorMock implements EndpointCertificateVali List<String> requiredNamesForZone) { // Mock does no validation - for unit tests only! } + } |