chore(dependencies): Spring Boot 2.2.4 upgrade (#3383)

gradle.properties

@@ -1,7 +1,6 @@
-#Thu Jan 23 21:06:18 UTC 2020
-fiatVersion=1.12.0
-enablePublishing=false
-korkVersion=7.12.0
+fiatVersion=1.13.0
+keikoVersion=3.4.0
+korkVersion=7.13.0
 spinnakerGradleVersion=7.0.1
-keikoVersion=3.3.0
+enablePublishing=false
 org.gradle.parallel=true

orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/Trigger.kt

@@ -18,6 +18,7 @@ package com.netflix.spinnaker.orca.pipeline.model
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter
 import com.fasterxml.jackson.annotation.JsonAnySetter
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.netflix.spinnaker.kork.artifacts.model.Artifact
 import com.netflix.spinnaker.kork.artifacts.model.ExpectedArtifact
@@ -31,8 +32,11 @@ interface Trigger {
   val parameters: Map<String, Any>
   val artifacts: List<Artifact>
   val notifications: List<Map<String, Any>>
+  @get:JsonProperty("rebake")
   var isRebake: Boolean
+  @get:JsonProperty("dryRun")
   var isDryRun: Boolean
+  @get:JsonProperty("strategy")
   var isStrategy: Boolean
   var resolvedExpectedArtifacts: List<ExpectedArtifact>
   @set:JsonAnySetter

orca-core/src/test/groovy/com/netflix/spinnaker/orca/pipeline/util/ContextParameterProcessorSpec.groovy

@@ -161,7 +161,7 @@ class ContextParameterProcessorSpec extends Specification {
     result.test == source.test
     summary[escapedExpression].size() == 1
     summary[escapedExpression][0].level as String == ExpressionEvaluationSummary.Result.Level.ERROR.name()
-    summary[escapedExpression][0].exceptionType == SpelEvaluationException
+    summary[escapedExpression][0].exceptionType == SpelEvaluationException.typeName
 
     where:
     testCase                                                            | desc
@@ -184,7 +184,7 @@ class ContextParameterProcessorSpec extends Specification {
     result.test == source.test
     summary[escapedExpression].size() == 1
     summary[escapedExpression][0].level as String == ExpressionEvaluationSummary.Result.Level.ERROR.name()
-    summary[escapedExpression][0].exceptionType == SpelEvaluationException
+    summary[escapedExpression][0].exceptionType == SpelEvaluationException.typeName
 
     where:
     testCase                                                   | desc

orca-flex/src/main/groovy/com/netflix/spinnaker/orca/flex/tasks/AssociateElasticIpTask.groovy

@@ -25,9 +25,11 @@ import org.springframework.stereotype.Component
 class AssociateElasticIpTask extends AbstractElasticIpTask {
   @Override
   ElasticIpResult performRequest(StageData stageData) {
-    stageData.with {
-      flexService.associateElasticIp(application, account, cluster, region, elasticIp)
-    }
+    flexService.associateElasticIp(stageData.application,
+            stageData.account,
+            stageData.cluster,
+            stageData.region,
+            stageData.elasticIp)
   }
 
   @Override

orca-flex/src/main/groovy/com/netflix/spinnaker/orca/flex/tasks/DisassociateElasticIpTask.groovy

@@ -25,9 +25,11 @@ import org.springframework.stereotype.Component
 class DisassociateElasticIpTask extends AbstractElasticIpTask {
   @Override
   ElasticIpResult performRequest(StageData stageData) {
-    stageData.with {
-      flexService.disassociateElasticIp(application, account, cluster, region, elasticIp.address)
-    }
+      flexService.disassociateElasticIp(stageData.application,
+              stageData.account,
+              stageData.cluster,
+              stageData.region,
+              stageData.elasticIp.address)
   }
 
   @Override

orca-front50/src/main/groovy/com/netflix/spinnaker/orca/front50/model/PluginInfo.java

@@ -24,18 +24,16 @@
 import lombok.NoArgsConstructor;
 
 @Data
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Builder
 public class PluginInfo {
   @Nonnull private String id;
   private String description;
   private String provider;
   @Nonnull private List<Release> releases;
 
   @Data
-  @NoArgsConstructor
-  @AllArgsConstructor
   public static class Release {
     private String version;
     private String date;

orca-front50/src/test/groovy/com/netflix/spinnaker/orca/front50/DependentPipelineStarterSpec.groovy

@@ -175,6 +175,7 @@ class DependentPipelineStarterSpec extends Specification {
       name             : "triggered",
       id               : "triggered",
       expectedArtifacts: [[
+                            id: "id1",
                             matchArtifact: [
                               kind: "gcs",
                               name: "gs://test/file.yaml",
@@ -234,6 +235,7 @@ class DependentPipelineStarterSpec extends Specification {
       name             : "triggered",
       id               : "triggered",
       expectedArtifacts: [[
+                            id: "id1",
                             matchArtifact: [
                               kind: "gcs",
                               name: "gs://test/file.yaml",
@@ -303,6 +305,7 @@ class DependentPipelineStarterSpec extends Specification {
       name             : "triggered",
       id               : "triggered",
       expectedArtifacts: [[
+                            id: "id1",
                             matchArtifact: [
                               kind: "gcs",
                               name: "gs://test/file.yaml",

orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/TemplatedPipelineModelMutator.java

@@ -17,7 +17,6 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.netflix.spinnaker.kork.artifacts.model.ExpectedArtifact;
 import com.netflix.spinnaker.orca.front50.PipelineModelMutator;
 import com.netflix.spinnaker.orca.pipelinetemplate.exceptions.TemplateLoaderException;
 import com.netflix.spinnaker.orca.pipelinetemplate.loader.TemplateLoader;
@@ -29,6 +28,7 @@
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.RenderContext;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.RenderUtil;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.Renderer;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -128,7 +128,6 @@ private void applyConfigurationsFromTemplate(
     }
   }
 
-  @SuppressWarnings("unchecked")
   private void applyConfigurations(
       PipelineConfiguration configuration, Map<String, Object> pipeline) {
     if (configuration.getConcurrentExecutions() != null) {
@@ -165,7 +164,7 @@ private void applyConfigurations(
           TemplateMerge.mergeDistinct(
               pipelineTemplateObjectMapper.convertValue(
                   pipeline.get("expectedArtifacts"),
-                  new TypeReference<List<ExpectedArtifact>>() {}),
+                  new TypeReference<List<HashMap<String, Object>>>() {}),
               configuration.getExpectedArtifacts()));
     }
   }

orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v2schema/model/V2PipelineTemplate.java

@@ -123,8 +123,7 @@ public List<V2StageDefinition> getStages() {
       return Collections.emptyList();
     }
     ObjectMapper oj = new ObjectMapper();
-    TypeReference v2StageDefTypeRef = new TypeReference<List<V2StageDefinition>>() {};
-    return oj.convertValue(pipelineStages, v2StageDefTypeRef);
+    return oj.convertValue(pipelineStages, new TypeReference<List<V2StageDefinition>>() {});
   }
 
   public void setStages(List<V2StageDefinition> stages) {

orca-pipelinetemplate/src/test/groovy/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/TemplatedPipelineModelMutatorSpec.groovy

@@ -67,6 +67,44 @@ class TemplatedPipelineModelMutatorSpec extends Specification {
     0 * subject.applyConfigurationsFromTemplate(_, _, pipeline)
   }
 
+  def "should merge expectedArtifacts when configured to inherit them"() {
+    given:
+    def pipeline = [
+      config: [
+        schema: '1',
+        pipeline: [
+          template: [
+            source: 'static-template'
+          ]
+        ],
+        configuration: [
+          inherit: ['expectedArtifacts'],
+          expectedArtifacts: [
+            [
+              id: 'artifact1'
+            ] as NamedHashMap
+          ]
+        ]
+      ]
+    ]
+
+    when:
+    subject.mutate(pipeline)
+
+    then:
+    1 * templateLoader.load(_) >> { [new PipelineTemplate(
+      schema: '1',
+      configuration: new Configuration(
+        expectedArtifacts: [
+          [
+            id: 'artifact2'
+          ] as NamedHashMap
+        ]
+      )
+    )]}
+    pipeline.expectedArtifacts.size() == 2
+  }
+
   def "should apply configurations from template if template is statically sourced"() {
     given:
     def pipeline = [

orca-queue-redis/src/main/kotlin/com/netflix/spinnaker/config/RedisOrcaQueueConfiguration.kt

@@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Primary
 import redis.clients.jedis.Jedis
 import redis.clients.jedis.JedisCluster
-import redis.clients.util.Pool
+import redis.clients.jedis.util.Pool
 import java.time.Clock
 import java.util.Optional
 

orca-queue-redis/src/main/kotlin/com/netflix/spinnaker/config/RedisQueueShovelConfiguration.kt

@@ -40,7 +40,7 @@ import redis.clients.jedis.HostAndPort
 import redis.clients.jedis.Jedis
 import redis.clients.jedis.JedisCluster
 import redis.clients.jedis.Protocol
-import redis.clients.util.Pool
+import redis.clients.jedis.util.Pool
 import java.net.URI
 import java.time.Clock
 import java.time.Duration

orca-queue-redis/src/main/kotlin/com/netflix/spinnaker/orca/q/redis/pending/RedisPendingExecutionService.kt

@@ -21,7 +21,7 @@ import com.fasterxml.jackson.module.kotlin.readValue
 import com.netflix.spinnaker.orca.q.pending.PendingExecutionService
 import com.netflix.spinnaker.q.Message
 import redis.clients.jedis.Jedis
-import redis.clients.util.Pool
+import redis.clients.jedis.util.Pool
 
 class RedisPendingExecutionService(
   private val pool: Pool<Jedis>,

orca-queue-redis/src/test/kotlin/com/netflix/spinnaker/orca/q/redis/RedisQueueIntegrationTest.kt

@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.test.context.junit4.SpringRunner
 import redis.clients.jedis.Jedis
-import redis.clients.util.Pool
+import redis.clients.jedis.util.Pool
 
 @Configuration
 class RedisTestConfig {

orca-redis/orca-redis.gradle

@@ -2,9 +2,6 @@ apply from: "$rootDir/gradle/kotlin.gradle"
 apply from: "$rootDir/gradle/spock.gradle"
 
 dependencies {
-  api("redis.clients:jedis:2.10.2") {
-    force = true
-  }
   api("com.netflix.spinnaker.kork:kork-jedis")
 
   implementation(project(":orca-core"))

orca-redis/src/main/java/com/netflix/spinnaker/orca/config/RedisConnectionInfo.java

@@ -17,7 +17,7 @@
 
 import java.net.URI;
 import redis.clients.jedis.Protocol;
-import redis.clients.util.JedisURIHelper;
+import redis.clients.jedis.util.JedisURIHelper;
 
 public class RedisConnectionInfo {
   public boolean hasPassword() {

orca-redis/src/main/java/com/netflix/spinnaker/orca/notifications/RedisClusterNotificationClusterLock.java

@@ -2,8 +2,10 @@
 
 import org.jetbrains.annotations.NotNull;
 import redis.clients.jedis.JedisCluster;
+import redis.clients.jedis.params.SetParams;
 
 public class RedisClusterNotificationClusterLock implements NotificationClusterLock {
+
   private final JedisCluster cluster;
 
   public RedisClusterNotificationClusterLock(JedisCluster cluster) {
@@ -13,6 +15,10 @@ public RedisClusterNotificationClusterLock(JedisCluster cluster) {
   @Override
   public boolean tryAcquireLock(@NotNull String notificationType, long lockTimeoutSeconds) {
     String key = "lock:" + notificationType;
-    return "OK".equals(cluster.set(key, "\uD83D\uDD12", "NX", "EX", lockTimeoutSeconds));
+    // assuming lockTimeoutSeconds will be < 2147483647
+    return "OK"
+        .equals(
+            cluster.set(
+                key, "\uD83D\uDD12", SetParams.setParams().nx().ex((int) lockTimeoutSeconds)));
   }
 }

orca-redis/src/main/java/com/netflix/spinnaker/orca/notifications/RedisNotificationClusterLock.java

@@ -18,6 +18,7 @@
 import com.netflix.spinnaker.kork.jedis.RedisClientDelegate;
 import com.netflix.spinnaker.kork.jedis.RedisClientSelector;
 import javax.annotation.Nonnull;
+import redis.clients.jedis.params.SetParams;
 
 public class RedisNotificationClusterLock implements NotificationClusterLock {
 
@@ -32,7 +33,14 @@ public boolean tryAcquireLock(@Nonnull String notificationType, long lockTimeout
     String key = "lock:" + notificationType;
     return redisClientDelegate.withCommandsClient(
         client -> {
-          return "OK".equals(client.set(key, "\uD83D\uDD12", "NX", "EX", lockTimeoutSeconds));
+          return "OK"
+              .equals(
+                  client
+                      // assuming lockTimeoutSeconds will be < 2147483647
+                      .set(
+                      key,
+                      "\uD83D\uDD12",
+                      SetParams.setParams().nx().ex((int) lockTimeoutSeconds)));
         });
   }
 }

orca-redis/src/main/java/com/netflix/spinnaker/orca/pipeline/persistence/jedis/RedisExecutionRepository.java

@@ -27,8 +27,8 @@
 import static java.lang.System.currentTimeMillis;
 import static java.util.Collections.*;
 import static net.logstash.logback.argument.StructuredArguments.value;
-import static redis.clients.jedis.BinaryClient.LIST_POSITION.AFTER;
-import static redis.clients.jedis.BinaryClient.LIST_POSITION.BEFORE;
+import static redis.clients.jedis.ListPosition.AFTER;
+import static redis.clients.jedis.ListPosition.BEFORE;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -58,7 +58,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import redis.clients.jedis.BinaryClient;
+import redis.clients.jedis.ListPosition;
 import redis.clients.jedis.Response;
 import redis.clients.jedis.ScanParams;
 import redis.clients.jedis.ScanResult;
@@ -786,7 +786,7 @@ public List<String> retrieveAllApplicationNames(@Nullable ExecutionType type, in
                   });
             }
 
-            cursor = chunk.getStringCursor();
+            cursor = chunk.getCursor();
             if (cursor.equals("0")) {
               break;
             }
@@ -1360,8 +1360,7 @@ private void storeStageInternal(RedisClientDelegate delegate, Stage stage, Boole
             tx.hdel(key, keysToRemove.toArray(new String[0]));
           }
           if (updateIndex) {
-            BinaryClient.LIST_POSITION pos =
-                stage.getSyntheticStageOwner() == STAGE_BEFORE ? BEFORE : AFTER;
+            ListPosition pos = stage.getSyntheticStageOwner() == STAGE_BEFORE ? BEFORE : AFTER;
             tx.linsert(indexKey, pos, stage.getParentStageId(), stage.getId());
           }
           tx.exec();

orca-redis/src/main/java/com/netflix/spinnaker/orca/telemetry/RedisPoolMetricsPostProcessor.java

@@ -23,7 +23,7 @@
 import org.springframework.stereotype.Component;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
-import redis.clients.util.Pool;
+import redis.clients.jedis.util.Pool;
 
 @Component
 public class RedisPoolMetricsPostProcessor extends AbstractMetricsPostProcessor<JedisPool> {

orca-redis/src/test/groovy/com/netflix/spinnaker/orca/pipeline/persistence/jedis/JedisExecutionRepositorySpec.groovy

@@ -27,7 +27,7 @@ import com.netflix.spinnaker.orca.pipeline.model.Stage
 import com.netflix.spinnaker.orca.pipeline.persistence.ExecutionNotFoundException
 import com.netflix.spinnaker.orca.pipeline.persistence.ExecutionRepositoryTck
 import redis.clients.jedis.Jedis
-import redis.clients.util.Pool
+import redis.clients.jedis.util.Pool
 import spock.lang.AutoCleanup
 import spock.lang.Shared
 import spock.lang.Unroll

orca-test-redis/src/main/java/com/netflix/spinnaker/orca/test/redis/EmbeddedRedisConfiguration.java

@@ -21,7 +21,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import redis.clients.jedis.Jedis;
-import redis.clients.util.Pool;
+import redis.clients.jedis.util.Pool;
 
 @Configuration
 public class EmbeddedRedisConfiguration {