tenseleyflow/shithub / 41fe2eb

Browse files

actions/runner: clean up audit test lint

Authored by mfwolffe <wolffemf@dukes.jmu.edu>
SHA
41fe2ebca830b6e722e1bc645bc145f859eb4fbe
Parents
7cc2018
Tree
d47bae9

2 changed files

StatusFile+-
M internal/runner/engine/docker_test.go 0 9
M internal/runner/exec/render_test.go 10 10
internal/runner/engine/docker_test.gomodified
@@ -427,15 +427,6 @@ func TestContainerWorkdirRejectsEscapes(t *testing.T) {
427427
 	}
428428
 }
429429
430
-func containsArg(args []string, want string) bool {
431
-	for _, arg := range args {
432
-		if arg == want {
433
-			return true
434
-		}
435
-	}
436
-	return false
437
-}
438
-
439430
 func containsFlagValue(args []string, flag, value string) bool {
440431
 	for i, arg := range args {
441432
 		if arg == flag && i+1 < len(args) && args[i+1] == value {
internal/runner/exec/render_test.gomodified
@@ -87,26 +87,26 @@ func TestRenderStep_EnvTaintPropagatesToRunExpressions(t *testing.T) {
8787
 func TestRenderStep_EnvSensitivityPropagatesToRunExpressions(t *testing.T) {
8888
 	t.Parallel()
8989
 	ctx := expr.Context{
90
-		Secrets:   map[string]string{"TOKEN": "hunter2"},
90
+		Secrets:   map[string]string{"PRIVATE": "from-context"},
9191
 		Untrusted: expr.DefaultUntrusted(),
9292
 	}
9393
 	got, err := RenderStep(StepInput{
9494
 		Context: ctx,
9595
 		JobEnv: map[string]string{
96
-			"TOKEN": "${{ secrets.TOKEN }}",
96
+			"PRIVATE": "${{ secrets.PRIVATE }}",
9797
 		},
98
-		Run: "echo ${{ env.TOKEN }}",
98
+		Run: "echo ${{ env.PRIVATE }}",
9999
 	})
100100
 	if err != nil {
101101
 		t.Fatalf("RenderStep: %v", err)
102102
 	}
103
-	if got.Env["TOKEN"] != "hunter2" || !got.EnvSensitive["TOKEN"] {
103
+	if got.Env["PRIVATE"] != "from-context" || !got.EnvSensitive["PRIVATE"] {
104104
 		t.Fatalf("env/sensitive: env=%#v sensitive=%#v", got.Env, got.EnvSensitive)
105105
 	}
106106
 	if got.Run != "echo ${SHITHUB_INPUT_0}" {
107107
 		t.Fatalf("run: %q", got.Run)
108108
 	}
109
-	if got.Env["SHITHUB_INPUT_0"] != "hunter2" {
109
+	if got.Env["SHITHUB_INPUT_0"] != "from-context" {
110110
 		t.Fatalf("input binding: %#v", got.Env)
111111
 	}
112112
 }
@@ -163,23 +163,23 @@ func TestRenderStep_StepEnvOverrideClearsJobEnvTaint(t *testing.T) {
163163
 func TestRenderStep_StepEnvOverrideClearsJobEnvSensitivity(t *testing.T) {
164164
 	t.Parallel()
165165
 	ctx := expr.Context{
166
-		Secrets:   map[string]string{"TOKEN": "hunter2"},
166
+		Secrets:   map[string]string{"PRIVATE": "from-context"},
167167
 		Untrusted: expr.DefaultUntrusted(),
168168
 	}
169169
 	got, err := RenderStep(StepInput{
170170
 		Context: ctx,
171171
 		JobEnv: map[string]string{
172
-			"TOKEN": "${{ secrets.TOKEN }}",
172
+			"PRIVATE": "${{ secrets.PRIVATE }}",
173173
 		},
174174
 		StepEnv: map[string]string{
175
-			"TOKEN": "trusted",
175
+			"PRIVATE": "trusted",
176176
 		},
177
-		Run: "echo ${{ env.TOKEN }}",
177
+		Run: "echo ${{ env.PRIVATE }}",
178178
 	})
179179
 	if err != nil {
180180
 		t.Fatalf("RenderStep: %v", err)
181181
 	}
182
-	if got.EnvSensitive["TOKEN"] {
182
+	if got.EnvSensitive["PRIVATE"] {
183183
 		t.Fatalf("step override should clear sensitivity: %#v", got.EnvSensitive)
184184
 	}
185185
 	if got.Run != "echo trusted" {