Titus: removes v2 REST based API

spinnaker · Mar 26, 2018 · 433d5c2 · 433d5c2
1 parent 653e37e
commit 433d5c2
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 576 deletions.
diff --git a/clouddriver-titus.gradle b/clouddriver-titus.gradle
@@ -26,10 +26,7 @@ dependencies {
   compile "com.netflix.spinnaker.clouddriver:clouddriver-aws:${clouddriverVersion}"
   compile spinnaker.dependency('bootActuator')
   compile spinnaker.dependency('bootWeb')
-  compile 'com.squareup.retrofit2:retrofit:2.0.0'
-  compile 'com.squareup.retrofit2:converter-jackson:2.0.0'
   compile 'com.squareup.okhttp3:okhttp:3.1.2'
-  compile 'com.squareup.okhttp3:logging-interceptor:3.1.2'
   testCompile "org.slf4j:slf4j-simple:${spinnaker.version('slf4j')}"
   spinnaker.group('test')
 }

diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/TitusClientProvider.groovy b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/TitusClientProvider.groovy
@@ -18,7 +18,7 @@ package com.netflix.spinnaker.clouddriver.titus
 
 import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.clouddriver.titus.client.RegionScopedTitusAutoscalingClient
-import com.netflix.spinnaker.clouddriver.titus.client.RegionScopedTitusClient
+
 import com.netflix.spinnaker.clouddriver.titus.client.RegionScopedTitusLoadBalancerClient
 import com.netflix.spinnaker.clouddriver.titus.client.TitusAutoscalingClient
 import com.netflix.spinnaker.clouddriver.titus.client.TitusJobCustomizer
@@ -47,7 +47,7 @@ class TitusClientProvider {
   TitusClient getTitusClient(NetflixTitusCredentials account, String region) {
     final TitusRegion titusRegion = Objects.requireNonNull(account.regions.find { it.name == region }, "region")
     final TitusClientKey key = new TitusClientKey(Objects.requireNonNull(account.name), titusRegion)
-    return titusClients.computeIfAbsent(key, { k -> k.region.apiVersion == '3' ? new RegionScopedV3TitusClient(k.region, registry, titusJobCustomizers, account.environment, account.eurekaName) : new RegionScopedTitusClient(k.region, registry, titusJobCustomizers) })
+    return titusClients.computeIfAbsent(key, { k -> new RegionScopedV3TitusClient(k.region, registry, titusJobCustomizers, account.environment, account.eurekaName) })
   }
 
   TitusAutoscalingClient getTitusAutoscalingClient(NetflixTitusCredentials account, String region) {

diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusClient.java b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusClient.java
diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/TitusRestAdapter.java b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/TitusRestAdapter.java