Merge pull request #26169 from vespa-engine/hmusum/configserver-cleanup-1a

Hmusum/configserver cleanup 1a

3 files changed, 4 insertions, 22 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 9865cda7bc9..8a4d523a6e4 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -4,8 +4,8 @@ package com.yahoo.vespa.config.server;
 import ai.vespa.http.DomainName;
 import ai.vespa.http.HttpURL;
 import ai.vespa.http.HttpURL.Query;
-import ai.vespa.util.http.hc5.VespaHttpClientBuilder;
 import ai.vespa.util.http.hc5.DefaultHttpClientBuilder;
+import ai.vespa.util.http.hc5.VespaHttpClientBuilder;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.component.Version;
 import com.yahoo.component.annotation.Inject;
@@ -94,10 +94,8 @@ import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.orchestrator.Orchestrator;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.message.BasicHeader;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -229,7 +227,6 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
     // Should be used by tests only (first constructor in this class makes sure we use injectable components where possible)
     public static class Builder {
         private TenantRepository tenantRepository;
-        private Optional<Provisioner> hostProvisioner;
         private HttpProxy httpProxy = new HttpProxy(new SimpleHttpFetcher(Duration.ofSeconds(30)));
         private EndpointsChecker endpointsChecker = __ -> { throw new UnsupportedOperationException(); };
         private Clock clock = Clock.systemUTC();
@@ -252,18 +249,6 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
             return this;
         }
 
-        public Builder withProvisioner(Provisioner provisioner) {
-            if (this.hostProvisioner != null) throw new IllegalArgumentException("provisioner already set in builder");
-            this.hostProvisioner = Optional.ofNullable(provisioner);
-            return this;
-        }
-
-        public Builder withHostProvisionerProvider(HostProvisionerProvider hostProvisionerProvider) {
-            if (this.hostProvisioner != null) throw new IllegalArgumentException("provisioner already set in builder");
-            this.hostProvisioner = hostProvisionerProvider.getHostProvisioner();
-            return this;
-        }
-
         public Builder withHttpProxy(HttpProxy httpProxy) {
             this.httpProxy = httpProxy;
             return this;
@@ -316,7 +301,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
 
         public ApplicationRepository build() {
             return new ApplicationRepository(tenantRepository,
-                                             hostProvisioner,
+                                             tenantRepository.hostProvisionerProvider().getHostProvisioner(),
                                              InfraDeployerProvider.empty().getInfraDeployer(),
                                              configConvergenceChecker,
                                              httpProxy,
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/HostProvisionerProvider.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/HostProvisionerProvider.java
index 9229fb88b40..5547156721a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/HostProvisionerProvider.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/HostProvisionerProvider.java
@@ -42,11 +42,6 @@ public class HostProvisionerProvider {
     }
 
     // for testing
-    public static HostProvisionerProvider withProvisioner(Provisioner provisioner, boolean hostedVespa) {
-        return withProvisioner(provisioner, new ConfigserverConfig(new ConfigserverConfig.Builder().hostedVespa(hostedVespa)));
-    }
-
-    // for testing
     public static HostProvisionerProvider withProvisioner(Provisioner provisioner, ConfigserverConfig config) {
         ComponentRegistry<Provisioner> registry = new ComponentRegistry<>();
         registry.register(ComponentId.createAnonymousComponentId("foobar"), provisioner);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
index 69d13bf2dea..00a10a97dc3 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
@@ -618,4 +618,6 @@ public class TenantRepository {
 
     public com.yahoo.vespa.curator.Curator getCurator() { return curator; }
 
+    public HostProvisionerProvider hostProvisionerProvider() { return hostProvisionerProvider; }
+
 }