Skip to content
This repository was archived by the owner on Dec 20, 2025. It is now read-only.

Commit c18a17c

Browse files
spinnakerbotrootdbyron-sf
authored
chore(dependencies): Autobump korkVersion (#1889)
* chore(dependencies): Autobump korkVersion * fix(retrofit2/test): deal with the introduction of Retrofit2EncodeCorrectionInterceptor adding beans as necessary. --------- Co-authored-by: root <root@7006d21ea161> Co-authored-by: David Byron <dbyron@salesforce.com>
1 parent ed77027 commit c18a17c

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

gate-plugins/src/test/groovy/com/netflix/spinnaker/gate/plugins/web/info/PluginInfoControllerSpec.groovy

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@ import com.netflix.spinnaker.gate.services.internal.RoscoService
3636
import com.netflix.spinnaker.gate.services.internal.SwabbieService
3737
import com.netflix.spinnaker.kork.plugins.SpinnakerPluginManager
3838
import com.netflix.spinnaker.kork.web.exceptions.GenericExceptionHandlers
39+
import com.netflix.spinnaker.okhttp.Retrofit2EncodeCorrectionInterceptor
3940
import org.springframework.beans.factory.annotation.Autowired
4041
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
4142
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
4243
import org.springframework.boot.test.mock.mockito.MockBean
44+
import org.springframework.context.annotation.Bean
4345
import org.springframework.context.annotation.Import
4446
import org.springframework.test.context.ActiveProfiles
4547
import org.springframework.test.context.ContextConfiguration
@@ -56,11 +58,18 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
5658
@Import(ErrorConfiguration)
5759
@WebMvcTest(controllers = [PluginInfoController])
5860
@AutoConfigureMockMvc(addFilters = false)
59-
@ContextConfiguration(classes = [PluginsAutoConfiguration.class,PluginInfoController, GenericExceptionHandlers, SpinnakerExtensionsConfigProperties, PluginWebConfiguration, ServiceConfiguration])
61+
@ContextConfiguration(classes = [PluginsAutoConfiguration, PluginInfoController, GenericExceptionHandlers, SpinnakerExtensionsConfigProperties, PluginWebConfiguration, ServiceConfiguration, PluginInfoControllerTestConfiguration])
6062
@ActiveProfiles("test")
6163
@TestPropertySource(properties = ["spring.config.location=classpath:gate-test.yml"])
6264
class PluginInfoControllerSpec extends Specification {
6365

66+
static class PluginInfoControllerTestConfiguration {
67+
@Bean
68+
Retrofit2EncodeCorrectionInterceptor retrofit2EncodeCorrectionInterceptor() {
69+
return new Retrofit2EncodeCorrectionInterceptor();
70+
}
71+
}
72+
6473
@Autowired
6574
private MockMvc mockMvc
6675

gate-web/src/test/groovy/com/netflix/spinnaker/gate/FunctionalSpec.groovy

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import com.netflix.spinnaker.kork.dynamicconfig.SpringDynamicConfigService
3333
import com.netflix.spinnaker.kork.retrofit.ErrorHandlingExecutorCallAdapterFactory
3434
import com.netflix.spinnaker.kork.retrofit.Retrofit2SyncCall
3535
import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException
36+
import com.netflix.spinnaker.okhttp.Retrofit2EncodeCorrectionInterceptor
3637
import okhttp3.OkHttpClient
3738
import org.springframework.boot.SpringApplication
3839
import org.springframework.boot.autoconfigure.EnableAutoConfiguration
@@ -291,6 +292,11 @@ class FunctionalSpec extends Specification {
291292
new PipelineControllerConfigProperties();
292293
}
293294

295+
@Bean
296+
Retrofit2EncodeCorrectionInterceptor retrofit2EncodeCorrectionInterceptor() {
297+
return new Retrofit2EncodeCorrectionInterceptor();
298+
}
299+
294300
@Override
295301
protected void configure(HttpSecurity http) throws Exception {
296302
http

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
enablePublishing=false
22
fiatVersion=1.54.0
33
includeProviders=basic,iap,ldap,oauth2,saml,x509
4-
korkVersion=7.251.0
4+
korkVersion=7.252.0
55
kotlinVersion=1.6.21
66
org.gradle.parallel=true
77
spinnakerGradleVersion=8.32.1

0 commit comments

Comments
 (0)