chef 14.14.29 → 14.15.6

data/spec/integration/knife/cookbook_show_spec.rb

@@ -82,7 +82,7 @@ describe "knife cookbook show", :workstation do
           specificity: default
           url:         http://127.0.0.1:8900/file_store/checksums/8226671f751ba102dea6a6b6bd32fa8d
         version:       1.0.0
-EOM
+      EOM
     end
 
     it "knife cookbook show x 1.0.0 metadata shows the metadata" do
@@ -109,7 +109,7 @@ EOM
           x::x: 
         source_url:       
         version:          1.0.0
-EOM
+      EOM
     end
 
     it "knife cookbook show x 1.0.0 recipes shows all the recipes" do
@@ -125,7 +125,7 @@ EOM
         path:        recipes/x.rb
         specificity: default
         url:         http://127.0.0.1:8900/file_store/checksums/d41d8cd98f00b204e9800998ecf8427e
-EOM
+      EOM
     end
     # rubocop:enable Layout/TrailingWhitespace
 

data/spec/integration/knife/cookbook_upload_spec.rb

@@ -36,14 +36,14 @@ describe "knife cookbook upload", :workstation do
         knife("cookbook upload x -o #{cb_dir}").should_succeed stderr: <<~EOM
           Uploading x            [1.0.0]
           Uploaded 1 cookbook.
-EOM
+        EOM
       end
 
       it "knife cookbook upload --freeze uploads and freezes the cookbook" do
         knife("cookbook upload x -o #{cb_dir} --freeze").should_succeed stderr: <<~EOM
           Uploading x            [1.0.0]
           Uploaded 1 cookbook.
-EOM
+        EOM
         # Modify the file, attempt to reupload
         file "cookbooks/x/metadata.rb", 'name "x"; version "1.0.0"#different'
         knife("cookbook upload x -o #{cb_dir} --freeze").should_fail stderr: <<~EOM
@@ -51,7 +51,7 @@ EOM
           ERROR: Version 1.0.0 of cookbook x is frozen. Use --force to override.
           WARNING: Not updating version constraints for x in the environment as the cookbook is frozen.
           ERROR: Failed to upload 1 cookbook.
-EOM
+        EOM
       end
     end
 
@@ -66,7 +66,7 @@ EOM
           Uploading x            [1.0.0]
           Uploading y            [1.0.0]
           Uploaded 2 cookbooks.
-EOM
+        EOM
       end
 
       it "knife cookbook upload fails due to missing dependencies" do
@@ -75,7 +75,7 @@ EOM
           ERROR: Cookbook x depends on cookbooks which are not currently
           ERROR: being uploaded and cannot be found on the server.
           ERROR: The missing cookbook(s) are: 'y' version '>= 0.0.0'
-EOM
+        EOM
       end
 
       it "knife cookbook upload -a uploads both cookbooks" do
@@ -83,7 +83,7 @@ EOM
           Uploading x            [1.0.0]
           Uploading y            [1.0.0]
           Uploaded all cookbooks.
-EOM
+        EOM
       end
     end
   end

data/spec/integration/knife/data_bag_delete_spec.rb

@@ -34,25 +34,25 @@ describe "knife data bag delete", :workstation do
     it "with an empty data bag" do
       knife("data bag delete canteloupe", input: "y").should_succeed <<~EOM
         Do you really want to delete canteloupe? (Y/N) Deleted data_bag[canteloupe]
-EOM
+      EOM
     end
 
     it "with a bag with some items" do
       knife("data bag delete rocket", input: "y").should_succeed <<~EOM
         Do you really want to delete rocket? (Y/N) Deleted data_bag[rocket]
-EOM
+      EOM
     end
 
     it "with a single item" do
       knife("data bag delete rocket falcon9", input: "y").should_succeed <<~EOM
         Do you really want to delete falcon9? (Y/N) Deleted data_bag_item[falcon9]
-EOM
+      EOM
     end
 
     it "choosing not to delete" do
       knife("data bag delete rocket falcon9", input: "n").should_succeed <<~EOM, exit_code: 3
         Do you really want to delete falcon9? (Y/N) You said no, so I'm done here.
-EOM
+      EOM
     end
   end
 end

data/spec/integration/knife/data_bag_from_file_spec.rb

@@ -47,7 +47,7 @@ describe "knife data bag from file", :workstation do
               "cipher": "aes-256-cbc"
             }
           }
-EOM
+        EOM
         file "data_bags/bar/round_trip.json", <<~EOM
           {
             "name": "data_bag_item_bar_round_trip",
@@ -70,33 +70,33 @@ EOM
               }
             }
           }
-EOM
+        EOM
       end
 
       it "uploads a single file" do
         knife("data bag from file foo #{db_dir}/foo/bar.json").should_succeed stderr: <<~EOM
           Updated data_bag_item[foo::bar]
-EOM
+        EOM
       end
 
       it "uploads a single encrypted file" do
         knife("data bag from file foo #{db_dir}/foo/encrypted.json").should_succeed stderr: <<~EOM
           Updated data_bag_item[foo::encrypted]
-EOM
+        EOM
       end
 
       it "uploads a file in chef's internal format" do
         pending "chef/chef#4815"
         knife("data bag from file bar #{db_dir}/bar/round_trip.json").should_succeed stderr: <<~EOM
           Updated data_bag_item[bar::round_trip]
-EOM
+        EOM
       end
 
       it "uploads many files" do
         knife("data bag from file foo #{db_dir}/foo/bar.json #{db_dir}/foo/bzr.json").should_succeed stderr: <<~EOM
           Updated data_bag_item[foo::bar]
           Updated data_bag_item[foo::bzr]
-EOM
+        EOM
       end
 
       it "uploads a whole directory" do
@@ -107,7 +107,7 @@ EOM
           cat
           dog
           encrypted
-EOM
+        EOM
       end
 
     end

data/spec/integration/knife/data_bag_list_spec.rb

@@ -36,7 +36,7 @@ describe "knife data bag list", :workstation do
         canteloupe
         rocket
         x
-EOM
+      EOM
     end
 
   end

data/spec/integration/knife/delete_spec.rb

@@ -43,7 +43,7 @@ describe "knife delete", :workstation do
       /roles/x.json
       /users
       /users/x.json
-EOM
+    EOM
   end
 
   let :server_everything do
@@ -68,7 +68,7 @@ EOM
       /users
       /users/admin.json
       /users/x.json
-EOM
+    EOM
   end
   let :server_nothing do
     <<~EOM
@@ -83,7 +83,7 @@ EOM
       /roles
       /users
       /users/admin.json
-EOM
+    EOM
   end
 
   let :nothing do
@@ -95,7 +95,7 @@ EOM
       /nodes
       /roles
       /users
-EOM
+    EOM
   end
 
   when_the_chef_server "has one of each thing" do
@@ -125,7 +125,7 @@ EOM
         knife("delete --both /cookbooks/x").should_fail <<~EOM
           ERROR: /cookbooks/x (remote) must be deleted recursively!  Pass -r to knife delete.
           ERROR: /cookbooks/x (local) must be deleted recursively!  Pass -r to knife delete.
-EOM
+        EOM
         knife("list -Rf /").should_succeed server_everything
         knife("list -Rf --local /").should_succeed everything
       end
@@ -151,7 +151,7 @@ EOM
           /users
           /users/admin.json
           /users/x.json
-EOM
+        EOM
         knife("list -Rf --local /").should_succeed <<~EOM
           /clients
           /clients/x.json
@@ -168,7 +168,7 @@ EOM
           /roles/x.json
           /users
           /users/x.json
-EOM
+        EOM
       end
 
       it "knife delete -r --local /cookbooks/x deletes x locally but not remotely" do
@@ -190,7 +190,7 @@ EOM
           /roles/x.json
           /users
           /users/x.json
-EOM
+        EOM
       end
 
       it "knife delete -r /cookbooks/x deletes x remotely but not locally" do
@@ -214,7 +214,7 @@ EOM
           /users
           /users/admin.json
           /users/x.json
-EOM
+        EOM
         knife("list -Rf --local /").should_succeed everything
       end
 
@@ -229,7 +229,7 @@ EOM
           knife("delete --both /data_bags/empty").should_fail <<~EOM
             ERROR: /data_bags/empty (remote) must be deleted recursively!  Pass -r to knife delete.
             ERROR: /data_bags/empty (local) must be deleted recursively!  Pass -r to knife delete.
-EOM
+          EOM
           knife("list -Rf /").should_succeed <<~EOM
             /clients
             /clients/chef-validator.json
@@ -252,7 +252,7 @@ EOM
             /users
             /users/admin.json
             /users/x.json
-EOM
+          EOM
           knife("list -Rf --local /").should_succeed <<~EOM
             /clients
             /clients/x.json
@@ -272,7 +272,7 @@ EOM
             /roles/x.json
             /users
             /users/x.json
-EOM
+          EOM
         end
       end
 
@@ -280,7 +280,7 @@ EOM
         knife("delete --both /data_bags/x").should_fail <<~EOM
           ERROR: /data_bags/x (remote) must be deleted recursively!  Pass -r to knife delete.
           ERROR: /data_bags/x (local) must be deleted recursively!  Pass -r to knife delete.
-EOM
+        EOM
         knife("list -Rf /").should_succeed server_everything
         knife("list -Rf --local /").should_succeed everything
       end
@@ -306,7 +306,7 @@ EOM
           /users
           /users/admin.json
           /users/x.json
-EOM
+        EOM
         knife("list -Rf --local /").should_succeed <<~EOM
           /clients
           /clients/x.json
@@ -323,7 +323,7 @@ EOM
           /roles/x.json
           /users
           /users/x.json
-EOM
+        EOM
       end
 
       it "knife delete --both /environments/x.json deletes x" do
@@ -348,7 +348,7 @@ EOM
           /users
           /users/admin.json
           /users/x.json
-EOM
+        EOM
         knife("list -Rf --local /").should_succeed <<~EOM
           /clients
           /clients/x.json
@@ -366,7 +366,7 @@ EOM
           /roles/x.json
           /users
           /users/x.json
-EOM
+        EOM
       end
 
       it "knife delete --both /roles/x.json deletes x" do
@@ -391,7 +391,7 @@ EOM
           /users
           /users/admin.json
           /users/x.json
-EOM
+        EOM
         knife("list -Rf --local /").should_succeed <<~EOM
           /clients
           /clients/x.json
@@ -409,7 +409,7 @@ EOM
           /roles
           /users
           /users/x.json
-EOM
+        EOM
       end
 
       it "knife delete --both /environments/_default.json fails but still deletes the local copy" do
@@ -432,7 +432,7 @@ EOM
           /roles/x.json
           /users
           /users/x.json
-EOM
+        EOM
       end
 
       it "knife delete --both /environments/nonexistent.json fails" do
@@ -445,7 +445,7 @@ EOM
         knife("delete --both /").should_fail <<~EOM
           ERROR: / (remote) cannot be deleted.
           ERROR: / (local) cannot be deleted.
-EOM
+        EOM
         knife("list -Rf /").should_succeed server_everything
         knife("list -Rf --local /").should_succeed everything
       end
@@ -468,7 +468,7 @@ EOM
           ERROR: /roles (local) cannot be deleted.
           ERROR: /users (remote) cannot be deleted.
           ERROR: /users (local) cannot be deleted.
-EOM
+        EOM
         knife("list -Rf /").should_succeed server_everything
         knife("list -Rf --local /").should_succeed everything
       end
@@ -512,7 +512,7 @@ EOM
           /users
           /users/admin.json
           /users/x.json
-EOM
+        EOM
         knife("list -Rf --local /").should_succeed nothing
       end
 
@@ -543,7 +543,7 @@ EOM
           /users
           /users/admin.json
           /users/x.json
-EOM
+        EOM
         knife("list -Rf --local /").should_succeed nothing
       end
 
@@ -569,7 +569,7 @@ EOM
           /users
           /users/admin.json
           /users/x.json
-EOM
+        EOM
         knife("list -Rf --local /").should_succeed nothing
       end
 
@@ -595,7 +595,7 @@ EOM
           /users
           /users/admin.json
           /users/x.json
-EOM
+        EOM
         knife("list -Rf --local /").should_succeed nothing
       end
 
@@ -629,7 +629,7 @@ EOM
           ERROR: /roles (local) cannot be deleted.
           ERROR: /users (remote) cannot be deleted.
           ERROR: /users (local) cannot be deleted.
-EOM
+        EOM
         knife("list -Rf /").should_succeed server_everything
         knife("list -Rf --local /").should_succeed nothing
       end
@@ -665,7 +665,7 @@ EOM
             users
             users/admin.json
             users/x.json
-EOM
+          EOM
           knife("list -Rf --local /").should_succeed <<~EOM
             clients
             cookbooks
@@ -674,7 +674,7 @@ EOM
             nodes
             roles
             users
-EOM
+          EOM
         end
       end
     end
@@ -718,7 +718,7 @@ EOM
           /roles/x.json
           /users
           /users/x.json
-EOM
+        EOM
       end
 
       it "knife delete --both /data_bags/x fails" do
@@ -746,7 +746,7 @@ EOM
           /roles/x.json
           /users
           /users/x.json
-EOM
+        EOM
       end
 
       it "knife delete --both /environments/x.json deletes x" do
@@ -769,7 +769,7 @@ EOM
           /roles/x.json
           /users
           /users/x.json
-EOM
+        EOM
       end
 
       it "knife delete --both /roles/x.json deletes x" do
@@ -792,7 +792,7 @@ EOM
           /roles
           /users
           /users/x.json
-EOM
+        EOM
       end
 
       it "knife delete --both /environments/_default.json fails but still deletes the local copy" do
@@ -815,7 +815,7 @@ EOM
           /roles/x.json
           /users
           /users/x.json
-EOM
+        EOM
       end
 
       it "knife delete --both / fails" do
@@ -842,7 +842,7 @@ EOM
           ERROR: /roles (local) cannot be deleted.
           ERROR: /users (remote) cannot be deleted.
           ERROR: /users (local) cannot be deleted.
-EOM
+        EOM
         knife("list -Rf /").should_succeed server_nothing
         knife("list -Rf --local /").should_succeed everything
       end
@@ -869,7 +869,7 @@ EOM
             roles
             users
             users/admin.json
-EOM
+          EOM
           knife("list -Rf --local /").should_succeed <<~EOM
             clients
             clients/x.json
@@ -888,7 +888,7 @@ EOM
             roles/x.json
             users
             users/x.json
-EOM
+          EOM
         end
       end
     end