diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-10-26 16:36:10 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-10-27 13:18:20 +0200 |
commit | abe78abeb5e7ed00dc3a743ca77a13e95fa47ce6 (patch) | |
tree | 2a4bd85bb288ac1bc8d20ca2153b09eef4f4aaf7 /controller-server/src/test | |
parent | 15719d50be8f37fdf78f4e6855af26c7d47d0ad8 (diff) |
Return enclave information for instance in application/v4
Diffstat (limited to 'controller-server/src/test')
2 files changed, 5 insertions, 1 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java index a3ea56ccc72..dd0f2ca028c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java @@ -255,6 +255,11 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry @Override public Optional<String> tenantDeveloperRoleArn(TenantName tenant) { return Optional.empty(); } @Override + public AthenzDomain cloudAccountAthenzDomain(CloudAccount cloudAccount) { + return AthenzDomain.from("vespa.enclave"); + } + + @Override public boolean hasZone(ZoneId zoneId) { return zones.stream().anyMatch(zone -> zone.getId().equals(zoneId)); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java index af0a85f1a90..ab671be23eb 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java @@ -331,7 +331,6 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest { "\"error-code\":\"BAD_REQUEST\"," + "\"message\":\"Invalid application id\"" + "}", 400); - } @Test |