log more when deleting endpoint certificates (#19587)

* log more when deleting endpoint certificates

* log before issuing delete

* add missing format argument

1 files changed, 10 insertions, 5 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainer.java
index 6b6c9084e87..f7e46aaa34a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EndpointCertificateMaintainer.java
@@ -160,16 +160,21 @@ public class EndpointCertificateMaintainer extends ControllerMaintainer {
         List<EndpointCertificateRequestMetadata> endpointCertificateMetadata = endpointCertificateProvider.listCertificates();
         Set<String> managedRequestIds = curator.readAllEndpointCertificateMetadata().values().stream().map(EndpointCertificateMetadata::requestId).collect(Collectors.toSet());
 
-        for (var cameoCertificateMetadata : endpointCertificateMetadata) {
-            if (!managedRequestIds.contains(cameoCertificateMetadata.requestId())) {
+        for (var providerCertificateMetadata : endpointCertificateMetadata) {
+            if (!managedRequestIds.contains(providerCertificateMetadata.requestId())) {
                 if (deleteUnmaintainedCertificates.value()) {
                     // The certificate is not known - however it could be in the process of being requested by us or another controller.
                     // So we only delete if it was requested more than 7 days ago.
-                    if (Instant.parse(cameoCertificateMetadata.createTime()).isBefore(Instant.now().minus(7, ChronoUnit.DAYS))) {
-                        endpointCertificateProvider.deleteCertificate(ApplicationId.fromSerializedForm("applicationid:is:unknown"), cameoCertificateMetadata.requestId());
+                    if (Instant.parse(providerCertificateMetadata.createTime()).isBefore(Instant.now().minus(7, ChronoUnit.DAYS))) {
+                        log.log(Level.INFO, String.format("Deleting unmaintained certificate with request_id %s and SANs %s",
+                                providerCertificateMetadata.requestId(),
+                                providerCertificateMetadata.dnsNames().stream().map(d -> d.dnsName).collect(Collectors.joining(", "))));
+                        endpointCertificateProvider.deleteCertificate(ApplicationId.fromSerializedForm("applicationid:is:unknown"), providerCertificateMetadata.requestId());
                     }
                 } else {
-                    log.info("Certificate metadata exists with provider but is not managed by controller: " + cameoCertificateMetadata);
+                    log.log(Level.INFO, String.format("Found unmaintained certificate with request_id %s and SANs %s",
+                            providerCertificateMetadata.requestId(),
+                            providerCertificateMetadata.dnsNames().stream().map(d -> d.dnsName).collect(Collectors.joining(", "))));
                 }
             }
         }