chef 16.2.44-universal-mingw32 → 16.4.35-universal-mingw32

data/spec/integration/knife/config_use_profile_spec.rb

@@ -22,80 +22,134 @@ describe "knife config use-profile", :workstation do
   include KnifeSupport
 
   include_context "default config options"
-  include_context "with a chef repo"
 
   let(:cmd_args) { [] }
 
-  let(:knife_use_profile) do
-    knife("config", "use-profile", *cmd_args, instance_filter: lambda { |instance|
-      # Fake the failsafe check because this command doesn't actually process knife.rb.
-      $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
-    })
-  end
+  when_the_repository("has a custom env") do
+    let(:knife_use_profile) do
+      knife("config", "use-profile", *cmd_args, instance_filter: lambda { |instance|
+        # Fake the failsafe check because this command doesn't actually process knife.rb.
+        $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
+        allow(File).to receive(:file?).and_call_original
+      })
+    end
+
+    subject { knife_use_profile.stdout }
+
+    around do |ex|
+      # Store and reset the value of some env vars.
+      old_chef_home = ENV["CHEF_HOME"]
+      old_knife_home = ENV["KNIFE_HOME"]
+      old_home = ENV["HOME"]
+      old_wd = Dir.pwd
+      ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
+      # Clear these out because they are cached permanently.
+      ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
+      Chef::Knife::ConfigUseProfile.reset_config_loader!
+      begin
+        ex.run
+      ensure
+        ENV["CHEF_HOME"] = old_chef_home
+        ENV["KNIFE_HOME"] = old_knife_home
+        ENV["HOME"] = old_home
+        Dir.chdir(old_wd)
+        ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
+        ChefConfig::PathHelper.per_tool_home_environment = nil
+      end
+    end
 
-  subject { knife_use_profile.stdout }
-
-  around do |ex|
-    # Store and reset the value of some env vars.
-    old_chef_home = ENV["CHEF_HOME"]
-    old_knife_home = ENV["KNIFE_HOME"]
-    old_home = ENV["HOME"]
-    old_wd = Dir.pwd
-    ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
-    # Clear these out because they are cached permanently.
-    ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
-    Chef::Knife::ConfigUseProfile.reset_config_loader!
-    begin
-      ex.run
-    ensure
-      ENV["CHEF_HOME"] = old_chef_home
-      ENV["KNIFE_HOME"] = old_knife_home
-      ENV["HOME"] = old_home
-      Dir.chdir(old_wd)
+    before do
+      # Always run from the temp folder. This can't be in the `around` block above
+      # because it has to run after the before set in the "with a chef repo" shared context.
+      directory("repo")
+      Dir.chdir(path_to("repo"))
       ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
-      ChefConfig::PathHelper.per_tool_home_environment = nil
+      ENV["HOME"] = path_to(".")
     end
-  end
 
-  before do
-    # Always run from the temp folder. This can't be in the `around` block above
-    # because it has to run after the before set in the "with a chef repo" shared context.
-    directory("repo")
-    Dir.chdir(path_to("repo"))
-    ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
-    ENV["HOME"] = path_to(".")
-  end
+    context "with no argument" do
+      subject { knife_use_profile.stderr }
+      it { is_expected.to eq "FATAL: You must specify a profile\n" }
+    end
 
-  context "with no argument" do
-    subject { knife_use_profile.stderr }
-    it { is_expected.to eq "FATAL: You must specify a profile\n" }
-  end
+    context "with an argument" do
+      let(:cmd_args) { %w{production} }
+      before { file(".chef/credentials", <<~EOH) }
+        [production]
+        client_name = "testuser"
+        client_key = "testkey.pem"
+        chef_server_url = "https://example.com/organizations/testorg"
+      EOH
+      it do
+        is_expected.to eq "Set default profile to production\n"
+        expect(File.read(path_to(".chef/context"))).to eq "production\n"
+      end
+    end
 
-  context "with an argument" do
-    let(:cmd_args) { %w{production} }
-    it do
-      is_expected.to eq "Set default profile to production\n"
-      expect(File.read(path_to(".chef/context"))).to eq "production\n"
+    context "with no credentials file" do
+      let(:cmd_args) { %w{production} }
+      subject { knife_use_profile.stderr }
+      it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
     end
-  end
 
-  context "with $CHEF_HOME" do
-    let(:cmd_args) { %w{staging} }
-    before { ENV["CHEF_HOME"] = path_to("chefhome"); file("chefhome/tmp", "") }
-    it do
-      is_expected.to eq "Set default profile to staging\n"
-      expect(File.read(path_to("chefhome/.chef/context"))).to eq "staging\n"
-      expect(File.exist?(path_to(".chef/context"))).to be_falsey
+    context "with an empty credentials file" do
+      let(:cmd_args) { %w{production} }
+      before { file(".chef/credentials", "") }
+      subject { knife_use_profile.stderr }
+      it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
     end
-  end
 
-  context "with $KNIFE_HOME" do
-    let(:cmd_args) { %w{development} }
-    before { ENV["KNIFE_HOME"] = path_to("knifehome"); file("knifehome/tmp", "") }
-    it do
-      is_expected.to eq "Set default profile to development\n"
-      expect(File.read(path_to("knifehome/.chef/context"))).to eq "development\n"
-      expect(File.exist?(path_to(".chef/context"))).to be_falsey
+    context "with an wrong argument" do
+      let(:cmd_args) { %w{staging} }
+      before { file(".chef/credentials", <<~EOH) }
+        [production]
+        client_name = "testuser"
+        client_key = "testkey.pem"
+        chef_server_url = "https://example.com/organizations/testorg"
+      EOH
+      subject { knife_use_profile }
+      it { expect { subject }.to raise_error ChefConfig::ConfigurationError, "Profile staging doesn't exist. Please add it to #{path_to(".chef/credentials")} and if it is profile with DNS name check that you are not missing single quotes around it as per docs https://docs.chef.io/workstation/knife_setup/#knife-profiles." }
+    end
+
+    context "with $CHEF_HOME" do
+      let(:cmd_args) { %w{staging} }
+      before do
+        ENV["CHEF_HOME"] = path_to("chefhome"); file("chefhome/tmp", "")
+        file("chefhome/.chef/credentials", <<~EOH
+        [staging]
+        client_name = "testuser"
+        client_key = "testkey.pem"
+        chef_server_url = "https://example.com/organizations/testorg"
+        EOH
+        )
+      end
+
+      it do
+        is_expected.to eq "Set default profile to staging\n"
+        expect(File.read(path_to("chefhome/.chef/context"))).to eq "staging\n"
+        expect(File.exist?(path_to(".chef/context"))).to be_falsey
+      end
+    end
+
+    context "with $KNIFE_HOME" do
+      let(:cmd_args) { %w{development} }
+
+      before do
+        ENV["KNIFE_HOME"] = path_to("knifehome"); file("knifehome/tmp", "")
+        file("knifehome/.chef/credentials", <<~EOH
+        [development]
+        client_name = "testuser"
+        client_key = "testkey.pem"
+        chef_server_url = "https://example.com/organizations/testorg"
+        EOH
+        )
+      end
+
+      it do
+        is_expected.to eq "Set default profile to development\n"
+        expect(File.read(path_to("knifehome/.chef/context"))).to eq "development\n"
+        expect(File.exist?(path_to(".chef/context"))).to be_falsey
+      end
     end
   end
 end

data/spec/integration/knife/cookbook_upload_spec.rb

@@ -25,7 +25,7 @@ describe "knife cookbook upload", :workstation do
 
   include_context "default config options"
 
-  let (:cb_dir) { "#{@repository_dir}/cookbooks" }
+  let(:cb_dir) { "#{@repository_dir}/cookbooks" }
 
   when_the_chef_server "is empty" do
     when_the_repository "has a cookbook" do
@@ -97,5 +97,32 @@ describe "knife cookbook upload", :workstation do
         expect { knife("cookbook upload x -o #{cb_dir}") }.to raise_error(Chef::Exceptions::MetadataNotValid)
       end
     end
+
+    when_the_repository "has cookbooks at multiple paths" do
+
+      let(:cb_dir_first) do
+        File.join(@repository_dir, "cookbooks")
+          .gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR)
+      end
+
+      let(:cb_dir_second) do
+        File.join(@repository_dir, "test_cookbooks")
+          .gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR)
+      end
+
+      before(:each) do
+        file "cookbooks/x/metadata.rb", cb_metadata("x", "1.0.0")
+        file "test_cookbooks/y/metadata.rb", cb_metadata("y", "1.0.0")
+      end
+
+      it "knife cookbook upload with -o or --cookbook-path" do
+        knife("cookbook upload x y -o #{cb_dir_first}#{File::PATH_SEPARATOR}#{cb_dir_second}").should_succeed stderr: <<~EOM
+          Uploading x            [1.0.0]
+          Uploading y            [1.0.0]
+          Uploaded 2 cookbooks.
+        EOM
+      end
+
+    end
   end
 end

data/spec/integration/knife/data_bag_from_file_spec.rb

@@ -24,7 +24,7 @@ describe "knife data bag from file", :workstation do
 
   include_context "default config options"
 
-  let (:db_dir) { "#{@repository_dir}/data_bags" }
+  let(:db_dir) { "#{@repository_dir}/data_bags" }
 
   when_the_chef_server "has an empty data bag" do
     before do

data/spec/integration/knife/diff_spec.rb

@@ -318,7 +318,9 @@ describe "knife diff", :workstation do
     end
   end # without versioned cookbooks
 
-  with_versioned_cookbooks do
+  context "with versioned cookbooks" do
+    before { Chef::Config[:versioned_cookbooks] = true }
+
     when_the_chef_server "has one of each thing" do
       before do
         client "x", "{}"

data/spec/integration/knife/download_spec.rb

@@ -594,7 +594,9 @@ describe "knife download", :workstation do
     end
   end # without versioned cookbooks
 
-  with_versioned_cookbooks do
+  context "with versioned cookbooks" do
+    before { Chef::Config[:versioned_cookbooks] = true }
+
     when_the_chef_server "has one of each thing" do
       before do
         client "x", {}

data/spec/integration/knife/environment_from_file_spec.rb

@@ -24,7 +24,7 @@ describe "knife environment from file", :workstation do
 
   # include_context "default config options"
 
-  let (:env_dir) { "#{@repository_dir}/environments" }
+  let(:env_dir) { "#{@repository_dir}/environments" }
 
   when_the_chef_server "is empty" do
     when_the_repository "has some environments" do

data/spec/integration/knife/node_from_file_spec.rb

@@ -24,7 +24,7 @@ describe "knife node from file", :workstation do
 
   # include_context "default config options"
 
-  let (:node_dir) { "#{@repository_dir}/nodes" }
+  let(:node_dir) { "#{@repository_dir}/nodes" }
 
   when_the_chef_server "is empty" do
     when_the_repository "has some nodes" do

data/spec/integration/knife/role_from_file_spec.rb

@@ -24,7 +24,7 @@ describe "knife role from file", :workstation do
 
   # include_context "default config options"
 
-  let (:role_dir) { "#{@repository_dir}/roles" }
+  let(:role_dir) { "#{@repository_dir}/roles" }
 
   when_the_chef_server "is empty" do
     when_the_repository "has some roles" do

data/spec/integration/knife/serve_spec.rb

@@ -26,11 +26,11 @@ describe "knife serve", :workstation do
   def with_knife_serve
     exception = nil
     t = Thread.new do
-      begin
-        knife("serve --chef-zero-port=8890")
-      rescue
-        exception = $!
-      end
+
+      knife("serve --chef-zero-port=8890")
+    rescue
+      exception = $!
+
     end
     begin
       Chef::Config.log_level = :debug

data/spec/integration/knife/upload_spec.rb

@@ -800,7 +800,9 @@ describe "knife upload", :workstation do
     end
   end # without versioned cookbooks
 
-  with_versioned_cookbooks do
+  context "with versioned cookbooks" do
+    before { Chef::Config[:versioned_cookbooks] = true }
+
     when_the_chef_server "has one of each thing" do
 
       before do

data/spec/integration/recipes/accumulator_spec.rb

@@ -6,7 +6,7 @@ describe "Accumulators" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
+  let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
 
   # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
   # following constraints are satisfied:

data/spec/integration/recipes/lwrp_inline_resources_spec.rb

@@ -6,7 +6,7 @@ describe "LWRPs with inline resources" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
+  let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
 
   # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
   # following constraints are satisfied:
@@ -59,7 +59,7 @@ describe "LWRPs with inline resources" do
       end
     end
 
-    after { File.delete(LwrpShadowedPropertyTest::PATH) if File.exists?(LwrpShadowedPropertyTest::PATH) }
+    after { File.delete(LwrpShadowedPropertyTest::PATH) if File.exist?(LwrpShadowedPropertyTest::PATH) }
 
     # https://github.com/chef/chef/issues/4334
     it "does not warn spuriously" do

data/spec/integration/recipes/lwrp_spec.rb

@@ -6,7 +6,7 @@ describe "LWRPs" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
+  let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
 
   # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
   # following constraints are satisfied:

data/spec/integration/recipes/notifies_spec.rb

@@ -22,7 +22,7 @@ describe "notifications" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
+  let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
   let(:chef_client) { "bundle exec chef-client --minimal-ohai" }
 
   when_the_repository "notifies a nameless resource" do

data/spec/integration/recipes/notifying_block_spec.rb

@@ -23,7 +23,7 @@ describe "notifying_block" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
+  let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
   let(:chef_client) { "bundle exec chef-client --minimal-ohai" }
 
   when_the_repository "notifying_block test one" do

data/spec/integration/recipes/recipe_dsl_spec.rb

@@ -1221,7 +1221,7 @@ describe "Recipe DSL methods" do
 
       it "utf-8 dsl names work" do
         recipe = converge do
-          Straße("blah") {}
+          Straße("blah") {} # rubocop: disable Naming/AsciiIdentifiers
         end
         expect(recipe.logged_warnings).to eq ""
         expect(BaseThingy.created_resource).to eq(UTF8Thingy)
@@ -1233,6 +1233,10 @@ describe "Recipe DSL methods" do
   before { Namer.current_index += 1 }
 
   context "with an LWRP that declares actions" do
+    let(:run_context) do
+      Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+    end
+
     let(:resource_class) do
       Class.new(Chef::Resource::LWRPBase) do
         provides :"recipe_dsl_spec#{Namer.current_index}"

data/spec/integration/recipes/resource_converge_if_changed_spec.rb

@@ -6,6 +6,7 @@ describe "Resource::ActionClass#converge_if_changed" do
   module Namer
     extend self
     attr_accessor :current_index
+
     def incrementing_value
       @incrementing_value += 1
       @incrementing_value
@@ -30,6 +31,7 @@ describe "Resource::ActionClass#converge_if_changed" do
         property :state2, default: "default_state2"
         property :sensitive1, default: "default_dontprintme", sensitive: true
         attr_accessor :converged
+
         def initialize(*args)
           super
           @converged = 0

data/spec/integration/recipes/resource_load_spec.rb

@@ -6,6 +6,7 @@ describe "Resource.load_current_value" do
   module Namer
     extend self
     attr_accessor :current_index
+
     def incrementing_value
       @incrementing_value += 1
       @incrementing_value
@@ -119,10 +120,10 @@ describe "Resource.load_current_value" do
       end
     end
 
-    let (:subresource_name) do
+    let(:subresource_name) do
       :"load_current_value_subresource_dsl#{Namer.current_index}"
     end
-    let (:subresource_class) do
+    let(:subresource_class) do
       r = Class.new(resource_class) do
         property :y, default: lazy { "default_y #{Namer.incrementing_value}" }
       end
@@ -194,6 +195,7 @@ describe "simple load_current_value tests" do
   let(:resource_class) do
     Class.new(Chef::Resource) do
       attr_writer :index # this is our hacky global state
+
       def index; @index ||= 1; end
 
       property :myindex, Integer