Rename 'getConfigServerAthenzIdentity' to 'getConfigServerHttpsIdentity'

4 files changed, 5 insertions, 5 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 3d8e8e04040..72f9f5b7ce2 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
@@ -55,7 +55,7 @@ public interface ZoneRegistry {
     SystemName system();
 
     /** Return the configserver's Athenz service identity */
-    AthenzIdentity getConfigServerAthenzIdentity(ZoneId zoneId);
+    AthenzIdentity getConfigServerHttpsIdentity(ZoneId zoneId);
 
     /** Return the Athenz service identity for a given node type */
     AthenzIdentity getNodeAthenzIdentity(ZoneId zoneId, NodeType nodeType);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 740194a15da..f097bd3c420 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -10,7 +10,6 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
-import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneApi;
 import com.yahoo.config.provision.zone.ZoneId;
@@ -903,7 +902,7 @@ public class ApplicationController {
         deploymentSpec.athenzDomain().ifPresent(athenzDomain -> {
             controller.zoneRegistry().zones().reachable().ids()
                       .forEach(zone -> {
-                          AthenzIdentity configServerAthenzIdentity = controller.zoneRegistry().getConfigServerAthenzIdentity(zone);
+                          AthenzIdentity configServerAthenzIdentity = controller.zoneRegistry().getConfigServerHttpsIdentity(zone);
                           deploymentSpec.athenzService(zone.environment(), zone.region())
                                         .map(service -> new AthenzService(athenzDomain.value(), service.value()))
                                         .ifPresent(service -> {
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 73a029ad3b3..a4ca8605f4b 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
@@ -269,7 +269,7 @@ public class ConfigServerRestExecutorImpl implements ConfigServerRestExecutor {
         AthenzIdentityVerifier hostnameVerifier =
                 new AthenzIdentityVerifier(
                         singleton(
-                                zoneRegistry.getConfigServerAthenzIdentity(
+                                zoneRegistry.getConfigServerHttpsIdentity(
                                         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/integration/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java
index a19fefc1b92..7771dd2d1a0 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
@@ -109,7 +109,8 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
         return ZoneFilterMock.from(List.copyOf(zones));
     }
 
-    public AthenzService getConfigServerAthenzIdentity(ZoneId zone) {
+    @Override
+    public AthenzService getConfigServerHttpsIdentity(ZoneId zone) {
         return new AthenzService("vespadomain", "provider-" + zone.environment().value() + "-" + zone.region().value());
     }