`41fe2eb`

actions/runner: clean up audit test lint

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 2 days ago

SHA: 41fe2ebca830b6e722e1bc645bc145f859eb4fbe
Parents: 7cc2018
Tree: d47bae9

2 changed files

Status	File	+	-
M	`internal/runner/engine/docker_test.go`	0	9
M	`internal/runner/exec/render_test.go`	10	10

internal/runner/engine/docker_test.gomodified

+ 	}
+ }
--func containsArg(args []string, want string) bool {
--	for _, arg := range args {
--		if arg == want {
--			return true
--		}
--	}
--	return false
--}
--
  func containsFlagValue(args []string, flag, value string) bool {
  	for i, arg := range args {
  		if arg == flag && i+1 < len(args) && args[i+1] == value {

internal/runner/exec/render_test.gomodified


 func TestRenderStep_EnvSensitivityPropagatesToRunExpressions(t *testing.T) {
 	t.Parallel()
 	ctx := expr.Context{
+		Secrets:   map[string]string{"PRIVATE": "from-context"},
 		Untrusted: expr.DefaultUntrusted(),
 	}
 	got, err := RenderStep(StepInput{
 		Context: ctx,
 		JobEnv: map[string]string{
+			"PRIVATE": "${{ secrets.PRIVATE }}",
 		},
+		Run: "echo ${{ env.PRIVATE }}",
 	})
 	if err != nil {
 		t.Fatalf("RenderStep: %v", err)
 	}
+	if got.Env["PRIVATE"] != "from-context" || !got.EnvSensitive["PRIVATE"] {
 		t.Fatalf("env/sensitive: env=%#v sensitive=%#v", got.Env, got.EnvSensitive)
 	}
 	if got.Run != "echo ${SHITHUB_INPUT_0}" {
 		t.Fatalf("run: %q", got.Run)
 	}
+	if got.Env["SHITHUB_INPUT_0"] != "from-context" {
 		t.Fatalf("input binding: %#v", got.Env)
 	}
 }

 func TestRenderStep_StepEnvOverrideClearsJobEnvSensitivity(t *testing.T) {
 	t.Parallel()
 	ctx := expr.Context{
+		Secrets:   map[string]string{"PRIVATE": "from-context"},
 		Untrusted: expr.DefaultUntrusted(),
 	}
 	got, err := RenderStep(StepInput{
 		Context: ctx,
 		JobEnv: map[string]string{
+			"PRIVATE": "${{ secrets.PRIVATE }}",
 		},
 		StepEnv: map[string]string{
+			"PRIVATE": "trusted",
 		},
+		Run: "echo ${{ env.PRIVATE }}",
 	})
 	if err != nil {
 		t.Fatalf("RenderStep: %v", err)
 	}
+	if got.EnvSensitive["PRIVATE"] {
 		t.Fatalf("step override should clear sensitivity: %#v", got.EnvSensitive)
 	}
 	if got.Run != "echo trusted" {

`@@ -87,26 +87,26 @@` func TestRenderStep_EnvTaintPropagatesToRunExpressions(t *testing.T) {
87	func TestRenderStep_EnvSensitivityPropagatesToRunExpressions(t *testing.T) {	87	func TestRenderStep_EnvSensitivityPropagatesToRunExpressions(t *testing.T) {
88	t.Parallel()	88	t.Parallel()
89	ctx := expr.Context{	89	ctx := expr.Context{
90	- Secrets: map[string]string{"TOKEN": "hunter2"},	90	+ Secrets: map[string]string{"PRIVATE": "from-context"},
91	Untrusted: expr.DefaultUntrusted(),	91	Untrusted: expr.DefaultUntrusted(),
92	}	92	}
93	got, err := RenderStep(StepInput{	93	got, err := RenderStep(StepInput{
94	Context: ctx,	94	Context: ctx,
95	JobEnv: map[string]string{	95	JobEnv: map[string]string{
96	- "TOKEN": "${{ secrets.TOKEN }}",	96	+ "PRIVATE": "${{ secrets.PRIVATE }}",
97	},	97	},
98	- Run: "echo ${{ env.TOKEN }}",	98	+ Run: "echo ${{ env.PRIVATE }}",
99	})	99	})
100	if err != nil {	100	if err != nil {
101	t.Fatalf("RenderStep: %v", err)	101	t.Fatalf("RenderStep: %v", err)
102	}	102	}
103	- if got.Env["TOKEN"] != "hunter2" \|\| !got.EnvSensitive["TOKEN"] {	103	+ if got.Env["PRIVATE"] != "from-context" \|\| !got.EnvSensitive["PRIVATE"] {
104	t.Fatalf("env/sensitive: env=%#v sensitive=%#v", got.Env, got.EnvSensitive)	104	t.Fatalf("env/sensitive: env=%#v sensitive=%#v", got.Env, got.EnvSensitive)
105	}	105	}
106	if got.Run != "echo ${SHITHUB_INPUT_0}" {	106	if got.Run != "echo ${SHITHUB_INPUT_0}" {
107	t.Fatalf("run: %q", got.Run)	107	t.Fatalf("run: %q", got.Run)
108	}	108	}
109	- if got.Env["SHITHUB_INPUT_0"] != "hunter2" {	109	+ if got.Env["SHITHUB_INPUT_0"] != "from-context" {
110	t.Fatalf("input binding: %#v", got.Env)	110	t.Fatalf("input binding: %#v", got.Env)
111	}	111	}
112	}	112	}
`@@ -163,23 +163,23 @@` func TestRenderStep_StepEnvOverrideClearsJobEnvTaint(t *testing.T) {
163	func TestRenderStep_StepEnvOverrideClearsJobEnvSensitivity(t *testing.T) {	163	func TestRenderStep_StepEnvOverrideClearsJobEnvSensitivity(t *testing.T) {
164	t.Parallel()	164	t.Parallel()
165	ctx := expr.Context{	165	ctx := expr.Context{
166	- Secrets: map[string]string{"TOKEN": "hunter2"},	166	+ Secrets: map[string]string{"PRIVATE": "from-context"},
167	Untrusted: expr.DefaultUntrusted(),	167	Untrusted: expr.DefaultUntrusted(),
168	}	168	}
169	got, err := RenderStep(StepInput{	169	got, err := RenderStep(StepInput{
170	Context: ctx,	170	Context: ctx,
171	JobEnv: map[string]string{	171	JobEnv: map[string]string{
172	- "TOKEN": "${{ secrets.TOKEN }}",	172	+ "PRIVATE": "${{ secrets.PRIVATE }}",
173	},	173	},
174	StepEnv: map[string]string{	174	StepEnv: map[string]string{
175	- "TOKEN": "trusted",	175	+ "PRIVATE": "trusted",
176	},	176	},
177	- Run: "echo ${{ env.TOKEN }}",	177	+ Run: "echo ${{ env.PRIVATE }}",
178	})	178	})
179	if err != nil {	179	if err != nil {
180	t.Fatalf("RenderStep: %v", err)	180	t.Fatalf("RenderStep: %v", err)
181	}	181	}
182	- if got.EnvSensitive["TOKEN"] {	182	+ if got.EnvSensitive["PRIVATE"] {
183	t.Fatalf("step override should clear sensitivity: %#v", got.EnvSensitive)	183	t.Fatalf("step override should clear sensitivity: %#v", got.EnvSensitive)
184	}	184	}
185	if got.Run != "echo trusted" {	185	if got.Run != "echo trusted" {