From 4b3b53ee9da7c72e596f5a22c548000049cb4c85 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 Dec 2024 18:23:49 +0000 Subject: [PATCH 1/2] chore(dependencies): Autobump fiatVersion --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9948f3ee63..c711270635 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ korkVersion=7.247.0 -fiatVersion=1.52.0 +fiatVersion=1.53.0 org.gradle.parallel=true spinnakerGradleVersion=8.32.1 targetJava17=true From ca269d51ad3e43c1da1f94a4066a1fcdffade662 Mon Sep 17 00:00:00 2001 From: kirangodishala Date: Fri, 6 Dec 2024 17:19:19 +0530 Subject: [PATCH 2/2] fix(tests): refactor a test to consume retrofit2 interfaces FiatService --- clouddriver-docker/clouddriver-docker.gradle | 1 + .../DockerRegistryImageLookupControllerTest.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/clouddriver-docker/clouddriver-docker.gradle b/clouddriver-docker/clouddriver-docker.gradle index b53a493d4d..e6fcfe364a 100644 --- a/clouddriver-docker/clouddriver-docker.gradle +++ b/clouddriver-docker/clouddriver-docker.gradle @@ -21,6 +21,7 @@ dependencies { implementation "io.spinnaker.kork:kork-retrofit" implementation "io.spinnaker.kork:kork-exceptions" + testImplementation "com.squareup.retrofit2:retrofit-mock" testImplementation "cglib:cglib-nodep" testImplementation "org.objenesis:objenesis" testImplementation "org.assertj:assertj-core" diff --git a/clouddriver-docker/src/test/java/com/netflix/spinnaker/clouddriver/docker/registry/controllers/DockerRegistryImageLookupControllerTest.java b/clouddriver-docker/src/test/java/com/netflix/spinnaker/clouddriver/docker/registry/controllers/DockerRegistryImageLookupControllerTest.java index b41db0cdbe..8d67a54d32 100644 --- a/clouddriver-docker/src/test/java/com/netflix/spinnaker/clouddriver/docker/registry/controllers/DockerRegistryImageLookupControllerTest.java +++ b/clouddriver-docker/src/test/java/com/netflix/spinnaker/clouddriver/docker/registry/controllers/DockerRegistryImageLookupControllerTest.java @@ -61,6 +61,7 @@ import org.springframework.context.annotation.Import; import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.web.servlet.MockMvc; +import retrofit2.mock.Calls; @SpringBootTest(classes = TestConfig.class, properties = "services.fiat.cache.max-entries=0") @AutoConfigureMockMvc @@ -112,7 +113,7 @@ void setUp() { @Test void authorizedToReadTags() throws Exception { var permissions = createAuthorizedUserPermission(); - given(fiatService.getUserPermission(eq("user"))).willReturn(permissions); + given(fiatService.getUserPermission(eq("user"))).willReturn(Calls.response(permissions)); mockMvc .perform( @@ -125,7 +126,7 @@ void authorizedToReadTags() throws Exception { @Test void notAuthorizedToReadTags() throws Exception { var permissions = createUnauthorizedUserPermission(); - given(fiatService.getUserPermission("user")).willReturn(permissions); + given(fiatService.getUserPermission("user")).willReturn(Calls.response(permissions)); mockMvc .perform( @@ -138,7 +139,7 @@ void notAuthorizedToReadTags() throws Exception { @Test void canSearchForAuthorizedItems() throws Exception { var permissions = createAuthorizedUserPermission(); - given(fiatService.getUserPermission("user")).willReturn(permissions); + given(fiatService.getUserPermission("user")).willReturn(Calls.response(permissions)); cache.merge(Keys.Namespace.TAGGED_IMAGE.getNs(), createTestAccountTaggedImageCacheData()); var credentials = createTestAccountCredentials(); accountCredentialsRepository.save(credentials.getName(), credentials); @@ -151,7 +152,7 @@ void canSearchForAuthorizedItems() throws Exception { @Test void filtersOutUnauthorizedItems() throws Exception { var permissions = createUnauthorizedUserPermission(); - given(fiatService.getUserPermission("user")).willReturn(permissions); + given(fiatService.getUserPermission("user")).willReturn(Calls.response(permissions)); cache.merge(Keys.Namespace.TAGGED_IMAGE.getNs(), createTestAccountTaggedImageCacheData()); var credentials = createTestAccountCredentials(); accountCredentialsRepository.save(credentials.getName(), credentials);