diff options
author | Morten Tokle <mortent@verizonmedia.com> | 2021-06-04 09:23:01 +0200 |
---|---|---|
committer | Morten Tokle <mortent@verizonmedia.com> | 2021-06-04 09:23:01 +0200 |
commit | 71e0b55944f86b0b82a43a67e6d920d5ccc2ccf1 (patch) | |
tree | 9132b55d2fe6c838e74868b867670b976f97b363 /vespa-athenz | |
parent | 7c70ce4afe908e054316dd89f54988dee3e9213d (diff) |
Use new API to get role cert
Diffstat (limited to 'vespa-athenz')
2 files changed, 2 insertions, 5 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java index cdbf0755059..24234757590 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java @@ -165,7 +165,7 @@ public class DefaultZtsClient extends ClientBase implements ZtsClient { @Override public X509Certificate getRoleCertificate(AthenzRole role, Pkcs10Csr csr, Duration expiry) { RoleCertificateRequestEntity requestEntity = new RoleCertificateRequestEntity(csr, expiry); - URI uri = ztsUrl.resolve(String.format("domain/%s/role/%s/token", role.domain().getName(), role.roleName())); + URI uri = ztsUrl.resolve("rolecert"); HttpUriRequest request = RequestBuilder.post(uri) .setEntity(toJsonStringEntity(requestEntity)) .build(); diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/RoleCertificateResponseEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/RoleCertificateResponseEntity.java index 857bfad9143..cd9a12c0074 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/RoleCertificateResponseEntity.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/RoleCertificateResponseEntity.java @@ -16,12 +16,9 @@ import java.time.Instant; @JsonIgnoreProperties(ignoreUnknown = true) public class RoleCertificateResponseEntity { public final X509Certificate certificate; - public final Instant expiry; @JsonCreator - public RoleCertificateResponseEntity(@JsonProperty("token") @JsonDeserialize(using = X509CertificateDeserializer.class) X509Certificate certificate, - @JsonProperty("expiryTime") Instant expiry) { + public RoleCertificateResponseEntity(@JsonProperty("x509Certificate") @JsonDeserialize(using = X509CertificateDeserializer.class) X509Certificate certificate) { this.certificate = certificate; - this.expiry = expiry; } } |