chef 14.14.29 → 14.15.6

data/spec/integration/knife/chef_repository_file_system_spec.rb

@@ -37,7 +37,7 @@ describe "General chef_repo file system checks", :workstation do
           /data_bags/bag1/
           /environments/
           /roles/
-EOM
+        EOM
       end
     end
 
@@ -55,7 +55,7 @@ EOM
       it "knife list --local -Rfp / does not return it" do
         knife("list --local -Rfp /").should_succeed(<<~EOM, stderr: "WARN: Cookbook 'cookbook1' is empty or entirely chefignored at #{Chef::Config.chef_repo_path}/cookbooks/cookbook1\n")
           /cookbooks/
-EOM
+        EOM
       end
     end
 
@@ -65,7 +65,7 @@ EOM
       it "knife list --local -Rfp / does not return it" do
         knife("list --local -Rfp /").should_succeed(<<~EOM, stderr: "WARN: Cookbook 'cookbook1' is empty or entirely chefignored at #{Chef::Config.chef_repo_path}/cookbooks/cookbook1\n")
           /cookbooks/
-EOM
+        EOM
       end
     end
 
@@ -82,7 +82,7 @@ EOM
           /cookbooks/cookbook1/templates/
           /cookbooks/cookbook1/templates/default/
           /cookbooks/cookbook1/templates/default/x.txt
-EOM
+        EOM
       end
     end
 
@@ -92,7 +92,7 @@ EOM
       it "knife list --local -Rfp / does not return it" do
         knife("list --local -Rfp /").should_succeed(<<~EOM, stderr: "WARN: Cookbook 'cookbook1' is empty or entirely chefignored at #{Chef::Config.chef_repo_path}/cookbooks/cookbook1\n")
           /cookbooks/
-EOM
+        EOM
       end
     end
 
@@ -110,7 +110,7 @@ EOM
           /cookbooks/cookbook1/templates/
           /cookbooks/cookbook1/templates/default/
           /cookbooks/cookbook1/templates/default/x.txt
-EOM
+        EOM
       end
     end
 
@@ -154,7 +154,7 @@ EOM
           /environments/environment1.json
           /roles/
           /roles/role1.json
-EOM
+        EOM
       end
     end
 
@@ -163,7 +163,7 @@ EOM
       it "does not show up in list -Rfp" do
         knife("list --local -Rfp /").should_succeed <<~EOM
           /cookbooks/
-EOM
+        EOM
       end
     end
 
@@ -172,7 +172,7 @@ EOM
       it "does not show up in list -Rfp" do
         knife("list --local -Rfp /").should_succeed <<~EOM
           /data_bags/
-EOM
+        EOM
       end
     end
   end

data/spec/integration/knife/chefignore_spec.rb

@@ -56,7 +56,7 @@ describe "chefignore tests", :workstation do
           /environments/x.json
           /roles/
           /roles/x.json
-EOM
+        EOM
       end
     end
   end
@@ -71,7 +71,7 @@ EOM
     it "the cookbook is not listed" do
       knife("list --local -Rfp /").should_succeed(<<~EOM, stderr: "WARN: Cookbook 'cookbook1' is empty or entirely chefignored at #{Chef::Config.chef_repo_path}/cookbooks/cookbook1\n")
         /cookbooks/
-EOM
+      EOM
     end
   end
 
@@ -93,7 +93,7 @@ EOM
           /cookbooks/cookbook1/y.json
           /cookbooks/cookbook2/
           /cookbooks/cookbook2/y.json
-EOM
+        EOM
       end
     end
 
@@ -110,7 +110,7 @@ EOM
           /cookbooks/cookbook1/y.json
           /cookbooks/cookbook2/
           /cookbooks/cookbook2/y.json
-EOM
+        EOM
       end
     end
 
@@ -132,7 +132,7 @@ EOM
           /cookbooks/cookbook2/recipes/y.rb
           /cookbooks/cookbook2/x.json
           /cookbooks/cookbook2/y.json
-EOM
+        EOM
       end
     end
 
@@ -153,7 +153,7 @@ EOM
           /cookbooks/cookbook2/
           /cookbooks/cookbook2/x.json
           /cookbooks/cookbook2/y.json
-EOM
+        EOM
       end
     end
 
@@ -173,7 +173,7 @@ EOM
           /cookbooks/cookbook2/
           /cookbooks/cookbook2/x.json
           /cookbooks/cookbook2/y.json
-EOM
+        EOM
       end
     end
 
@@ -191,7 +191,7 @@ EOM
           /cookbooks/cookbook2/
           /cookbooks/cookbook2/x.json
           /cookbooks/cookbook2/y.json
-EOM
+        EOM
       end
     end
 
@@ -207,7 +207,7 @@ EOM
           /cookbooks/cookbook1/y.json
           /cookbooks/cookbook2/
           /cookbooks/cookbook2/y.json
-EOM
+        EOM
       end
     end
   end
@@ -239,7 +239,7 @@ EOM
           /cookbooks/mycookbook/x.json
           /cookbooks/yourcookbook/
           /cookbooks/yourcookbook/metadata.rb
-EOM
+        EOM
       end
 
       context "and conflicting cookbooks" do
@@ -258,7 +258,7 @@ EOM
             /cookbooks/yourcookbook/
             /cookbooks/yourcookbook/onlyincookbooks1.rb
             /cookbooks/yourcookbook/x.json
-EOM
+          EOM
         end
       end
     end
@@ -272,7 +272,7 @@ EOM
       knife("list --local -Rfp /cookbooks").should_succeed <<~EOM
         /cookbooks/chefignore/
         /cookbooks/chefignore/metadata.rb
-EOM
+      EOM
     end
   end
 
@@ -294,7 +294,7 @@ EOM
         /cookbooks/blah/metadata.rb
         /cookbooks/chefignore/
         /cookbooks/chefignore/metadata.rb
-EOM
+      EOM
     end
   end
 end

data/spec/integration/knife/client_bulk_delete_spec.rb

@@ -40,7 +40,7 @@ describe "knife client bulk delete", :workstation do
 
         Are you sure you want to delete these clients? (Y/N) Deleted client car
         Deleted client cat
-EOM
+      EOM
 
       knife("client list").should_succeed <<~EOM
         cdr
@@ -48,7 +48,7 @@ EOM
         chef-webui
         concat
         cons
-EOM
+      EOM
     end
 
     it "deletes all matching clients when unanchored" do
@@ -60,14 +60,14 @@ EOM
         Are you sure you want to delete these clients? (Y/N) Deleted client car
         Deleted client cat
         Deleted client concat
-EOM
+      EOM
 
       knife("client list").should_succeed <<~EOM
         cdr
         chef-validator
         chef-webui
         cons
-EOM
+      EOM
     end
   end
 
@@ -93,7 +93,7 @@ EOM
 
         Are you sure you want to delete these clients? (Y/N) Deleted client car
         Deleted client cat
-EOM
+      EOM
 
       knife("client list").should_succeed <<~EOM
         car-validator
@@ -101,7 +101,7 @@ EOM
         chef-validator
         chef-webui
         cons
-EOM
+      EOM
     end
 
     it "deletes a validator when told to" do
@@ -117,14 +117,14 @@ EOM
 
         Are you sure you want to delete these clients? (Y/N) Deleted client car
         Deleted client cat
-EOM
+      EOM
 
       knife("client list").should_succeed <<~EOM
         cdr
         chef-validator
         chef-webui
         cons
-EOM
+      EOM
     end
   end
 end

data/spec/integration/knife/client_create_spec.rb

@@ -38,7 +38,7 @@ describe "knife client create", :workstation do
         chef_type: client
         name:      bah
         validator: true
-EOM
+      EOM
     end
 
     it "refuses to add an existing client" do

data/spec/integration/knife/client_delete_spec.rb

@@ -35,7 +35,7 @@ describe "knife client delete", :workstation do
     it "deletes a client" do
       knife("client delete car", input: "Y").should_succeed <<~EOM
         Do you really want to delete car? (Y/N) Deleted client[car]
-EOM
+      EOM
 
       knife("client list").should_succeed <<~EOM
         car-validator
@@ -44,19 +44,19 @@ EOM
         chef-validator
         chef-webui
         cons
-EOM
+      EOM
     end
 
     it "refuses to delete a validator normally" do
       knife("client delete car-validator", input: "Y").should_fail exit_code: 2, stdout: "Do you really want to delete car-validator? (Y/N) ", stderr: <<~EOM
         FATAL: You must specify --delete-validators to delete the validator client car-validator
-EOM
+      EOM
     end
 
     it "deletes a validator correctly" do
       knife("client delete car-validator -D", input: "Y").should_succeed <<~EOM
         Do you really want to delete car-validator? (Y/N) Deleted client[car-validator]
-EOM
+      EOM
     end
 
   end

data/spec/integration/knife/client_key_delete_spec.rb

@@ -33,7 +33,7 @@ describe "knife client key delete", :workstation do
       knife("client key create -k new car")
       knife("client key delete car new", input: "Y").should_succeed stdout: out, stderr: <<~EOM
         Deleted key named new for the client named car
-EOM
+      EOM
 
       knife("client key list car").should_succeed ""
     end

data/spec/integration/knife/client_key_list_spec.rb

@@ -45,7 +45,7 @@ describe "knife client key list", :workstation do
         expired:    http://127.0.0.1:8900/clients/cons/keys/expired (expired)
         new:        http://127.0.0.1:8900/clients/cons/keys/new
         next_month: http://127.0.0.1:8900/clients/cons/keys/next_month
-EOM
+      EOM
     end
 
     it "lists the expired keys for a client" do

data/spec/integration/knife/client_list_spec.rb

@@ -41,7 +41,7 @@ describe "knife client list", :workstation do
         chef-validator
         chef-webui
         cons
-EOM
+      EOM
     end
 
   end

data/spec/integration/knife/common_options_spec.rb

@@ -95,7 +95,7 @@ describe "knife common options", :workstation do
             syHLXYFNy0OxMtH/bBAXBGNHd9gf5uOnqh0pYcbe/uRAxumC7Rl0cL509eURiA2T
             +vFmf54y9YdnLXaqv+FhJT6B6V7WX7IpU9BMqJY1cJYXHuHG2KA=
             -----END RSA PRIVATE KEY-----
-EOM
+          EOM
         end
 
         it "knife raw /nodes/x should retrieve the node" do

data/spec/integration/knife/config_get_spec.rb

@@ -150,7 +150,7 @@ describe "knife config get", :workstation do
     let(:cmd_args) { %w{node_name client_key} }
     before { file(".chef/credentials", "[default]\nclient_name = \"three\"\nclient_key = \"three.pem\"") }
 
-    it { is_expected.to match(/^client_key:\s+\S*\/.chef\/three.pem\nnode_name:\s+three\Z/) }
+    it { is_expected.to match(%r{^client_key:\s+\S*/.chef/three.pem\nnode_name:\s+three\Z}) }
   end
 
   context "with a dotted argument" do

data/spec/integration/knife/config_list_profiles_spec.rb

@@ -183,6 +183,7 @@ describe "knife config list-profiles", :workstation do
       { "profile" => "default", "active" => true, "client_name" => "testuser", "client_key" => path_to(".chef/testkey.pem"), "server_url" => "https://example.com/organizations/testorg" },
       { "profile" => "prod", "active" => false, "client_name" => "testuser", "client_key" => path_to(".chef/testkey.pem"), "server_url" => "https://example.com/organizations/prod" },
       { "profile" => "qa", "active" => false, "client_name" => "qauser", "client_key" => path_to("src/qauser.pem"), "server_url" => "https://example.com/organizations/testorg" },
-    ] }
+    ]
+    }
   end
 end

data/spec/integration/knife/cookbook_api_ipv6_spec.rb

@@ -54,7 +54,7 @@ describe "Knife cookbook API integration with IPv6", :workstation, :not_supporte
         syHLXYFNy0OxMtH/bBAXBGNHd9gf5uOnqh0pYcbe/uRAxumC7Rl0cL509eURiA2T
         +vFmf54y9YdnLXaqv+FhJT6B6V7WX7IpU9BMqJY1cJYXHuHG2KA=
         -----END RSA PRIVATE KEY-----
-END_VALIDATION_PEM
+      END_VALIDATION_PEM
     end
 
     let(:cache_path) do
@@ -77,10 +77,10 @@ END_VALIDATION_PEM
           <<~END_CLIENT_RB
             chef_server_url "http://[::1]:8900"
             syntax_check_cache_path '#{cache_path}'
-            client_key '#{path_to('config/knifeuser.pem')}'
+            client_key '#{path_to("config/knifeuser.pem")}'
             node_name 'whoisthisis'
             cookbook_path '#{CHEF_SPEC_DATA}/cookbooks'
-END_CLIENT_RB
+          END_CLIENT_RB
         end
 
         before do

data/spec/integration/knife/cookbook_bulk_delete_spec.rb

@@ -42,21 +42,21 @@ describe "knife cookbook bulk delete", :workstation do
         foo  fox
         
         Do you really want to delete these cookbooks? (Y/N) 
-EOM
+      EOM
 
       stderr = <<~EOM
         Deleted cookbook  foo                       [1.0.0]
         Deleted cookbook  foo                       [0.6.5]
         Deleted cookbook  fox                       [0.6.5]
         Deleted cookbook  fox                       [0.6.0]
-EOM
+      EOM
 
       knife("cookbook bulk delete ^fo.*", input: "Y").should_succeed(stderr: stderr, stdout: stdout)
 
       knife("cookbook list -a").should_succeed <<~EOM
         fax   0.6.0
         zfa   0.6.5
-EOM
+      EOM
     end
     # rubocop:enable Layout/TrailingWhitespace
 

data/spec/integration/knife/cookbook_download_spec.rb

@@ -37,7 +37,7 @@ describe "knife cookbook download", :workstation do
         Downloading x cookbook version 1.0.1
         Downloading root_files
         Cookbook downloaded to #{tmpdir}/x-1.0.1
-EOM
+      EOM
     end
 
     it "knife cookbook download with a version downloads the specified version" do
@@ -45,7 +45,7 @@ EOM
         Downloading x cookbook version 1.0.1
         Downloading root_files
         Cookbook downloaded to #{tmpdir}/x-1.0.1
-EOM
+      EOM
     end
 
     it "knife cookbook download with an unknown version raises an error" do
@@ -64,8 +64,8 @@ EOM
         Downloading x cookbook version 1.0.1
         Downloading root_files
         Cookbook downloaded to #{tmpdir}/x-1.0.1
-EOM
-)
+      EOM
+                                                                            )
     end
   end
 end

data/spec/integration/knife/cookbook_list_spec.rb

@@ -39,7 +39,7 @@ describe "knife cookbook list", :workstation do
         x   1.0.0
         y   0.6.5
         z   0.6.5
-EOM
+      EOM
     end
 
     it "knife cookbook list -a shows all the versions of all the cookbooks" do
@@ -47,7 +47,7 @@ EOM
         x   1.0.0  0.6.5  0.6.0
         y   0.6.5  0.6.0
         z   0.6.5
-EOM
+      EOM
     end
 
   end