diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-12-19 13:30:43 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-01-03 13:50:08 +0100 |
commit | b3ae7caa9d7ed625d41328e6327e9a5ae87ed835 (patch) | |
tree | a3ba3ee124b251da0e333c0241a4d99554d2bbd9 | |
parent | 615232d1cd53b20c7e91a2d445c4cd162c11e54b (diff) |
Provide Athenz identity of configservers in ZoneRegistry
2 files changed, 9 insertions, 0 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java index 03207d86983..e95c297b593 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java @@ -5,6 +5,7 @@ import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.SystemName; import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; +import com.yahoo.vespa.hosted.controller.api.integration.athenz.AthenzService; import java.net.URI; import java.time.Duration; @@ -52,4 +53,7 @@ public interface ZoneRegistry { /** Returns the system of this registry. */ SystemName system(); + /** Return the configserver's Athenz service identity */ + AthenzService getConfigserverAthenzService(ZoneId zoneId); + } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java index 82434b6260c..21072f0b162 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java @@ -8,6 +8,7 @@ import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.SystemName; import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId; import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; +import com.yahoo.vespa.hosted.controller.api.integration.athenz.AthenzService; import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry; import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneFilter; import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneFilterMock; @@ -68,6 +69,10 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry return ZoneFilterMock.from(Collections.unmodifiableList(zones)); } + public AthenzService getConfigserverAthenzService(ZoneId zone) { + return new AthenzService("vespadomain", "provider-" + zone.environment().value() + "-" + zone.region().value()); + } + @Override public boolean hasZone(ZoneId zoneId) { return zones.contains(zoneId); |