(GH-2338) Rename 'sensitive' plan in tests

lucywyman · lucywyman · commit a59b798dba57 · 2020-11-18T09:16:38.000-08:00
'Sensitive' is a reserved word in Puppet 7 and cannot be used as a plan
name. We have a plan named 'sensitive' used for testing the `run_plan`
plan function. This renames the test fixture to 'sensitive_test'.

!no-release-note
diff --git a/bolt-modules/boltlib/spec/fixtures/modules/sensitive_test/plans/complex.pp b/bolt-modules/boltlib/spec/fixtures/modules/sensitive_test/plans/complex.pp
@@ -1,4 +1,4 @@
-plan sensitive::complex (
+plan sensitive_test::complex (
   Variant[Sensitive[String], Array[String]] $complex
 ) {
 }
diff --git a/bolt-modules/boltlib/spec/fixtures/modules/sensitive_test/plans/init.pp b/bolt-modules/boltlib/spec/fixtures/modules/sensitive_test/plans/init.pp
@@ -1,4 +1,4 @@
-plan sensitive (
+plan sensitive_test (
   Sensitive $array,
   Sensitive $hash,
   Sensitive $string
diff --git a/bolt-modules/boltlib/spec/fixtures/modules/sensitive_test/plans/no_api.pp b/bolt-modules/boltlib/spec/fixtures/modules/sensitive_test/plans/no_api.pp
@@ -1,4 +1,4 @@
-plan sensitive::no_api (
+plan sensitive_test::no_api (
   Sensitive[String] $string
 ) {
 }
diff --git a/bolt-modules/boltlib/spec/functions/run_plan_spec.rb b/bolt-modules/boltlib/spec/functions/run_plan_spec.rb
@@ -171,28 +171,31 @@
       sensitive.expects(:new).with(input_params['string'])
                .returns(expected_params['string'])
 
-      is_expected.to run.with_params('sensitive', input_params.merge('_bolt_api_call' => true))
-                        .and_return(input_params)
+      is_expected.to run
+        .with_params('sensitive_test', input_params.merge('_bolt_api_call' => true))
+        .and_return(input_params)
     end
 
     it 'parameters are not wrapped from non-API calls' do
       sensitive.expects(:new).never
 
-      is_expected.to run.with_params('sensitive::no_api', 'string' => string)
-                        .and_raise_error(
-                          Puppet::ParseError,
-                          /parameter 'string' expects a Sensitive\[String\]/
-                        )
+      is_expected.to run
+        .with_params('sensitive_test::no_api', 'string' => string)
+        .and_raise_error(
+          Puppet::ParseError,
+          /parameter 'string' expects a Sensitive\[String\]/
+        )
     end
 
     it 'complex parameters using Sensitive are not wrapped' do
       sensitive.expects(:new).never
 
-      is_expected.to run.with_params('sensitive::complex', 'complex' => string)
-                        .and_raise_error(
-                          Puppet::ParseError,
-                          /parameter 'complex' expects a value of type Sensitive\[String\] or Array/
-                        )
+      is_expected.to run
+        .with_params('sensitive_test::complex', 'complex' => string)
+        .and_raise_error(
+          Puppet::ParseError,
+          /parameter 'complex' expects a value of type Sensitive\[String\] or Array/
+        )
     end
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-plan sensitive::complex (`
	`1`	`+plan sensitive_test::complex (`
`2`	`2`	`Variant[Sensitive[String], Array[String]] $complex`
`3`	`3`	`) {`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-plan sensitive (`
	`1`	`+plan sensitive_test (`
`2`	`2`	`Sensitive $array,`
`3`	`3`	`Sensitive $hash,`
`4`	`4`	`Sensitive $string`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-plan sensitive::no_api (`
	`1`	`+plan sensitive_test::no_api (`
`2`	`2`	`Sensitive[String] $string`
`3`	`3`	`) {`
`4`	`4`	`}`