refactor(retrofit2): remove all retrofit1 references

clouddriver-appengine/clouddriver-appengine.gradle

@@ -21,10 +21,7 @@ dependencies {
   implementation "io.spinnaker.kork:kork-moniker"
   implementation "io.spinnaker.kork:kork-retrofit"
   implementation "io.spinnaker.kork:kork-web"
-  implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
   implementation "com.netflix.spectator:spectator-api"
-  implementation "com.squareup.retrofit:converter-jackson"
-  implementation "com.squareup.retrofit:retrofit"
   implementation "commons-io:commons-io"
   implementation "org.apache.commons:commons-compress:1.21"
   implementation "org.apache.groovy:groovy"

clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/artifacts/config/StorageConfigurationProperties.java

@@ -22,8 +22,6 @@
 import java.util.NoSuchElementException;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import retrofit.client.Response;
-import retrofit.mime.TypedByteArray;
 
 @Data
 @ConfigurationProperties("artifacts.gcs")
@@ -33,10 +31,6 @@ public class StorageConfigurationProperties {
   public static class ManagedAccount {
     String name;
     String jsonPath;
-
-    public static String responseToString(Response response) {
-      return new String(((TypedByteArray) response.getBody()).getBytes());
-    }
   }
 
   ManagedAccount getAccount(String name) {

clouddriver-aws/src/integration/java/com/netflix/spinnaker/clouddriver/aws/test/ModifyServerGroupLaunchTemplateSpec.java

@@ -81,6 +81,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ActiveProfiles;
+import retrofit2.mock.Calls;
 
 /**
  * Test class for general test cases related to CreateServerGroup operation. Note: launch template
@@ -178,7 +179,7 @@ public void setup() {
     Map applicationMap = new HashMap();
     applicationMap.put("application", "myAwsApp");
     applicationMap.put("legacyUdf", null);
-    when(mockFront50Service.getApplication(ASG_NAME)).thenReturn(applicationMap);
+    when(mockFront50Service.getApplication(ASG_NAME)).thenReturn(Calls.response(applicationMap));
 
     // mock EC2 responses
     when(mockRegionScopedProvider.getAmazonEC2()).thenReturn(mockEc2);

clouddriver-cloudrun/clouddriver-cloudrun.gradle

@@ -19,7 +19,6 @@ dependencies {
   implementation "io.spinnaker.kork:kork-cloud-config-server"
   implementation "io.spinnaker.kork:kork-moniker"
   implementation "com.netflix.spectator:spectator-api"
-  implementation "com.squareup.retrofit:retrofit"
   implementation "commons-io:commons-io"
   implementation "org.apache.commons:commons-compress:1.20"
   implementation "org.apache.groovy:groovy"

clouddriver-consul/clouddriver-consul.gradle

@@ -3,7 +3,6 @@ dependencies {
 
   implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
   implementation "com.squareup.retrofit:converter-jackson"
-  implementation "com.squareup.retrofit:retrofit"
   implementation "org.apache.groovy:groovy"
   implementation "org.apache.groovy:groovy-json"
   implementation "org.springframework.boot:spring-boot-starter-web"

clouddriver-core/clouddriver-core.gradle

@@ -34,9 +34,7 @@ dependencies {
   implementation "io.spinnaker.kork:kork-annotations"
   implementation "io.spinnaker.kork:kork-moniker"
   implementation "io.spinnaker.kork:kork-secrets"
-  implementation "com.squareup.retrofit:converter-jackson"
-  implementation "com.squareup.retrofit:retrofit"
-  implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
+  implementation "com.squareup.retrofit2:converter-jackson"
   implementation "io.reactivex:rxjava"
   implementation "net.jodah:failsafe:1.0.4"
   implementation "org.apache.groovy:groovy"

clouddriver-core/src/test/groovy/com/netflix/spinnaker/clouddriver/safety/TrafficGuardSpec.groovy

@@ -31,8 +31,11 @@ import com.netflix.spinnaker.clouddriver.model.SimpleServerGroup
 import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException
 import com.netflix.spinnaker.moniker.Moniker
-import retrofit.RetrofitError
-import retrofit.client.Response
+import okhttp3.MediaType
+import okhttp3.ResponseBody
+import retrofit2.Response
+import retrofit2.Retrofit
+import retrofit2.converter.jackson.JacksonConverterFactory
 import retrofit2.mock.Calls;
 import spock.lang.Ignore
 import spock.lang.Shared
@@ -445,7 +448,7 @@ class TrafficGuardSpec extends Specification {
     !application.containsKey("trafficGuards")
     result == false
     1 * front50Service.getApplication("app") >> {
-      throw new SpinnakerHttpException(new RetrofitError(null, null, new Response("http://stash.com", 404, "test reason", [], null), null, null, null, null))
+      throw makeSpinnakerHttpException(404)
     }
   }
 
@@ -596,6 +599,23 @@ class TrafficGuardSpec extends Specification {
     0 * _
   }
 
+  static SpinnakerHttpException makeSpinnakerHttpException(int status) {
+    String url = "https://some-url";
+    Response retrofit2Response =
+      Response.error(
+        status,
+        ResponseBody.create(
+          MediaType.parse("application/json"), "{ \"message\": \"arbitrary message\" }"))
+
+    Retrofit retrofit =
+      new Retrofit.Builder()
+        .baseUrl(url)
+        .addConverterFactory(JacksonConverterFactory.create())
+        .build()
+
+    return new SpinnakerHttpException(retrofit2Response, retrofit)
+  }
+
   private void addGuard(Map guard) {
     if (!guard.containsKey("enabled")) {
       guard.enabled = true

clouddriver-docker/clouddriver-docker.gradle

@@ -9,10 +9,8 @@ dependencies {
   implementation "org.springframework.cloud:spring-cloud-context"
   implementation "org.apache.groovy:groovy"
   implementation "com.google.guava:guava"
-//  implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
   implementation "com.netflix.spectator:spectator-api"
   implementation "com.squareup.retrofit2:converter-jackson"
-//  implementation "com.squareup.retrofit:retrofit"
   implementation "org.apache.commons:commons-compress:1.21"
   implementation "commons-io:commons-io"
   implementation "io.spinnaker.fiat:fiat-api:$fiatVersion"

clouddriver-docker/src/main/groovy/com/netflix/spinnaker/clouddriver/docker/registry/api/v2/client/DockerRegistryClient.groovy

@@ -18,25 +18,20 @@ package com.netflix.spinnaker.clouddriver.docker.registry.api.v2.client
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.google.gson.Gson
-import com.google.gson.GsonBuilder
 import com.netflix.spinnaker.clouddriver.docker.registry.api.v2.DockerUserAgent
 import com.netflix.spinnaker.clouddriver.docker.registry.api.v2.auth.DockerBearerToken
 import com.netflix.spinnaker.clouddriver.docker.registry.api.v2.auth.DockerBearerTokenService
 import com.netflix.spinnaker.clouddriver.docker.registry.api.v2.exception.DockerRegistryAuthenticationException
 import com.netflix.spinnaker.clouddriver.docker.registry.api.v2.exception.DockerRegistryOperationException
-import com.netflix.spinnaker.config.DefaultServiceEndpoint
 import com.netflix.spinnaker.kork.client.ServiceClientProvider
 import com.netflix.spinnaker.kork.retrofit.ErrorHandlingExecutorCallAdapterFactory
 import com.netflix.spinnaker.kork.retrofit.Retrofit2SyncCall
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException
-import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerNetworkException
-import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerRetrofitErrorHandler
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerServerException
 import groovy.util.logging.Slf4j
 import okhttp3.ResponseBody
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import retrofit.converter.GsonConverter
 import retrofit2.Response
 import retrofit2.converter.jackson.JacksonConverterFactory;
 import retrofit2.Call
@@ -162,7 +157,6 @@ class DockerRegistryClient {
   String address
   String email
   DockerRegistryService registryService
-  GsonConverter converter
   String catalogFile
   String repositoriesRegex
 
@@ -191,7 +185,6 @@ class DockerRegistryClient {
       .addConverterFactory(JacksonConverterFactory.create())
       .build()
       .create(DockerRegistryService);
-    this.converter = new GsonConverter(new GsonBuilder().create())
     this.address = address
     this.catalogFile = catalogFile
     this.repositoriesRegex = repositoriesRegex
@@ -221,7 +214,6 @@ class DockerRegistryClient {
                        DockerRegistryService dockerRegistryService,
                        DockerBearerTokenService dockerBearerTokenService) {
     this.paginateSize = paginateSize
-    this.converter = new GsonConverter(new GsonBuilder().create())
     this.address = address
     this.catalogFile = catalogFile
     this.repositoriesRegex = repositoriesRegex

clouddriver-docker/src/test/groovy/com/netflix/spinnaker/clouddriver/docker/registry/provider/agent/DockerRegistryImageCachingAgentTest.groovy

@@ -21,7 +21,6 @@ import com.netflix.spinnaker.clouddriver.docker.registry.DockerRegistryCloudProv
 import com.netflix.spinnaker.clouddriver.docker.registry.api.v2.client.DockerRegistryClient
 import com.netflix.spinnaker.clouddriver.docker.registry.api.v2.client.DockerRegistryTags
 import com.netflix.spinnaker.clouddriver.docker.registry.security.DockerRegistryCredentials
-import retrofit.RetrofitError
 import spock.lang.Specification
 
 import java.time.Instant
@@ -202,7 +201,7 @@ class DockerRegistryImageCachingAgentTest extends Specification {
       ["repo-1", "tag-2"],
     ]
     client.getCreationDate("repo-1", "tag-1") >> {
-      throw RetrofitError.httpError("", null, null, null)
+      throw new IOException()
     }
     client.getCreationDate("repo-1", "tag-2") >> Instant.EPOCH
 

clouddriver-ecs/clouddriver-ecs.gradle

@@ -31,8 +31,6 @@ dependencies {
   implementation "io.spinnaker.kork:kork-credentials-api"
   implementation "io.spinnaker.kork:kork-exceptions"
   implementation "io.spinnaker.kork:kork-moniker"
-  implementation "com.squareup.retrofit:converter-jackson"
-  implementation "com.squareup.retrofit:retrofit"
   implementation "commons-io:commons-io"
   implementation "org.apache.commons:commons-lang3"
   implementation "org.apache.httpcomponents:httpclient"

clouddriver-elasticsearch/clouddriver-elasticsearch.gradle

@@ -9,7 +9,7 @@ dependencies {
   implementation "io.spinnaker.kork:kork-moniker"
   implementation "io.spinnaker.kork:kork-retrofit"
   implementation "io.spinnaker.kork:kork-security"
-  implementation "com.squareup.retrofit:retrofit"
+  implementation "com.squareup.retrofit2:converter-jackson"
   implementation "org.apache.groovy:groovy"
   implementation "org.elasticsearch:elasticsearch"
   implementation "org.springframework.boot:spring-boot-starter-web"

clouddriver-elasticsearch/src/test/groovy/com/netflix/spinnaker/clouddriver/elasticsearch/ops/DeleteEntityTagsAtomicOperationSpec.groovy

@@ -23,9 +23,11 @@ import com.netflix.spinnaker.clouddriver.elasticsearch.descriptions.DeleteEntity
 import com.netflix.spinnaker.clouddriver.elasticsearch.model.ElasticSearchEntityTagsProvider
 import com.netflix.spinnaker.clouddriver.model.EntityTags
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException
-import org.springframework.http.HttpStatus
-import retrofit.RetrofitError
-import retrofit.client.Response
+import okhttp3.MediaType
+import okhttp3.ResponseBody
+import retrofit2.Response
+import retrofit2.Retrofit
+import retrofit2.converter.jackson.JacksonConverterFactory
 import retrofit2.mock.Calls
 import spock.lang.Specification
 
@@ -48,17 +50,12 @@ class DeleteEntityTagsAtomicOperationSpec extends Specification {
   }
 
   void 'should remove entityTag from ElasticSearch if not found in Front50'() {
-    given:
-    RetrofitError notFoundRetrofitError = RetrofitError.httpError("url",
-      new Response("url", HttpStatus.NOT_FOUND.value(), "Application Not Found", [], null),
-      null, null)
-    SpinnakerHttpException spinnakerHttpException = new SpinnakerHttpException(notFoundRetrofitError)
     when:
     description.id = 'abc'
     operation.operate([])
 
     then:
-    1 * front50Service.getEntityTags('abc') >> { throw spinnakerHttpException }
+    1 * front50Service.getEntityTags('abc') >> { throw makeSpinnakerHttpException(404) }
     1 * entityTagsProvider.delete('abc')
     0 * _
   }
@@ -125,4 +122,22 @@ class DeleteEntityTagsAtomicOperationSpec extends Specification {
   Collection<EntityTags.EntityTag> buildTags(Map<String, String> tags) {
     return tags.collect { k, v -> new EntityTags.EntityTag(name: k, value: v) }
   }
+
+  static SpinnakerHttpException makeSpinnakerHttpException(int status) {
+    String url = "https://some-url";
+    Response retrofit2Response =
+      Response.error(
+        status,
+        ResponseBody.create(
+          MediaType.parse("application/json"), "{ \"message\": \"arbitrary message\" }"))
+
+    Retrofit retrofit =
+      new Retrofit.Builder()
+        .baseUrl(url)
+        .addConverterFactory(JacksonConverterFactory.create())
+        .build()
+
+    return new SpinnakerHttpException(retrofit2Response, retrofit)
+  }
+
 }

clouddriver-google/clouddriver-google.gradle

@@ -29,7 +29,6 @@ dependencies {
   implementation "io.spinnaker.kork:kork-retrofit2"
   implementation "io.spinnaker.kork:kork-exceptions"
   implementation "io.spinnaker.kork:kork-web"
-  implementation "com.squareup.retrofit:retrofit"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "org.springframework.cloud:spring-cloud-context"

clouddriver-lambda/clouddriver-lambda.gradle

@@ -19,8 +19,6 @@ dependencies {
   implementation "org.apache.commons:commons-compress:1.20"
   implementation "org.apache.groovy:groovy"
   implementation "org.springframework.boot:spring-boot-starter-web"
-  implementation "com.squareup.retrofit:converter-jackson"
-  implementation "com.squareup.retrofit:retrofit"
   implementation "com.netflix.spectator:spectator-api"
   implementation "com.netflix.frigga:frigga"
 

clouddriver-yandex/clouddriver-yandex.gradle

@@ -23,7 +23,6 @@ dependencies {
   implementation "io.spinnaker.kork:kork-artifacts"
   implementation "io.spinnaker.kork:kork-config"
   implementation "io.spinnaker.kork:kork-moniker"
-  implementation "com.squareup.retrofit:retrofit"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "com.google.protobuf:protobuf-java"