Titus: code reformatting and copyright headers

spinnaker · Mar 26, 2018 · 88ad9b3 · 88ad9b3
1 parent f5cdc2d
commit 88ad9b3
Show file tree

Hide file tree

Showing 52 changed files with 1,372 additions and 1,229 deletions.
diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/TitusClientProvider.groovy b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/TitusClientProvider.groovy
@@ -17,16 +17,9 @@
 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.RegionScopedTitusLoadBalancerClient
-import com.netflix.spinnaker.clouddriver.titus.client.TitusAutoscalingClient
-import com.netflix.spinnaker.clouddriver.titus.client.TitusJobCustomizer
-import com.netflix.spinnaker.clouddriver.titus.client.TitusLoadBalancerClient
-import com.netflix.spinnaker.clouddriver.titus.client.TitusRegion
+import com.netflix.spinnaker.clouddriver.titus.client.*
 import com.netflix.spinnaker.clouddriver.titus.client.model.GrpcChannelFactory
 import com.netflix.spinnaker.clouddriver.titus.credentials.NetflixTitusCredentials
-import com.netflix.spinnaker.clouddriver.titus.client.TitusClient
 import com.netflix.spinnaker.clouddriver.titus.v3client.RegionScopedV3TitusClient
 import groovy.transform.Immutable
 

diff --git a/.../groovy/com/netflix/spinnaker/clouddriver/titus/caching/TitusCachingProviderConfig.groovy b/.../groovy/com/netflix/spinnaker/clouddriver/titus/caching/TitusCachingProviderConfig.groovy
@@ -37,10 +37,12 @@ import javax.inject.Provider
 @Configuration
 class TitusCachingProviderConfig {
 
-  @Value('${titus.pollIntervalMillis:10000}') // 10 seconds
+  @Value('${titus.pollIntervalMillis:10000}')
+  // 10 seconds
   Long pollIntervalMillis
 
-  @Value('${titus.timeoutMillis:300000}') // 5 minutes
+  @Value('${titus.timeoutMillis:300000}')
+  // 5 minutes
   Long timeOutMilis
 
   @Bean

diff --git a/...vy/com/netflix/spinnaker/clouddriver/titus/caching/agents/TitusClusterCachingAgent.groovy b/...vy/com/netflix/spinnaker/clouddriver/titus/caching/agents/TitusClusterCachingAgent.groovy
@@ -18,7 +18,6 @@ package com.netflix.spinnaker.clouddriver.titus.caching.agents
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.google.protobuf.util.JsonFormat
 import com.netflix.frigga.Names
@@ -60,11 +59,7 @@ import javax.inject.Provider
 
 import static com.netflix.spinnaker.cats.agent.AgentDataType.Authority.AUTHORITATIVE
 import static com.netflix.spinnaker.cats.agent.AgentDataType.Authority.INFORMATIVE
-import static com.netflix.spinnaker.clouddriver.core.provider.agent.Namespace.APPLICATIONS
-import static com.netflix.spinnaker.clouddriver.core.provider.agent.Namespace.HEALTH
-import static com.netflix.spinnaker.clouddriver.core.provider.agent.Namespace.LOAD_BALANCERS
-import static com.netflix.spinnaker.clouddriver.core.provider.agent.Namespace.SERVER_GROUPS
-import static com.netflix.spinnaker.clouddriver.core.provider.agent.Namespace.TARGET_GROUPS
+import static com.netflix.spinnaker.clouddriver.core.provider.agent.Namespace.*
 import static com.netflix.spinnaker.clouddriver.titus.caching.Keys.Namespace.*
 
 class TitusClusterCachingAgent implements CachingAgent, CustomScheduledAgent, OnDemandAgent {
@@ -168,8 +163,8 @@ class TitusClusterCachingAgent implements CachingAgent, CustomScheduledAgent, On
           serverGroupKey,
           10 * 60, // ttl is 10 minutes,
           [
-            cacheTime     : new Date(),
-            cacheResults  : cacheResultAsJson
+            cacheTime   : new Date(),
+            cacheResults: cacheResultAsJson
           ],
           [:]
         )
@@ -461,7 +456,7 @@ class TitusClusterCachingAgent implements CachingAgent, CustomScheduledAgent, On
       } as Set).asImmutable()
 
       targetGroupKeys = (targetGroupNames.collect {
-        com.netflix.spinnaker.clouddriver.aws.data.Keys.getTargetGroupKey(it, getAwsAccountId(account, region), region,getAwsVpcId(account, region))
+        com.netflix.spinnaker.clouddriver.aws.data.Keys.getTargetGroupKey(it, getAwsAccountId(account, region), region, getAwsVpcId(account, region))
       } as Set).asImmutable()
 
     }

diff --git a/...com/netflix/spinnaker/clouddriver/titus/caching/providers/TitusApplicationProvider.groovy b/...com/netflix/spinnaker/clouddriver/titus/caching/providers/TitusApplicationProvider.groovy
@@ -15,6 +15,7 @@
  */
 
 package com.netflix.spinnaker.clouddriver.titus.caching.providers
+
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.spinnaker.cats.cache.Cache
@@ -63,7 +64,8 @@ class TitusApplicationProvider implements ApplicationProvider {
       return null
     }
     String name = Keys.parse(cacheData.id).application
-    Map<String, String> attributes = objectMapper.convertValue(cacheData.attributes, new TypeReference<Map<String, String>>() {})
+    Map<String, String> attributes = objectMapper.convertValue(cacheData.attributes, new TypeReference<Map<String, String>>() {
+    })
     Map<String, Set<String>> clusterNames = [:].withDefault { new HashSet<String>() }
     for (String clusterId : cacheData.relationships[CLUSTERS.ns]) {
       Map<String, String> cluster = Keys.parse(clusterId)

diff --git a/...ovy/com/netflix/spinnaker/clouddriver/titus/caching/providers/TitusClusterProvider.groovy b/...ovy/com/netflix/spinnaker/clouddriver/titus/caching/providers/TitusClusterProvider.groovy
@@ -220,7 +220,7 @@ class TitusClusterProvider implements ClusterProvider<TitusCluster> {
       }
       serverGroup.instances = serverGroup.instances ?: []
       serverGroup.targetGroups = serverGroupEntry.attributes.targetGroups
-      if(serverGroup.targetGroups){
+      if (serverGroup.targetGroups) {
         awsLookupUtil.lookupTargetGroupHealth(job, serverGroup.instances)
       }
       [(serverGroupEntry.id): serverGroup]

diff --git a/...vy/com/netflix/spinnaker/clouddriver/titus/caching/providers/TitusInstanceProvider.groovy b/...vy/com/netflix/spinnaker/clouddriver/titus/caching/providers/TitusInstanceProvider.groovy
@@ -62,7 +62,7 @@ class TitusInstanceProvider implements InstanceProvider<TitusInstance> {
     }
 
     String stack = awsLookupUtil.stack(account)
-    if(!stack){
+    if (!stack) {
       stack = 'mainvpc'
     }
 

diff --git a/.../groovy/com/netflix/spinnaker/clouddriver/titus/caching/providers/TitusJobProvider.groovy b/.../groovy/com/netflix/spinnaker/clouddriver/titus/caching/providers/TitusJobProvider.groovy
@@ -80,7 +80,7 @@ class TitusJobProvider implements JobProvider<TitusJobStatus> {
       OutputStream outputStream = new ByteArrayOutputStream()
       try {
         amazonS3DataProvider.getAdhocData("titus", "${s3.accountName}:${s3.region}:${s3.bucket}", "${s3.key}/${fileName}", outputStream)
-      } catch(Exception e){
+      } catch (Exception e) {
         throw new RuntimeException("Could not load ${fileName} for task ${job.tasks.last().id}")
       }
       fileContents = new ByteArrayInputStream(outputStream.toByteArray())

diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/caching/utils/AwsLookupUtil.groovy b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/caching/utils/AwsLookupUtil.groovy
@@ -209,13 +209,13 @@ class AwsLookupUtil {
       return null
     }
 
-    [name: awsSecurityGroupProvider.getById(awsDetails.awsAccount,
+    [name      : awsSecurityGroupProvider.getById(awsDetails.awsAccount,
       region,
       securityGroupId,
       awsDetails.vpcId
     )?.name,
      awsAccount: awsDetails.awsAccount,
-     vpcId: awsDetails.vpcId
+     vpcId     : awsDetails.vpcId
     ]
 
   }

diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/EndpointValidator.java b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/EndpointValidator.java
@@ -25,28 +25,28 @@
 
 public class EndpointValidator {
 
-    private static final Set<String> ALLOWED_PROTOCOLS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList("http", "https")));
-
-    public static String validateEndpoint(String endpoint) {
-        URL url;
-        try {
-            url = new URL(endpoint);
-        } catch (NullPointerException e) {
-            throw new IllegalArgumentException(String.format("Invalid endpoint provided (%s)", endpoint));
-        } catch (MalformedURLException e) {
-            throw new IllegalArgumentException(String.format("Invalid endpoint provided (%s): %s", endpoint, e.getMessage()));
-        }
-
-        if (url.getHost() == null || "".equals(url.getHost())) {
-            throw new IllegalArgumentException(String.format("Invalid endpoint provided (%s): No host specified", endpoint));
-        }
-
-        String protocol = url.getProtocol();
-        if (!ALLOWED_PROTOCOLS.contains(protocol)) {
-            throw new IllegalArgumentException(
-                String.format("Invalid endpoint provided (%s): Invalid protocol specified (%s)", endpoint, protocol));
-        }
-        return endpoint;
+  private static final Set<String> ALLOWED_PROTOCOLS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList("http", "https")));
+
+  public static String validateEndpoint(String endpoint) {
+    URL url;
+    try {
+      url = new URL(endpoint);
+    } catch (NullPointerException e) {
+      throw new IllegalArgumentException(String.format("Invalid endpoint provided (%s)", endpoint));
+    } catch (MalformedURLException e) {
+      throw new IllegalArgumentException(String.format("Invalid endpoint provided (%s): %s", endpoint, e.getMessage()));
     }
 
+    if (url.getHost() == null || "".equals(url.getHost())) {
+      throw new IllegalArgumentException(String.format("Invalid endpoint provided (%s): No host specified", endpoint));
+    }
+
+    String protocol = url.getProtocol();
+    if (!ALLOWED_PROTOCOLS.contains(protocol)) {
+      throw new IllegalArgumentException(
+        String.format("Invalid endpoint provided (%s): Invalid protocol specified (%s)", endpoint, protocol));
+    }
+    return endpoint;
+  }
+
 }
diff --git a/...y/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusLoadBalancerClient.java b/...y/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusLoadBalancerClient.java
@@ -61,7 +61,7 @@ public Map<String, List<String>> getAllLoadBalancers() {
     Map<String, List<String>> results = new HashMap<>();
     for (GetJobLoadBalancersResult result : loadBalancerServiceBlockingStub.getAllLoadBalancers(GetAllLoadBalancersRequest.newBuilder().setPage(Page.newBuilder().setPageSize(1000).build()).build()).getJobLoadBalancersList()) {
       for (LoadBalancerId loadBalancerid : result.getLoadBalancersList()) {
-        if(results.get(result.getJobId()) == null){
+        if (results.get(result.getJobId()) == null) {
           List<String> loadBalancers = new ArrayList<>();
           loadBalancers.add(loadBalancerid.getId());
           results.put(result.getJobId(), loadBalancers);

diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/TitusClient.java b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/TitusClient.java
@@ -23,88 +23,79 @@
 
 public interface TitusClient {
 
-    /**
-     * @param jobId
-     * @return
-     */
-    public Job getJob(String jobId);
-
-    /**
-     *
-     * @param jobName
-     * @return
-     */
-    public Job findJobByName(String jobName);
-
-    /**
-     * @param application
-     * @return
-     */
-    public List<Job> findJobsByApplication(String application);
-
-    /**
-     *
-     * @param submitJobRequest
-     * @return
-     */
-    public String submitJob(SubmitJobRequest submitJobRequest);
-
-    /**
-     *
-     * @param taskId
-     * @return
-     */
-    public Task getTask(String taskId);
-
-    /**
-     *
-     * @param resizeJobRequest
-     */
-    public void resizeJob(ResizeJobRequest resizeJobRequest);
-
-    /**
-     *
-     * @param activateJobRequest
-     */
-    public void activateJob(ActivateJobRequest activateJobRequest);
-
-    /**
-     *
-     * @param shouldEnable
-     */
-    public void setAutoscaleEnabled(String jobId, boolean shouldEnable);
-
-    /**
-     *
-     * @param terminateJobRequest
-     */
-    public void terminateJob(TerminateJobRequest terminateJobRequest);
-
-    /**
-     *
-     * @param terminateTasksAndShrinkJob
-     */
-    public void terminateTasksAndShrink(TerminateTasksAndShrinkJobRequest terminateTasksAndShrinkJob);
-
-    /**
-     * @param taskId
-     * @return
-     */
-    public Map logsDownload(String taskId);
-
-    /**
-     *
-     * @return
-     */
-    public TitusHealth getHealth();
-
-    /**
-     * @return
-     */
-    public List<Job> getAllJobs();
-
-    public Object getJobJson(String jobId);
-
-    public Object getTaskJson(String taskId);
+  /**
+   * @param jobId
+   * @return
+   */
+  public Job getJob(String jobId);
+
+  /**
+   * @param jobName
+   * @return
+   */
+  public Job findJobByName(String jobName);
+
+  /**
+   * @param application
+   * @return
+   */
+  public List<Job> findJobsByApplication(String application);
+
+  /**
+   * @param submitJobRequest
+   * @return
+   */
+  public String submitJob(SubmitJobRequest submitJobRequest);
+
+  /**
+   * @param taskId
+   * @return
+   */
+  public Task getTask(String taskId);
+
+  /**
+   * @param resizeJobRequest
+   */
+  public void resizeJob(ResizeJobRequest resizeJobRequest);
+
+  /**
+   * @param activateJobRequest
+   */
+  public void activateJob(ActivateJobRequest activateJobRequest);
+
+  /**
+   * @param shouldEnable
+   */
+  public void setAutoscaleEnabled(String jobId, boolean shouldEnable);
+
+  /**
+   * @param terminateJobRequest
+   */
+  public void terminateJob(TerminateJobRequest terminateJobRequest);
+
+  /**
+   * @param terminateTasksAndShrinkJob
+   */
+  public void terminateTasksAndShrink(TerminateTasksAndShrinkJobRequest terminateTasksAndShrinkJob);
+
+  /**
+   * @param taskId
+   * @return
+   */
+  public Map logsDownload(String taskId);
+
+  /**
+   * @return
+   */
+  public TitusHealth getHealth();
+
+  /**
+   * @return
+   */
+  public List<Job> getAllJobs();
+
+  public Object getJobJson(String jobId);
+
+  public Object getTaskJson(String taskId);
 
 }
diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/TitusClientObjectMapper.java b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/TitusClientObjectMapper.java
@@ -24,18 +24,18 @@
 
 public class TitusClientObjectMapper {
 
-    public static ObjectMapper configure() {
-        return configure(Optional.empty());
-    }
+  public static ObjectMapper configure() {
+    return configure(Optional.empty());
+  }
 
-    public static ObjectMapper configure(ObjectMapper template) {
-        return configure(Optional.ofNullable(template));
-    }
+  public static ObjectMapper configure(ObjectMapper template) {
+    return configure(Optional.ofNullable(template));
+  }
 
-    public static ObjectMapper configure(Optional<ObjectMapper> objectMapper) {
-        return objectMapper
-                .map(ObjectMapper::copy).orElse(new ObjectMapper())
-                .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-                .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
-    }
+  public static ObjectMapper configure(Optional<ObjectMapper> objectMapper) {
+    return objectMapper
+      .map(ObjectMapper::copy).orElse(new ObjectMapper())
+      .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+      .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+  }
 }