More fixes

Author: adrw

Diff for: service/src/main/kotlin/app/cash/backfila/service/listener/AuditClientListener.kt

@@ -16,57 +16,57 @@ class AuditClientListener @Inject constructor(
   private val backfilaConfig: BackfilaConfig,
 ) : BackfillRunListener {
   override fun runStarted(id: Id<DbBackfillRun>, user: String) {
-    val (backfillName, run, description) = transacter.transaction { session ->
+    val (backfillName, serviceName, description) = transacter.transaction { session ->
       val run = session.load<DbBackfillRun>(id)
-      AuditEvent(run.registered_backfill.name, run, "Backfill started by $user ${dryRunPrefix(run)}${nameAndId(run)}")
+      AuditEvent(run.registered_backfill.name, serviceName(run), "Backfill started by $user ${dryRunPrefix(run)}${nameAndId(run)}")
     }
     auditClient.logEvent(
       target = backfillName,
       description = description,
       requestorLDAP = user,
-      applicationName = serviceName(run),
+      applicationName = serviceName,
       detailURL = idUrl(id),
     )
   }
 
   override fun runPaused(id: Id<DbBackfillRun>, user: String) {
-    val (backfillName, run, description) = transacter.transaction { session ->
+    val (backfillName, serviceName, description) = transacter.transaction { session ->
       val run = session.load<DbBackfillRun>(id)
-      AuditEvent(run.registered_backfill.name, run, "Backfill paused by $user ${dryRunPrefix(run)}${nameAndId(run)}")
+      AuditEvent(run.registered_backfill.name, serviceName(run), "Backfill paused by $user ${dryRunPrefix(run)}${nameAndId(run)}")
     }
     auditClient.logEvent(
       target = backfillName,
       description = description,
       requestorLDAP = user,
-      applicationName = serviceName(run),
+      applicationName = serviceName,
       detailURL = idUrl(id),
     )
   }
 
   override fun runErrored(id: Id<DbBackfillRun>) {
-    val (backfillName, run, description) = transacter.transaction { session ->
+    val (backfillName, serviceName, description) = transacter.transaction { session ->
       val run = session.load<DbBackfillRun>(id)
-      AuditEvent(run.registered_backfill.name, run, "Backfill paused due to error ${dryRunPrefix(run)}${nameAndId(run)}")
+      AuditEvent(run.registered_backfill.name, serviceName(run), "Backfill paused due to error ${dryRunPrefix(run)}${nameAndId(run)}")
     }
     auditClient.logEvent(
       target = backfillName,
       description = description,
       automatedChange = true,
-      applicationName = serviceName(run),
+      applicationName = serviceName,
       detailURL = idUrl(id),
     )
   }
 
   override fun runCompleted(id: Id<DbBackfillRun>) {
-    val (backfillName, run, description) = transacter.transaction { session ->
+    val (backfillName, serviceName, description) = transacter.transaction { session ->
       val run = session.load<DbBackfillRun>(id)
-      AuditEvent(run.registered_backfill.name, run, "Backfill completed ${dryRunPrefix(run)}${nameAndId(run)}")
+      AuditEvent(run.registered_backfill.name, serviceName(run), "Backfill completed ${dryRunPrefix(run)}${nameAndId(run)}")
     }
     auditClient.logEvent(
       target = backfillName,
       description = description,
       automatedChange = true,
-      applicationName = serviceName(run),
+      applicationName = serviceName,
       detailURL = idUrl(id),
     )
   }
@@ -96,7 +96,7 @@ class AuditClientListener @Inject constructor(
 
   private data class AuditEvent(
     val backfillName: String,
-    val run: DbBackfillRun,
+    val serviceName: String,
     val description: String,
   )
 }