aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eriksen <andreer@yahooinc.com>2023-05-15 12:45:02 +0200
committerGitHub <noreply@github.com>2023-05-15 12:45:02 +0200
commitc2359b5144e5547e52b020c81c07581a234bda7e (patch)
tree5b58799f57f2faa5fcb11391ca3d4ce55ffc4de8
parentc6c3a766726191b22672d470f8a2dfe77ed29d5b (diff)
re-request endpoint cert with new metadata (#27114)
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/certificate/EndpointCertificatesHandler.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/certificate/EndpointCertificatesHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/certificate/EndpointCertificatesHandler.java
index a00e80b17d4..9bee5623774 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/certificate/EndpointCertificatesHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/certificate/EndpointCertificatesHandler.java
@@ -42,7 +42,7 @@ public class EndpointCertificatesHandler extends ThreadedHttpRequestHandler {
public HttpResponse handle(HttpRequest request) {
if (request.getMethod().equals(GET)) return listEndpointCertificates();
- if (request.getMethod().equals(POST)) return reRequestEndpointCertificateFor(request.getProperty("application"));
+ if (request.getMethod().equals(POST)) return reRequestEndpointCertificateFor(request.getProperty("application"), request.getProperty("ignoreExistingMetadata") != null);
throw new RestApiException.MethodNotAllowed(request);
}
@@ -59,7 +59,7 @@ public class EndpointCertificatesHandler extends ThreadedHttpRequestHandler {
return new StringResponse(requestsWithNames);
}
- public StringResponse reRequestEndpointCertificateFor(String instanceId) {
+ public StringResponse reRequestEndpointCertificateFor(String instanceId, boolean ignoreExistingMetadata) {
ApplicationId applicationId = ApplicationId.fromFullString(instanceId);
try (var lock = curator.lock(TenantAndApplicationId.from(applicationId))) {
@@ -67,7 +67,7 @@ public class EndpointCertificatesHandler extends ThreadedHttpRequestHandler {
.orElseThrow(() -> new RestApiException.NotFound("No certificate found for application " + applicationId.serializedForm()));
EndpointCertificateMetadata reRequestedMetadata = endpointCertificateProvider.requestCaSignedCertificate(
- applicationId, endpointCertificateMetadata.requestedDnsSans(), Optional.of(endpointCertificateMetadata));
+ applicationId, endpointCertificateMetadata.requestedDnsSans(), ignoreExistingMetadata ? Optional.empty() : Optional.of(endpointCertificateMetadata));
curator.writeEndpointCertificateMetadata(applicationId, reRequestedMetadata);