chef-dk 3.6.57 → 3.7.23

data/spec/unit/policyfile_evaluation_spec.rb

@@ -73,7 +73,7 @@ describe ChefDK::PolicyfileCompiler do
 
               Backtrace:
                 TestPolicyfile.rb:1:in `eval_policyfile'
-E
+          E
           expect(policyfile.errors.first).to eq(expected_message)
         end
       end
@@ -469,7 +469,7 @@ E
             err = <<~MESSAGE
               Multiple sources are marked as the preferred source for some cookbooks. Only one source can be preferred for a cookbook.
               supermarket(https://supermarket.chef.io) and supermarket(https://mart.example) are both set as the preferred source for cookbook(s) 'foo'
-MESSAGE
+            MESSAGE
             expect(policyfile.errors).to eq([err])
           end
 
@@ -548,7 +548,7 @@ MESSAGE
 
           Previous source: {:path=>"local_cookbooks/foo"}
           Conflicts with: {:chef_server=>"https://mychefserver.example.com"}
-EOH
+        EOH
         expect(policyfile.errors.size).to eq(1)
         expect(policyfile.errors.first).to eq(expected)
       end

data/spec/unit/policyfile_lock_build_spec.rb

@@ -208,7 +208,7 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
         cookbook:foo;id:467dc855408ce8b74f991c5dc2fd72a6aa369b60
         default_attributes:{}
         override_attributes:{}
-REVISION_STRING
+      REVISION_STRING
     end
 
     let(:expected_revision_id) do
@@ -278,9 +278,9 @@ REVISION_STRING
           "ddd" => true,
           "ccc" => false,
           "bbb" => nil,
-          "e"   => 1.2,
-          "f"   => 5,
-          "g"   => 1_000_000_000_000_000.0,
+          "e" => 1.2,
+          "f" => 5,
+          "g" => 1_000_000_000_000_000.0,
           "nested" => { "a" => "b" },
         }
         p.override_attributes = { "foo2" => "baz" }
@@ -295,7 +295,7 @@ REVISION_STRING
         cookbook:foo;id:467dc855408ce8b74f991c5dc2fd72a6aa369b60
         default_attributes:{"aaa":"aaa","bbb":null,"ccc":false,"ddd":true,"e":1.2,"f":5,"foo":"bar","g":1e+15,"nested":{"a":"b"}}
         override_attributes:{"foo2":"baz"}
-REVISION_STRING
+      REVISION_STRING
     end
 
     let(:expected_revision_id) do
@@ -327,9 +327,9 @@ REVISION_STRING
           "ddd" => true,
           "ccc" => false,
           "bbb" => nil,
-          "e"   => 1.2,
-          "f"   => 5,
-          "g"   => 1_000_000_000_000_000.0,
+          "e" => 1.2,
+          "f" => 5,
+          "g" => 1_000_000_000_000_000.0,
           "nested" => { "a" => "b" },
         },
         "override_attributes" => { "foo2" => "baz" },
@@ -386,7 +386,7 @@ REVISION_STRING
         cookbook:bar;id:#{cookbook_bar_cksum}
         default_attributes:{}
         override_attributes:{}
-REVISION_STRING
+      REVISION_STRING
     end
 
     let(:expected_revision_id) do
@@ -487,7 +487,7 @@ REVISION_STRING
         cookbook:foo;id:1.0.0
         default_attributes:{}
         override_attributes:{}
-REVISION_STRING
+      REVISION_STRING
     end
 
     let(:expected_revision_id) do
@@ -614,7 +614,7 @@ REVISION_STRING
         cookbook:foo;id:#{cookbook_foo_cksum}
         default_attributes:{}
         override_attributes:{}
-REVISION_STRING
+      REVISION_STRING
     end
 
     let(:expected_revision_id) do
@@ -741,7 +741,7 @@ REVISION_STRING
         cookbook:foo;id:#{cookbook_foo_cksum}
         default_attributes:{}
         override_attributes:{}
-REVISION_STRING
+      REVISION_STRING
     end
 
     let(:expected_revision_id) do
@@ -812,7 +812,7 @@ REVISION_STRING
         cookbook:foo;id:#{cookbook_foo_cksum}
         default_attributes:{}
         override_attributes:{}
-REVISION_STRING
+      REVISION_STRING
     end
 
     let(:expected_revision_id) do
@@ -958,7 +958,7 @@ REVISION_STRING
         cookbook:foo;id:#{cookbook_foo_cksum}
         default_attributes:#{canonicalized_default_attrs}
         override_attributes:#{canonicalized_override_attrs}
-REVISION_STRING
+      REVISION_STRING
     end
 
     let(:expected_revision_id) do

data/spec/unit/policyfile_lock_validation_spec.rb

@@ -123,7 +123,7 @@ describe ChefDK::PolicyfileLock, "validating locked cookbooks" do
         long_description 'Installs/Configures local-cookbook'
         version          '2.3.4'
 
-E
+      E
       expect(IO.read(metadata_path)).to eq(expected_metadata_rb)
     end
 
@@ -154,7 +154,7 @@ E
           long_description 'Installs/Configures local-cookbook'
           version          '2.3.4'
 
-E
+        E
       end
 
       before do
@@ -183,7 +183,7 @@ E
           long_description 'Installs/Configures local-cookbook'
           version          '2.3.5' # changed from 2.3.4
 
-E
+        E
       end
 
       before do
@@ -230,7 +230,7 @@ E
           long_description 'Installs/Configures local-cookbook'
           version          '3.0.0' # changed from 2.3.4, violates `~> 2.0` constraint
 
-E
+        E
       end
 
       before do
@@ -254,7 +254,7 @@ E
           # This is totally new code,
           # it is different than the old code
 
-E
+        E
       end
 
       before do
@@ -292,7 +292,7 @@ E
 
           depends "foo", "=1.0.0"
 
-E
+        E
       end
 
       before do
@@ -339,7 +339,7 @@ E
 
           depends "not-a-thing"
 
-E
+        E
       end
 
       before do
@@ -379,7 +379,7 @@ E
 
           depends "foo", ">= 1.0.0"
 
-E
+        E
       end
 
       before do
@@ -413,7 +413,7 @@ E
 
           depends "foo", "~> 2.0"
 
-E
+        E
       end
 
       before do
@@ -484,7 +484,7 @@ E
           long_description 'Installs/Configures local-cookbook'
           version          '3.0.0' # changed from 2.3.4
 
-E
+        E
       end
 
       let(:new_metadata_another_local_cookbook) do
@@ -499,7 +499,7 @@ E
 
           # This dep now requires the updated version of 'local-cookbook'
           depends 'local-cookbook', '= 3.0.0'
-E
+        E
       end
 
       let(:metadata_path_another_local_cookbook) do
@@ -550,7 +550,7 @@ E
         long_description 'Installs/Configures foo'
         version          '1.0.0'
 
-E
+      E
       expect(IO.read(metadata_path)).to eq(expected_metadata_rb)
     end
 
@@ -590,7 +590,7 @@ E
           description      'Installs/Configures foo'
           long_description 'Installs/Configures foo'
           version          '1.0.0'
-E
+        E
       end
 
       before do

data/spec/unit/policyfile_services/clean_policies_spec.rb

@@ -180,7 +180,7 @@ describe ChefDK::PolicyfileServices::CleanPolicies do
             expected_message = <<~MESSAGE
               DELETE appserver 4444444444444444444444444444444444444444444444444444444444444444
               DELETE load-balancer 7777777777777777777777777777777777777777777777777777777777777777
-MESSAGE
+            MESSAGE
             expect(ui.output).to eq(expected_message)
           end
 
@@ -214,7 +214,7 @@ MESSAGE
             expected_message = <<~ERROR
               Failed to delete some policy revisions:
               - appserver (4444444444444444444444444444444444444444444444444444444444444444): Net::HTTPServerException 403 \"Unauthorized\"
-ERROR
+            ERROR
 
             expect { clean_policies_service.run }.to raise_error do |error|
               expect(error.message).to eq(expected_message)
@@ -222,7 +222,7 @@ ERROR
             expected_message = <<~MESSAGE
               DELETE appserver 4444444444444444444444444444444444444444444444444444444444444444
               DELETE load-balancer 7777777777777777777777777777777777777777777777777777777777777777
-MESSAGE
+            MESSAGE
             expect(ui.output).to eq(expected_message)
           end
 

data/spec/unit/policyfile_services/export_repo_spec.rb

@@ -145,7 +145,7 @@ describe ChefDK::PolicyfileServices::ExportRepo do
               }
             }
           }
-E
+        E
       end
 
       it "reads the lockfile data" do
@@ -295,7 +295,7 @@ E
                 exit!(1)
               end
 
-CONFIG
+            CONFIG
             config_path = File.join(export_dir, ".chef", "config.rb")
             expect(File).to exist(config_path)
             expect(IO.read(config_path)).to eq(expected_config_text)

data/spec/unit/policyfile_services/install_spec.rb

@@ -49,7 +49,7 @@ describe ChefDK::PolicyfileServices::Install do
       run_list 'local-cookbook'
 
       cookbook 'local-cookbook', path: '#{local_cookbooks_root}/local-cookbook'
-E
+    E
   end
 
   let(:overwrite) { false }

data/spec/unit/policyfile_services/push_archive_spec.rb

@@ -77,7 +77,7 @@ describe ChefDK::PolicyfileServices::PushArchive do
           }
         }
       }
-E
+    E
   end
 
   let(:archive_files) { [] }
@@ -289,7 +289,7 @@ E
               This archive was created with an older version of ChefDK. This version of
               ChefDK does not support archives in the older format. Re-create the archive
               with a newer version of ChefDK or downgrade ChefDK.
-MESSAGE
+            MESSAGE
             expect(exception_cause.message).to eq(msg)
           end
 

data/spec/unit/policyfile_services/push_spec.rb

@@ -177,7 +177,7 @@ describe ChefDK::PolicyfileServices::Push do
               }
             }
           }
-E
+        E
       end
 
       let(:http_client) { instance_double(Chef::ServerAPI) }

data/spec/unit/policyfile_services/show_policy_spec.rb

@@ -146,7 +146,7 @@ describe ChefDK::PolicyfileServices::ShowPolicy do
 
             Policy db is not assigned to any groups
 
-OUTPUT
+          OUTPUT
           expect(ui.output).to eq(expected_output)
         end
 
@@ -189,7 +189,7 @@ OUTPUT
               * 9999999999
               * aaaaaaaaaa
 
-OUTPUT
+            OUTPUT
             expect(ui.output).to eq(expected_output)
           end
         end
@@ -274,7 +274,7 @@ OUTPUT
             * staging:  9999999999
             * prod:     aaaaaaaaaa
 
-OUTPUT
+          OUTPUT
           expect(ui.output).to eq(expected_output)
         end
 
@@ -344,7 +344,7 @@ OUTPUT
             * staging:  9999999999
             * prod:     aaaaaaaaaa
 
-OUTPUT
+          OUTPUT
           expect(ui.output).to eq(expected_output)
         end
 
@@ -390,7 +390,7 @@ OUTPUT
 
               * bbbbbbbbbb
 
-OUTPUT
+            OUTPUT
             expect(ui.output).to eq(expected_output)
           end
 
@@ -470,7 +470,7 @@ OUTPUT
             * staging:  dddddddddd
             * prod:     *NOT APPLIED*
 
-OUTPUT
+          OUTPUT
           expect(ui.output).to eq(expected_output)
         end
 
@@ -515,7 +515,7 @@ OUTPUT
 
             No policies named 'appserver' are associated with a policy group
 
-OUTPUT
+          OUTPUT
 
           expect(ui.output).to eq(expected_output)
         end
@@ -565,7 +565,7 @@ OUTPUT
 
             No policies named 'appserver' are associated with a policy group
 
-OUTPUT
+          OUTPUT
 
           expect(ui.output).to eq(expected_output)
         end
@@ -595,7 +595,7 @@ OUTPUT
 
             No policies named 'appserver' are associated with a policy group
 
-OUTPUT
+          OUTPUT
 
           expect(ui.output).to eq(expected_output)
         end
@@ -636,7 +636,7 @@ OUTPUT
             * staging:  2222222222
             * prod:     2222222222
 
-OUTPUT
+          OUTPUT
           expect(ui.output).to eq(expected_output)
         end
 
@@ -678,7 +678,7 @@ OUTPUT
             * staging:  2222222222
             * prod:     1111111111
 
-OUTPUT
+          OUTPUT
           expect(ui.output).to eq(expected_output)
         end
 
@@ -764,7 +764,7 @@ OUTPUT
               * yum:             4.5.6 (123abc0000)
               * other_cookbook:  *NONE*
 
-OUTPUT
+            OUTPUT
             expect(ui.output).to eq(expected_output)
           end
         end
@@ -787,7 +787,7 @@ OUTPUT
 
               * 3333333333
 
-OUTPUT
+            OUTPUT
 
             expect(ui.output).to eq(expected_output)
           end

data/spec/unit/policyfile_services/undelete_spec.rb

@@ -138,7 +138,7 @@ describe ChefDK::PolicyfileServices::Undelete do
           #{timestamps[2]}: delete-policy-group example3
           #{timestamps[1]}: delete-policy-group example2
           #{timestamps[0]}: delete-policy-group example1
-OUTPUT
+        OUTPUT
         expect(ui.output).to eq(expected_output)
       end
 

data/spec/unit/policyfile_services/update_attributes_spec.rb

@@ -58,7 +58,7 @@ describe ChefDK::PolicyfileServices::UpdateAttributes do
       default["default_attr"] = "new_value_default"
 
       override["override_attr"] = "new_value_override"
-E
+    E
   end
 
   let(:ui) { TestHelpers::TestUI.new }

data/spec/unit/policyfile_services/update_spec.rb

@@ -57,7 +57,7 @@ describe ChefDK::PolicyfileServices::Install do
       cookbook 'top-level'
       cookbook 'top-level-bis'
       cookbook 'b', '>= 1.2.3'
-EOH
+    EOH
   end
 
   def cookbook_lock(name, version)