chore(dependencies): Autobump korkVersion (#6286)

* chore(dependencies): Autobump korkVersion * refactor(dependency): replace JacksonFactory to GsonFactory --------- Co-authored-by: root <root@0e8a9747aac9> Co-authored-by: Edgar Garcia <edgar.garcia@harness.io>
spinnaker · Sep 26, 2024 · 7be08cd · 7be08cd
1 parent 3cdf32e
commit 7be08cd
Show file tree

Hide file tree

Showing 20 changed files with 47 additions and 51 deletions.
diff --git a/...rc/main/java/com/netflix/spinnaker/clouddriver/appengine/artifacts/GcsStorageService.java b/...rc/main/java/com/netflix/spinnaker/clouddriver/appengine/artifacts/GcsStorageService.java
@@ -20,7 +20,7 @@
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.storage.Storage;
 import com.google.api.services.storage.StorageScopes;
 import com.google.api.services.storage.model.Objects;
@@ -56,7 +56,7 @@ public static class Factory {
     public Factory(String applicationName) throws IOException, GeneralSecurityException {
       applicationName_ = applicationName;
       transport_ = GoogleNetHttpTransport.newTrustedTransport();
-      jsonFactory_ = JacksonFactory.getDefaultInstance();
+      jsonFactory_ = GsonFactory.getDefaultInstance();
     }
 
     public Factory(String applicationName, HttpTransport transport, JsonFactory jsonFactory) {

diff --git a/.../main/java/com/netflix/spinnaker/clouddriver/appengine/security/AppengineCredentials.java b/.../main/java/com/netflix/spinnaker/clouddriver/appengine/security/AppengineCredentials.java
@@ -19,7 +19,7 @@
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.appengine.v1.Appengine;
 import com.google.auth.http.HttpCredentialsAdapter;
 import com.google.auth.oauth2.GoogleCredentials;
@@ -35,7 +35,7 @@ public AppengineCredentials(String project) {
 
   public Appengine getAppengine(String applicationName) {
     HttpTransport httpTransport = buildHttpTransport();
-    JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+    JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
     GoogleCredentials credentials = getCredentials();
     HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credentials);
 

diff --git a/...src/main/java/com/netflix/spinnaker/clouddriver/artifacts/gcs/GcsArtifactCredentials.java b/...src/main/java/com/netflix/spinnaker/clouddriver/artifacts/gcs/GcsArtifactCredentials.java
@@ -22,7 +22,7 @@
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.storage.Storage;
 import com.google.api.services.storage.StorageScopes;
 import com.google.auth.http.HttpCredentialsAdapter;
@@ -52,7 +52,7 @@ public class GcsArtifactCredentials implements ArtifactCredentials {
   GcsArtifactCredentials(String applicationName, GcsArtifactAccount account)
       throws IOException, GeneralSecurityException {
     HttpTransport transport = GoogleNetHttpTransport.newTrustedTransport();
-    JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+    JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
     Optional<String> credentialsPath = account.getJsonPath();
 
     GoogleCredentials credentials;

diff --git a/...rc/main/java/com/netflix/spinnaker/clouddriver/cloudrun/security/CloudrunCredentials.java b/...rc/main/java/com/netflix/spinnaker/clouddriver/cloudrun/security/CloudrunCredentials.java
@@ -19,7 +19,7 @@
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.run.v1.CloudRun;
 import com.google.auth.http.HttpCredentialsAdapter;
 import com.google.auth.oauth2.GoogleCredentials;
@@ -35,7 +35,7 @@ public CloudrunCredentials(String project) {
 
   public CloudRun getCloudrun(String applicationName) {
     HttpTransport httpTransport = buildHttpTransport();
-    JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
+    JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
     GoogleCredentials credentials =
         getCredentials().createScoped("https://www.googleapis.com/auth/cloud-platform");
     HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credentials);

diff --git a/...ver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtil.groovy b/...ver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtil.groovy
@@ -24,7 +24,7 @@ import com.google.api.client.http.GenericUrl
 import com.google.api.client.http.HttpHeaders
 import com.google.api.client.http.HttpResponse
 import com.google.api.client.json.JsonObjectParser
-import com.google.api.client.json.jackson2.JacksonFactory
+import com.google.api.client.json.gson.GsonFactory
 import com.google.api.services.compute.Compute
 import com.google.api.services.compute.model.*
 import com.netflix.spinnaker.cats.cache.Cache
@@ -142,7 +142,7 @@ class GCEUtil {
       {
         return compute.getRequestFactory()
           .buildGetRequest(new GenericUrl(reference))
-          .setParser(new JsonObjectParser(JacksonFactory.getDefaultInstance()))
+          .setParser(new JsonObjectParser(GsonFactory.getDefaultInstance()))
           .execute()
       },
       "gce/image",

diff --git a/...rc/main/groovy/com/netflix/spinnaker/clouddriver/google/security/GoogleCredentials.groovy b/...rc/main/groovy/com/netflix/spinnaker/clouddriver/google/security/GoogleCredentials.groovy
@@ -18,7 +18,7 @@ package com.netflix.spinnaker.clouddriver.google.security
 
 import com.google.api.client.http.HttpTransport
 import com.google.api.client.json.JsonFactory
-import com.google.api.client.json.jackson2.JacksonFactory
+import com.google.api.client.json.gson.GsonFactory
 import com.google.api.services.compute.Compute
 import com.netflix.spinnaker.clouddriver.google.ComputeVersion
 import com.netflix.spinnaker.clouddriver.googlecommon.security.GoogleCommonCredentials
@@ -33,7 +33,7 @@ public class GoogleCredentials extends GoogleCommonCredentials {
 
   Compute getCompute(String applicationName) {
     HttpTransport httpTransport = buildHttpTransport()
-    JsonFactory jsonFactory = JacksonFactory.getDefaultInstance()
+    JsonFactory jsonFactory = GsonFactory.getDefaultInstance()
 
     def credentials = getCredentials()
     def reqInit = setHttpTimeout(credentials)

diff --git a/...om/netflix/spinnaker/clouddriver/google/controllers/GoogleNamedImageLookupController.java b/...om/netflix/spinnaker/clouddriver/google/controllers/GoogleNamedImageLookupController.java
@@ -20,7 +20,7 @@
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.compute.model.Image;
 import com.google.common.annotations.VisibleForTesting;
 import com.netflix.spinnaker.cats.cache.Cache;
@@ -55,7 +55,7 @@
 public class GoogleNamedImageLookupController {
 
   private final Cache cacheView;
-  private final JacksonFactory jsonMapper = new JacksonFactory();
+  private final GsonFactory jsonMapper = new GsonFactory();
   private final ObjectMapper objectMapper =
       new ObjectMapper().configure(JsonGenerator.Feature.WRITE_NUMBERS_AS_STRINGS, true);
 

diff --git a/.../groovy/com/netflix/spinnaker/clouddriver/google/compute/BatchComputeRequestImplTest.java b/.../groovy/com/netflix/spinnaker/clouddriver/google/compute/BatchComputeRequestImplTest.java
@@ -26,7 +26,7 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import com.google.api.services.compute.Compute;
 import com.google.api.services.compute.Compute.Images.Get;
@@ -341,9 +341,7 @@ private interface ResponseSupplier {
 
   private static Compute computeWithResponses(ResponseSupplier... responses) {
     return new Compute(
-        responses(responses),
-        JacksonFactory.getDefaultInstance(),
-        /* httpRequestInitializer= */ null);
+        responses(responses), GsonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null);
   }
 
   private static HttpTransport responses(ResponseSupplier... responses) {

diff --git a/...om/netflix/spinnaker/clouddriver/google/compute/BatchPaginatedComputeRequestImplTest.java b/...om/netflix/spinnaker/clouddriver/google/compute/BatchPaginatedComputeRequestImplTest.java
@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.mock;
 
 import com.google.api.client.googleapis.testing.json.GoogleJsonResponseExceptionFactoryTesting;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.compute.Compute;
 import com.google.api.services.compute.model.Image;
 import com.google.api.services.compute.model.ImageList;
@@ -96,7 +96,7 @@ void exception() {
             pageToken ->
                 FakeGoogleComputeRequest.createWithException(
                     GoogleJsonResponseExceptionFactoryTesting.newMock(
-                        JacksonFactory.getDefaultInstance(), 500, "bad news"),
+                        GsonFactory.getDefaultInstance(), 500, "bad news"),
                     mock(Compute.Images.List.class)),
             ImageList::getNextPageToken,
             ImageList::getItems));

diff --git a/...ovy/com/netflix/spinnaker/clouddriver/google/compute/GetFirstBatchComputeRequestTest.java b/...ovy/com/netflix/spinnaker/clouddriver/google/compute/GetFirstBatchComputeRequestTest.java
@@ -21,7 +21,7 @@
 
 import com.google.api.client.googleapis.testing.json.GoogleJsonResponseExceptionFactoryTesting;
 import com.google.api.client.http.HttpResponseException;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.compute.Compute;
 import com.google.api.services.compute.model.Image;
 import java.io.IOException;
@@ -69,7 +69,7 @@ void notFound() throws IOException {
         GetFirstBatchComputeRequest.create(new FakeBatchComputeRequest<>());
     HttpResponseException notFoundException =
         GoogleJsonResponseExceptionFactoryTesting.newMock(
-            JacksonFactory.getDefaultInstance(), 404, "not found");
+            GsonFactory.getDefaultInstance(), 404, "not found");
     batchRequest.queue(FakeGoogleComputeRequest.createWithException(notFoundException));
     batchRequest.queue(FakeGoogleComputeRequest.createWithException(notFoundException));
     batchRequest.queue(FakeGoogleComputeRequest.createWithException(notFoundException));
@@ -87,10 +87,10 @@ void error() throws IOException {
         GetFirstBatchComputeRequest.create(new FakeBatchComputeRequest<>());
     HttpResponseException notFoundException =
         GoogleJsonResponseExceptionFactoryTesting.newMock(
-            JacksonFactory.getDefaultInstance(), 404, "not found");
+            GsonFactory.getDefaultInstance(), 404, "not found");
     HttpResponseException actualError =
         GoogleJsonResponseExceptionFactoryTesting.newMock(
-            JacksonFactory.getDefaultInstance(), 500, "bad news");
+            GsonFactory.getDefaultInstance(), 500, "bad news");
     batchRequest.queue(FakeGoogleComputeRequest.createWithException(notFoundException));
     batchRequest.queue(FakeGoogleComputeRequest.createWithException(notFoundException));
     batchRequest.queue(FakeGoogleComputeRequest.createWithException(actualError));

diff --git a/...r-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/ImagesTest.java b/...r-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/ImagesTest.java
@@ -20,7 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThatIOException;
 
 import com.google.api.client.http.HttpTransport;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import com.google.api.services.compute.Compute;
 import com.google.api.services.compute.model.Image;
@@ -130,7 +130,7 @@ private static Images createImages(HttpTransport transport) {
   private static Images createImages(HttpTransport transport, Registry registry) {
     Compute compute =
         new Compute(
-            transport, JacksonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null);
+            transport, GsonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null);
     GoogleNamedAccountCredentials credentials =
         new GoogleNamedAccountCredentials.Builder()
             .name("plumpy")

diff --git a/...c/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/InstanceTemplatesTest.java b/...c/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/InstanceTemplatesTest.java
@@ -20,7 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThatIOException;
 
 import com.google.api.client.http.HttpTransport;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import com.google.api.services.compute.Compute;
@@ -198,7 +198,7 @@ private static InstanceTemplates createInstanceTemplates(
       HttpTransport transport, Registry registry) {
     Compute compute =
         new Compute(
-            transport, JacksonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null);
+            transport, GsonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null);
     GoogleNamedAccountCredentials credentials =
         new GoogleNamedAccountCredentials.Builder()
             .name("spin-user")

diff --git a/...com/netflix/spinnaker/clouddriver/google/compute/RegionGoogleServerGroupManagersTest.java b/...com/netflix/spinnaker/clouddriver/google/compute/RegionGoogleServerGroupManagersTest.java
@@ -20,7 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThatIOException;
 
 import com.google.api.client.http.HttpTransport;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import com.google.api.services.compute.Compute;
@@ -246,7 +246,7 @@ private static RegionGoogleServerGroupManagers createManagers(
       HttpTransport transport, Registry registry) {
     Compute compute =
         new Compute(
-            transport, JacksonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null);
+            transport, GsonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null);
     GoogleNamedAccountCredentials credentials =
         new GoogleNamedAccountCredentials.Builder()
             .name("spin-user")

diff --git a/...y/com/netflix/spinnaker/clouddriver/google/compute/ZoneGoogleServerGroupManagersTest.java b/...y/com/netflix/spinnaker/clouddriver/google/compute/ZoneGoogleServerGroupManagersTest.java
@@ -20,7 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThatIOException;
 
 import com.google.api.client.http.HttpTransport;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import com.google.api.services.compute.Compute;
@@ -246,7 +246,7 @@ private static ZoneGoogleServerGroupManagers createManagers(
       HttpTransport transport, Registry registry) {
     Compute compute =
         new Compute(
-            transport, JacksonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null);
+            transport, GsonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null);
     GoogleNamedAccountCredentials credentials =
         new GoogleNamedAccountCredentials.Builder()
             .name("spin-user")

diff --git a/...google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtilSpec.groovy b/...google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtilSpec.groovy
@@ -22,7 +22,7 @@ package com.netflix.spinnaker.clouddriver.google.deploy
   import com.google.api.client.http.HttpRequest
   import com.google.api.client.http.HttpRequestFactory
   import com.google.api.client.http.HttpResponse
-  import com.google.api.client.json.jackson2.JacksonFactory
+  import com.google.api.client.json.gson.GsonFactory
   import com.google.api.services.compute.Compute
   import com.google.api.services.compute.model.*
   import com.netflix.spectator.api.DefaultRegistry
@@ -88,7 +88,7 @@ package com.netflix.spinnaker.clouddriver.google.deploy
       def executorMock = Mock(GoogleExecutorTraits)
 
       def httpTransport = GoogleNetHttpTransport.newTrustedTransport()
-      def jsonFactory = JacksonFactory.defaultInstance
+      def jsonFactory = GsonFactory.defaultInstance
       def httpRequestInitializer =
         new GoogleCredential.Builder().setTransport(httpTransport).setJsonFactory(jsonFactory).build()
       def compute = new Compute.Builder(
@@ -124,7 +124,7 @@ package com.netflix.spinnaker.clouddriver.google.deploy
       def executorMock = Mock(GoogleExecutorTraits)
 
       def httpTransport = GoogleNetHttpTransport.newTrustedTransport()
-      def jsonFactory = JacksonFactory.defaultInstance
+      def jsonFactory = GsonFactory.defaultInstance
       def httpRequestInitializer =
         new GoogleCredential.Builder().setTransport(httpTransport).setJsonFactory(jsonFactory).build()
       def compute = new Compute.Builder(
@@ -157,7 +157,7 @@ package com.netflix.spinnaker.clouddriver.google.deploy
       def executorMock = Mock(GoogleExecutorTraits)
 
       def httpTransport = GoogleNetHttpTransport.newTrustedTransport()
-      def jsonFactory = JacksonFactory.defaultInstance
+      def jsonFactory = GsonFactory.defaultInstance
       def httpRequestInitializer =
         new GoogleCredential.Builder().setTransport(httpTransport).setJsonFactory(jsonFactory).build()
       def compute = new Compute.Builder(

diff --git a/...pinnaker/clouddriver/google/deploy/ops/CreateGoogleInstanceAtomicOperationUnitSpec.groovy b/...pinnaker/clouddriver/google/deploy/ops/CreateGoogleInstanceAtomicOperationUnitSpec.groovy
@@ -20,7 +20,7 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleCredential
 import com.google.api.client.googleapis.batch.BatchRequest
 import com.google.api.client.googleapis.batch.json.JsonBatchCallback
 import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport
-import com.google.api.client.json.jackson2.JacksonFactory
+import com.google.api.client.json.gson.GsonFactory
 import com.google.api.services.compute.Compute
 import com.google.api.services.compute.model.Image
 import com.google.api.services.compute.model.ImageList
@@ -69,7 +69,7 @@ class CreateGoogleInstanceAtomicOperationUnitSpec extends Specification implemen
       def instancesInsertMock = Mock(Compute.Instances.Insert)
 
       def httpTransport = GoogleNetHttpTransport.newTrustedTransport()
-      def jsonFactory = JacksonFactory.defaultInstance
+      def jsonFactory = GsonFactory.defaultInstance
       def httpRequestInitializer =
               new GoogleCredential.Builder().setTransport(httpTransport).setJsonFactory(jsonFactory).build()
       def images = new Compute.Builder(
@@ -167,7 +167,7 @@ class CreateGoogleInstanceAtomicOperationUnitSpec extends Specification implemen
       def listMock = new MockFor(Compute.Images.List)
 
       def httpTransport = GoogleNetHttpTransport.newTrustedTransport()
-      def jsonFactory = JacksonFactory.defaultInstance
+      def jsonFactory = GsonFactory.defaultInstance
       def httpRequestInitializer =
               new GoogleCredential.Builder().setTransport(httpTransport).setJsonFactory(jsonFactory).build()
       def images = new Compute.Builder(

diff --git a/...spinnaker/clouddriver/google/deploy/ops/StatefullyUpdateBootImageAtomicOperationTest.java b/...spinnaker/clouddriver/google/deploy/ops/StatefullyUpdateBootImageAtomicOperationTest.java
@@ -26,7 +26,7 @@
 
 import com.google.api.client.googleapis.testing.json.GoogleJsonResponseExceptionFactoryTesting;
 import com.google.api.client.http.HttpStatusCodes;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.compute.Compute;
 import com.google.api.services.compute.Compute.InstanceTemplates.Delete;
 import com.google.api.services.compute.Compute.InstanceTemplates.Insert;
@@ -239,9 +239,7 @@ private static FakeGoogleComputeRequest<Compute.Images.Get, Image> status404()
       throws IOException {
     return FakeGoogleComputeRequest.createWithException(
         GoogleJsonResponseExceptionFactoryTesting.newMock(
-            JacksonFactory.getDefaultInstance(),
-            HttpStatusCodes.STATUS_CODE_NOT_FOUND,
-            "not found"));
+            GsonFactory.getDefaultInstance(), HttpStatusCodes.STATUS_CODE_NOT_FOUND, "not found"));
   }
 
   private static InstanceTemplate baseInstanceTemplate() {