chef 15.17.4 → 16.0.257

data/spec/unit/knife/role_env_run_list_add_spec.rb

@@ -21,8 +21,8 @@ require "spec_helper"
 
 describe Chef::Knife::RoleEnvRunListAdd do
   before(:each) do
-    #    Chef::Config[:role_name]  = "websimian"
-    #    Chef::Config[:env_name]  = "QA"
+#    Chef::Config[:role_name]  = "websimian"
+#    Chef::Config[:env_name]  = "QA"
     @knife = Chef::Knife::RoleEnvRunListAdd.new
     @knife.config = {
       after: nil,
@@ -36,10 +36,10 @@ describe Chef::Knife::RoleEnvRunListAdd do
 
   describe "run" do
 
-    #    it "should display all the things" do
-    #      @knife.run
-    #      @role.to_json.should == 'show all the things'
-    #    end
+#    it "should display all the things" do
+#      @knife.run
+#      @role.to_json.should == 'show all the things'
+#    end
 
     it "should have an empty default run list" do
       @knife.run

data/spec/unit/knife/role_env_run_list_clear_spec.rb

@@ -44,10 +44,10 @@ describe Chef::Knife::RoleEnvRunListClear do
 
   describe "run" do
 
-    #    it "should display all the things" do
-    #      @knife.run
-    #      @role.to_json.should == 'show all the things'
-    #    end
+#    it "should display all the things" do
+#      @knife.run
+#      @role.to_json.should == 'show all the things'
+#    end
 
     it "should load the node" do
       expect(Chef::Role).to receive(:load).with("will").and_return(@role)

data/spec/unit/knife/role_env_run_list_remove_spec.rb

@@ -44,10 +44,10 @@ describe Chef::Knife::RoleEnvRunListRemove do
 
   describe "run" do
 
-    #    it "should display all the things" do
-    #      @knife.run
-    #      @role.to_json.should == 'show all the things'
-    #    end
+#    it "should display all the things" do
+#      @knife.run
+#      @role.to_json.should == 'show all the things'
+#    end
 
     it "should load the node" do
       expect(Chef::Role).to receive(:load).with("will").and_return(@role)

data/spec/unit/knife/role_env_run_list_replace_spec.rb

@@ -44,10 +44,10 @@ describe Chef::Knife::RoleEnvRunListReplace do
 
   describe "run" do
 
-    #    it "should display all the things" do
-    #      @knife.run
-    #      @role.to_json.should == 'show all the things'
-    #    end
+#    it "should display all the things" do
+#      @knife.run
+#      @role.to_json.should == 'show all the things'
+#    end
 
     it "should load the node" do
       expect(Chef::Role).to receive(:load).with("will").and_return(@role)

data/spec/unit/knife/role_env_run_list_set_spec.rb

@@ -44,10 +44,10 @@ describe Chef::Knife::RoleEnvRunListSet do
 
   describe "run" do
 
-    #    it "should display all the things" do
-    #      @knife.run
-    #      @role.to_json.should == 'show all the things'
-    #    end
+#    it "should display all the things" do
+#      @knife.run
+#      @role.to_json.should == 'show all the things'
+#    end
 
     it "should load the node" do
       expect(Chef::Role).to receive(:load).with("will").and_return(@role)

data/spec/unit/knife/role_run_list_add_spec.rb

@@ -21,8 +21,8 @@ require "spec_helper"
 
 describe Chef::Knife::RoleRunListAdd do
   before(:each) do
-    #    Chef::Config[:role_name]  = "websimian"
-    #    Chef::Config[:env_name]  = "QA"
+#    Chef::Config[:role_name]  = "websimian"
+#    Chef::Config[:env_name]  = "QA"
     @knife = Chef::Knife::RoleRunListAdd.new
     @knife.config = {
       after: nil,
@@ -36,10 +36,10 @@ describe Chef::Knife::RoleRunListAdd do
 
   describe "run" do
 
-    #    it "should display all the things" do
-    #      @knife.run
-    #      @role.to_json.should == 'show all the things'
-    #    end
+#    it "should display all the things" do
+#      @knife.run
+#      @role.to_json.should == 'show all the things'
+#    end
 
     it "should have a run list with the monkey role" do
       @knife.run

data/spec/unit/knife/role_run_list_clear_spec.rb

@@ -43,10 +43,10 @@ describe Chef::Knife::RoleRunListClear do
 
   describe "run" do
 
-    #    it "should display all the things" do
-    #      @knife.run
-    #      @role.to_json.should == 'show all the things'
-    #    end
+#    it "should display all the things" do
+#      @knife.run
+#      @role.to_json.should == 'show all the things'
+#    end
 
     it "should load the node" do
       expect(Chef::Role).to receive(:load).with("will").and_return(@role)

data/spec/unit/knife/role_run_list_remove_spec.rb

@@ -43,10 +43,10 @@ describe Chef::Knife::RoleRunListRemove do
 
   describe "run" do
 
-    #    it "should display all the things" do
-    #      @knife.run
-    #      @role.to_json.should == 'show all the things'
-    #    end
+#    it "should display all the things" do
+#      @knife.run
+#      @role.to_json.should == 'show all the things'
+#    end
 
     it "should load the node" do
       expect(Chef::Role).to receive(:load).with("will").and_return(@role)

data/spec/unit/knife/role_run_list_replace_spec.rb

@@ -43,10 +43,10 @@ describe Chef::Knife::RoleRunListReplace do
 
   describe "run" do
 
-    #    it "should display all the things" do
-    #      @knife.run
-    #      @role.to_json.should == 'show all the things'
-    #    end
+#    it "should display all the things" do
+#      @knife.run
+#      @role.to_json.should == 'show all the things'
+#    end
 
     it "should load the node" do
       expect(Chef::Role).to receive(:load).with("will").and_return(@role)

data/spec/unit/knife/role_run_list_set_spec.rb

@@ -43,10 +43,10 @@ describe Chef::Knife::RoleRunListSet do
 
   describe "run" do
 
-    #    it "should display all the things" do
-    #      @knife.run
-    #      @role.to_json.should == 'show all the things'
-    #    end
+#    it "should display all the things" do
+#      @knife.run
+#      @role.to_json.should == 'show all the things'
+#    end
 
     it "should load the node" do
       expect(Chef::Role).to receive(:load).with("will").and_return(@role)

data/spec/unit/knife/ssh_spec.rb

@@ -253,15 +253,19 @@ describe Chef::Knife::Ssh do
       expect(@knife.session.servers[0].options[:timeout]).to eq(120)
     end
 
-    it "uses the timeout from Chef Config" do
-      Chef::Config[:knife][:ssh_timeout] = 5
-      @knife.config[:ssh_timeout] = nil
+    it "uses the timeout from the CLI" do
+      @knife.config = {}
+      Chef::Config[:knife][:ssh_timeout] = nil
+      @knife.config[:ssh_timeout] = 5
       @knife.session_from_list([["the.b.org", nil, nil]])
+      @knife.merge_configs
       expect(@knife.session.servers[0].options[:timeout]).to eq(5)
     end
 
     it "uses the timeout from knife config" do
-      @knife.config[:ssh_timeout] = 6
+      @knife.config = {}
+      Chef::Config[:knife][:ssh_timeout] = 6
+      @knife.merge_configs
       @knife.session_from_list([["the.b.org", nil, nil]])
       expect(@knife.session.servers[0].options[:timeout]).to eq(6)
     end
@@ -279,10 +283,10 @@ describe Chef::Knife::Ssh do
   end
 
   describe "#ssh_command" do
-    let(:execution_channel) { double(:execution_channel, on_data: nil, on_extended_data: nil) }
+    let(:execution_channel) { double(:execution_channel, on_data: nil) }
     let(:session_channel) { double(:session_channel, request_pty: nil) }
 
-    let(:execution_channel2) { double(:execution_channel, on_data: nil, on_extended_data: nil) }
+    let(:execution_channel2) { double(:execution_channel, on_data: nil) }
     let(:session_channel2) { double(:session_channel, request_pty: nil) }
 
     let(:session) { double(:session, loop: nil) }
@@ -396,111 +400,4 @@ describe Chef::Knife::Ssh do
       end
     end
   end
-
-  describe "#configure_password" do
-    before do
-      @knife.config.delete(:ssh_password_ng)
-      @knife.config.delete(:ssh_password)
-    end
-
-    context "when setting ssh_password_ng from knife ssh" do
-      # in this case ssh_password_ng exists, but ssh_password does not
-      it "should prompt for a password when ssh_passsword_ng is nil" do
-        @knife.config[:ssh_password_ng] = nil
-        expect(@knife).to receive(:get_password).and_return("mysekretpassw0rd")
-        @knife.configure_password
-        expect(@knife.config[:ssh_password]).to eq("mysekretpassw0rd")
-      end
-
-      it "should set ssh_password to false if ssh_password_ng is false" do
-        @knife.config[:ssh_password_ng] = false
-        expect(@knife).not_to receive(:get_password)
-        @knife.configure_password
-        expect(@knife.config[:ssh_password]).to be_falsey
-      end
-
-      it "should set ssh_password to ssh_password_ng if we set a password" do
-        @knife.config[:ssh_password_ng] = "mysekretpassw0rd"
-        expect(@knife).not_to receive(:get_password)
-        @knife.configure_password
-        expect(@knife.config[:ssh_password]).to eq("mysekretpassw0rd")
-      end
-    end
-
-    context "when setting ssh_password from knife bootstrap / knife * server create" do
-      # in this case ssh_password exists, but ssh_password_ng does not
-      it "should set ssh_password to nil when ssh_password is nil" do
-        @knife.config[:ssh_password] = nil
-        expect(@knife).not_to receive(:get_password)
-        @knife.configure_password
-        expect(@knife.config[:ssh_password]).to be_nil
-      end
-
-      it "should set ssh_password to false when ssh_password is false" do
-        @knife.config[:ssh_password] = false
-        expect(@knife).not_to receive(:get_password)
-        @knife.configure_password
-        expect(@knife.config[:ssh_password]).to be_falsey
-      end
-
-      it "should set ssh_password to ssh_password if we set a password" do
-        @knife.config[:ssh_password] = "mysekretpassw0rd"
-        expect(@knife).not_to receive(:get_password)
-        @knife.configure_password
-        expect(@knife.config[:ssh_password]).to eq("mysekretpassw0rd")
-      end
-    end
-    context "when setting ssh_password in the config variable" do
-      before(:each) do
-        Chef::Config[:knife][:ssh_password] = "my_knife_passw0rd"
-      end
-      context "when setting ssh_password_ng from knife ssh" do
-        # in this case ssh_password_ng exists, but ssh_password does not
-        it "should prompt for a password when ssh_passsword_ng is nil" do
-          @knife.config[:ssh_password_ng] = nil
-          expect(@knife).to receive(:get_password).and_return("mysekretpassw0rd")
-          @knife.configure_password
-          expect(@knife.config[:ssh_password]).to eq("mysekretpassw0rd")
-        end
-
-        it "should set ssh_password to the configured knife.rb value if ssh_password_ng is false" do
-          @knife.config[:ssh_password_ng] = false
-          expect(@knife).not_to receive(:get_password)
-          @knife.configure_password
-          expect(@knife.config[:ssh_password]).to eq("my_knife_passw0rd")
-        end
-
-        it "should set ssh_password to ssh_password_ng if we set a password" do
-          @knife.config[:ssh_password_ng] = "mysekretpassw0rd"
-          expect(@knife).not_to receive(:get_password)
-          @knife.configure_password
-          expect(@knife.config[:ssh_password]).to eq("mysekretpassw0rd")
-        end
-      end
-
-      context "when setting ssh_password from knife bootstrap / knife * server create" do
-        # in this case ssh_password exists, but ssh_password_ng does not
-        it "should set ssh_password to the configured knife.rb value when ssh_password is nil" do
-          @knife.config[:ssh_password] = nil
-          expect(@knife).not_to receive(:get_password)
-          @knife.configure_password
-          expect(@knife.config[:ssh_password]).to eq("my_knife_passw0rd")
-        end
-
-        it "should set ssh_password to the configured knife.rb value when ssh_password is false" do
-          @knife.config[:ssh_password] = false
-          expect(@knife).not_to receive(:get_password)
-          @knife.configure_password
-          expect(@knife.config[:ssh_password]).to eq("my_knife_passw0rd")
-        end
-
-        it "should set ssh_password to ssh_password if we set a password" do
-          @knife.config[:ssh_password] = "mysekretpassw0rd"
-          expect(@knife).not_to receive(:get_password)
-          @knife.configure_password
-          expect(@knife.config[:ssh_password]).to eq("mysekretpassw0rd")
-        end
-      end
-    end
-  end
 end

data/spec/unit/knife/status_spec.rb

@@ -39,7 +39,7 @@ describe Chef::Knife::Status do
     let(:opts) do
       { filter_result:
                  { name: ["name"], ipaddress: ["ipaddress"], ohai_time: ["ohai_time"],
-                   ec2: ["ec2"], run_list: ["run_list"], platform: ["platform"],
+                   cloud: ["cloud"], run_list: ["run_list"], platform: ["platform"],
                    platform_version: ["platform_version"], chef_environment: ["chef_environment"] } }
     end
 

data/spec/unit/knife/supermarket_share_spec.rb

@@ -108,7 +108,7 @@ describe Chef::Knife::SupermarketShare do
       expect { @knife.run }.to raise_error(SystemExit)
     end
 
-    if File.exist?("/usr/bin/gnutar") || File.exist?("/bin/gnutar")
+    if File.exists?("/usr/bin/gnutar") || File.exists?("/bin/gnutar")
       it "should use gnutar to make a tarball of the cookbook" do
         expect(@knife).to receive(:shell_out!) do |args|
           expect(args.to_s).to match(/gnutar -czf/)
@@ -140,9 +140,7 @@ describe Chef::Knife::SupermarketShare do
       before do
         allow(Chef::CookbookSiteStreamingUploader).to receive(:create_build_dir).and_return("/var/tmp/dummy")
         @knife.config = { dry_run: true }
-        @so = instance_double("Mixlib::ShellOut")
-        allow(@knife).to receive(:shell_out!).and_return(@so)
-        allow(@so).to receive(:stdout).and_return("file")
+        allow(@knife).to receive_message_chain(:shell_out!, :stdout).and_return("file")
       end
 
       it "should list files in the tarball" do
@@ -153,7 +151,7 @@ describe Chef::Knife::SupermarketShare do
       end
 
       it "does not upload the cookbook" do
-        allow(@knife).to receive(:shell_out!).and_return(@so)
+        allow(@knife).to receive(:shell_out!).and_return(true)
         expect(@knife).not_to receive(:do_upload)
         @knife.run
       end

data/spec/unit/knife_spec.rb

@@ -353,6 +353,24 @@ describe Chef::Knife do
         expect(knife_command.config_source(:listen)).to eq(:cli)
       end
 
+      it "merges Chef::Config[:knife] values into the config hash even if they have no cli keys" do
+        Chef::Config[:knife][:opt_with_no_cli_key] = "from-knife-config"
+        knife_command = KnifeSpecs::TestYourself.new([]) # empty argv
+        knife_command.configure_chef
+        expect(knife_command.config[:opt_with_no_cli_key]).to eq("from-knife-config")
+        expect(knife_command.config_source(:opt_with_no_cli_key)).to eq(:config)
+      end
+
+      it "merges Chef::Config[:knife] default values into the config hash even if they have no cli keys" do
+        Chef::Config.config_context :knife do
+          default :opt_with_no_cli_key, "from-knife-default"
+        end
+        knife_command = KnifeSpecs::TestYourself.new([]) # empty argv
+        knife_command.configure_chef
+        expect(knife_command.config[:opt_with_no_cli_key]).to eq("from-knife-default")
+        expect(knife_command.config_source(:opt_with_no_cli_key)).to eq(:config_default)
+      end
+
       context "verbosity is one" do
         let(:fake_config) { "/does/not/exist/knife.rb" }
 

data/spec/unit/lwrp_spec.rb

@@ -140,7 +140,7 @@ describe "LWRP" do
     before do
       @tmpdir = Dir.mktmpdir("lwrp_test")
       @lwrp_path = File.join(@tmpdir, "foo.rb")
-      content = IO.read(File.expand_path("../data/lwrp/resources/foo.rb", __dir__))
+      content = IO.read(File.expand_path("../../data/lwrp/resources/foo.rb", __FILE__))
       IO.write(@lwrp_path, content)
       Chef::Resource::LWRPBase.build_from_file("lwrp", @lwrp_path, nil)
       @original_resource = Chef::ResourceResolver.resolve(:lwrp_foo)
@@ -152,7 +152,7 @@ describe "LWRP" do
 
     context "And the LWRP is asked to load again, this time with different code" do
       before do
-        content = IO.read(File.expand_path("../data/lwrp_override/resources/foo.rb", __dir__))
+        content = IO.read(File.expand_path("../../data/lwrp_override/resources/foo.rb", __FILE__))
         IO.write(@lwrp_path, content)
         Chef::Resource::LWRPBase.build_from_file("lwrp", @lwrp_path, nil)
       end
@@ -390,11 +390,11 @@ describe "LWRP" do
     end
 
     before(:each) do
-      Dir[File.expand_path(File.expand_path("../data/lwrp/resources/*", __dir__))].each do |file|
+      Dir[File.expand_path(File.expand_path("../../data/lwrp/resources/*", __FILE__))].each do |file|
         Chef::Resource::LWRPBase.build_from_file(lwrp_cookbook_name, file, run_context)
       end
 
-      Dir[File.expand_path(File.expand_path("../data/lwrp/providers/*", __dir__))].each do |file|
+      Dir[File.expand_path(File.expand_path("../../data/lwrp/providers/*", __FILE__))].each do |file|
         Chef::Provider::LWRPBase.build_from_file(lwrp_cookbook_name, file, run_context)
       end
     end

data/spec/unit/mixin/powershell_exec_spec.rb

@@ -40,4 +40,14 @@ describe Chef::Mixin::PowershellExec, :windows_only do
       expect(execution.errors[0]).to include("Runtime exception: this-should-error")
     end
   end
+
+  describe "#powershell_exec!" do
+    it "runs a basic command and returns a Chef::PowerShell object" do
+      expect(object.powershell_exec!("$PSVersionTable")).to be_kind_of(Chef::PowerShell)
+    end
+
+    it "raises an error if the command fails" do
+      expect(object.powershell_exec!("$PSVersionTable")).to be_kind_of(Chef::PowerShell::CommandFailed)
+    end
+  end
 end

data/spec/unit/mixin/securable_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 #
 # Author:: Mark Mzyk (<mmzyk@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.