Make JSON more canonical

Author: ZacSweers

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

@@ -15,6 +15,7 @@
  */
 package slack.cli.exec
 
+import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 /**
@@ -30,10 +31,10 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 internal data class Issue(
   val message: String,
-  val logMessage: String,
-  val matchingText: String,
-  val groupingHash: String,
-  val retrySignal: RetrySignal
+  @Json(name = "log_message") val logMessage: String,
+  @Json(name = "matching_text") val matchingText: String,
+  @Json(name = "grouping_hash") val groupingHash: String,
+  @Json(name = "retry_signal") val retrySignal: RetrySignal
 ) {
 
   private fun List<String>.checkContains(errorText: String): Boolean {

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

@@ -15,6 +15,7 @@
  */
 package slack.cli.exec
 
+import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import kotlin.reflect.full.declaredMemberProperties
 
@@ -24,7 +25,8 @@ private const val CURRENT_VERSION = 1
 @JsonClass(generateAdapter = true)
 internal data class ProcessedExecConfig(
   val version: Int = CURRENT_VERSION,
-  val issues: List<Issue> =
+  @Json(name = "known_issues")
+  val knownIssues: List<Issue> =
     KnownIssues::class.declaredMemberProperties.map { it.get(KnownIssues) as Issue },
 ) {
   init {

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

@@ -54,7 +54,7 @@ internal class ResultProcessor(
     val bugsnag: Bugsnag? by lazy { bugsnagKey?.let { key -> createBugsnag(key) } }
 
     val logLinesReversed = logFile.readLines().asReversed()
-    for (issue in config.issues) {
+    for (issue in config.knownIssues) {
       val retrySignal = issue.check(logLinesReversed, echo)
 
       if (retrySignal != RetrySignal.Unknown) {

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

@@ -30,13 +30,13 @@ class ProcessedExecConfigTest {
       """
       {
         "version": 1,
-        "issues": [
+        "known_issues": [
           {
             "message": "${KnownIssues.ftlRateLimit.message}",
-            "logMessage": "${KnownIssues.ftlRateLimit.logMessage}",
-            "matchingText": "${KnownIssues.ftlRateLimit.matchingText}",
-            "groupingHash": "${KnownIssues.ftlRateLimit.groupingHash}",
-            "retrySignal": {
+            "log_message": "${KnownIssues.ftlRateLimit.logMessage}",
+            "matching_text": "${KnownIssues.ftlRateLimit.matchingText}",
+            "grouping_hash": "${KnownIssues.ftlRateLimit.groupingHash}",
+            "retry_signal": {
               "type": "delayed",
               "delay": ${1.minutes.inWholeMilliseconds}
             }
@@ -53,6 +53,6 @@ class ProcessedExecConfigTest {
   @Test
   fun defaults() {
     val defaultConfig = ProcessedExecConfig()
-    assertThat(defaultConfig.issues).isNotEmpty()
+    assertThat(defaultConfig.knownIssues).isNotEmpty()
   }
 }