fix(misc): Use new client provider for all internal spinnaker service…

…s. (#752)
spinnaker · May 19, 2020 · b383b52 · b383b52
1 parent 3b56280
commit b383b52
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 44 deletions.
diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/DockerRegistryConfig.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/DockerRegistryConfig.groovy
@@ -16,7 +16,9 @@
 
 package com.netflix.spinnaker.igor.config
 
-import com.netflix.spinnaker.config.OkHttpClientConfiguration
+import com.jakewharton.retrofit.Ok3Client
+import com.netflix.spinnaker.config.DefaultServiceEndpoint
+import com.netflix.spinnaker.config.okhttp3.OkHttpClientProvider
 import com.netflix.spinnaker.igor.IgorConfigurationProperties
 import com.netflix.spinnaker.igor.docker.model.DockerRegistryAccounts
 import com.netflix.spinnaker.igor.docker.service.ClouddriverService
@@ -28,8 +30,6 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import retrofit.Endpoints
 import retrofit.RestAdapter
-import retrofit.client.OkClient
-
 
 @Configuration
 @ConditionalOnProperty(['services.clouddriver.base-url', 'docker-registry.enabled'])
@@ -42,17 +42,15 @@ class DockerRegistryConfig {
     }
 
     @Bean
-    ClouddriverService dockerRegistryProxyService(OkHttpClientConfiguration okHttpClientConfig, IgorConfigurationProperties igorConfigurationProperties) {
+    ClouddriverService dockerRegistryProxyService(OkHttpClientProvider clientProvider, IgorConfigurationProperties igorConfigurationProperties) {
         def address = igorConfigurationProperties.services.clouddriver.baseUrl ?: 'none'
         if (address == 'none') {
             null
         }
 
-        def cli = okHttpClientConfig.create()
-
         new RestAdapter.Builder()
                 .setEndpoint(Endpoints.newFixedEndpoint(address))
-                .setClient(new OkClient(cli))
+                .setClient(new Ok3Client(clientProvider.getClient(new DefaultServiceEndpoint("clouddriver", address))))
                 .setLogLevel(RestAdapter.LogLevel.BASIC)
                 .setLog(new Slf4jRetrofitLogger(ClouddriverService))
                 .build()

diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/EchoConfig.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/EchoConfig.groovy
@@ -16,7 +16,9 @@
 
 package com.netflix.spinnaker.igor.config
 
-import com.netflix.spinnaker.config.OkHttpClientConfiguration
+import com.jakewharton.retrofit.Ok3Client
+import com.netflix.spinnaker.config.DefaultServiceEndpoint
+import com.netflix.spinnaker.config.okhttp3.OkHttpClientProvider
 import com.netflix.spinnaker.igor.IgorConfigurationProperties
 import com.netflix.spinnaker.igor.history.EchoService
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger
@@ -25,7 +27,6 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import retrofit.Endpoints
 import retrofit.RestAdapter
-import retrofit.client.OkClient
 
 /**
  * history service configuration
@@ -34,18 +35,16 @@ import retrofit.client.OkClient
 @Configuration
 class EchoConfig {
     @Bean
-    EchoService echoService(OkHttpClientConfiguration okHttpClientConfig, IgorConfigurationProperties igorConfigurationProperties) {
+    EchoService echoService(OkHttpClientProvider okHttpClientProvider, IgorConfigurationProperties igorConfigurationProperties) {
         String address = igorConfigurationProperties.services.echo.baseUrl ?: 'none'
 
         if (address == 'none') {
             return null
         }
 
-        def cli = okHttpClientConfig.create()
-
         new RestAdapter.Builder()
             .setEndpoint(Endpoints.newFixedEndpoint(address))
-            .setClient(new OkClient(cli))
+            .setClient(new Ok3Client(okHttpClientProvider.getClient(new DefaultServiceEndpoint("echo", address))))
             .setLogLevel(RestAdapter.LogLevel.NONE)
             .setLog(new Slf4jRetrofitLogger(EchoService))
             .build()

diff --git a/igor-web/src/main/java/com/netflix/spinnaker/igor/config/IgorRetrofitConfig.java b/igor-web/src/main/java/com/netflix/spinnaker/igor/config/IgorRetrofitConfig.java
diff --git a/igor-web/src/main/java/com/netflix/spinnaker/igor/config/KeelConfig.java b/igor-web/src/main/java/com/netflix/spinnaker/igor/config/KeelConfig.java
@@ -16,6 +16,8 @@
 package com.netflix.spinnaker.igor.config;
 
 import com.jakewharton.retrofit.Ok3Client;
+import com.netflix.spinnaker.config.DefaultServiceEndpoint;
+import com.netflix.spinnaker.config.okhttp3.OkHttpClientProvider;
 import com.netflix.spinnaker.igor.keel.KeelService;
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
 import org.springframework.beans.factory.annotation.Value;
@@ -44,11 +46,16 @@ public Endpoint keelEndpoint(@Value("${services.keel.base-url}") String keelBase
 
   @Bean
   public KeelService keelService(
-      Endpoint keelEndpoint, Ok3Client ok3Client, RestAdapter.LogLevel retrofitLogLevel) {
+      Endpoint keelEndpoint,
+      OkHttpClientProvider clientProvider,
+      RestAdapter.LogLevel retrofitLogLevel) {
     return new RestAdapter.Builder()
         .setEndpoint(keelEndpoint)
         .setConverter(new JacksonConverter())
-        .setClient(ok3Client)
+        .setClient(
+            new Ok3Client(
+                clientProvider.getClient(
+                    new DefaultServiceEndpoint("keel", keelEndpoint.getUrl()))))
         .setLogLevel(retrofitLogLevel)
         .setLog(new Slf4jRetrofitLogger(KeelService.class))
         .build()