chef 14.14.29 → 14.15.6

data/spec/integration/client/exit_code_spec.rb

@@ -30,21 +30,21 @@ describe "chef-client" do
     def setup_client_rb
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
-EOM
+        cookbook_path "#{path_to("cookbooks")}"
+      EOM
     end
 
     def setup_client_rb_with_audit_mode
       file "config/client.rb", <<~EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         audit_mode :audit_only
         silence_deprecation_warnings %w{chef-27}
-EOM
+      EOM
     end
 
     def run_chef_client_and_expect_exit_code(exit_code)
-      shell_out!("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default'",
+      shell_out!("#{chef_client} -c \"#{path_to("config/client.rb")}\" -o 'x::default'",
         cwd: chef_dir,
         returns: [exit_code])
     end
@@ -73,7 +73,7 @@ EOM
                   expect(4 - 4).to eq(1)
                 end
               end
-RECIPE
+            RECIPE
           end
 
           it "exits with AUDIT_MODE_FAILURE, 42" do
@@ -115,7 +115,7 @@ RECIPE
           before do
             file "cookbooks/x/recipes/default.rb", <<~EOM
               raise Chef::Exceptions::Reboot.new
-EOM
+            EOM
           end
 
           it "exits with REBOOT_SCHEDULED, 35" do
@@ -128,7 +128,7 @@ EOM
           before do
             file "cookbooks/x/recipes/default.rb", <<~EOM
               raise Chef::Exceptions::RebootFailed.new
-EOM
+            EOM
           end
 
           it "exits with REBOOT_FAILED, 41" do

data/spec/integration/client/ipv6_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -53,7 +53,7 @@ describe "chef-client" do
       syHLXYFNy0OxMtH/bBAXBGNHd9gf5uOnqh0pYcbe/uRAxumC7Rl0cL509eURiA2T
       +vFmf54y9YdnLXaqv+FhJT6B6V7WX7IpU9BMqJY1cJYXHuHG2KA=
       -----END RSA PRIVATE KEY-----
-END_VALIDATION_PEM
+    END_VALIDATION_PEM
   end
 
   let(:cache_path) do
@@ -63,10 +63,10 @@ END_VALIDATION_PEM
   let(:basic_config_file) do
     <<~END_CLIENT_RB
       chef_server_url "http://[::1]:8900"
-      validation_key '#{path_to('config/validator.pem')}'
+      validation_key '#{path_to("config/validator.pem")}'
       cache_path '#{cache_path}'
       client_key '#{cache_path}/client.pem'
-END_CLIENT_RB
+    END_CLIENT_RB
   end
 
   let(:client_rb_content) do
@@ -75,7 +75,7 @@ END_CLIENT_RB
 
   let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") }
 
-  let(:chef_client_cmd) { %Q{ruby '#{chef_dir}/chef-client' --minimal-ohai -c "#{path_to('config/client.rb')}" -lwarn} }
+  let(:chef_client_cmd) { %Q{bundle exec chef-client --minimal-ohai -c "#{path_to("config/client.rb")}" -lwarn} }
 
   after do
     FileUtils.rm_rf(cache_path)

data/spec/integration/knife/chef_fs_data_store_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -107,7 +107,7 @@ describe "ChefFSDataStore tests", :workstation do
             /policy_groups/x.json
             /roles/
             /roles/x.json
-EOM
+          EOM
         end
       end
 
@@ -185,47 +185,47 @@ EOM
         end
 
         it "knife raw -z -i empty.json -m PUT /clients/x" do
-          knife("raw -z -i #{path_to('empty.json')} -m PUT /clients/x").should_succeed( /"x"/ )
+          knife("raw -z -i #{path_to("empty.json")} -m PUT /clients/x").should_succeed( /"x"/ )
           knife("list --local /clients").should_succeed "/clients/x.json\n"
         end
 
         it "knife cookbook upload works" do
-          knife("cookbook upload -z --cookbook-path #{path_to('cookbooks_to_upload')} x").should_succeed stderr: <<~EOM
+          knife("cookbook upload -z --cookbook-path #{path_to("cookbooks_to_upload")} x").should_succeed stderr: <<~EOM
             Uploading x              [1.0.0]
             Uploaded 1 cookbook.
-EOM
+          EOM
           knife("list --local -Rfp /cookbooks").should_succeed "/cookbooks/x/\n/cookbooks/x/metadata.rb\n"
         end
 
         it "knife raw -z -i empty.json -m PUT /data/x/y" do
-          knife("raw -z -i #{path_to('empty.json')} -m PUT /data/x/y").should_succeed( /"y"/ )
+          knife("raw -z -i #{path_to("empty.json")} -m PUT /data/x/y").should_succeed( /"y"/ )
           knife("list --local -Rfp /data_bags").should_succeed "/data_bags/x/\n/data_bags/x/y.json\n"
         end
 
         it "knife raw -z -i empty.json -m PUT /environments/x" do
-          knife("raw -z -i #{path_to('empty.json')} -m PUT /environments/x").should_succeed( /"x"/ )
+          knife("raw -z -i #{path_to("empty.json")} -m PUT /environments/x").should_succeed( /"x"/ )
           knife("list --local /environments").should_succeed "/environments/x.json\n"
         end
 
         it "knife raw -z -i dummynode.json -m PUT /nodes/x" do
-          knife("raw -z -i #{path_to('dummynode.json')} -m PUT /nodes/x").should_succeed( /"x"/ )
+          knife("raw -z -i #{path_to("dummynode.json")} -m PUT /nodes/x").should_succeed( /"x"/ )
           knife("list --local /nodes").should_succeed "/nodes/x.json\n"
           knife("show -z /nodes/x.json --verbose").should_succeed(/"bar"/)
         end
 
         it "knife raw -z -i empty.json -m PUT /roles/x" do
-          knife("raw -z -i #{path_to('empty.json')} -m PUT /roles/x").should_succeed( /"x"/ )
+          knife("raw -z -i #{path_to("empty.json")} -m PUT /roles/x").should_succeed( /"x"/ )
           knife("list --local /roles").should_succeed "/roles/x.json\n"
         end
 
-        it "After knife raw -z -i rolestuff.json -m PUT /roles/x, the output is pretty", skip: (RUBY_VERSION < "1.9") do
-          knife("raw -z -i #{path_to('rolestuff.json')} -m PUT /roles/x").should_succeed( /"x"/ )
+        it "After knife raw -z -i rolestuff.json -m PUT /roles/x, the output is pretty" do
+          knife("raw -z -i #{path_to("rolestuff.json")} -m PUT /roles/x").should_succeed( /"x"/ )
           expect(IO.read(path_to("roles/x.json"))).to eq <<~EOM.strip
             {
               "name": "x",
               "description": "hi there"
             }
-EOM
+          EOM
         end
       end
     end
@@ -242,53 +242,53 @@ EOM
         end
 
         it "knife raw -z -i empty.json -m POST /clients" do
-          knife("raw -z -i #{path_to('empty.json')} -m POST /clients").should_succeed( /uri/ )
+          knife("raw -z -i #{path_to("empty.json")} -m POST /clients").should_succeed( /uri/ )
           knife("list --local /clients").should_succeed "/clients/z.json\n"
         end
 
         it "knife cookbook upload works" do
-          knife("cookbook upload -z --cookbook-path #{path_to('cookbooks_to_upload')} z").should_succeed stderr: <<~EOM
+          knife("cookbook upload -z --cookbook-path #{path_to("cookbooks_to_upload")} z").should_succeed stderr: <<~EOM
             Uploading z            [1.0.0]
             Uploaded 1 cookbook.
-EOM
+          EOM
           knife("list --local -Rfp /cookbooks").should_succeed "/cookbooks/z/\n/cookbooks/z/metadata.rb\n"
         end
 
         it "knife raw -z -i empty.json -m POST /data" do
-          knife("raw -z -i #{path_to('empty.json')} -m POST /data").should_succeed( /uri/ )
+          knife("raw -z -i #{path_to("empty.json")} -m POST /data").should_succeed( /uri/ )
           knife("list --local -Rfp /data_bags").should_succeed "/data_bags/z/\n"
         end
 
         it "knife raw -z -i empty.json -m POST /data/x" do
-          knife("raw -z -i #{path_to('empty_x.json')} -m POST /data").should_succeed( /uri/ )
-          knife("raw -z -i #{path_to('empty_id.json')} -m POST /data/x").should_succeed( /"z"/ )
+          knife("raw -z -i #{path_to("empty_x.json")} -m POST /data").should_succeed( /uri/ )
+          knife("raw -z -i #{path_to("empty_id.json")} -m POST /data/x").should_succeed( /"z"/ )
           knife("list --local -Rfp /data_bags").should_succeed "/data_bags/x/\n/data_bags/x/z.json\n"
         end
 
         it "knife raw -z -i empty.json -m POST /environments" do
-          knife("raw -z -i #{path_to('empty.json')} -m POST /environments").should_succeed( /uri/ )
+          knife("raw -z -i #{path_to("empty.json")} -m POST /environments").should_succeed( /uri/ )
           knife("list --local /environments").should_succeed "/environments/z.json\n"
         end
 
         it "knife raw -z -i dummynode.json -m POST /nodes" do
-          knife("raw -z -i #{path_to('dummynode.json')} -m POST /nodes").should_succeed( /uri/ )
+          knife("raw -z -i #{path_to("dummynode.json")} -m POST /nodes").should_succeed( /uri/ )
           knife("list --local /nodes").should_succeed "/nodes/z.json\n"
           knife("show -z /nodes/z.json").should_succeed(/"bar"/)
         end
 
         it "knife raw -z -i empty.json -m POST /roles" do
-          knife("raw -z -i #{path_to('empty.json')} -m POST /roles").should_succeed( /uri/ )
+          knife("raw -z -i #{path_to("empty.json")} -m POST /roles").should_succeed( /uri/ )
           knife("list --local /roles").should_succeed "/roles/z.json\n"
         end
 
-        it "After knife raw -z -i rolestuff.json -m POST /roles, the output is pretty", skip: (RUBY_VERSION < "1.9") do
-          knife("raw -z -i #{path_to('rolestuff.json')} -m POST /roles").should_succeed( /uri/ )
+        it "After knife raw -z -i rolestuff.json -m POST /roles, the output is pretty" do
+          knife("raw -z -i #{path_to("rolestuff.json")} -m POST /roles").should_succeed( /uri/ )
           expect(IO.read(path_to("roles/x.json"))).to eq <<~EOM.strip
             {
               "name": "x",
               "description": "hi there"
             }
-EOM
+          EOM
         end
       end
 
@@ -321,7 +321,7 @@ EOM
           /policies/
           /policy_groups/
           /roles/
-EOM
+        EOM
       end
 
       context "DELETE /TYPE/NAME" do
@@ -388,23 +388,23 @@ EOM
         end
 
         it "knife raw -z -i empty.json -m PUT /clients/x fails with 404" do
-          knife("raw -z -i #{path_to('empty.json')} -m PUT /clients/x").should_fail( /404/ )
+          knife("raw -z -i #{path_to("empty.json")} -m PUT /clients/x").should_fail( /404/ )
         end
 
         it "knife raw -z -i empty.json -m PUT /data/x/y fails with 404" do
-          knife("raw -z -i #{path_to('empty.json')} -m PUT /data/x/y").should_fail( /404/ )
+          knife("raw -z -i #{path_to("empty.json")} -m PUT /data/x/y").should_fail( /404/ )
         end
 
         it "knife raw -z -i empty.json -m PUT /environments/x fails with 404" do
-          knife("raw -z -i #{path_to('empty.json')} -m PUT /environments/x").should_fail( /404/ )
+          knife("raw -z -i #{path_to("empty.json")} -m PUT /environments/x").should_fail( /404/ )
         end
 
         it "knife raw -z -i empty.json -m PUT /nodes/x fails with 404" do
-          knife("raw -z -i #{path_to('empty.json')} -m PUT /nodes/x").should_fail( /404/ )
+          knife("raw -z -i #{path_to("empty.json")} -m PUT /nodes/x").should_fail( /404/ )
         end
 
         it "knife raw -z -i empty.json -m PUT /roles/x fails with 404" do
-          knife("raw -z -i #{path_to('empty.json')} -m PUT /roles/x").should_fail( /404/ )
+          knife("raw -z -i #{path_to("empty.json")} -m PUT /roles/x").should_fail( /404/ )
         end
 
       end
@@ -459,7 +459,7 @@ EOM
             /roles/x.json
             /users/
             /users/x.json
-EOM
+          EOM
         end
       end
 
@@ -485,18 +485,18 @@ EOM
         end
 
         it "knife raw -z -i empty.json -m PUT /users/x" do
-          knife("raw -z -i #{path_to('empty.json')} -m PUT /users/x").should_succeed( /"x"/ )
+          knife("raw -z -i #{path_to("empty.json")} -m PUT /users/x").should_succeed( /"x"/ )
           knife("list --local /users").should_succeed "/users/x.json\n"
         end
 
-        it "After knife raw -z -i rolestuff.json -m PUT /roles/x, the output is pretty", skip: (RUBY_VERSION < "1.9") do
-          knife("raw -z -i #{path_to('rolestuff.json')} -m PUT /roles/x").should_succeed( /"x"/ )
+        it "After knife raw -z -i rolestuff.json -m PUT /roles/x, the output is pretty" do
+          knife("raw -z -i #{path_to("rolestuff.json")} -m PUT /roles/x").should_succeed( /"x"/ )
           expect(IO.read(path_to("roles/x.json"))).to eq <<~EOM.strip
             {
               "name": "x",
               "description": "hi there"
             }
-EOM
+          EOM
         end
       end
     end
@@ -513,7 +513,7 @@ EOM
         end
 
         it "knife raw -z -i empty.json -m POST /users" do
-          knife("raw -z -i #{path_to('empty.json')} -m POST /users").should_succeed( /uri/ )
+          knife("raw -z -i #{path_to("empty.json")} -m POST /users").should_succeed( /uri/ )
           knife("list --local /users").should_succeed "/users/z.json\n"
         end
       end
@@ -527,7 +527,7 @@ EOM
           /nodes/
           /roles/
           /users/
-EOM
+        EOM
       end
 
       context "DELETE /TYPE/NAME" do
@@ -548,7 +548,7 @@ EOM
         end
 
         it "knife raw -z -i empty.json -m PUT /users/x fails with 404" do
-          knife("raw -z -i #{path_to('empty.json')} -m PUT /users/x").should_fail( /404/ )
+          knife("raw -z -i #{path_to("empty.json")} -m PUT /users/x").should_fail( /404/ )
         end
       end
     end

data/spec/integration/knife/chef_repo_path_spec.rb

@@ -59,7 +59,7 @@ describe "chef_repo_path tests", :workstation do
 
       it "knife list --local -Rfp --chef-repo-path chef_repo2 / grabs chef_repo2 stuff" do
         Chef::Config.delete(:chef_repo_path)
-        knife("list --local -Rfp --chef-repo-path #{path_to('chef_repo2')} /").should_succeed <<~EOM
+        knife("list --local -Rfp --chef-repo-path #{path_to("chef_repo2")} /").should_succeed <<~EOM
           /clients/
           /clients/client3.json
           /cookbooks/
@@ -76,13 +76,13 @@ describe "chef_repo_path tests", :workstation do
           /roles/role3.json
           /users/
           /users/user3.json
-EOM
+        EOM
       end
 
       # "Skipping for BK... As Windows 2019 has 8dot3name disabled by default"
       it "knife list --local -Rfp --chef-repo-path chef_r~1 / grabs chef_repo2 stuff", :windows_only, :skip_buildkite do
         Chef::Config.delete(:chef_repo_path)
-        knife("list --local -Rfp --chef-repo-path #{path_to('chef_r~1')} /").should_succeed <<~EOM
+        knife("list --local -Rfp --chef-repo-path #{path_to("chef_r~1")} /").should_succeed <<~EOM
           /clients/
           /clients/client3.json
           /cookbooks/
@@ -99,13 +99,13 @@ EOM
           /roles/role3.json
           /users/
           /users/user3.json
-EOM
+        EOM
       end
 
       # "Skipping for BK... As Windows 2019 has 8dot3name disabled by default"
       it "knife list --local -Rfp --chef-repo-path chef_r~1 / grabs chef_repo2 stuff", :windows_only, :skip_buildkite do
         Chef::Config.delete(:chef_repo_path)
-        knife("list -z -Rfp --chef-repo-path #{path_to('chef_r~1')} /").should_succeed <<~EOM
+        knife("list -z -Rfp --chef-repo-path #{path_to("chef_r~1")} /").should_succeed <<~EOM
           /acls/
           /acls/clients/
           /acls/clients/client3.json
@@ -147,7 +147,7 @@ EOM
           /policy_groups/
           /roles/
           /roles/role3.json
-EOM
+        EOM
       end
 
       context "when all _paths are set to alternates" do
@@ -159,7 +159,7 @@ EOM
         end
 
         it "knife list --local -Rfp --chef-repo-path chef_repo2 / grabs chef_repo2 stuff" do
-          knife("list --local -Rfp --chef-repo-path #{path_to('chef_repo2')} /").should_succeed <<~EOM
+          knife("list --local -Rfp --chef-repo-path #{path_to("chef_repo2")} /").should_succeed <<~EOM
             /clients/
             /clients/client3.json
             /cookbooks/
@@ -176,7 +176,7 @@ EOM
             /roles/role3.json
             /users/
             /users/user3.json
-EOM
+          EOM
         end
 
         context "when cwd is at the top level" do
@@ -213,7 +213,7 @@ EOM
               roles/role2.json
               users/
               users/user2.json
-EOM
+            EOM
           end
         end
 
@@ -223,7 +223,7 @@ EOM
             knife("list --local -Rfp").should_succeed <<~EOM
               bag2/
               bag2/item2.json
-EOM
+            EOM
           end
           it "knife list --local -Rfp ../roles lists roles" do
             knife("list --local -Rfp ../roles").should_succeed "/roles/role2.json\n"
@@ -258,7 +258,7 @@ EOM
               roles/role2.json
               users/
               users/user2.json
-EOM
+            EOM
           end
         end
 
@@ -282,7 +282,7 @@ EOM
             knife("list --local -Rfp").should_succeed <<~EOM
               bag2/
               bag2/item2.json
-EOM
+            EOM
           end
         end
       end
@@ -329,7 +329,7 @@ EOM
               roles/role3.json
               users/
               users/user3.json
-EOM
+            EOM
           end
         end
 
@@ -339,7 +339,7 @@ EOM
             knife("list --local -Rfp").should_succeed <<~EOM
               bag3/
               bag3/item3.json
-EOM
+            EOM
           end
         end
       end
@@ -366,7 +366,7 @@ EOM
               {
 
               }
-EOM
+            EOM
           end
         end
 
@@ -383,7 +383,7 @@ EOM
               /cookbooks/cookbook1/metadata.rb
               /cookbooks/cookbook2/
               /cookbooks/cookbook2/metadata.rb
-EOM
+            EOM
           end
         end
 
@@ -400,7 +400,7 @@ EOM
               /cookbooks/cookbook1/metadata.rb
               /cookbooks/cookbook2/
               /cookbooks/cookbook2/metadata.rb
-EOM
+            EOM
           end
         end
 
@@ -417,7 +417,7 @@ EOM
               /cookbooks/cookbook1/metadata.rb
               /cookbooks/cookbook2/
               /cookbooks/cookbook2/metadata.rb
-EOM
+            EOM
           end
         end
 
@@ -434,7 +434,7 @@ EOM
               /data_bags/bag2/item2.json
               /data_bags/blah/
               /data_bags/blah/item.json
-EOM
+            EOM
           end
         end
 
@@ -451,7 +451,7 @@ EOM
               /data_bags/bag2/item2.json
               /data_bags/blah/
               /data_bags/blah/item1.json
-EOM
+            EOM
           end
         end
 
@@ -466,7 +466,7 @@ EOM
               {
 
               }
-EOM
+            EOM
           end
         end
 
@@ -481,7 +481,7 @@ EOM
               {
 
               }
-EOM
+            EOM
           end
         end
 
@@ -496,7 +496,7 @@ EOM
               {
 
               }
-EOM
+            EOM
           end
         end
 
@@ -511,7 +511,7 @@ EOM
               {
 
               }
-EOM
+            EOM
           end
         end
 
@@ -530,7 +530,7 @@ EOM
               bag/item.json
               bag2/
               bag2/item2.json
-EOM
+            EOM
           end
         end
 
@@ -563,7 +563,7 @@ EOM
               users/
               users/user1.json
               users/user2.json
-EOM
+            EOM
           end
         end
 
@@ -575,7 +575,7 @@ EOM
               bag/item.json
               bag2/
               bag2/item2.json
-EOM
+            EOM
           end
         end
       end
@@ -620,7 +620,7 @@ EOM
               users/
               users/user1.json
               users/user3.json
-EOM
+            EOM
           end
         end
 
@@ -632,7 +632,7 @@ EOM
               bag/item.json
               bag3/
               bag3/item3.json
-EOM
+            EOM
           end
         end
 
@@ -665,7 +665,7 @@ EOM
               users/
               users/user1.json
               users/user3.json
-EOM
+            EOM
           end
         end
 
@@ -677,7 +677,7 @@ EOM
               bag/item.json
               bag3/
               bag3/item3.json
-EOM
+            EOM
           end
         end
       end
@@ -725,7 +725,7 @@ EOM
               roles/role3.json
               users/
               users/user3.json
-EOM
+            EOM
           end
         end
 
@@ -735,7 +735,7 @@ EOM
             knife("list --local -Rfp").should_succeed <<~EOM
               bag3/
               bag3/item3.json
-EOM
+            EOM
           end
         end
       end
@@ -781,7 +781,7 @@ EOM
               users/
               users/user1.json
               users/user3.json
-EOM
+            EOM
           end
         end
 
@@ -793,7 +793,7 @@ EOM
               bag/item.json
               bag3/
               bag3/item3.json
-EOM
+            EOM
           end
         end
 
@@ -826,7 +826,7 @@ EOM
               users/
               users/user1.json
               users/user3.json
-EOM
+            EOM
           end
         end
 
@@ -838,7 +838,7 @@ EOM
               bag/item.json
               bag3/
               bag3/item3.json
-EOM
+            EOM
           end
         end
       end
@@ -865,7 +865,7 @@ EOM
             knife("list --local -Rfp").should_succeed <<~EOM
               bag/
               bag/item.json
-EOM
+            EOM
           end
         end
 
@@ -889,7 +889,7 @@ EOM
               roles/role3.json
               users/
               users/user3.json
-EOM
+            EOM
           end
         end
 
@@ -917,14 +917,14 @@ EOM
             /data_bags/
             /data_bags/bag/
             /data_bags/bag/item.json
-EOM
+          EOM
         end
 
         it "knife list --local -Rfp /data_bags lists data bags" do
           knife("list --local -Rfp /data_bags").should_succeed <<~EOM
             /data_bags/bag/
             /data_bags/bag/item.json
-EOM
+          EOM
         end
 
         context "when cwd is inside the data_bags directory" do
@@ -933,7 +933,7 @@ EOM
             knife("list --local -Rfp").should_succeed <<~EOM
               bag/
               bag/item.json
-EOM
+            EOM
           end
         end
       end