diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-05-10 22:27:36 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2021-05-25 16:42:36 +0200 |
commit | 7a7a00d3d08917ad738cf91590b901f0074d4b5d (patch) | |
tree | 5363741b73cc93b5aa5f2c6f3ff843f4322dc11a | |
parent | 66198687e08a341f09bb428f8080d87899f4f33d (diff) |
Rename request_id -> requestId
4 files changed, 30 insertions, 29 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-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java index fead9e26181..68652bff095 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java @@ -82,7 +82,7 @@ public class EndpointCertificates { if (!currentCertificateMetadata.get().requestedDnsSans().containsAll(requiredSansForZone)) { var reprovisionedCertificateMetadata = provisionEndpointCertificate(deployment, currentCertificateMetadata, instanceSpec) - .withRequestId(currentCertificateMetadata.get().request_id()); // We're required to keep the original request_id + .withRequestId(currentCertificateMetadata.get().requestId()); // 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 certificateValidator.validate(reprovisionedCertificateMetadata, instance.id().serializedForm(), zone, requiredSansForZone); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java index 7e4fc285793..3ced0d60453 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/EndpointCertificateMetadataSerializer.java @@ -46,7 +46,7 @@ public class EndpointCertificateMetadataSerializer { object.setString(certNameField, metadata.certName()); object.setLong(versionField, metadata.version()); object.setLong(lastRequestedField, metadata.lastRequested()); - object.setString(requestIdField, metadata.request_id()); + object.setString(requestIdField, metadata.requestId()); var cursor = object.setArray(requestedDnsSansField); metadata.requestedDnsSans().forEach(cursor::addString); object.setString(issuerField, metadata.issuer()); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java index 22a41740b91..a3580a9fda3 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java @@ -204,7 +204,7 @@ public class EndpointCertificatesTest { assertTrue(endpointCertificateMetadata.isPresent()); assertEquals(0, endpointCertificateMetadata.get().version()); assertEquals(endpointCertificateMetadata, mockCuratorDb.readEndpointCertificateMetadata(testInstance.id())); - assertEquals("original-request-uuid", endpointCertificateMetadata.get().request_id()); + assertEquals("original-request-uuid", endpointCertificateMetadata.get().requestId()); assertEquals(Set.copyOf(expectedCombinedSans), Set.copyOf(endpointCertificateMetadata.get().requestedDnsSans())); } |