Use ConsoleUrls instead of ZoneRegistry

2 files changed, 6 insertions, 27 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentFailureMails.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentFailureMails.java
index ef08c3a9adc..72728966dbc 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentFailureMails.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentFailureMails.java
@@ -1,9 +1,9 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.organization;
 
+import com.yahoo.vespa.hosted.controller.api.integration.ConsoleUrls;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.RunId;
-import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry;
 
 import java.util.Collection;
 
@@ -14,10 +14,10 @@ import java.util.Collection;
  */
 public class DeploymentFailureMails {
 
-    private final ZoneRegistry registry;
+    private final ConsoleUrls consoleUrls;
 
-    public DeploymentFailureMails(ZoneRegistry registry) {
-        this.registry = registry;
+    public DeploymentFailureMails(ConsoleUrls consoleUrls) {
+        this.consoleUrls = consoleUrls;
     }
 
     public Mail nodeAllocationFailure(RunId id, Collection<String> recipients) {
@@ -66,8 +66,8 @@ public class DeploymentFailureMails {
                                       jobToString(id.type()),
                                       id.application(),
                                       messageDetail,
-                                      registry.dashboardUrl(id),
-                                      registry.supportUrl()));
+                                      consoleUrls.deploymentRun(id),
+                                      consoleUrls.support()));
     }
 
     private String jobToString(JobType type) {
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 747c6b72172..92c0a6b1fbb 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
@@ -1,8 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.zone;
 
-import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.AthenzDomain;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.CloudName;
@@ -18,7 +16,6 @@ import com.yahoo.config.provision.zone.ZoneFilter;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.athenz.api.AthenzIdentity;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
-import com.yahoo.vespa.hosted.controller.api.integration.deployment.RunId;
 
 import java.net.URI;
 import java.time.Duration;
@@ -97,24 +94,6 @@ public interface ZoneRegistry {
     /** Returns the routing method used by given zone */
     RoutingMethod routingMethod(ZoneId zone);
 
-    /** Returns a URL where an informative dashboard can be found. */
-    URI dashboardUrl();
-
-    /** Returns a URL which displays information about the given tenant. */
-    URI dashboardUrl(TenantName id);
-
-    /** Returns a URL which displays information about the given application. */
-    URI dashboardUrl(TenantName tenantName, ApplicationName applicationName);
-
-    /** Returns a URL which displays information about the given application instance. */
-    URI dashboardUrl(ApplicationId id);
-
-    /** Returns a URL which displays information about the given job run. */
-    URI dashboardUrl(RunId id);
-
-    /** Returns a URL used to request support from the Vespa team. */
-    URI supportUrl();
-
     /** Returns a URL to the controller's api endpoint */
     URI apiUrl();