diff options
author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-07-19 14:28:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-19 14:28:27 +0200 |
commit | 344f131dde68738a351f35afbdef504c995f6ca3 (patch) | |
tree | 228ef227b225524e31816ef45bdc4a1645bcde7b /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java | |
parent | 4b04f0b6da1c27f7be90e2a87f29aad10d70d5b8 (diff) | |
parent | 8b372efe2a7347c24f7db6326d314e840362d070 (diff) |
Merge pull request #10071 from vespa-engine/ogronnesby/athenz-domain-for-test-runner-config
Use security domain from ZoneRegistry in InternalStepRunner
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java')
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java | 7 |
1 files changed, 6 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 f802a6af549..cff0f8da463 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 @@ -6,6 +6,7 @@ import com.google.inject.Inject; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.component.AbstractComponent; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.AthenzDomain; import com.yahoo.config.provision.CloudName; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; @@ -27,7 +28,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.stream.Collectors; /** * @author mpolden @@ -108,6 +108,11 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry } @Override + public AthenzDomain accessControlDomain() { + return AthenzDomain.from("vespadomain"); + } + + @Override public UpgradePolicy upgradePolicy() { return upgradePolicy; } |