Revert "fix(slack): Fix Slack callback handling"

This reverts commit db018a9.

gradle.properties

@@ -8,7 +8,6 @@ testContainersVersion=1.15.3
 okHttpVersion=4.5.0
 resilience4jVersion=1.5.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-notifications/keel-notifications.gradle

@@ -6,9 +6,9 @@ dependencies {
   implementation(project(":keel-network"))
   implementation("org.springframework.boot:spring-boot-autoconfigure")
 
-  implementation("com.slack.api:slack-api-model-kotlin-extension:${slackSdkVersion}")
-  implementation("com.slack.api:slack-api-client-kotlin-extension:${slackSdkVersion}")
-  implementation("com.slack.api:bolt:${slackSdkVersion}")
+  implementation("com.slack.api:slack-api-model-kotlin-extension:1.4.1")
+  implementation("com.slack.api:slack-api-client-kotlin-extension:1.4.1")
+  implementation("com.slack.api:bolt:1.6.0")
 
   testImplementation("dev.minutest:minutest")
   testImplementation("io.strikt:strikt-core")

keel-web/keel-web.gradle

@@ -1,11 +1,9 @@
 plugins {
-  id "application"
-  id "com.github.hauner.jarTest" version "1.0.1"
+  id("application")
 }
 
-apply plugin: "com.netflix.dgs.codegen"
-apply plugin: "io.spinnaker.package"
-apply plugin: "com.github.hauner.jarTest"
+apply(plugin: "com.netflix.dgs.codegen")
+apply(plugin: "io.spinnaker.package")
 
 repositories {
   mavenCentral() // for graphql-java-extended-scalars
@@ -48,7 +46,7 @@ dependencies {
   implementation("io.swagger.core.v3:swagger-annotations:2.1.2")
   implementation("org.apache.maven:maven-artifact:3.6.3")
   implementation("io.spinnaker.kork:kork-plugins")
-  implementation("com.slack.api:bolt-servlet:${slackSdkVersion}")
+  implementation("com.slack.api:bolt-servlet:1.6.0")
   implementation("com.graphql-java:graphql-java-extended-scalars:16.0.1")
 
   // DGS dependencies

keel-web/src/main/kotlin/com/netflix/spinnaker/config/DefaultSecurityConfiguration.kt → keel-web/src/main/kotlin/com/netflix/spinnaker/config/SecurityConfiguration.kt

@@ -10,4 +10,4 @@ import org.springframework.context.annotation.Configuration
 @Configuration
 @ConditionalOnProperty(name = ["keel.security.custom"], havingValue = "false", matchIfMissing = true)
 @EnableFiatAutoConfig
-class DefaultSecurityConfiguration
+class SecurityConfiguration

keel-web/src/main/kotlin/com/netflix/spinnaker/keel/rest/SlackAppController.kt

@@ -0,0 +1,57 @@
+package com.netflix.spinnaker.keel.rest
+
+import com.netflix.spinnaker.keel.notifications.slack.callbacks.CommitModalCallbackHandler
+import com.netflix.spinnaker.keel.notifications.slack.callbacks.ManualJudgmentCallbackHandler
+import com.slack.api.app_backend.interactive_components.payload.BlockActionPayload
+import com.slack.api.bolt.App
+import com.slack.api.bolt.context.builtin.ActionContext
+import com.slack.api.bolt.request.builtin.BlockActionRequest
+import com.slack.api.bolt.servlet.SlackAppServlet
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+import javax.servlet.annotation.WebServlet
+
+
+@Component
+@WebServlet("/slack/notifications/callbacks")
+/**
+ * New endpoint for the new slack integration. This will be called from gate directly instead of echo.
+ * We use Slack Bolt library (https://github.com/slackapi/java-slack-sdk/), which has a native support for handling callbacks from slack.
+ */
+class SlackAppController(
+  slackApp: App,
+  private val mjHandler: ManualJudgmentCallbackHandler,
+  private val commitModalCallbackHandler: CommitModalCallbackHandler,
+) : SlackAppServlet(slackApp) {
+
+  private val log by lazy { LoggerFactory.getLogger(javaClass) }
+
+  init {
+    // The pattern here should match the action id field in the actual button.
+    // for example, for manual judgment notifications: constraintId:OVERRIDE_PASS:MANUAL_JUDGMENT
+    val actionIdPattern = "^(\\w+):(\\w+):(\\w+)".toPattern()
+    slackApp.blockAction(actionIdPattern) { req: BlockActionRequest, ctx: ActionContext ->
+      if (req.payload.notificationType == "MANUAL_JUDGMENT") {
+        log.info(logMessage("'manual judgment' button clicked", req))
+        mjHandler.respondToButton(req, ctx)
+      } else if (req.payload.notificationType == "FULL_COMMIT_MODAL") {
+        log.info(logMessage("'show full commit' button clicked", req))
+        commitModalCallbackHandler.openModal(req, ctx)
+      } else if (req.payload.actions.first().actionId == "button:url:mj-diff-link") {
+        log.info(logMessage("'see changes' button clicked", req))
+      } else {
+        log.debug(logMessage("Unrecognized action", req))
+      }
+      // we always need to acknowledge the button within 3 seconds
+      ctx.ack()
+    }
+  }
+
+  fun logMessage(what: String, req: BlockActionRequest) =
+    "[slack interaction] $what by ${req.payload.user.username} (${req.payload.user.id}) " +
+      "in channel ${req.payload.channel.name} (${req.payload.channel.id})"
+
+  //action id is consistent of 3 parts, where the last part is the type
+  val BlockActionPayload.notificationType
+    get() = actions.first().actionId.split(":").last()
+}