diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-04-13 14:52:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-13 14:52:12 +0200 |
commit | 23ec3ccc6a124fb1d10916279f9a79688a1e91d9 (patch) | |
tree | 4961d7f01ebe9472fc3454c06f606bb0af7fc62f /vespa-athenz/src | |
parent | 5905ac318a39b0258f392924ed0959e55e35e586 (diff) |
Revert "Jonmv/reapply upgrade athenz"
Diffstat (limited to 'vespa-athenz/src')
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/aws/AwsCredentials.java | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/aws/AwsCredentials.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/aws/AwsCredentials.java index b5473929184..30ff63fb108 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/aws/AwsCredentials.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/aws/AwsCredentials.java @@ -25,18 +25,12 @@ public class AwsCredentials { private final AthenzDomain athenzDomain; private final AwsRole awsRole; private final ZtsClient ztsClient; - private final String externalId; private volatile AwsTemporaryCredentials credentials; public AwsCredentials(ZtsClient ztsClient, AthenzDomain athenzDomain, AwsRole awsRole) { - this(ztsClient, athenzDomain, awsRole, null); - } - - public AwsCredentials(ZtsClient ztsClient, AthenzDomain athenzDomain, AwsRole awsRole, String externalId) { this.ztsClient = ztsClient; this.athenzDomain = athenzDomain; this.awsRole = awsRole; - this.externalId = externalId; this.credentials = get(); } @@ -48,16 +42,12 @@ public class AwsCredentials { this(new DefaultZtsClient.Builder(ztsUrl).withSslContext(sslContext).build(), athenzDomain, awsRole); } - public AwsCredentials(URI ztsUrl, SSLContext sslContext, AthenzDomain athenzDomain, AwsRole awsRole, String externalId) { - this(new DefaultZtsClient.Builder(ztsUrl).withSslContext(sslContext).build(), athenzDomain, awsRole, externalId); - } - /** * Requests temporary credentials from ZTS or return cached credentials */ public AwsTemporaryCredentials get() { if(shouldRefresh(credentials)) { - this.credentials = ztsClient.getAwsTemporaryCredentials(athenzDomain, awsRole, externalId); + this.credentials = ztsClient.getAwsTemporaryCredentials(athenzDomain, awsRole); } return credentials; } |