diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-08-26 14:30:07 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-08-26 14:32:54 +0200 |
commit | f49fbf259ea28bf3025580f875885762f12dc651 (patch) | |
tree | b1cf65b9966a98480e3e3fee4307558643bec90c /vespa-athenz/src | |
parent | 1baf860bedd3b2193799ddd3a4a5b9dc50cb5c6a (diff) |
Remove unused parameters from ZtsClient methods
Diffstat (limited to 'vespa-athenz/src')
5 files changed, 5 insertions, 26 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 ddba229d8d1..7116bf72ec4 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 @@ -66,12 +66,10 @@ public class DefaultZtsClient extends ClientBase implements ZtsClient { @Override public InstanceIdentity registerInstance(AthenzIdentity providerIdentity, AthenzIdentity instanceIdentity, - String instanceId, String attestationData, - boolean requestServiceToken, Pkcs10Csr csr) { InstanceRegisterInformation payload = - new InstanceRegisterInformation(providerIdentity, instanceIdentity, attestationData, csr, requestServiceToken); + new InstanceRegisterInformation(providerIdentity, instanceIdentity, attestationData, csr); HttpUriRequest request = RequestBuilder.post() .setUri(ztsUrl.resolve("instance/")) .setEntity(toJsonStringEntity(payload)) @@ -83,9 +81,8 @@ public class DefaultZtsClient extends ClientBase implements ZtsClient { public InstanceIdentity refreshInstance(AthenzIdentity providerIdentity, AthenzIdentity instanceIdentity, String instanceId, - boolean requestServiceToken, Pkcs10Csr csr) { - InstanceRefreshInformation payload = new InstanceRefreshInformation(csr, requestServiceToken); + InstanceRefreshInformation payload = new InstanceRefreshInformation(csr); URI uri = ztsUrl.resolve( String.format("instance/%s/%s/%s/%s", providerIdentity.getFullName(), diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/ZtsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/ZtsClient.java index efe244d500f..c09ad8f48a0 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/ZtsClient.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/ZtsClient.java @@ -5,7 +5,6 @@ import com.yahoo.security.Pkcs10Csr; import com.yahoo.vespa.athenz.api.AthenzDomain; import com.yahoo.vespa.athenz.api.AthenzIdentity; import com.yahoo.vespa.athenz.api.AthenzRole; -import com.yahoo.vespa.athenz.api.AthenzService; import com.yahoo.vespa.athenz.api.AwsRole; import com.yahoo.vespa.athenz.api.AwsTemporaryCredentials; import com.yahoo.vespa.athenz.api.ZToken; @@ -30,9 +29,7 @@ public interface ZtsClient extends AutoCloseable { */ InstanceIdentity registerInstance(AthenzIdentity providerIdentity, AthenzIdentity instanceIdentity, - String instanceId, // TODO Remove this parameter (unused/unnecessary) String attestationData, - boolean requestServiceToken, Pkcs10Csr csr); /** @@ -43,7 +40,6 @@ public interface ZtsClient extends AutoCloseable { InstanceIdentity refreshInstance(AthenzIdentity providerIdentity, AthenzIdentity instanceIdentity, String instanceId, - boolean requestServiceToken, Pkcs10Csr csr); /** diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/InstanceRefreshInformation.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/InstanceRefreshInformation.java index fee91dbc15b..f6c359c09a8 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/InstanceRefreshInformation.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/InstanceRefreshInformation.java @@ -18,12 +18,8 @@ public class InstanceRefreshInformation { @JsonProperty("csr") @JsonSerialize(using = Pkcs10CsrSerializer.class) private final Pkcs10Csr csr; - @JsonProperty("token") - private final boolean requestServiceToken; - public InstanceRefreshInformation(Pkcs10Csr csr, - boolean requestServiceToken) { + public InstanceRefreshInformation(Pkcs10Csr csr) { this.csr = csr; - this.requestServiceToken = requestServiceToken; } } diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/InstanceRegisterInformation.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/InstanceRegisterInformation.java index 67a49059776..cd272ccf685 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/InstanceRegisterInformation.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/bindings/InstanceRegisterInformation.java @@ -4,10 +4,9 @@ package com.yahoo.vespa.athenz.client.zts.bindings; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.yahoo.vespa.athenz.api.AthenzIdentity; -import com.yahoo.vespa.athenz.api.AthenzService; import com.yahoo.security.Pkcs10Csr; import com.yahoo.security.Pkcs10CsrUtils; +import com.yahoo.vespa.athenz.api.AthenzIdentity; /** * Used for serializing request to ZTS @@ -26,23 +25,17 @@ public class InstanceRegisterInformation { private final String service; @JsonProperty("attestationData") private final String attestationData; - @JsonProperty("ssh") - private final String ssh = null; // Not needed @JsonProperty("csr") private final String csr; - @JsonProperty("token") - private final boolean token; public InstanceRegisterInformation(AthenzIdentity providerIdentity, AthenzIdentity instanceIdentity, String attestationData, - Pkcs10Csr csr, - boolean requestServiceToken) { + Pkcs10Csr csr) { this.provider = providerIdentity.getFullName(); this.domain = instanceIdentity.getDomain().getName(); this.service = instanceIdentity.getName(); this.attestationData = attestationData; this.csr = Pkcs10CsrUtils.toPem(csr); - this.token = requestServiceToken; } } diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java index 9e2d8bc548c..eccf1088cce 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzCredentialsService.java @@ -83,9 +83,7 @@ class AthenzCredentialsService { ztsClient.registerInstance( configserverIdentity, tenantIdentity, - null, EntityBindingsMapper.toAttestationData(document), - false, csr); X509Certificate certificate = instanceIdentity.certificate(); writeCredentialsToDisk(keyPair.getPrivate(), certificate, document); @@ -107,7 +105,6 @@ class AthenzCredentialsService { configserverIdentity, tenantIdentity, document.providerUniqueId().asDottedString(), - false, csr); X509Certificate certificate = instanceIdentity.certificate(); writeCredentialsToDisk(newKeyPair.getPrivate(), certificate, document); |