From 81660e29d24aba393c2603c39bcc072c4e26a532 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Mon, 10 May 2021 14:10:01 +0200 Subject: Move wildcard endpoint building to RoutingController --- .../hosted/controller/ApplicationController.java | 9 +- .../vespa/hosted/controller/RoutingController.java | 40 +++++++ .../certificate/EndpointCertificateManager.java | 122 +++++++-------------- .../EndpointCertificateManagerTest.java | 45 ++++---- 4 files changed, 103 insertions(+), 113 deletions(-) (limited to 'controller-server') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index e6c96134ca7..fab67d483ff 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -137,12 +137,9 @@ public class ApplicationController { deploymentTrigger = new DeploymentTrigger(controller, clock); applicationPackageValidator = new ApplicationPackageValidator(controller); - endpointCertificateManager = new EndpointCertificateManager( - controller.zoneRegistry(), - curator, - controller.serviceRegistry().endpointCertificateProvider(), - controller.serviceRegistry().endpointCertificateValidator(), - clock); + endpointCertificateManager = new EndpointCertificateManager(controller, + controller.serviceRegistry().endpointCertificateProvider(), + controller.serviceRegistry().endpointCertificateValidator()); // Update serialization format of all applications Once.after(Duration.ofMinutes(1), () -> { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java index 433b2b340d5..8d3eceec01d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java @@ -3,12 +3,16 @@ package com.yahoo.vespa.hosted.controller; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; +import com.google.common.hash.HashCode; +import com.google.common.hash.Hashing; +import com.google.common.io.BaseEncoding; import com.yahoo.component.Version; import com.yahoo.config.application.api.DeploymentInstanceSpec; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.InstanceName; +import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.zone.RoutingMethod; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.vespa.flags.BooleanFlag; @@ -34,6 +38,7 @@ import com.yahoo.vespa.hosted.controller.routing.RoutingId; import com.yahoo.vespa.hosted.controller.routing.RoutingPolicies; import com.yahoo.vespa.hosted.rotation.config.RotationsConfig; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -149,6 +154,34 @@ public class RoutingController { return Collections.unmodifiableMap(endpoints); } + /** Returns the wildcard endpoints for given deployment */ + public List wildcardEndpoints(DeploymentId deployment) { + List endpointDnsNames = new ArrayList<>(); + + // We add first an endpoint name based on a hash of the application ID, + // as the certificate provider requires the first CN to be < 64 characters long. + endpointDnsNames.add(commonNameHashOf(deployment.applicationId(), controller.system())); + + // Add wildcard names for global endpoints when deploying to production + List builders = new ArrayList<>(); + if (deployment.zoneId().environment().isProduction()) { + builders.add(Endpoint.of(deployment.applicationId()).target(EndpointId.defaultId())); + builders.add(Endpoint.of(deployment.applicationId()).wildcard()); + } + + // Add wildcard names for zone endpoints + builders.add(Endpoint.of(deployment.applicationId()).target(ClusterSpec.Id.from("default"), deployment.zoneId())); + builders.add(Endpoint.of(deployment.applicationId()).wildcard(deployment.zoneId())); + + for (var builder : builders) { + Endpoint endpoint = builder.routingMethod(RoutingMethod.exclusive) + .on(Port.tls()) + .in(controller.system()); + endpointDnsNames.add(endpoint.dnsName()); + } + return Collections.unmodifiableList(endpointDnsNames); + } + /** Change status of all global endpoints for given deployment */ public void setGlobalRotationStatus(DeploymentId deployment, EndpointStatus status) { endpointsOf(deployment.applicationId()).requiresRotation().primary().ifPresent(endpoint -> { @@ -349,6 +382,13 @@ public class RoutingController { .isPresent(); } + /** Create a common name based on a hash of given application. This must be less than 64 characters long. */ + private static String commonNameHashOf(ApplicationId application, SystemName system) { + HashCode sha1 = Hashing.sha1().hashString(application.serializedForm(), StandardCharsets.UTF_8); + String base32 = BaseEncoding.base32().omitPadding().lowerCase().encode(sha1.asBytes()); + return 'v' + base32 + Endpoint.dnsSuffix(system); + } + /** Returns direct routing endpoints if any exist and feature flag is set for given application */ // TODO: Remove this when feature flag is removed, and in-line .direct() filter where relevant public EndpointList directEndpoints(EndpointList endpoints, ApplicationId application) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManager.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManager.java index 6f964999fba..9ac31dee424 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManager.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManager.java @@ -1,30 +1,20 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.certificate; -import com.google.common.hash.Hashing; -import com.google.common.io.BaseEncoding; import com.yahoo.config.application.api.DeploymentInstanceSpec; -import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.SystemName; -import com.yahoo.config.provision.zone.RoutingMethod; import com.yahoo.config.provision.zone.ZoneApi; import com.yahoo.config.provision.zone.ZoneId; +import com.yahoo.vespa.hosted.controller.Controller; import com.yahoo.vespa.hosted.controller.Instance; +import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateMetadata; import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateProvider; import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateValidator; -import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry; -import com.yahoo.vespa.hosted.controller.application.Endpoint; -import com.yahoo.vespa.hosted.controller.application.EndpointId; import com.yahoo.vespa.hosted.controller.persistence.CuratorDb; -import org.jetbrains.annotations.NotNull; -import java.nio.charset.Charset; import java.time.Clock; import java.time.Duration; import java.time.Instant; -import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; @@ -37,7 +27,7 @@ import java.util.stream.Collectors; /** * Looks up stored endpoint certificate metadata, provisions new certificates if none is found, * re-provisions if zone is not covered, and uses refreshed certificates if a newer version is available. - *

+ * * See also EndpointCertificateMaintainer, which handles refreshes, deletions and triggers deployments * * @author andreer @@ -46,40 +36,38 @@ public class EndpointCertificateManager { private static final Logger log = Logger.getLogger(EndpointCertificateManager.class.getName()); - private final ZoneRegistry zoneRegistry; + private final Controller controller; private final CuratorDb curator; - private final EndpointCertificateProvider endpointCertificateProvider; private final Clock clock; - private final EndpointCertificateValidator endpointCertificateValidator; - - public EndpointCertificateManager(ZoneRegistry zoneRegistry, - CuratorDb curator, - EndpointCertificateProvider endpointCertificateProvider, - EndpointCertificateValidator endpointCertificateValidator, - Clock clock) { - this.zoneRegistry = zoneRegistry; - this.curator = curator; - this.endpointCertificateProvider = endpointCertificateProvider; - this.clock = clock; - this.endpointCertificateValidator = endpointCertificateValidator; + private final EndpointCertificateProvider certificateProvider; + private final EndpointCertificateValidator certificateValidator; + + public EndpointCertificateManager(Controller controller, EndpointCertificateProvider certificateProvider, + EndpointCertificateValidator certificateValidator) { + this.controller = controller; + this.curator = controller.curator(); + this.clock = controller.clock(); + this.certificateProvider = certificateProvider; + this.certificateValidator = certificateValidator; } public Optional getEndpointCertificateMetadata(Instance instance, ZoneId zone, Optional instanceSpec) { - var t0 = Instant.now(); + Instant start = clock.instant(); Optional metadata = getOrProvision(instance, zone, instanceSpec); metadata.ifPresent(m -> curator.writeEndpointCertificateMetadata(instance.id(), m.withLastRequested(clock.instant().getEpochSecond()))); - Duration duration = Duration.between(t0, Instant.now()); + Duration duration = Duration.between(start, clock.instant()); if (duration.toSeconds() > 30) log.log(Level.INFO, String.format("Getting endpoint certificate metadata for %s took %d seconds!", instance.id().serializedForm(), duration.toSeconds())); return metadata; } - @NotNull private Optional getOrProvision(Instance instance, ZoneId zone, Optional instanceSpec) { final var currentCertificateMetadata = curator.readEndpointCertificateMetadata(instance.id()); + DeploymentId deployment = new DeploymentId(instance.id(), zone); + if (currentCertificateMetadata.isEmpty()) { - var provisionedCertificateMetadata = provisionEndpointCertificate(instance, Optional.empty(), zone, instanceSpec); + var provisionedCertificateMetadata = provisionEndpointCertificate(deployment, Optional.empty(), instanceSpec); // We do not verify the certificate if one has never existed before - because we do not want to // wait for it to be available before we deploy. This allows the config server to start // provisioning nodes ASAP, and the risk is small for a new deployment. @@ -88,89 +76,55 @@ public class EndpointCertificateManager { } // Re-provision certificate if it is missing SANs for the zone we are deploying to - var requiredSansForZone = dnsNamesOf(instance.id(), zone); + var requiredSansForZone = controller.routing().wildcardEndpoints(deployment); if (!currentCertificateMetadata.get().requestedDnsSans().containsAll(requiredSansForZone)) { var reprovisionedCertificateMetadata = - provisionEndpointCertificate(instance, currentCertificateMetadata, zone, instanceSpec) - .withRequestId(currentCertificateMetadata.get().request_id()); // We're required to keep the original request_id + provisionEndpointCertificate(deployment, currentCertificateMetadata, instanceSpec) + .withRequestId(currentCertificateMetadata.get().request_id()); // We're required to keep the original request_id curator.writeEndpointCertificateMetadata(instance.id(), reprovisionedCertificateMetadata); // Verification is unlikely to succeed in this case, as certificate must be available first - controller will retry - endpointCertificateValidator.validate(reprovisionedCertificateMetadata, instance.id().serializedForm(), zone, requiredSansForZone); + certificateValidator.validate(reprovisionedCertificateMetadata, instance.id().serializedForm(), zone, requiredSansForZone); return Optional.of(reprovisionedCertificateMetadata); } - endpointCertificateValidator.validate(currentCertificateMetadata.get(), instance.id().serializedForm(), zone, requiredSansForZone); + certificateValidator.validate(currentCertificateMetadata.get(), instance.id().serializedForm(), zone, requiredSansForZone); return currentCertificateMetadata; } - private EndpointCertificateMetadata provisionEndpointCertificate(Instance instance, Optional currentMetadata, ZoneId deploymentZone, Optional instanceSpec) { + private EndpointCertificateMetadata provisionEndpointCertificate(DeploymentId deployment, Optional currentMetadata, Optional instanceSpec) { List currentlyPresentNames = currentMetadata.isPresent() ? currentMetadata.get().requestedDnsSans() : Collections.emptyList(); - var requiredZones = new LinkedHashSet<>(Set.of(deploymentZone)); + var requiredZones = new LinkedHashSet<>(Set.of(deployment.zoneId())); - var zoneCandidateList = zoneRegistry.zones().controllerUpgraded().zones().stream().map(ZoneApi::getId).collect(Collectors.toList()); + var zoneCandidateList = controller.zoneRegistry().zones().controllerUpgraded().zones().stream().map(ZoneApi::getId).collect(Collectors.toList()); // If not deploying to a dev or perf zone, require all prod zones in deployment spec + test and staging - if (!deploymentZone.environment().isManuallyDeployed()) { + if (!deployment.zoneId().environment().isManuallyDeployed()) { zoneCandidateList.stream() - .filter(z -> z.environment().isTest() || instanceSpec.isPresent() && instanceSpec.get().deploysTo(z.environment(), z.region())) - .forEach(requiredZones::add); + .filter(z -> z.environment().isTest() || instanceSpec.isPresent() && instanceSpec.get().deploysTo(z.environment(), z.region())) + .forEach(requiredZones::add); } var requiredNames = requiredZones.stream() - .flatMap(zone -> dnsNamesOf(instance.id(), zone).stream()) - .collect(Collectors.toCollection(LinkedHashSet::new)); + .flatMap(zone -> controller.routing().wildcardEndpoints(new DeploymentId(deployment.applicationId(), zone)).stream()) + .collect(Collectors.toCollection(LinkedHashSet::new)); // Make sure all currently present names will remain present. // Instead of just adding "currently present names", we regenerate them in case the names for a zone have changed. zoneCandidateList.stream() - .map(zone -> dnsNamesOf(instance.id(), zone)) - .filter(zoneNames -> zoneNames.stream().anyMatch(currentlyPresentNames::contains)) - .filter(currentlyPresentNames::containsAll) - .forEach(requiredNames::addAll); + .map(zone -> controller.routing().wildcardEndpoints(new DeploymentId(deployment.applicationId(), zone))) + .filter(zoneNames -> zoneNames.stream().anyMatch(currentlyPresentNames::contains)) + .filter(currentlyPresentNames::containsAll) + .forEach(requiredNames::addAll); // This check must be relaxed if we ever remove from the set of names generated. if (!requiredNames.containsAll(currentlyPresentNames)) throw new RuntimeException("SANs to be requested do not cover all existing names! Missing names: " - + currentlyPresentNames.stream().filter(s -> !requiredNames.contains(s)).collect(Collectors.joining(", "))); + + currentlyPresentNames.stream().filter(s -> !requiredNames.contains(s)).collect(Collectors.joining(", "))); - return endpointCertificateProvider.requestCaSignedCertificate(instance.id(), List.copyOf(requiredNames), currentMetadata); + return certificateProvider.requestCaSignedCertificate(deployment.applicationId(), List.copyOf(requiredNames), currentMetadata); } - - private List dnsNamesOf(ApplicationId applicationId, ZoneId zone) { - List endpointDnsNames = new ArrayList<>(); - - // We add first an endpoint name based on a hash of the applicationId, - // as the certificate provider requires the first CN to be < 64 characters long. - endpointDnsNames.add(commonNameHashOf(applicationId, zoneRegistry.system())); - - List endpoints = new ArrayList<>(); - - if (zone.environment().isProduction()) { - endpoints.add(Endpoint.of(applicationId).target(EndpointId.defaultId())); - endpoints.add(Endpoint.of(applicationId).wildcard()); - } - - endpoints.add(Endpoint.of(applicationId).target(ClusterSpec.Id.from("default"), zone)); - endpoints.add(Endpoint.of(applicationId).wildcard(zone)); - - endpoints.stream() - .map(endpoint -> endpoint.routingMethod(RoutingMethod.exclusive)) - .map(endpoint -> endpoint.on(Endpoint.Port.tls())) - .map(endpointBuilder -> endpointBuilder.in(zoneRegistry.system())) - .map(Endpoint::dnsName).forEach(endpointDnsNames::add); - - return Collections.unmodifiableList(endpointDnsNames); - } - - /** Create a common name based on a hash of the ApplicationId. This should always be less than 64 characters long. */ - @SuppressWarnings("UnstableApiUsage") - private static String commonNameHashOf(ApplicationId application, SystemName system) { - var hashCode = Hashing.sha1().hashString(application.serializedForm(), Charset.defaultCharset()); - var base32encoded = BaseEncoding.base32().omitPadding().lowerCase().encode(hashCode.asBytes()); - return 'v' + base32encoded + Endpoint.dnsSuffix(system); - } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManagerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManagerTest.java index e30f044c579..f17a8ac60e2 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManagerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManagerTest.java @@ -5,29 +5,26 @@ import com.yahoo.config.application.api.DeploymentSpec; import com.yahoo.config.application.api.xml.DeploymentSpecXmlReader; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Environment; -import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.security.KeyAlgorithm; import com.yahoo.security.KeyUtils; import com.yahoo.security.SignatureAlgorithm; import com.yahoo.security.X509CertificateBuilder; import com.yahoo.security.X509CertificateUtils; -import com.yahoo.vespa.flags.Flags; -import com.yahoo.vespa.flags.InMemoryFlagSource; +import com.yahoo.test.ManualClock; +import com.yahoo.vespa.hosted.controller.ControllerTester; import com.yahoo.vespa.hosted.controller.Instance; -import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateMock; import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateMetadata; +import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateMock; import com.yahoo.vespa.hosted.controller.api.integration.certificates.EndpointCertificateValidatorImpl; import com.yahoo.vespa.hosted.controller.integration.SecretStoreMock; -import com.yahoo.vespa.hosted.controller.integration.ZoneRegistryMock; -import com.yahoo.vespa.hosted.controller.persistence.MockCuratorDb; +import com.yahoo.vespa.hosted.controller.persistence.CuratorDb; import org.junit.Before; import org.junit.Test; import javax.security.auth.x500.X500Principal; import java.security.KeyPair; import java.security.cert.X509Certificate; -import java.time.Clock; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.ArrayList; @@ -43,15 +40,17 @@ import static org.junit.Assert.assertTrue; */ public class EndpointCertificateManagerTest { + private final ControllerTester tester = new ControllerTester(); private final SecretStoreMock secretStore = new SecretStoreMock(); - private final ZoneRegistryMock zoneRegistryMock = new ZoneRegistryMock(SystemName.main); - private final MockCuratorDb mockCuratorDb = new MockCuratorDb(); + private final CuratorDb mockCuratorDb = tester.curator(); + private final ManualClock clock = tester.clock(); private final EndpointCertificateMock endpointCertificateMock = new EndpointCertificateMock(); - private final InMemoryFlagSource inMemoryFlagSource = new InMemoryFlagSource(); - private static final Clock clock = Clock.fixed(Instant.EPOCH, java.time.ZoneId.systemDefault()); private final EndpointCertificateValidatorImpl endpointCertificateValidator = new EndpointCertificateValidatorImpl(secretStore, clock); - private final EndpointCertificateManager endpointCertificateManager = - new EndpointCertificateManager(zoneRegistryMock, mockCuratorDb, endpointCertificateMock, endpointCertificateValidator, clock); + private final EndpointCertificateManager endpointCertificateManager = new EndpointCertificateManager(tester.controller(), endpointCertificateMock, endpointCertificateValidator); + private final KeyPair testKeyPair = KeyUtils.generateKeypair(KeyAlgorithm.EC, 192); + + private X509Certificate testCertificate; + private X509Certificate testCertificate2; private static final List expectedSans = List.of( "vt2ktgkqme5zlnp4tj4ttyor7fj3v7q5o.vespa.oath.cloud", @@ -81,11 +80,7 @@ public class EndpointCertificateManagerTest { "*.default.default.us-east-1.dev.vespa.oath.cloud" ); - private static final KeyPair testKeyPair = KeyUtils.generateKeypair(KeyAlgorithm.EC, 192); - private static final X509Certificate testCertificate = makeTestCert(expectedSans); - private static final X509Certificate testCertificate2 = makeTestCert(expectedCombinedSans); - - private static X509Certificate makeTestCert(List sans) { + private X509Certificate makeTestCert(List sans) { X509CertificateBuilder x509CertificateBuilder = X509CertificateBuilder .fromKeypair( testKeyPair, @@ -104,13 +99,16 @@ public class EndpointCertificateManagerTest { @Before public void setUp() { - zoneRegistryMock.exclusiveRoutingIn(zoneRegistryMock.zones().all().zones()); - testZone = zoneRegistryMock.zones().directlyRouted().in(Environment.prod).zones().stream().findFirst().orElseThrow().getId(); + tester.zoneRegistry().exclusiveRoutingIn(tester.zoneRegistry().zones().all().zones()); + testZone = tester.zoneRegistry().zones().directlyRouted().in(Environment.prod).zones().stream().findFirst().orElseThrow().getId(); + clock.setInstant(Instant.EPOCH); + testCertificate = makeTestCert(expectedSans); + testCertificate2 = makeTestCert(expectedCombinedSans); } @Test public void provisions_new_certificate_in_dev() { - ZoneId testZone = zoneRegistryMock.zones().directlyRouted().in(Environment.dev).zones().stream().findFirst().orElseThrow().getId(); + ZoneId testZone = tester.zoneRegistry().zones().directlyRouted().in(Environment.dev).zones().stream().findFirst().orElseThrow().getId(); Optional endpointCertificateMetadata = endpointCertificateManager.getEndpointCertificateMetadata(testInstance, testZone, Optional.empty()); assertTrue(endpointCertificateMetadata.isPresent()); assertTrue(endpointCertificateMetadata.get().keyName().matches("vespa.tls.default.default.*-key")); @@ -160,7 +158,7 @@ public class EndpointCertificateManagerTest { @Test public void reprovisions_certificate_with_added_sans_when_deploying_to_new_zone() { - ZoneId testZone = zoneRegistryMock.zones().directlyRouted().in(Environment.prod).zones().stream().skip(1).findFirst().orElseThrow().getId(); + ZoneId testZone = tester.zoneRegistry().zones().directlyRouted().in(Environment.prod).zones().stream().skip(1).findFirst().orElseThrow().getId(); mockCuratorDb.writeEndpointCertificateMetadata(testInstance.id(), new EndpointCertificateMetadata(testKeyName, testCertName, -1, 0, "original-request-uuid", expectedSans, "mockCa", Optional.empty(), Optional.empty())); secretStore.setSecret("vespa.tls.default.default.default-key", KeyUtils.toPem(testKeyPair.getPrivate()), -1); @@ -190,7 +188,7 @@ public class EndpointCertificateManagerTest { " \n" + "\n"); - ZoneId testZone = zoneRegistryMock.zones().controllerUpgraded().in(Environment.staging).zones().stream().findFirst().orElseThrow().getId(); + ZoneId testZone = tester.zoneRegistry().zones().all().in(Environment.staging).zones().stream().findFirst().orElseThrow().getId(); Optional endpointCertificateMetadata = endpointCertificateManager.getEndpointCertificateMetadata(testInstance, testZone, Optional.of(deploymentSpec.requireInstance("default"))); assertTrue(endpointCertificateMetadata.isPresent()); assertTrue(endpointCertificateMetadata.get().keyName().matches("vespa.tls.default.default.*-key")); @@ -198,4 +196,5 @@ public class EndpointCertificateManagerTest { assertEquals(0, endpointCertificateMetadata.get().version()); assertEquals(Set.copyOf(expectedCombinedSans), Set.copyOf(endpointCertificateMetadata.get().requestedDnsSans())); } + } -- cgit v1.2.3