fix: if condition in composite action misbehaves (#2473)

ChristopherHX · mergify[bot] · web-flow · commit 5ffec84f8dd6 · 2024-10-10T02:52:09.000Z
Co-authored-by: mergify[bot] &lt;37929162+mergify[bot]@users.noreply.github.com&gt;
diff --git a/pkg/runner/expression.go b/pkg/runner/expression.go
@@ -108,6 +108,19 @@ var hashfiles string
 
 // NewStepExpressionEvaluator creates a new evaluator
 func (rc *RunContext) NewStepExpressionEvaluator(ctx context.Context, step step) ExpressionEvaluator {
+	return rc.NewStepExpressionEvaluatorExt(ctx, step, false)
+}
+
+// NewStepExpressionEvaluatorExt creates a new evaluator
+func (rc *RunContext) NewStepExpressionEvaluatorExt(ctx context.Context, step step, rcInputs bool) ExpressionEvaluator {
+	ghc := rc.getGithubContext(ctx)
+	if rcInputs {
+		return rc.newStepExpressionEvaluator(ctx, step, ghc, getEvaluatorInputs(ctx, rc, nil, ghc))
+	}
+	return rc.newStepExpressionEvaluator(ctx, step, ghc, getEvaluatorInputs(ctx, rc, step, ghc))
+}
+
+func (rc *RunContext) newStepExpressionEvaluator(ctx context.Context, step step, ghc *model.GithubContext, inputs map[string]interface{}) ExpressionEvaluator {
 	// todo: cleanup EvaluationEnvironment creation
 	job := rc.Run.Job()
 	strategy := make(map[string]interface{})
@@ -127,9 +140,6 @@ func (rc *RunContext) NewStepExpressionEvaluator(ctx context.Context, step step)
 		}
 	}
 
-	ghc := rc.getGithubContext(ctx)
-	inputs := getEvaluatorInputs(ctx, rc, step, ghc)
-
 	ee := &exprparser.EvaluationEnvironment{
 		Github:   step.getGithubContext(ctx),
 		Env:      *step.getEnv(),
diff --git a/pkg/runner/step.go b/pkg/runner/step.go
@@ -261,7 +261,7 @@ func isStepEnabled(ctx context.Context, expr string, step step, stage stepStage)
 		defaultStatusCheck = exprparser.DefaultStatusCheckSuccess
 	}
 
-	runStep, err := EvalBool(ctx, rc.NewStepExpressionEvaluator(ctx, step), expr, defaultStatusCheck)
+	runStep, err := EvalBool(ctx, rc.NewStepExpressionEvaluatorExt(ctx, step, stage == stepStageMain), expr, defaultStatusCheck)
 	if err != nil {
 		return false, fmt.Errorf("  \u274C  Error in if-expression: \"if: %s\" (%s)", expr, err)
 	}
diff --git a/pkg/runner/testdata/uses-composite-check-for-input-in-if-uses/composite_action/action.yml b/pkg/runner/testdata/uses-composite-check-for-input-in-if-uses/composite_action/action.yml
@@ -0,0 +1,47 @@
+name: "Test Composite Action"
+description: "Test action uses composite"
+
+inputs:
+  b:
+    default: true
+  b2: {}
+
+runs:
+  using: "composite"
+  steps:
+  - uses: actions/github-script@v7
+    if: inputs.b == 'true'
+    with:
+      script: |
+        console.log(${{ tojson(inputs) }})
+        if( ${{ tojson(inputs.b) }} != 'true' ) {
+          process.exit(-1);
+        }
+      github-token: noop
+  - uses: actions/github-script@v7
+    if: inputs.b != 'true'
+    with:
+      script: |
+        console.log(${{ tojson(inputs) }})
+        if( ${{ tojson(inputs.b) }} == 'true' ) {
+          process.exit(-1);
+        }
+      github-token: noop
+  - uses: actions/github-script@v7
+    if: inputs.b2 == 'false'
+    with:
+      script: |
+        console.log(${{ tojson(inputs) }})
+        if( ${{ tojson(inputs.b2) }} != 'false' ) {
+          process.exit(-1);
+        }
+      github-token: noop
+  - uses: actions/github-script@v7
+    if: inputs.b2 != 'false'
+    with:
+      script: |
+        console.log(${{ tojson(inputs) }})
+        if( ${{ tojson(inputs.b2) }} == 'false' ) {
+          process.exit(-1);
+        }
+      github-token: noop
diff --git a/pkg/runner/testdata/uses-composite-check-for-input-in-if-uses/push.yml b/pkg/runner/testdata/uses-composite-check-for-input-in-if-uses/push.yml
@@ -0,0 +1,24 @@
+name: uses-composite-check-for-input-in-if-uses
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./uses-composite-check-for-input-in-if-uses/composite_action
+        with:
+          b: true
+          b2: true
+      - uses: ./uses-composite-check-for-input-in-if-uses/composite_action
+        with:
+          b: false
+          b2: false
+      - uses: ./uses-composite-check-for-input-in-if-uses/composite_action
+        with:
+          b: true
+          b2: false
+      - uses: ./uses-composite-check-for-input-in-if-uses/composite_action
+        with:
+          b: false
+          b2: true

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ func isStepEnabled(ctx context.Context, expr string, step step, stage stepStage)`
`261`	`261`	`defaultStatusCheck = exprparser.DefaultStatusCheckSuccess`
`262`	`262`	`}`
`263`	`263`
`264`		`- runStep, err := EvalBool(ctx, rc.NewStepExpressionEvaluator(ctx, step), expr, defaultStatusCheck)`
	`264`	`+ runStep, err := EvalBool(ctx, rc.NewStepExpressionEvaluatorExt(ctx, step, stage == stepStageMain), expr, defaultStatusCheck)`
`265`	`265`	`if err != nil {`
`266`	`266`	`return false, fmt.Errorf(" \u274C Error in if-expression: \"if: %s\" (%s)", expr, err)`
`267`	`267`	`}`