From ca7b5e5421f6734879314bd2a67fc8f178d2645a Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Wed, 14 Mar 2018 10:42:29 +0100 Subject: Fix TODOs --- .../vespa/hosted/controller/api/integration/zone/ZoneRegistry.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'controller-api') 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 81283ce802f..85657aadc33 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 @@ -28,9 +28,8 @@ public interface ZoneRegistry { /** Returns the default region for the given environment, if one is configured. */ Optional getDefaultRegion(Environment environment); - // TODO Rename to getConfigServerUris once port 4080 is removed from configservers /** Returns a list with all known config servers in the given zone, with a secure connection URL. */ - List getConfigServerSecureUris(ZoneId zoneId); + List getConfigServerUris(ZoneId zoneId); /** Returns a URL with the logs for the given deployment, if logging is configured for its zone. */ Optional getLogServerUri(DeploymentId deploymentId); -- cgit v1.2.3 From cfd386e9bca93bd49f21454ecff143f9323381b4 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Wed, 14 Mar 2018 10:45:10 +0100 Subject: Remove unused method --- .../controller/api/integration/zone/ZoneRegistry.java | 19 ++++++++----------- .../vespa/hosted/controller/ZoneRegistryMock.java | 5 ----- 2 files changed, 8 insertions(+), 16 deletions(-) (limited to 'controller-api') 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 85657aadc33..4fa24a5e866 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 @@ -19,31 +19,28 @@ import java.util.Optional; */ public interface ZoneRegistry { - /** Returns whether the system of this registry contains the given zone. */ + /** Returns whether the system of this registry contains the given zone */ boolean hasZone(ZoneId zoneId); - /** Returns a list containing the id of all zones in this registry. */ + /** Returns a list containing the id of all zones in this registry */ ZoneFilter zones(); - /** Returns the default region for the given environment, if one is configured. */ + /** Returns the default region for the given environment, if one is configured */ Optional getDefaultRegion(Environment environment); - /** Returns a list with all known config servers in the given zone, with a secure connection URL. */ + /** Returns a list with all known config servers in the given zone, with a secure connection URL */ List getConfigServerUris(ZoneId zoneId); - /** Returns a URL with the logs for the given deployment, if logging is configured for its zone. */ + /** Returns a URL with the logs for the given deployment, if logging is configured for its zone */ Optional getLogServerUri(DeploymentId deploymentId); - /** Returns the time to live for deployments in the given zone, or empty if this is infinite. */ + /** Returns the time to live for deployments in the given zone, or empty if this is infinite */ Optional getDeploymentTimeToLive(ZoneId zoneId); - /** Returns a URL pointing at monitoring resources for the given deployment. */ + /** Returns the monitoring system URL for the given deployment */ URI getMonitoringSystemUri(DeploymentId deploymentId); - /** Returns the URL of the dashboard for the system of this registry. */ - URI getDashboardUri(); - - /** Returns the system of this registry. */ + /** Returns the system of this registry */ SystemName system(); /** Return the configserver's Athenz service identity */ 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 4978fa77b26..113ee3d6737 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 @@ -125,9 +125,4 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry + deploymentId.zoneId().region().value() + "&application=" + deploymentId.applicationId().toShortString()); } - @Override - public URI getDashboardUri() { - return URI.create("http://dashboard.test"); - } - } -- cgit v1.2.3 From 02f13f889ff02ebc05c3f94763eb34a249fd6191 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Wed, 14 Mar 2018 10:52:43 +0100 Subject: Make casing consistent --- .../vespa/hosted/controller/api/integration/zone/ZoneRegistry.java | 2 +- .../vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java | 2 +- .../test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'controller-api') 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 4fa24a5e866..25b286bf94c 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 @@ -44,6 +44,6 @@ public interface ZoneRegistry { SystemName system(); /** Return the configserver's Athenz service identity */ - AthenzService getConfigserverAthenzService(ZoneId zoneId); + AthenzService getConfigServerAthenzService(ZoneId zoneId); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java index b23ff3e67ed..06dc29b3b70 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java @@ -263,7 +263,7 @@ public class ConfigServerRestExecutorImpl implements ConfigServerRestExecutor { AthenzIdentityVerifier hostnameVerifier = new AthenzIdentityVerifier( singleton( - zoneRegistry.getConfigserverAthenzService( + zoneRegistry.getConfigServerAthenzService( ZoneId.from(proxyRequest.getEnvironment(), proxyRequest.getRegion())))); return HttpClientBuilder.create() .setUserAgent("config-server-proxy-client") 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 113ee3d6737..d7504edb342 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 @@ -76,7 +76,7 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry return ZoneFilterMock.from(Collections.unmodifiableList(zones)); } - public AthenzService getConfigserverAthenzService(ZoneId zone) { + public AthenzService getConfigServerAthenzService(ZoneId zone) { return new AthenzService("vespadomain", "provider-" + zone.environment().value() + "-" + zone.region().value()); } -- cgit v1.2.3