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 | |
parent | c20789e307457b8c0eeef4587604a45cea5672b1 (diff) |
Rename Ckms -> SecretStore
-rw-r--r-- | athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/CkmsKeyProvider.java | 10 | ||||
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/SecretStore.java (renamed from container-disc/src/main/java/com/yahoo/container/jdisc/Ckms.java) | 2 | ||||
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java | 10 | ||||
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResource.java | 14 | ||||
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResourceTest.java | 8 |
5 files changed, 22 insertions, 22 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); } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/Ckms.java b/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStore.java index 26c71686a82..5e18f608777 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/Ckms.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStore.java @@ -5,7 +5,7 @@ package com.yahoo.container.jdisc; /** * @author mortent */ -public interface Ckms { +public interface SecretStore { /** Returns the secret for this key */ String getSecret(String key); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java index 806932385e1..f719debdc85 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzClientFactoryImpl.java @@ -9,7 +9,7 @@ import com.yahoo.athenz.auth.token.PrincipalToken; import com.yahoo.athenz.auth.util.Crypto; import com.yahoo.athenz.zms.ZMSClient; import com.yahoo.athenz.zts.ZTSClient; -import com.yahoo.container.jdisc.Ckms; +import com.yahoo.container.jdisc.SecretStore; import com.yahoo.container.jdisc.athenz.AthenzIdentityProvider; import com.yahoo.vespa.athenz.api.NToken; import com.yahoo.vespa.athenz.utils.AthenzIdentities; @@ -25,14 +25,14 @@ import java.security.PrivateKey; */ public class AthenzClientFactoryImpl implements AthenzClientFactory { - private final Ckms ckms; + private final SecretStore secretStore; private final AthenzConfig config; private final AthenzPrincipalAuthority athenzPrincipalAuthority; private final AthenzIdentityProvider identityProvider; @Inject - public AthenzClientFactoryImpl(Ckms ckms, AthenzIdentityProvider identityProvider, AthenzConfig config) { - this.ckms = ckms; + public AthenzClientFactoryImpl(SecretStore secretStore, AthenzIdentityProvider identityProvider, AthenzConfig config) { + this.secretStore = secretStore; this.identityProvider = identityProvider; this.config = config; this.athenzPrincipalAuthority = new AthenzPrincipalAuthority(config.principalHeaderName()); @@ -72,7 +72,7 @@ public class AthenzClientFactoryImpl implements AthenzClientFactory { private PrivateKey getServicePrivateKey() { AthenzConfig.Service service = config.service(); - String privateKey = ckms.getSecret(service.privateKeySecretName(), service.privateKeyVersion()).trim(); + String privateKey = secretStore.getSecret(service.privateKeySecretName(), service.privateKeyVersion()).trim(); return Crypto.loadPrivateKey(privateKey); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResource.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResource.java index d0154ace4e0..96f64f945b5 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResource.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResource.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.restapi.impl; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; import com.yahoo.container.jaxrs.annotation.Component; -import com.yahoo.container.jdisc.Ckms; +import com.yahoo.container.jdisc.SecretStore; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -24,20 +24,20 @@ import javax.ws.rs.core.UriBuilder; public class StatusPageResource implements com.yahoo.vespa.hosted.controller.api.statuspage.StatusPageResource { private final Client client; - private final Ckms ckms; + private final SecretStore secretStore; @Inject - public StatusPageResource(@Component Ckms ckms) { - this(ckms, ClientBuilder.newClient()); + public StatusPageResource(@Component SecretStore secretStore) { + this(secretStore, ClientBuilder.newClient()); } - protected StatusPageResource(Ckms ckms, Client client) { - this.ckms = ckms; + protected StatusPageResource(SecretStore secretStore, Client client) { + this.secretStore = secretStore; this.client = client; } protected UriBuilder statusPageURL(String page, String since) { - String[] secrets = ckms.getSecret("vespa_hosted.controller.statuspage_api_key").split(":"); + String[] secrets = secretStore.getSecret("vespa_hosted.controller.statuspage_api_key").split(":"); UriBuilder uriBuilder = UriBuilder.fromUri("https://" + secrets[0] + ".statuspage.io/api/v2/" + page + ".json?api_key=" + secrets[1]); if (since != null) { uriBuilder.queryParam("since", since); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResourceTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResourceTest.java index b116ba3b5ee..851b023c8fb 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResourceTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/restapi/impl/StatusPageResourceTest.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.restapi.impl; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.yahoo.container.jdisc.Ckms; +import com.yahoo.container.jdisc.SecretStore; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -30,15 +30,15 @@ public class StatusPageResourceTest { Client mockClient = Mockito.mock(Client.class); WebTarget mockTarget = Mockito.mock(WebTarget.class); Invocation.Builder mockRequest = Mockito.mock(Invocation.Builder.class); - Ckms ckms = Mockito.mock(Ckms.class); + SecretStore secretStore = Mockito.mock(SecretStore.class); Mockito.when(mockClient.target(Mockito.any(UriBuilder.class))).thenReturn(mockTarget); Mockito.when(mockTarget.request()).thenReturn(mockRequest); Mockito.when(mockRequest.get(JsonNode.class)).thenReturn( new ObjectMapper().readTree("{\"page\":{\"name\":\"Vespa\"}}")); - Mockito.when(ckms.getSecret(Mockito.any(String.class))).thenReturn("testpage:testkey"); + Mockito.when(secretStore.getSecret(Mockito.any(String.class))).thenReturn("testpage:testkey"); - statusPage = new StatusPageResource(ckms, mockClient); + statusPage = new StatusPageResource(secretStore, mockClient); } |