Merge pull request #17813 from vespa-engine/mpolden/include-legacy-endpoint-in-cert

Include legacy endpoint in certificate in public

4 files changed, 37 insertions, 27 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
index 5216c1421fa..63701ca9547 100644
--- 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
@@ -18,18 +18,18 @@ public class EndpointCertificateMetadata {
     private final String certName;
     private final int version;
     private final long lastRequested;
-    private final String request_id;
+    private final String requestId;
     private final List<String> requestedDnsSans;
     private final String issuer;
     private final Optional<Long> expiry;
     private final Optional<Long> lastRefreshed;
 
-    public EndpointCertificateMetadata(String keyName, String certName, int version, long lastRequested, String request_id, List<String> requestedDnsSans, String issuer, Optional<Long> expiry, Optional<Long> lastRefreshed) {
+    public EndpointCertificateMetadata(String keyName, String certName, int version, long lastRequested, String requestId, List<String> requestedDnsSans, String issuer, Optional<Long> expiry, Optional<Long> lastRefreshed) {
         this.keyName = keyName;
         this.certName = certName;
         this.version = version;
         this.lastRequested = lastRequested;
-        this.request_id = request_id;
+        this.requestId = requestId;
         this.requestedDnsSans = requestedDnsSans;
         this.issuer = issuer;
         this.expiry = expiry;
@@ -52,8 +52,8 @@ public class EndpointCertificateMetadata {
         return lastRequested;
     }
 
-    public String request_id() {
-        return request_id;
+    public String requestId() {
+        return requestId;
     }
 
     public List<String> requestedDnsSans() {
@@ -78,7 +78,7 @@ public class EndpointCertificateMetadata {
                 this.certName,
                 version,
                 this.lastRequested,
-                this.request_id,
+                this.requestId,
                 this.requestedDnsSans,
                 this.issuer,
                 this.expiry,
@@ -91,7 +91,7 @@ public class EndpointCertificateMetadata {
                 this.certName,
                 this.version,
                 lastRequested,
-                this.request_id,
+                this.requestId,
                 this.requestedDnsSans,
                 this.issuer,
                 this.expiry,
@@ -104,7 +104,7 @@ public class EndpointCertificateMetadata {
                 this.certName,
                 this.version,
                 this.lastRequested,
-                this.request_id,
+                this.requestId,
                 this.requestedDnsSans,
                 this.issuer,
                 this.expiry,
@@ -127,16 +127,16 @@ public class EndpointCertificateMetadata {
     @Override
     public String toString() {
         return "EndpointCertificateMetadata{" +
-                "keyName='" + keyName + '\'' +
-                ", certName='" + certName + '\'' +
-                ", version=" + version +
-                ", lastRequested=" + lastRequested +
-                ", request_id=" + request_id +
-                ", requestedDnsSans=" + requestedDnsSans +
-                ", issuer=" + issuer +
-                ", expiry=" + expiry +
-                ", lastRefreshed=" + lastRefreshed +
-                '}';
+               "keyName='" + keyName + '\'' +
+               ", certName='" + certName + '\'' +
+               ", version=" + version +
+               ", lastRequested=" + lastRequested +
+               ", requestId=" + requestId +
+               ", requestedDnsSans=" + requestedDnsSans +
+               ", issuer=" + issuer +
+               ", expiry=" + expiry +
+               ", lastRefreshed=" + lastRefreshed +
+               '}';
     }
 
     @Override
@@ -146,17 +146,18 @@ public class EndpointCertificateMetadata {
         EndpointCertificateMetadata that = (EndpointCertificateMetadata) o;
         return version == that.version &&
                 lastRequested == that.lastRequested &&
-                keyName.equals(that.keyName) &&
-                certName.equals(that.certName) &&
-                request_id.equals(that.request_id) &&
-                requestedDnsSans.equals(that.requestedDnsSans) &&
-                issuer.equals(that.issuer) &&
-                expiry.equals(that.expiry) &&
-                lastRefreshed.equals(that.lastRefreshed);
+               keyName.equals(that.keyName) &&
+               certName.equals(that.certName) &&
+               requestId.equals(that.requestId) &&
+               requestedDnsSans.equals(that.requestedDnsSans) &&
+               issuer.equals(that.issuer) &&
+               expiry.equals(that.expiry) &&
+               lastRefreshed.equals(that.lastRefreshed);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(keyName, certName, version, lastRequested, request_id, requestedDnsSans, issuer, expiry, lastRefreshed);
+        return Objects.hash(keyName, certName, version, lastRequested, requestId, requestedDnsSans, issuer, expiry, lastRefreshed);
     }
+
 }
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!
     }
+
 }