diff options
author | Morten Tokle <mortent@oath.com> | 2018-04-23 15:15:02 +0200 |
---|---|---|
committer | Morten Tokle <mortent@oath.com> | 2018-04-23 15:15:02 +0200 |
commit | 7c3160ddd88d7b8ee4a37b8aa59ed561280e8a76 (patch) | |
tree | c1f610c3ba755e1092bb71b265df5eb69ba125f2 /athenz-identity-provider-service | |
parent | c20789e307457b8c0eeef4587604a45cea5672b1 (diff) |
Rename Ckms -> SecretStore
Diffstat (limited to 'athenz-identity-provider-service')
-rw-r--r-- | athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/CkmsKeyProvider.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/CkmsKeyProvider.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/CkmsKeyProvider.java index 41aee29d761..983f0749a42 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/CkmsKeyProvider.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/CkmsKeyProvider.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.athenz.instanceproviderservice.impl; import com.google.inject.Inject; import com.yahoo.config.provision.Zone; -import com.yahoo.container.jdisc.Ckms; +import com.yahoo.container.jdisc.SecretStore; import com.yahoo.vespa.athenz.tls.KeyUtils; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.KeyProvider; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.config.AthenzProviderServiceConfig; @@ -23,15 +23,15 @@ import static com.yahoo.vespa.hosted.athenz.instanceproviderservice.impl.Utils.g @SuppressWarnings("unused") // Injected component public class CkmsKeyProvider implements KeyProvider { - private final Ckms ckms; + private final SecretStore secretStore; private final String secretName; private final Map<Integer, KeyPair> secrets; @Inject - public CkmsKeyProvider(Ckms ckms, + public CkmsKeyProvider(SecretStore secretStore, Zone zone, AthenzProviderServiceConfig config) { - this.ckms = ckms; + this.secretStore = secretStore; this.secretName = getZoneConfig(config, zone).secretName(); this.secrets = new HashMap<>(); } @@ -59,7 +59,7 @@ public class CkmsKeyProvider implements KeyProvider { } private KeyPair readKeyPair(int version) { - PrivateKey privateKey = KeyUtils.fromPemEncodedPrivateKey(ckms.getSecret(secretName, version)); + PrivateKey privateKey = KeyUtils.fromPemEncodedPrivateKey(secretStore.getSecret(secretName, version)); PublicKey publicKey = KeyUtils.extractPublicKey(privateKey); return new KeyPair(publicKey, privateKey); } |