mark all inputs to spec as safe

operator-framework · Mar 3, 2021 · 9a9182d · 9a9182d
1 parent 6e1441c
commit 9a9182d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/internal/ansible/runner/runner.go b/internal/ansible/runner/runner.go
@@ -160,6 +160,7 @@ func New(watch watches.Watch, runnerArgs string) (Runner, error) {
 		ansibleVerbosity:    watch.AnsibleVerbosity,
 		ansibleArgs:         runnerArgs,
 		snakeCaseParameters: watch.SnakeCaseParameters,
+		markUnsafe:          watch.MarkUnsafe,
 	}, nil
 }
 
@@ -174,6 +175,7 @@ type runner struct {
 	maxRunnerArtifacts  int
 	ansibleVerbosity    int
 	snakeCaseParameters bool
+	markUnsafe          bool
 	ansibleArgs         string
 }
 
@@ -337,7 +339,13 @@ func (r *runner) makeParameters(u *unstructured.Unstructured) map[string]interfa
 		parameters = paramconv.MapToSnake(spec)
 	} else {
 		for k, v := range spec {
-			parameters[k] = markUnsafe(v)
+			parameters[k] = v
+		}
+	}
+
+	if r.markUnsafe {
+		for key, val := range parameters {
+			parameters[key] = markUnsafe(val)
 		}
 	}
 

diff --git a/internal/ansible/runner/runner_test.go b/internal/ansible/runner/runner_test.go
@@ -355,7 +355,9 @@ func TestMakeParameters(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		testRunner := runner{}
+		testRunner := runner{
+			markUnsafe: true,
+		}
 		parameters := testRunner.makeParameters(&tc.inputParams)
 
 		val, ok := parameters[inputSpec]