Add build scan server to config + test

Author: ZacSweers

src/main/kotlin/slack/cli/exec/ProcessedExecConfig.kt

@@ -25,6 +25,7 @@ private const val CURRENT_VERSION = 1
 @JsonClass(generateAdapter = true)
 internal data class ProcessedExecConfig(
   val version: Int = CURRENT_VERSION,
+  @Json(name = "gradle_enterprise_server") val gradleEnterpriseServer: String? = null,
   @Json(name = "known_issues")
   val knownIssues: List<Issue> =
     KnownIssues::class.declaredMemberProperties.map { it.get(KnownIssues) as Issue },

src/main/kotlin/slack/cli/exec/ResultProcessor.kt

@@ -65,7 +65,7 @@ internal class ResultProcessor(
             // Group by the throwable message
             report.setGroupingHash(issue.groupingHash)
             report.addToTab("Run Info", "After-Retry", isAfterRetry)
-            logLinesReversed.parseBuildScan()?.let { scanLink ->
+            config.gradleEnterpriseServer?.let(logLinesReversed::parseBuildScan)?.let { scanLink ->
               report.addToTab("Run Info", "Build-Scan", scanLink)
             }
           }
@@ -85,19 +85,6 @@ internal class ResultProcessor(
     return RetrySignal.Unknown
   }
 
-  // TODO test this
-  private fun List<String>.parseBuildScan(): String? {
-    // Find a build scan URL like so
-    // Publishing build scan...
-    // https://some-server.com/s/ueizlbptdqv6q
-
-    // Index of the publish log. Scan link should be above or below this.
-    val indexOfBuildScan = indexOfFirst { it.contains("Publishing build scan...") }
-    // Note the lines may be in reverse order here, so try both above and below
-    return get(indexOfBuildScan - 1).trim().takeUnless { "https" !in it }
-      ?: get(indexOfBuildScan + 1).trim().takeUnless { "https" !in it }
-  }
-
   private fun verboseEcho(message: String) {
     if (verbose) echo(message)
   }
@@ -158,3 +145,15 @@ private fun Report.populateBuildKiteTab() {
 }
 
 private fun envOrNull(envKey: String) = System.getenv(envKey)?.takeUnless { it.isBlank() }
+
+internal fun List<String>.parseBuildScan(serverUrl: String): String? {
+  // Find a build scan URL like so
+  // Publishing build scan...
+  // https://some-server.com/s/ueizlbptdqv6q
+
+  // Index of the publish log. Scan link should be above or below this.
+  val indexOfBuildScan = indexOfFirst { it.contains("Publishing build scan...") }
+  // Note the lines may be in reverse order here, so try both above and below
+  return get(indexOfBuildScan - 1).trim().takeIf { serverUrl in it }
+    ?: get(indexOfBuildScan + 1).trim().takeIf { serverUrl in it }
+}

src/test/kotlin/slack/cli/exec/ProcessedExecConfigTest.kt

@@ -30,6 +30,7 @@ class ProcessedExecConfigTest {
       """
       {
         "version": 1,
+        "gradle_enterprise_server": "https://gradle-enterprise.example.com",
         "known_issues": [
           {
             "message": "${KnownIssues.ftlRateLimit.message}",
@@ -47,7 +48,14 @@ class ProcessedExecConfigTest {
         .trimIndent()
 
     val issue = adapter.fromJson(json)!!
-    assertThat(issue).isEqualTo(ProcessedExecConfig(1, listOf(KnownIssues.ftlRateLimit)))
+    assertThat(issue)
+      .isEqualTo(
+        ProcessedExecConfig(
+          1,
+          "https://gradle-enterprise.example.com",
+          listOf(KnownIssues.ftlRateLimit)
+        )
+      )
   }
 
   @Test

src/test/kotlin/slack/cli/exec/ResultProcessorTest.kt

@@ -98,6 +98,22 @@ class ResultProcessorTest {
     check(signal is RetrySignal.Ack)
   }
 
+  @Test
+  fun parseBuildScan() {
+    val url = "https://gradle-enterprise.example.com"
+    val scanUrl = "$url/s/ueizlbptdqv6q"
+    val log =
+      """
+      Publishing build scan...
+      $scanUrl
+
+    """.trimIndent().padWithTestLogs()
+
+    // Assert in both directions they match
+    assertThat(log.lines().parseBuildScan(url)).isEqualTo(scanUrl)
+    assertThat(log.lines().reversed().parseBuildScan(url)).isEqualTo(scanUrl)
+  }
+
   private fun newProcessor(): ResultProcessor {
     return ResultProcessor(
       verbose = true,