diff options
| author | Harald Musum <musum@verizonmedia.com> | 2023-03-20 12:01:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-20 12:01:50 +0100 |
| commit | 605fde0ceb8a8d1732efc18e61c3a0e8b657037b (patch) | |
| tree | 1a02355acb54e802217cbd1fb721ce8ff549f059 | |
| parent | 2306ee6febc80fb52bcb1f3d497e99807f3c1561 (diff) | |
| parent | e27994d162c154e49ed3d4da2312ee3766b1abf2 (diff) | |
Merge pull request #26486 from vespa-engine/hmusum/allow-access-to-state-v1-api-through-controller
Allow access to /state/v1 on config servers through controller
2 files changed, 4 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java index 3c832dc8873..caead4de03d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java @@ -38,7 +38,8 @@ public class ConfigServerApiHandler extends AuditLoggingRequestHandler { private static final URI CONTROLLER_URI = URI.create("https://localhost:4443/"); private static final List<HttpURL.Path> WHITELISTED_APIS = List.of(parse("/flags/v1/"), parse("/nodes/v2/"), - parse("/orchestrator/v1/")); + parse("/orchestrator/v1/"), + parse("/state/v1/")); private final ZoneRegistry zoneRegistry; private final ConfigServerRestExecutor proxy; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandlerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandlerTest.java index 8bda8ba0d59..82783485158 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandlerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandlerTest.java @@ -87,13 +87,12 @@ public class ConfigServerApiHandlerTest extends ControllerContainerTest { @Test void test_allowed_apis() { - // GET /configserver/v1/prod/us-north-1 tester.assertResponse(() -> operatorRequest("http://localhost:8080/configserver/v1/prod/us-north-1/"), - "{\"error-code\":\"FORBIDDEN\",\"message\":\"Cannot access path '/' through /configserver/v1, following APIs are permitted: /flags/v1/, /nodes/v2/, /orchestrator/v1/\"}", + "{\"error-code\":\"FORBIDDEN\",\"message\":\"Cannot access path '/' through /configserver/v1, following APIs are permitted: /flags/v1/, /nodes/v2/, /orchestrator/v1/, /state/v1/\"}", 403); tester.assertResponse(() -> operatorRequest("http://localhost:8080/configserver/v1/prod/us-north-1/application/v2/tenant/vespa"), - "{\"error-code\":\"FORBIDDEN\",\"message\":\"Cannot access path '/application/v2/tenant/vespa' through /configserver/v1, following APIs are permitted: /flags/v1/, /nodes/v2/, /orchestrator/v1/\"}", + "{\"error-code\":\"FORBIDDEN\",\"message\":\"Cannot access path '/application/v2/tenant/vespa' through /configserver/v1, following APIs are permitted: /flags/v1/, /nodes/v2/, /orchestrator/v1/, /state/v1/\"}", 403); } |