Merge branch 'spinnaker:master' into travis_client_user_exception_han…

…dling_for_retrofiterror
spinnaker · Sep 11, 2023 · f88bf13 · f88bf13
2 parents 1fdde08 + ae0d3d5
commit f88bf13
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-fiatVersion=1.41.0
-korkVersion=7.188.0
+fiatVersion=1.42.0
+korkVersion=7.189.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.31.0
 targetJava11=true

diff --git a/igor-web/igor-web.gradle b/igor-web/igor-web.gradle
@@ -19,6 +19,7 @@ dependencies {
     annotationProcessor "org.projectlombok:lombok"
     testAnnotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion")
     testAnnotationProcessor "org.projectlombok:lombok"
+    implementation "io.spinnaker.kork:kork-retrofit"
 
     runtimeOnly "org.springframework.boot:spring-boot-properties-migrator"
     implementation "org.springframework.boot:spring-boot-starter-actuator"

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
@@ -21,6 +21,7 @@ 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.kork.retrofit.exceptions.SpinnakerRetrofitErrorHandler
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.context.annotation.Bean
@@ -49,6 +50,7 @@ class EchoConfig {
             .setClient(new Ok3Client(okHttpClientProvider.getClient(new DefaultServiceEndpoint("echo", address))))
             .setLogLevel(retrofitLogLevel)
             .setLog(new Slf4jRetrofitLogger(EchoService))
+            .setErrorHandler(SpinnakerRetrofitErrorHandler.getInstance())
             .build()
             .create(EchoService)
     }