chef-dk 3.6.57 → 3.7.23

data/spec/unit/command/generator_commands/generator_generator_spec.rb

@@ -186,7 +186,7 @@ describe ChefDK::Command::GeneratorCommands::GeneratorGenerator do
           long_description 'Custom code generator cookbook for use with ChefDK'
           version          '0.1.0'
 
-METADATA
+        METADATA
         expect(metadata_content).to eq(expected_metadata)
       end
     end

data/spec/unit/command/generator_commands/policyfile_spec.rb

@@ -134,7 +134,7 @@ describe ChefDK::Command::GeneratorCommands::Policyfile do
 
         # Specify a custom source for a single cookbook:
         # cookbook 'example_cookbook', path: '../cookbooks/example_cookbook'
-POLICYFILE_RB
+      POLICYFILE_RB
     end
 
     before do

data/spec/unit/command/generator_commands/repo_spec.rb

@@ -300,7 +300,7 @@ describe ChefDK::Command::GeneratorCommands::Repo do
                 Create policyfiles here. When using a chef-repo, give your policyfiles
                 the same filename as the name set in the policyfile itself, and use the
                 `.rb` file extension.
-README
+              README
             end
 
             it "has the right contents" do
@@ -334,7 +334,7 @@ README
                 For more information on roles, see the Chef wiki page:
 
                 https://docs.chef.io/roles.html
-README
+              README
             end
 
             it "has the right contents" do
@@ -358,7 +358,7 @@ README
                 For more information on environments, see the Chef wiki page:
 
                 https://docs.chef.io/environments.html
-README
+              README
             end
 
             it "has the right contents" do

data/spec/unit/command/install_spec.rb

@@ -148,7 +148,7 @@ describe ChefDK::Command::Install do
           Error: install failed
           Reason: (StandardError) some operation failed
 
-E
+        E
 
         command.run
         expect(ui.output).to eq(expected_error_text)
@@ -164,7 +164,7 @@ E
             Reason: (StandardError) some operation failed
 
 
-E
+          E
 
           expected_error_text << backtrace.join("\n") << "\n"
 

data/spec/unit/command/provision_spec.rb

@@ -288,7 +288,7 @@ describe ChefDK::Command::Provision do
             # SSL Settings:
             ssl_verify_mode :verify_peer
 
-CONFIG
+          CONFIG
           expect(context.chef_config).to eq(expected_config)
         end
 
@@ -369,7 +369,7 @@ CONFIG
               policy_group "some-policy-group"
               policy_name "myapp"
 
-CONFIG
+            CONFIG
             expect(context.chef_config).to eq(expected_config)
           end
 
@@ -416,7 +416,7 @@ CONFIG
             policy_group "some-policy-group"
             policy_name "myapp"
 
-CONFIG
+          CONFIG
           expect(context.chef_config).to eq(expected_config)
         end
 
@@ -497,7 +497,7 @@ CONFIG
           Error: push failed
           Reason: (StandardError) some operation failed
 
-E
+        E
         expect(command.run(params)).to eq(1)
         expect(ui.output).to include(expected_output)
       end
@@ -549,7 +549,7 @@ E
 
         it "exits 0" do
           return_value = command.run(params)
-          expect(ui.output).to eq("")
+          expect(ui.output).to eq("DEPRECATED: This command is deprecated and will be removed in ChefDK 4.\n")
           expect(return_value).to eq(0)
         end
 
@@ -561,7 +561,7 @@ E
 
         it "exits 0" do
           return_value = command.run(params)
-          expect(ui.output).to eq("")
+          expect(ui.output).to eq("DEPRECATED: This command is deprecated and will be removed in ChefDK 4.\n")
           expect(return_value).to eq(0)
         end
       end
@@ -577,7 +577,7 @@ E
 
         it "exits 0" do
           return_value = command.run(params)
-          expect(ui.output).to eq("")
+          expect(ui.output).to eq("DEPRECATED: This command is deprecated and will be removed in ChefDK 4.\n")
           expect(return_value).to eq(0)
         end
 

data/spec/unit/command/push_spec.rb

@@ -162,7 +162,7 @@ describe ChefDK::Command::Push do
             Error: push failed
             Reason: (StandardError) some operation failed
 
-E
+          E
 
           expect(ui.output).to eq(expected_output)
         end
@@ -182,7 +182,7 @@ E
               Reason: (StandardError) some operation failed
 
 
-E
+            E
             expected_output << backtrace.join("\n") << "\n"
 
             expect(ui.output).to eq(expected_output)

data/spec/unit/command/shell_init_spec.rb

@@ -106,7 +106,7 @@ describe ChefDK::Command::ShellInit do
         export GEM_ROOT="#{expected_gem_root}"
         export GEM_HOME="#{expected_gem_home}"
         export GEM_PATH="#{expected_gem_path}"
-EOH
+      EOH
     end
     include_context "shell init script", shell
   end
@@ -122,7 +122,7 @@ EOH
         $env:GEM_ROOT="#{expected_gem_root}"
         $env:GEM_HOME="#{expected_gem_home}"
         $env:GEM_PATH="#{expected_gem_path}"
-EOH
+      EOH
     end
     include_context "shell init script", shell
   end
@@ -157,7 +157,7 @@ EOH
               COMPREPLY=($(compgen -W "$COMMANDS" -- ${COMP_WORDS[COMP_CWORD]} ))
           }
           complete -F _chef_comp chef
-END_COMPLETION
+        END_COMPLETION
       end
 
       before do
@@ -253,7 +253,7 @@ END_COMPLETION
         set -gx GEM_ROOT "#{expected_gem_root}";
         set -gx GEM_HOME "#{expected_gem_home}";
         set -gx GEM_PATH "#{expected_gem_path}";
-EOH
+      EOH
     end
 
     include_context "shell init script", "fish"
@@ -287,7 +287,7 @@ EOH
           complete -c chef -f -n '__fish_chef_no_command' -a env -d "Prints environment variables used by ChefDK"
           complete -c chef -f -n '__fish_chef_no_command' -a gem -d "Runs the `gem` command in context of the embedded ruby"
           complete -c chef -f -n '__fish_chef_no_command' -a generate -d "Generate a new app, cookbook, or component"
-END_COMPLETION
+        END_COMPLETION
       end
 
       before do

data/spec/unit/command/show_policy_spec.rb

@@ -192,7 +192,7 @@ describe ChefDK::Command::ShowPolicy do
           Error: Failed to list policies
           Reason: (StandardError) some operation failed
 
-E
+        E
 
         expect(ui.output).to eq(expected_output)
       end
@@ -208,7 +208,7 @@ E
             Reason: (StandardError) some operation failed
 
 
-E
+          E
           expected_output << backtrace.join("\n") << "\n"
 
           expect(ui.output).to eq(expected_output)

data/spec/unit/command/undelete_spec.rb

@@ -200,7 +200,7 @@ describe ChefDK::Command::Undelete do
           Error: Failed to undelete.
           Reason: (StandardError) some operation failed
 
-E
+        E
 
         expect(ui.output).to eq(expected_output)
       end
@@ -216,7 +216,7 @@ E
             Reason: (StandardError) some operation failed
 
 
-E
+          E
           expected_output << backtrace.join("\n") << "\n"
 
           expect(ui.output).to eq(expected_output)

data/spec/unit/command/update_spec.rb

@@ -174,7 +174,7 @@ describe ChefDK::Command::Update do
           Error: install failed
           Reason: (StandardError) some operation failed
 
-E
+        E
 
         command.run
         expect(ui.output).to eq(expected_error_text)
@@ -190,7 +190,7 @@ E
             Reason: (StandardError) some operation failed
 
 
-E
+          E
 
           expected_error_text << backtrace.join("\n") << "\n"
 
@@ -252,7 +252,7 @@ E
           Error: Failed to update Policyfile lock
           Reason: (StandardError) some operation failed
 
-E
+        E
 
         command.run
         expect(ui.output).to eq(expected_error_text)
@@ -268,7 +268,7 @@ E
             Reason: (StandardError) some operation failed
 
 
-E
+          E
 
           expected_error_text << backtrace.join("\n") << "\n"
 

data/spec/unit/policyfile/chef_server_lock_fetcher_spec.rb

@@ -59,7 +59,7 @@ describe ChefDK::Policyfile::ChefServerLockFetcher do
           }
         }
       }
-E
+    E
   end
 
   def minimal_lockfile

data/spec/unit/policyfile/comparison_base_spec.rb

@@ -57,7 +57,7 @@ describe "Policyfile Comparison Bases" do
           }
         }
       }
-E
+    E
   end
 
   let(:minimal_lockfile) { FFI_Yajl::Parser.parse(minimal_lockfile_json) }

data/spec/unit/policyfile/differ_spec.rb

@@ -285,7 +285,7 @@ describe ChefDK::Policyfile::Differ do
     it "reports that there are no updates" do
       expected_message = <<~E
         No changes for policy lock 'jenkins' between 'git: HEAD' and 'local disk'
-E
+      E
       differ.run_report
       expect(output).to include(expected_message)
     end
@@ -334,7 +334,7 @@ E
         +recipe[two::two]
         +recipe[three::three]
 
-E
+      E
       differ.run_report
       expect(output).to eq(expected_message)
     end
@@ -391,7 +391,7 @@ E
           +recipe[q::new]
           +recipe[r::new]
 
-E
+        E
         differ.run_report
         expect(output).to eq(expected_message)
       end
@@ -451,7 +451,7 @@ E
         -  }
         -}
 
-E
+      E
       differ.run_report
       expect(output).to eq(expected_message)
     end
@@ -524,7 +524,7 @@ E
         +  }
         +}
 
-E
+      E
       differ.run_report
       expect(output).to eq(expected_message)
     end
@@ -584,7 +584,7 @@ E
            "cache_key": null,
            "scm_info": {
 
-E
+      E
       differ.run_report
       expect(output).to eq(expected_message)
     end
@@ -630,7 +630,7 @@ E
         +  "new_attr": "hello"
          }
 
-E
+      E
       differ.run_report
       expect(output).to eq(expected_output)
     end
@@ -676,7 +676,7 @@ E
         +  "new_attr": "ALL THE DIFF"
          }
 
-E
+      E
 
       differ.run_report
       expect(output).to eq(expected_output)

data/spec/unit/policyfile/git_lock_fetcher_spec.rb

@@ -78,7 +78,7 @@ describe ChefDK::Policyfile::GitLockFetcher do
   let(:minimal_lockfile_modified) do
     minimal_lockfile.tap do |lockfile|
       lockfile["cookbook_locks"][cookbook_name]["source_options"] = {
-        "git"      => repo,
+        "git" => repo,
         "revision" => git_revision,
       }
     end
@@ -87,11 +87,11 @@ describe ChefDK::Policyfile::GitLockFetcher do
   let(:minimal_lockfile_with_scm_info) do
     minimal_lockfile_modified.tap do |lockfile|
       lockfile["cookbook_locks"][cookbook_name]["scm_info"] = {
-        "scm"                          => "git",
-        "remote"                       => repo,
-        "revision"                     => git_revision,
-        "working_tree_clean"           => true,
-        "published"                    => true,
+        "scm" => "git",
+        "remote" => repo,
+        "revision" => git_revision,
+        "working_tree_clean" => true,
+        "published" => true,
         "synchronized_remote_branches" => [
           "origin/master",
         ],
@@ -101,7 +101,7 @@ describe ChefDK::Policyfile::GitLockFetcher do
 
   let(:source_options) do
     {
-      git:      repo,
+      git: repo,
       revision: git_revision,
     }
   end
@@ -142,7 +142,7 @@ describe ChefDK::Policyfile::GitLockFetcher do
           relative_path_fetcher.lock_data["cookbook_locks"][cookbook_name]["source_options"]
         ).to match(
                {
-                 "git"      => repo,
+                 "git" => repo,
                  "revision" => git_revision,
                }
              )

data/spec/unit/policyfile/local_lock_fetcher_spec.rb

@@ -57,7 +57,7 @@ describe ChefDK::Policyfile::LocalLockFetcher do
           }
         }
       }
-E
+    E
   end
 
   def minimal_lockfile

data/spec/unit/policyfile/reports/upload_spec.rb

@@ -85,7 +85,7 @@ describe ChefDK::Policyfile::Reports::Upload do
         Using    a-longer-named-cookbook 1.0.0      (e4ac353b)
         Uploaded foo                     1.2.42     (cb61daeb)
         Uploaded barbazqux               12.34.5678 (1241ea6f)
-E
+      E
       expect(ui.output).to eq(expected_output)
     end
 

data/spec/unit/policyfile_demands_spec.rb

@@ -307,7 +307,7 @@ describe ChefDK::PolicyfileCompiler, "when expressing the Policyfile graph deman
 
             You may have specified an incorrect recipe in your run list,
             or this recipe may not be available in that version of the cookbook
-MESSAGE
+          MESSAGE
 
           expect { policyfile.install }.to raise_error do |e|
             expect(e).to be_a(ChefDK::CookbookDoesNotContainRequiredRecipe)
@@ -338,7 +338,7 @@ MESSAGE
 
             You may have specified an incorrect recipe in your run list,
             or this recipe may not be available in that version of the cookbook
-MESSAGE
+          MESSAGE
 
           expect { policyfile.install }.to raise_error do |e|
             expect(e).to be_a(ChefDK::CookbookDoesNotContainRequiredRecipe)
@@ -371,7 +371,7 @@ MESSAGE
 
             You may have specified an incorrect recipe in your run list,
             or this recipe may not be available in that version of the cookbook
-MESSAGE
+          MESSAGE
 
           expect { policyfile.install }.to raise_error do |e|
             expect(e).to be_a(ChefDK::CookbookDoesNotContainRequiredRecipe)
@@ -1063,7 +1063,7 @@ MESSAGE
               default_source :supermarket, "https://supermarket.chef.io" do |s|
                 s.preferred_for "remote-cb", "remote-cb-two"
               end
-ERROR
+            ERROR
 
             expect { policyfile.remote_artifacts_graph }.to raise_error do |error|
               expect(error).to be_a(ChefDK::CookbookSourceConflict)
@@ -1165,7 +1165,7 @@ ERROR
             default_source :supermarket, "https://supermarket.chef.io" do |s|
               s.preferred_for "remote-cb-two"
             end
-ERROR
+          ERROR
 
           expect { policyfile.remote_artifacts_graph }.to raise_error do |error|
             expect(error).to be_a(ChefDK::CookbookSourceConflict)