From ad0d840e9c1dcc9a6f6561947df17a53d45826a1 Mon Sep 17 00:00:00 2001 From: Kiran Godishala <53332225+kirangodishala@users.noreply.github.com> Date: Wed, 9 Apr 2025 02:32:23 +0530 Subject: [PATCH] fix(retrofit1): exclude Retrofit2EncodeCorrectionInterceptor from the retrofit1 clients (#4857) * fix(retrofit1): exclude Retrofit2EncodeCorrectionInterceptor from the retrofit1 clients * test(retrofit1): revert adding Retrofit2EncodeCorrectionInterceptor to retrofit1 clients in tests as kork is updated with new constructor --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 2fdb327a9f67345c4919e1503ff5119fa3c31caf) --- .../orca/clouddriver/config/CloudDriverConfiguration.java | 2 +- .../netflix/spinnaker/orca/echo/config/EchoConfiguration.groovy | 2 +- .../netflix/spinnaker/orca/igor/config/IgorConfiguration.groovy | 2 +- .../com/netflix/spinnaker/orca/config/KeelConfiguration.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/config/CloudDriverConfiguration.java b/orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/config/CloudDriverConfiguration.java index ac8e04b5c1..ef2d7d2ddf 100644 --- a/orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/config/CloudDriverConfiguration.java +++ b/orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/config/CloudDriverConfiguration.java @@ -206,7 +206,7 @@ public T buildService(Class type, String url) { .setEndpoint(newFixedEndpoint(url)) .setClient( new Ok3Client( - clientProvider.getClient(new DefaultServiceEndpoint("clouddriver", url)))) + clientProvider.getClient(new DefaultServiceEndpoint("clouddriver", url), true))) .setLogLevel(retrofitLogLevel) .setLog(new RetrofitSlf4jLog(type)) .setConverter(new JacksonConverter(objectMapper)) diff --git a/orca-echo/src/main/groovy/com/netflix/spinnaker/orca/echo/config/EchoConfiguration.groovy b/orca-echo/src/main/groovy/com/netflix/spinnaker/orca/echo/config/EchoConfiguration.groovy index 5ad4573e9f..4c8e380bbe 100644 --- a/orca-echo/src/main/groovy/com/netflix/spinnaker/orca/echo/config/EchoConfiguration.groovy +++ b/orca-echo/src/main/groovy/com/netflix/spinnaker/orca/echo/config/EchoConfiguration.groovy @@ -68,7 +68,7 @@ class EchoConfiguration { EchoService echoService(Endpoint echoEndpoint) { new RestAdapter.Builder() .setEndpoint(echoEndpoint) - .setClient(new Ok3Client(clientProvider.getClient(new DefaultServiceEndpoint("echo", echoEndpoint.url)))) + .setClient(new Ok3Client(clientProvider.getClient(new DefaultServiceEndpoint("echo", echoEndpoint.url), true))) .setLogLevel(retrofitLogLevel) .setErrorHandler(SpinnakerRetrofitErrorHandler.getInstance()) .setLog(new RetrofitSlf4jLog(EchoService)) diff --git a/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/config/IgorConfiguration.groovy b/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/config/IgorConfiguration.groovy index 2fc638d15a..08e73b38a0 100644 --- a/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/config/IgorConfiguration.groovy +++ b/orca-igor/src/main/groovy/com/netflix/spinnaker/orca/igor/config/IgorConfiguration.groovy @@ -59,7 +59,7 @@ class IgorConfiguration { IgorService igorService(Endpoint igorEndpoint, ObjectMapper mapper, RequestInterceptor spinnakerRequestInterceptor) { new RestAdapter.Builder() .setEndpoint(igorEndpoint) - .setClient(new Ok3Client(clientProvider.getClient(new DefaultServiceEndpoint("igor", igorEndpoint.url)))) + .setClient(new Ok3Client(clientProvider.getClient(new DefaultServiceEndpoint("igor", igorEndpoint.url), true))) .setLogLevel(retrofitLogLevel) .setErrorHandler(SpinnakerRetrofitErrorHandler.getInstance()) .setRequestInterceptor(spinnakerRequestInterceptor) diff --git a/orca-keel/src/main/kotlin/com/netflix/spinnaker/orca/config/KeelConfiguration.kt b/orca-keel/src/main/kotlin/com/netflix/spinnaker/orca/config/KeelConfiguration.kt index 09924c8298..e8795f94bf 100644 --- a/orca-keel/src/main/kotlin/com/netflix/spinnaker/orca/config/KeelConfiguration.kt +++ b/orca-keel/src/main/kotlin/com/netflix/spinnaker/orca/config/KeelConfiguration.kt @@ -59,7 +59,7 @@ class KeelConfiguration { RestAdapter.Builder() .setRequestInterceptor(spinnakerRequestInterceptor) .setEndpoint(keelEndpoint) - .setClient(Ok3Client(clientProvider.getClient(DefaultServiceEndpoint("keel", keelEndpoint.url)))) + .setClient(Ok3Client(clientProvider.getClient(DefaultServiceEndpoint("keel", keelEndpoint.url), true))) .setLogLevel(retrofitLogLevel) .setErrorHandler(SpinnakerRetrofitErrorHandler.getInstance()) .setConverter(JacksonConverter(keelObjectMapper))