From 67c47ed770ac44fe6ca7171f3f002e83aae7066c Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@vespa.ai>
Date: Tue, 2 Apr 2024 23:37:08 +0200
Subject: Revert "Move useProxyProtocol to Cloud'"

---
 .../yahoo/vespa/model/container/xml/ContainerModelBuilder.java |  9 +++++++--
 .../src/main/java/com/yahoo/config/provision/Cloud.java        |  5 -----
 .../src/main/java/com/yahoo/config/provision/Zone.java         | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index db848d13f5a..20a16f7c7a4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -25,6 +25,7 @@ import com.yahoo.config.model.producer.TreeConfigProducer;
 import com.yahoo.config.provision.AthenzDomain;
 import com.yahoo.config.provision.AthenzService;
 import com.yahoo.config.provision.Capacity;
+import com.yahoo.config.provision.CloudName;
 import com.yahoo.config.provision.ClusterMembership;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.DataplaneToken;
@@ -598,7 +599,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
         // If the deployment contains certificate/private key reference, setup TLS port
         var builder = HostedSslConnectorFactory.builder(serverName, getMtlsDataplanePort(state))
-                .proxyProtocol(state.zone().cloud().useProxyProtocol())
+                .proxyProtocol(useProxyProtocol(state.zone()))
                 .tlsCiphersOverride(state.getProperties().tlsCiphersOverride())
                 .endpointConnectionTtl(state.getProperties().endpointConnectionTtl());
         var endpointCert = state.endpointCertificateSecrets().orElse(null);
@@ -633,6 +634,10 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         server.addConnector(connectorFactory);
     }
 
+    private static boolean useProxyProtocol(Zone zone) {
+        return !zone.cloud().name().equals(CloudName.AZURE);
+    }
+
     private void addCloudTokenSupport(DeployState state, ApplicationContainerCluster cluster) {
         var server = cluster.getHttp().getHttpServer().get();
         if (!enableTokenSupport(state)) return;
@@ -657,7 +662,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         // Setup dedicated connector
         var connector = HostedSslConnectorFactory.builder(server.getComponentId().getName()+"-token", tokenPort)
                 .tokenEndpoint(true)
-                .proxyProtocol(state.zone().cloud().useProxyProtocol())
+                .proxyProtocol(useProxyProtocol(state.zone()))
                 .endpointCertificate(endpointCert)
                 .remoteAddressHeader("X-Forwarded-For")
                 .remotePortHeader("X-Forwarded-Port")
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
index 463d9edcdad..38705b02a28 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
@@ -57,11 +57,6 @@ public class Cloud {
         return account;
     }
 
-    /** Returns whether load balancers use proxy protocol v1 or not (e.g. use source NAT). */
-    public boolean useProxyProtocol() {
-        return !name.equals(CloudName.AZURE);
-    }
-
     /** For testing purposes only */
     public static Cloud defaultCloud() {
         return new Builder().build();
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
index 73c6010f514..30392c17896 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
@@ -54,6 +54,11 @@ public class Zone {
         this.region = region;
     }
 
+    // TODO(mpolden): For compatibility with older config models. Remove when versions < 8.327 are gone
+    public Cloud getCloud() {
+        return cloud();
+    }
+
     /** Returns the current cloud */
     public Cloud cloud() { return cloud; }
 
@@ -97,10 +102,5 @@ public class Zone {
         return Objects.hash(environment, region);
     }
 
-    // TODO(mpolden): For compatibility with older config models. Remove when versions < 8.327 are gone
-    @Deprecated(forRemoval = true)
-    public Cloud getCloud() {
-        return cloud();
-    }
 }
 
-- 
cgit v1.2.3