summaryrefslogtreecommitdiff
path: root/spec/integration/client
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2019-04-12 18:39:34 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2019-04-12 18:45:55 -0700
commit6607b130fe16fa9f28300548d01561d04da54eae (patch)
tree5a317c6e770683e3b99f177f4fbb3fe1346d32b6 /spec/integration/client
parent3a87c705090c7f44d51666c0bf88add9c2445e9a (diff)
downloadchef-6607b130fe16fa9f28300548d01561d04da54eae.tar.gz
Allow empty strings in -o to result in empty override run listlcg/empty-override-runlist
Previously this was not possible. Now you can do this: ``` chef-client -o "" ./foo.rb ``` And it will only run foo.rb and not any of the recipes in your run_list at all. Node will not be saved at the end. Useful to one-shot something like keyrotation (which still needs keys and needs to talk to the chef server API, so this is a different use case from simple chef-apply). Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'spec/integration/client')
-rw-r--r--spec/integration/client/client_spec.rb67
1 files changed, 67 insertions, 0 deletions
diff --git a/spec/integration/client/client_spec.rb b/spec/integration/client/client_spec.rb
index afe94f854e..006839be3f 100644
--- a/spec/integration/client/client_spec.rb
+++ b/spec/integration/client/client_spec.rb
@@ -233,6 +233,7 @@ describe "chef-client" do
THECONSTANT = '1'
end
EOM
+
file "arbitrary.rb", <<~EOM
file #{path_to('tempfile.txt').inspect} do
content ::Blah::THECONSTANT
@@ -245,6 +246,72 @@ describe "chef-client" do
expect(IO.read(path_to("tempfile.txt"))).to eq("1")
end
+ it "should run recipes specified directly on the command line AFTER recipes in the run list (without an override_runlist this time)" do
+ file "config/client.rb", <<~EOM
+ local_mode true
+ client_key #{path_to('mykey.pem').inspect}
+ cookbook_path #{path_to('cookbooks').inspect}
+ EOM
+
+ file "config/dna.json", <<~EOM
+ {
+ "run_list": [ "recipe[x::constant_definition]" ]
+ }
+ EOM
+
+ file "cookbooks/x/recipes/constant_definition.rb", <<~EOM
+ class ::Blah
+ THECONSTANT = '1'
+ end
+ EOM
+
+ file "arbitrary.rb", <<~EOM
+ file #{path_to('tempfile.txt').inspect} do
+ content ::Blah::THECONSTANT
+ end
+ EOM
+
+ result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -j \"#{path_to('config/dna.json')}\" arbitrary.rb", cwd: path_to(""))
+ result.error!
+
+ expect(IO.read(path_to("tempfile.txt"))).to eq("1")
+ end
+
+ it "an override_runlist of an empty string should allow a recipe specified directly on the command line to be the only one run" do
+ file "config/client.rb", <<~EOM
+ local_mode true
+ client_key #{path_to('mykey.pem').inspect}
+ cookbook_path #{path_to('cookbooks').inspect}
+ class ::Blah
+ THECONSTANT = "1"
+ end
+ EOM
+
+ file "config/dna.json", <<~EOM
+ {
+ "run_list": [ "recipe[x::constant_definition]" ]
+ }
+ EOM
+
+ file "cookbooks/x/recipes/constant_definition.rb", <<~EOM
+ class ::Blah
+ THECONSTANT = "2"
+ end
+ EOM
+
+ file "arbitrary.rb", <<~EOM
+ raise "this test failed" unless ::Blah::THECONSTANT == "1"
+ file #{path_to('tempfile.txt').inspect} do
+ content ::Blah::THECONSTANT
+ end
+ EOM
+
+ result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -j \"#{path_to('config/dna.json')}\" -o \"\" arbitrary.rb", cwd: path_to(""))
+ result.error!
+
+ expect(IO.read(path_to("tempfile.txt"))).to eq("1")
+ end
+
end
it "should complete with success when passed the -z flag" do