diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-11-12 09:53:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-12 09:53:20 +0100 |
| commit | ccf1fa3639fa60ab775fdd0630bde5183d234a45 (patch) | |
| tree | a880112953528e0e9b7c5e209515f538e0a7b238 /controller-server | |
| parent | f8c6a1d99dca72ca1ee1d22261f6900814a150d1 (diff) | |
| parent | b646d63b666d722aeaf1aa8cea49cce70164dea8 (diff) | |
Merge pull request #19986 from vespa-engine/mpolden/application-api-fix
Handle application scope in application API
Diffstat (limited to 'controller-server')
4 files changed, 20 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 0ecf259be1c..ef129dd76f7 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -2678,7 +2678,8 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { private static String endpointScopeString(Endpoint.Scope scope) { switch (scope) { - case weighted: return "region"; + case weighted: return "weighted"; + case application: return "application"; case global: return "global"; case zone: return "zone"; } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java index e322205f064..ae6232ae419 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java @@ -10,6 +10,7 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ApplicationName; import com.yahoo.config.provision.AthenzService; import com.yahoo.config.provision.Environment; +import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.zone.RoutingMethod; @@ -140,6 +141,7 @@ public class ApplicationApiTest extends ControllerContainerTest { .region("us-east-3") .region("us-west-1") .blockChange(false, true, "mon-fri", "0-8", "UTC") + .applicationEndpoint("a0", "foo", "us-central-1", Map.of(InstanceName.from("instance1"), 1)) .build(); private static final AthenzDomain ATHENZ_TENANT_DOMAIN = new AthenzDomain("domain1"); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment.json index 3ce83528b2c..fb6088f54b8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment.json @@ -20,6 +20,14 @@ "scope": "global", "routingMethod": "shared", "legacy": false + }, + { + "cluster": "foo", + "tls": true, + "url": "https://a0--application1--tenant1.us-central-1-r.vespa.oath.cloud:4443/", + "scope": "application", + "routingMethod": "shared", + "legacy": false } ], "clusters": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/clusters", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-us-central-1.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-us-central-1.json index 4edbc58121b..409e97b063c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-us-central-1.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-us-central-1.json @@ -23,6 +23,14 @@ "scope": "global", "routingMethod": "shared", "legacy": false + }, + { + "cluster": "foo", + "tls": true, + "url": "https://a0--application1--tenant1.us-central-1-r.vespa.oath.cloud:4443/", + "scope": "application", + "routingMethod": "shared", + "legacy": false } ], "clusters":"http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/clusters", |