refactor(front50,clouddriver): replace RetrofitError with SpinnakerRe…

…trofitErrorHandler in DockerRegistry and PluginMonitor for custom error handling in front50 and clouddriver (#1125) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
spinnaker · Sep 14, 2023 · fa7bfa8 · fa7bfa8
1 parent 1c88412
commit fa7bfa8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/igor-web/igor-web.gradle b/igor-web/igor-web.gradle
@@ -83,6 +83,8 @@ dependencies {
     implementation "javax.inject:javax.inject:1"
     implementation "javax.validation:validation-api"
 
+    implementation "io.spinnaker.kork:kork-retrofit"
+
     runtimeOnly "io.spinnaker.kork:kork-runtime"
 
     testImplementation "com.squareup.okhttp:mockwebserver"

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
@@ -22,6 +22,7 @@ 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
+import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerRetrofitErrorHandler
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger
 import groovy.transform.CompileStatic
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
@@ -55,6 +56,7 @@ class DockerRegistryConfig {
                 .setClient(new Ok3Client(clientProvider.getClient(new DefaultServiceEndpoint("clouddriver", address))))
                 .setLogLevel(retrofitLogLevel)
                 .setLog(new Slf4jRetrofitLogger(ClouddriverService))
+                .setErrorHandler(SpinnakerRetrofitErrorHandler.getInstance())
                 .build()
                 .create(ClouddriverService)
     }

diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/PluginMonitorConfig.java b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/PluginMonitorConfig.java
@@ -31,6 +31,7 @@
 import com.netflix.spinnaker.kork.discovery.DiscoveryStatusListener;
 import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService;
 import com.netflix.spinnaker.kork.jedis.RedisClientDelegate;
+import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerRetrofitErrorHandler;
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
 import java.util.Optional;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -65,6 +66,7 @@ public PluginReleaseService pluginReleaseService(
                     clientProvider.getClient(new DefaultServiceEndpoint("front50", address))))
             .setLogLevel(retrofitLogLevel)
             .setLog(new Slf4jRetrofitLogger(Front50Service.class))
+            .setErrorHandler(SpinnakerRetrofitErrorHandler.getInstance())
             .build()
             .create(Front50Service.class);
 

diff --git a/...web/src/main/groovy/com/netflix/spinnaker/igor/docker/model/DockerRegistryAccounts.groovy b/...web/src/main/groovy/com/netflix/spinnaker/igor/docker/model/DockerRegistryAccounts.groovy
@@ -17,10 +17,10 @@
 package com.netflix.spinnaker.igor.docker.model
 
 import com.netflix.spinnaker.igor.docker.service.ClouddriverService
+import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerServerException
 import com.netflix.spinnaker.security.AuthenticatedRequest
 import groovy.util.logging.Slf4j
 import org.springframework.beans.factory.annotation.Autowired
-import retrofit.RetrofitError
 
 @Slf4j
 class DockerRegistryAccounts {
@@ -40,8 +40,8 @@ class DockerRegistryAccounts {
                     service.getAccountDetails(it)
                 }
             }
-        } catch (RetrofitError e) {
-            log.error "Failed to get list of docker accounts", e
+        } catch (SpinnakerServerException e) {
+          log.error "Failed to get list of docker accounts", e
         }
     }
 }