fix(misc): Use the client provider api to publish plugin to front50 (#…

…1242)
spinnaker · Jun 8, 2020 · d37302b · d37302b
1 parent 66bb288
commit d37302b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/...-plugins/src/main/kotlin/com/netflix/spinnaker/gate/plugins/web/PluginWebConfiguration.kt b/...-plugins/src/main/kotlin/com/netflix/spinnaker/gate/plugins/web/PluginWebConfiguration.kt
@@ -19,5 +19,5 @@ import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
 
 @Configuration
-@ComponentScan("com.netflix.spinnaker.gate.plugins.web")
+@ComponentScan("com.netflix.spinnaker.config.okhttp3", "com.netflix.spinnaker.gate.plugins.web")
 open class PluginWebConfiguration
diff --git a/...src/main/kotlin/com/netflix/spinnaker/gate/plugins/web/publish/PluginPublishController.kt b/...src/main/kotlin/com/netflix/spinnaker/gate/plugins/web/publish/PluginPublishController.kt
@@ -16,6 +16,8 @@
 package com.netflix.spinnaker.gate.plugins.web.publish
 
 import com.google.common.hash.Hashing
+import com.netflix.spinnaker.config.DefaultServiceEndpoint
+import com.netflix.spinnaker.config.okhttp3.OkHttpClientProvider
 import com.netflix.spinnaker.gate.config.ServiceConfiguration
 import com.netflix.spinnaker.gate.plugins.web.PluginService
 import com.netflix.spinnaker.kork.exceptions.SystemException
@@ -41,11 +43,12 @@ import org.springframework.web.multipart.MultipartFile
 @RequestMapping("/plugins/publish")
 class PluginPublishController(
   private val pluginService: PluginService,
-  private val okHttpClient: OkHttpClient,
+  okHttpClientProvider: OkHttpClientProvider,
   serviceConfiguration: ServiceConfiguration
 ) {
 
   private val front50Url = serviceConfiguration.getServiceEndpoint("front50").url
+  private val okHttpClient: OkHttpClient = okHttpClientProvider.getClient(DefaultServiceEndpoint("front50", front50Url))
 
   @SneakyThrows
   @ApiOperation(value = "Publish a plugin binary and the plugin info metadata.")

diff --git a/...c/test/groovy/com/netflix/spinnaker/gate/plugins/web/info/PluginInfoControllerSpec.groovy b/...c/test/groovy/com/netflix/spinnaker/gate/plugins/web/info/PluginInfoControllerSpec.groovy
@@ -17,13 +17,13 @@
 package com.netflix.spinnaker.gate.plugins.web.info
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.netflix.spinnaker.config.okhttp3.OkHttpClientProvider
 import com.netflix.spinnaker.gate.config.ServiceConfiguration
 import com.netflix.spinnaker.gate.plugins.web.PluginWebConfiguration
 import com.netflix.spinnaker.gate.plugins.web.SpinnakerExtensionsConfigProperties
 import com.netflix.spinnaker.gate.services.TaskService
 import com.netflix.spinnaker.gate.services.internal.Front50Service
 import com.netflix.spinnaker.kork.web.exceptions.GenericExceptionHandlers
-import okhttp3.OkHttpClient
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
@@ -55,15 +55,15 @@ class PluginInfoControllerSpec extends Specification {
   @Autowired
   SpinnakerExtensionsConfigProperties spinnakerExtensionsConfigProperties
 
+  @Autowired
+  OkHttpClientProvider okHttpClientProvider
+
   @MockBean
   private TaskService taskService
 
   @MockBean
   private Front50Service front50Service
 
-  @MockBean
-  private OkHttpClient okHttpClient
-
   private Map requestContent = ['name': 'test plugin', provider: 'Test Co']
 
   def 'should load configuration bean with expected values'() {