summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2020-08-11 16:13:27 +0200
committerGitHub <noreply@github.com>2020-08-11 16:13:27 +0200
commit265de2d8a13bd08472e9872bfffef78e00fe444c (patch)
tree081fece24c1f6a497bf70cf344811e83c2cd6beb /controller-api
parent2489d302d50567e7f145c8aff971bb892c9ce87c (diff)
Revert "record when endpoint certificates have last been requested (#14026)"
This reverts commit 2489d302d50567e7f145c8aff971bb892c9ce87c.
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMetadata.java29
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java2
2 files changed, 5 insertions, 26 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 e610e5505af..53366c9b922 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
@@ -16,21 +16,19 @@ public class EndpointCertificateMetadata {
private final String keyName;
private final String certName;
private final int version;
- private final long lastRequested;
// TODO: make these fields required once all certs have them stored
private final Optional<String> request_id;
private final Optional<List<String>> requestedDnsSans;
private final Optional<String> issuer;
- public EndpointCertificateMetadata(String keyName, String certName, int version, long lastRequested) {
- this(keyName, certName, version, lastRequested, Optional.empty(), Optional.empty(), Optional.empty());
+ public EndpointCertificateMetadata(String keyName, String certName, int version) {
+ this(keyName, certName, version, Optional.empty(), Optional.empty(), Optional.empty());
}
- public EndpointCertificateMetadata(String keyName, String certName, int version, long lastRequested, Optional<String> request_id, Optional<List<String>> requestedDnsSans, Optional<String> issuer) {
+ public EndpointCertificateMetadata(String keyName, String certName, int version, Optional<String> request_id, Optional<List<String>> requestedDnsSans, Optional<String> issuer) {
this.keyName = keyName;
this.certName = certName;
this.version = version;
- this.lastRequested = lastRequested;
this.request_id = request_id;
this.requestedDnsSans = requestedDnsSans;
this.issuer = issuer;
@@ -48,10 +46,6 @@ public class EndpointCertificateMetadata {
return version;
}
- public long lastRequested() {
- return lastRequested;
- }
-
public Optional<String> request_id() {
return request_id;
}
@@ -69,19 +63,6 @@ public class EndpointCertificateMetadata {
this.keyName,
this.certName,
version,
- this.lastRequested,
- this.request_id,
- this.requestedDnsSans,
- this.issuer
- );
- }
-
- public EndpointCertificateMetadata withLastRequested(long lastRequested) {
- return new EndpointCertificateMetadata(
- this.keyName,
- this.certName,
- this.version,
- lastRequested,
this.request_id,
this.requestedDnsSans,
this.issuer
@@ -94,7 +75,6 @@ public class EndpointCertificateMetadata {
"keyName='" + keyName + '\'' +
", certName='" + certName + '\'' +
", version=" + version +
- ", lastRequested=" + lastRequested +
", request_id=" + request_id +
", requestedDnsSans=" + requestedDnsSans +
", issuer=" + issuer +
@@ -107,7 +87,6 @@ public class EndpointCertificateMetadata {
if (o == null || getClass() != o.getClass()) return false;
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) &&
@@ -117,6 +96,6 @@ public class EndpointCertificateMetadata {
@Override
public int hashCode() {
- return Objects.hash(keyName, certName, version, lastRequested, request_id, requestedDnsSans, issuer);
+ return Objects.hash(keyName, certName, version, request_id, requestedDnsSans, issuer);
}
}
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 a484bb329a3..b0d45b0d7bb 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
@@ -25,7 +25,7 @@ public class EndpointCertificateMock implements EndpointCertificateProvider {
this.dnsNames.put(applicationId, dnsNames);
String endpointCertificatePrefix = String.format("vespa.tls.%s.%s.%s", applicationId.tenant(),
applicationId.application(), applicationId.instance());
- return new EndpointCertificateMetadata(endpointCertificatePrefix + "-key", endpointCertificatePrefix + "-cert", 0, 0, Optional.of("mock-id-string"), Optional.of(dnsNames), Optional.of("mockCa"));
+ return new EndpointCertificateMetadata(endpointCertificatePrefix + "-key", endpointCertificatePrefix + "-cert", 0, Optional.of("mock-id-string"), Optional.of(dnsNames), Optional.of("mockCa"));
}
@Override