diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-02-23 12:24:18 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-02-23 12:24:18 +0100 |
commit | 64fb3d8bde1b479d5412ea39d4d914d8a62acd3a (patch) | |
tree | 37acb2e1c5a43ad2db5b2a33228761d4618d7f55 | |
parent | 371216d2a98b70a9aab317095169be04525b3208 (diff) |
Use Ckms instead of SecretStore in StatusPageResource
2 files changed, 11 insertions, 11 deletions
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 f5852b9dfcf..d0154ace4e0 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.vespa.hosted.controller.api.integration.security.KeyService; +import com.yahoo.container.jdisc.Ckms; 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 KeyService keyService; + private final Ckms ckms; @Inject - public StatusPageResource(@Component KeyService keyService) { - this(keyService, ClientBuilder.newClient()); + public StatusPageResource(@Component Ckms ckms) { + this(ckms, ClientBuilder.newClient()); } - protected StatusPageResource(KeyService keyService, Client client) { - this.keyService = keyService; + protected StatusPageResource(Ckms ckms, Client client) { + this.ckms = ckms; this.client = client; } protected UriBuilder statusPageURL(String page, String since) { - String[] secrets = keyService.getSecret("vespa_hosted.controller.statuspage_api_key").split(":"); + String[] secrets = ckms.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 4e2e4bb15b4..b116ba3b5ee 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.vespa.hosted.controller.api.integration.security.KeyService; +import com.yahoo.container.jdisc.Ckms; 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); - KeyService keyService = Mockito.mock(KeyService.class); + Ckms ckms = Mockito.mock(Ckms.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(keyService.getSecret(Mockito.any(String.class))).thenReturn("testpage:testkey"); + Mockito.when(ckms.getSecret(Mockito.any(String.class))).thenReturn("testpage:testkey"); - statusPage = new StatusPageResource(keyService, mockClient); + statusPage = new StatusPageResource(ckms, mockClient); } |