Route cancel-in-progress through github_event_name_equals (review 63766)

dag/gunbc/witness/witness_floor_workflow.dag

@@ -269,45 +269,33 @@ fn github_run_id_expr() -> Expression { ContextAccess { context: Github, path: [
 fn github_pr_number_expr() -> Expression { ContextAccess { context: Github, path: ["event", "pull_request", "number"] } }
 fn github_dispatch_input_expr(name: String) -> Expression { ContextAccess { context: Github, path: ["event", "inputs", name] } }
 
-fn gha_and(left: Expression, right: Expression) -> Expression {
-  LogicalAnd { left: left, right: right }
-}
-
-fn gha_or(left: Expression, right: Expression) -> Expression {
-  LogicalOr { left: left, right: right }
-}
-
 type WitnessFloorGroupBranch
   = ShaAfterEvent { event: String, prefix: String }
   | NonemptyInputAfterEvent { event: String, input: String, prefix: String }
   | PrNumberAfterEvent { event: String, prefix: String }
   | RefAfterEvent { event: String }
   | RunIdFallback { prefix: String }
 
-fn gha_not_equals(left: Expression, right: Expression) -> Expression {
-  NotEquals { left: left, right: right }
-}
-
 fn nonempty_input_after_event_expr(event: String, input: String, prefix: String) -> Expression {
-  gha_and(
+  LogicalAnd {
     left: github_event_name_equals(event: event),
-    right: gha_and(
-      left: gha_not_equals(left: github_dispatch_input_expr(name: input), right: StringLiteral { value: "" }),
+    right: LogicalAnd {
+      left: NotEquals { left: github_dispatch_input_expr(name: input), right: StringLiteral { value: "" } },
       right: gha_format_prefix(prefix: prefix, arg: github_dispatch_input_expr(name: input))
-    )
-  )
+    }
+  }
 }
 
 fn group_branch_expr(branch: WitnessFloorGroupBranch) -> Expression {
   match branch {
     ShaAfterEvent { event: e, prefix: p } =>
-      gha_and(left: github_event_name_equals(event: e), right: gha_format_prefix(prefix: p, arg: github_sha_expr()))
+      LogicalAnd { left: github_event_name_equals(event: e), right: gha_format_prefix(prefix: p, arg: github_sha_expr()) }
     NonemptyInputAfterEvent { event: e, input: i, prefix: p } =>
       nonempty_input_after_event_expr(event: e, input: i, prefix: p)
     PrNumberAfterEvent { event: e, prefix: p } =>
-      gha_and(left: github_event_name_equals(event: e), right: gha_format_prefix(prefix: p, arg: github_pr_number_expr()))
+      LogicalAnd { left: github_event_name_equals(event: e), right: gha_format_prefix(prefix: p, arg: github_pr_number_expr()) }
     RefAfterEvent { event: e } =>
-      gha_and(left: github_event_name_equals(event: e), right: github_ref_expr())
+      LogicalAnd { left: github_event_name_equals(event: e), right: github_ref_expr() }
     RunIdFallback { prefix: p } =>
       gha_format_prefix(prefix: p, arg: github_run_id_expr())
   }
@@ -320,7 +308,7 @@ fn witness_floor_group_expression() -> Expression {
       fold_list(
         xs: skip(xs: witness_floor_group_branches(), n: 1),
         empty: group_branch_expr(branch: first),
-        cons: fn(acc, b) { gha_or(left: acc, right: group_branch_expr(branch: b)) }
+        cons: fn(acc, b) { LogicalOr { left: acc, right: group_branch_expr(branch: b) } }
       )
   }
 }
@@ -527,15 +515,11 @@ data witness_floor_running_supersession_policy: RunningSupersessionPolicy = witn
 
 data witness_floor_pending_replacement_policy: PendingReplacementPolicy = witness_floor_concurrency_policy.pending
 
-fn supersession_event_expression(event: String) -> String {
-  concat(concat("${{ github.event_name == '", event), "' }}")
-}
-
 fn cancel_in_progress_of_policy(policy: RunningSupersessionPolicy) -> CancelInProgressSpec {
   match policy {
     NeverSupersedeRunning => CancelInProgressBool { value: false }
     SupersedeRunningForEvent { event: e } =>
-      CancelInProgressExpression { expression: supersession_event_expression(event: e) }
+      CancelInProgressExpression { expression: interpolate(expression: github_event_name_equals(event: e)) }
   }
 }
 
@@ -555,7 +539,7 @@ fn queue_max_cancel_of_policy(policy: RunningSupersessionPolicy) -> CancelInProg
   match policy {
     NeverSupersedeRunning => QueueMaxCancelInProgressFalse
     SupersedeRunningForEvent { event: e } =>
-      QueueMaxCancelInProgressExpression { expression: supersession_event_expression(event: e) }
+      QueueMaxCancelInProgressExpression { expression: interpolate(expression: github_event_name_equals(event: e)) }
   }
 }
 

dag/test/claim/run_disposition_witness_test.dag

@@ -40,11 +40,12 @@ import gunbc.witness_floor_workflow {
   RunningSupersessionPolicy,
   NeverSupersedeRunning,
   SupersedeRunningForEvent,
-  supersession_event_expression,
+  github_event_name_equals,
   witness_floor_concurrency_policy,
   witness_floor_running_supersession_policy,
   concurrency_of_policy
 }
+import extdeps.github.expressions { interpolate }
 import extdeps.github.actions {
   ConcurrencySpec,
   ConcurrencyScalar,
@@ -640,7 +641,7 @@ test fn w_running_cancel_four_cell_through_the_producer() -> Bool {
     CancelInProgressExpression { expression: _ } => false
   }
   let safe_cancel = match cancel_in_progress_of_policy(policy: safe) {
-    CancelInProgressExpression { expression: e } => e == supersession_event_expression(event: "pull_request")
+    CancelInProgressExpression { expression: e } => e == interpolate(expression: github_event_name_equals(event: "pull_request"))
     CancelInProgressBool { value: _ } => false
   }
   unproven_is_never