chore(upstream): Port upstream changes from Netflix

gradle.properties

@@ -7,7 +7,8 @@ org.gradle.parallel=true
 testContainersVersion=1.15.3
 okHttpVersion=4.5.0
 resilience4jVersion=1.5.0
-spinnakerGradleVersion=8.26.0
+spinnakerGradleVersion=8.23.0
+slackSdkVersion=1.12.1
 
 # Used to control whether to spin up docker to run liquibase before jooq
 buildingInDocker=false

keel-api/src/main/kotlin/com/netflix/spinnaker/keel/api/ClusterDeployStrategy.kt

@@ -13,6 +13,10 @@ abstract class ClusterDeployStrategy {
 
   companion object {
     val DEFAULT_WAIT_FOR_INSTANCES_UP: Duration = Duration.ofMinutes(30)
+    const val RED_BLACK_STRATEGY = "red-black"
+    const val HIGHLANDER_STRATEGY = "highlander"
+    const val NONE_STRATEGY = "none"
+    const val ROLLING_PUSH_STRATEGY = "rolling-push"
   }
 }
 
@@ -28,7 +32,7 @@ data class RedBlack(
   // The order of this list is important for pauseTime based staggers
   override val stagger: List<StaggeredRegion> = emptyList()
 ) : ClusterDeployStrategy() {
-  override val strategy = "red-black"
+  override val strategy = RED_BLACK_STRATEGY
 
   override val isStaggered: Boolean
     get() = stagger.isNotEmpty()
@@ -37,13 +41,13 @@ data class RedBlack(
 data class Highlander(
   override val health: DeployHealth = AUTO
 ) : ClusterDeployStrategy() {
-  override val strategy = "highlander"
+  override val strategy = HIGHLANDER_STRATEGY
 }
 
 data class NoStrategy(
   override val health: DeployHealth = AUTO
 ): ClusterDeployStrategy() {
-  override val strategy = "none"
+  override val strategy = NONE_STRATEGY
 }
 
 data class RollingPush(
@@ -54,7 +58,7 @@ data class RollingPush(
   val totalRelaunches: Int? = null,
   val terminationOrder: TerminationOrder? = null
 ): ClusterDeployStrategy() {
-  override val strategy = "rolling-push"
+  override val strategy = ROLLING_PUSH_STRATEGY
 }
 
 enum class TerminationOrder {

keel-api/src/main/kotlin/com/netflix/spinnaker/keel/api/ManagedRolloutConfig.kt

@@ -0,0 +1,17 @@
+package com.netflix.spinnaker.keel.api
+
+
+/**
+ * When managed rollout is enabled, we will deploy with a ManagedRollout stage instead of
+ *   the normal deploy stage.
+ */
+data class ManagedRolloutConfig(
+  val enabled: Boolean = false,
+  val selectionStrategy: SelectionStrategy? = null
+)
+
+// duplication of com.netflix.buoy.sdk.model.SelectionStrategy
+// so that we don't add another dependency into this module
+enum class SelectionStrategy {
+  ALPHABETICAL, OFF_PEAK
+}

keel-api/src/main/kotlin/com/netflix/spinnaker/keel/api/Moniker.kt

@@ -15,4 +15,19 @@ data class Moniker(
       detail == null -> "$app-$stack"
       else -> "$app-${stack.orEmpty()}-$detail"
     }
+
+  /**
+   * @return The [Moniker] with an updated [Moniker.detail] field containing as much of the specified
+   * [suffix] as possible while respecting max length constraints on resource names.
+   */
+  fun withSuffix(suffix: String, maxNameLength: Int = 32): Moniker {
+    // calculates the truncation point in the detail field based on how many characters are left of the
+    // max name length after removing the current detail and accounting for empty stack and detail (which
+    // cause extra dashes to be added to the name)
+    var truncateAt = (maxNameLength - toName().length - suffix.length - 1)
+    if (stack == null) --truncateAt
+    if (detail == null) --truncateAt else truncateAt += detail!!.length
+    val updatedDetail = listOfNotNull(detail?.take(truncateAt), suffix).joinToString("-")
+    return copy(detail = updatedDetail)
+  }
 }

keel-api/src/main/kotlin/com/netflix/spinnaker/keel/api/Resource.kt

@@ -49,6 +49,21 @@ data class Resource<out T : ResourceSpec>(
       else -> null
     }
 
+  /**
+   * Adds the specified [suffix] to the resource [id] and all properties of the [spec] derived from it.
+   */
+  fun deepRename(suffix: String): Resource<T> {
+    val updatedSpec = spec.deepRename(suffix)
+    return copy(
+      spec = updatedSpec as T,
+      metadata = metadata + mapOf(
+        // this is so the resource ID is updated with the new name (which is in the spec)
+        "id" to updatedSpec.id,
+        "application" to application
+      )
+    )
+  }
+
   // TODO: this is kinda dirty, but because we add uid to the metadata when persisting we don't really want to consider it in equality checks
   override fun equals(other: Any?): Boolean {
     if (this === other) return true

keel-api/src/main/kotlin/com/netflix/spinnaker/keel/api/ResourceSpec.kt

@@ -10,8 +10,7 @@ interface ResourceSpec {
    * form the fully-qualified resource id.
    *
    * This can be a property that is part of the spec, or derived from other properties. If the
-   * latter remember to annotate the overridden property with
-   * [com.fasterxml.jackson.annotation.JsonIgnore].
+   * latter, remember to annotate the overridden property with [com.fasterxml.jackson.annotation.JsonIgnore].
    */
   val id: String
 
@@ -30,4 +29,14 @@ interface ResourceSpec {
    * other fields.
    */
   val displayName: String
+
+  /**
+   * Applies the given [suffix] to the resource [id], and to all aggregate properties of the spec
+   * whose names are derived from the [id].
+   *
+   * @return a copy of the original [ResourceSpec] with the modified identifiers.
+   */
+  @JvmDefault
+  fun deepRename(suffix: String): ResourceSpec =
+    throw UnsupportedOperationException("Not implemented")
 }

keel-api/src/main/kotlin/com/netflix/spinnaker/keel/api/actuation/TaskLauncher.kt

@@ -16,21 +16,24 @@ interface TaskLauncher {
       resource = resource,
       description = description,
       correlationId = correlationId,
-      stages = listOf(job)
+      stages = listOf(job),
+      artifactVersion = null
     )
 
   suspend fun submitJob(
     resource: Resource<*>,
     description: String,
     correlationId: String,
-    stages: List<Job>
+    stages: List<Job>,
+    artifactVersion: String? = null
   ): Task
 
   fun submitJobAsync(
     resource: Resource<*>,
     description: String,
     correlationId: String,
-    stages: List<Map<String, Any?>>
+    stages: List<Map<String, Any?>>,
+    artifactVersion: String? = null
   ): CompletableFuture<Task>
 
   suspend fun submitJob(
@@ -43,7 +46,8 @@ interface TaskLauncher {
     correlationId: String? = null,
     stages: List<Job>,
     artifacts: List<Map<String, Any?>> = emptyList(),
-    parameters: Map<String, Any> = emptyMap()
+    parameters: Map<String, Any> = emptyMap(),
+    artifactVersion: String? = null
   ): Task =
     submitJob(
       user = user,
@@ -56,7 +60,8 @@ interface TaskLauncher {
       stages = stages,
       type = SubjectType.CONSTRAINT,
       artifacts = artifacts,
-      parameters = parameters
+      parameters = parameters,
+      artifactVersion = artifactVersion
     )
 
   /**
@@ -76,7 +81,8 @@ interface TaskLauncher {
     stages: List<Job>,
     type: SubjectType,
     artifacts: List<Map<String, Any?>> = emptyList(),
-    parameters: Map<String, Any> = emptyMap()
+    parameters: Map<String, Any> = emptyMap(),
+    artifactVersion: String? = null
   ): Task
 
   suspend fun correlatedTasksRunning(correlationId: String): Boolean
@@ -85,4 +91,9 @@ interface TaskLauncher {
    * @return The [TaskExecution] matching the [taskId].
    */
   suspend fun getTaskExecution(taskId: String): TaskExecution
+
+  /**
+   * Cancels the given tasks as the provided user identity
+   */
+  suspend fun cancelTasks(taskIds: List<String>, user: String)
 }

keel-api/src/main/kotlin/com/netflix/spinnaker/keel/api/artifacts/DeliveryArtifact.kt

@@ -104,6 +104,9 @@ abstract class DeliveryArtifact {
   /** Filters for the artifact origin in source control. */
   open val from: ArtifactOriginFilter? = null
 
+  /** Whether this artifact was created for a preview environment. */
+  open val isPreview: Boolean = false
+
   @get:ExcludedFromDiff
   val filteredByBranch: Boolean
     get() = from?.branch != null
@@ -155,5 +158,14 @@ abstract class DeliveryArtifact {
       .map { (it.spec as? ArtifactReferenceProvider)?.artifactReference }
       .contains(reference)
 
+  /**
+   * returns the resource ids using the artifact in the environment
+   */
+  fun resourcesUsing(environment: Environment) =
+    environment
+      .resources
+      .filter { reference == (it.spec as? ArtifactReferenceProvider)?.artifactReference }
+      .map { it.id }
+
   override fun toString() = "${type.toUpperCase()} artifact $name (ref: $reference)"
 }

keel-api/src/main/kotlin/com/netflix/spinnaker/keel/api/artifacts/PublishedArtifact.kt

@@ -35,6 +35,7 @@ data class PublishedArtifact(
     name: String,
     type: String,
     version: String,
+    reference: String? = null,
     status: ArtifactStatus? = null,
     createdAt: Instant? = null,
     gitMetadata: GitMetadata? = null,
@@ -43,7 +44,7 @@ data class PublishedArtifact(
   ) : this(
     name = name,
     type = type.toLowerCase(),
-    reference = name,
+    reference = reference?: name,
     version = version,
     metadata = (metadata ?: emptyMap()) + mapOf(
       "releaseStatus" to status?.name,

keel-api/src/main/kotlin/com/netflix/spinnaker/keel/api/constraints/ConstraintRepository.kt

@@ -25,7 +25,7 @@ interface ConstraintRepository {
 
   fun getConstraintStateById(uid: UID): ConstraintState?
 
-  fun deleteConstraintState(deliveryConfigName: String, environmentName: String, type: String)
+  fun deleteConstraintState(deliveryConfigName: String, environmentName: String, reference: String, version: String, type: String): Int
 
   fun constraintStateFor(application: String): List<ConstraintState>
 

keel-artifact/src/main/kotlin/com/netflix/spinnaker/keel/artifacts/ArtifactListener.kt

@@ -90,7 +90,7 @@ class ArtifactListener(
           launch {
             val lastStoredVersions = repository.artifactVersions(artifact, artifactRefreshConfig.limit)
             val currentVersions = lastStoredVersions.map { it.version }
-              log.debug("Last recorded versions of $artifact: $currentVersions")
+            log.debug("Last recorded versions of $artifact: $currentVersions")
 
             val artifactSupplier = artifactSuppliers.supporting(artifact.type)
             val latestAvailableVersions = artifactSupplier.getLatestArtifacts(artifact.deliveryConfig, artifact, artifactRefreshConfig.limit)

keel-clouddriver/src/main/kotlin/com/netflix/spinnaker/keel/clouddriver/model/ActiveServerGroup.kt

@@ -245,7 +245,8 @@ data class LaunchTemplateData(
   val keyName: String,
   val iamInstanceProfile: IamInstanceProfile,
   val monitoring: InstanceMonitoring,
-  val ramDiskId: String?
+  val ramDiskId: String?,
+  val metadataOptions: Map<String, String> = emptyMap()
 )
 
 data class IamInstanceProfile(