chef 11.4.4 → 11.6.0.hotfix.1

data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb

@@ -83,14 +83,15 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
         @description = Chef::Formatters::ErrorDescription.new("Error Converging Resource:")
         @template_class = Class.new { include Chef::Mixin::Template }
         @template = @template_class.new
-        @context = {:chef => "cool"}
+        @context = Chef::Mixin::Template::TemplateContext.new({})
+        @context[:chef] = "cool"
 
         @resource = template("/tmp/foo.txt") do
           mode "0644"
         end
 
         @error = begin
-                   @template.render_template("foo\nbar\nbaz\n<%= this_is_not_defined %>\nquin\nqunx\ndunno", @context) {|r| r}
+                   @context.render_template_from_string("foo\nbar\nbaz\n<%= this_is_not_defined %>\nquin\nqunx\ndunno")
                  rescue  Chef::Mixin::Template::TemplateError => e
                    e
                  end

data/spec/unit/knife/bootstrap_spec.rb

@@ -128,13 +128,65 @@ describe Chef::Knife::Bootstrap do
     @knife.render_template(template_string).should match /\{\"foo\":\"bar\"\}/
   end
 
-
   it "should take the node name from ARGV" do
     @knife.name_args = ['barf']
     @knife.name_args.first.should == "barf"
   end
 
-  describe "when configuring the underlying knife ssh command"
+  describe "specifying the encrypted data bag secret key" do
+    subject(:knife) { described_class.new }
+    let(:secret) { "supersekret" }
+    let(:secret_file) { File.join(CHEF_SPEC_DATA, 'bootstrap', 'encrypted_data_bag_secret') }
+    let(:options) { [] }
+    let(:template_file) { File.expand_path(File.join(CHEF_SPEC_DATA, "bootstrap", "secret.erb")) }
+    let(:rendered_template) do
+      knife.instance_variable_set("@template_file", template_file)
+      knife.parse_options(options)
+      template_string = knife.read_template
+      knife.render_template(template_string)
+    end
+
+    context "via --secret" do
+      let(:options){ ["--secret", secret] }
+
+      it "creates a secret file" do
+        rendered_template.should match(%r{#{secret}})
+      end
+
+      it "renders the client.rb with an encrypted_data_bag_secret entry" do
+        rendered_template.should match(%r{encrypted_data_bag_secret\s*"/etc/chef/encrypted_data_bag_secret"})
+      end
+    end
+
+    context "via --secret-file" do
+      let(:options) { ["--secret-file", secret_file] }
+      let(:secret) { IO.read(secret_file) }
+
+      it "creates a secret file" do
+        rendered_template.should match(%r{#{secret}})
+      end
+
+      it "renders the client.rb with an encrypted_data_bag_secret entry" do
+        rendered_template.should match(%r{encrypted_data_bag_secret\s*"/etc/chef/encrypted_data_bag_secret"})
+      end
+    end
+
+    context "via Chef::Config[:encrypted_data_bag_secret]" do
+      before(:each) { Chef::Config[:encrypted_data_bag_secret] = secret_file }
+      let(:secret) { IO.read(secret_file) }
+
+      it "creates a secret file" do
+        rendered_template.should match(%r{#{secret}})
+      end
+
+      it "renders the client.rb with an encrypted_data_bag_secret entry" do
+        rendered_template.should match(%r{encrypted_data_bag_secret\s*"/etc/chef/encrypted_data_bag_secret"})
+      end
+      after(:each) { Chef::Config.configuration = @original_config }
+    end
+  end
+
+  describe "when configuring the underlying knife ssh command" do
     context "from the command line" do
       before do
         @knife.name_args = ["foo.example.com"]
@@ -143,61 +195,96 @@ describe Chef::Knife::Bootstrap do
         @knife.config[:ssh_password]  = "open_sesame"
         Chef::Config[:knife][:ssh_user] = nil
         Chef::Config[:knife][:ssh_port] = nil
+        @knife.config[:forward_agent] = true
         @knife.config[:identity_file] = "~/.ssh/me.rsa"
         @knife.stub!(:read_template).and_return("")
         @knife_ssh = @knife.knife_ssh
       end
-  
+
       it "configures the hostname" do
         @knife_ssh.name_args.first.should == "foo.example.com"
       end
-  
+
       it "configures the ssh user" do
         @knife_ssh.config[:ssh_user].should == 'rooty'
       end
-  
+
       it "configures the ssh password" do
         @knife_ssh.config[:ssh_password].should == 'open_sesame'
       end
-  
+
       it "configures the ssh port" do
         @knife_ssh.config[:ssh_port].should == '4001'
       end
   
+      it "configures the ssh agent forwarding" do
+        @knife_ssh.config[:forward_agent].should == true
+      end
+
       it "configures the ssh identity file" do
         @knife_ssh.config[:identity_file].should == '~/.ssh/me.rsa'
       end
     end
+    context "validating use_sudo_password" do
+      before do
+        @knife.config[:distro] = "ubuntu"
+        @knife.config[:ssh_password] = "password"
+        @knife.stub(:read_template).and_return(IO.read(@knife.find_template).chomp)
+      end
+
+      it "use_sudo_password contains description and long params for help" do
+        @knife.options.should have_key(:use_sudo_password) \
+          and @knife.options[:use_sudo_password][:description].to_s.should_not == ''\
+          and @knife.options[:use_sudo_password][:long].to_s.should_not == ''
+      end
 
+      it "uses the password from --ssh-password for sudo when --use-sudo-password is set" do
+        @knife.config[:use_sudo] = true
+        @knife.config[:use_sudo_password] = true
+        @knife.ssh_command.should include("echo #{@knife.config[:ssh_password]} | sudo -S")
+      end
+
+      it "should not honor --use-sudo-password when --use-sudo is not set" do
+        @knife.config[:use_sudo] = false
+        @knife.config[:use_sudo_password] = true
+        @knife.ssh_command.should_not include("echo #{@knife.config[:ssh_password]} | sudo -S")
+      end
+    end
     context "from the knife config file" do
       before do
         @knife.name_args = ["config.example.com"]
         @knife.config[:ssh_user] = nil
         @knife.config[:ssh_port] = nil
         @knife.config[:ssh_gateway] = nil
+        @knife.config[:forward_agent] = nil
         @knife.config[:identity_file] = nil
         @knife.config[:host_key_verify] = nil
         Chef::Config[:knife][:ssh_user] = "curiosity"
         Chef::Config[:knife][:ssh_port] = "2430"
+        Chef::Config[:knife][:forward_agent] = true
         Chef::Config[:knife][:identity_file] = "~/.ssh/you.rsa"
         Chef::Config[:knife][:ssh_gateway] = "towel.blinkenlights.nl"
         Chef::Config[:knife][:host_key_verify] = true
         @knife.stub!(:read_template).and_return("")
         @knife_ssh = @knife.knife_ssh
       end
-  
+
       it "configures the ssh user" do
         @knife_ssh.config[:ssh_user].should == 'curiosity'
       end
-  
+
       it "configures the ssh port" do
         @knife_ssh.config[:ssh_port].should == '2430'
       end
   
+      it "configures the ssh agent forwarding" do
+        @knife_ssh.config[:forward_agent].should == true
+      end
+
       it "configures the ssh identity file" do
         @knife_ssh.config[:identity_file].should == '~/.ssh/you.rsa'
       end
-  
+
       it "configures the ssh gateway" do
         @knife_ssh.config[:ssh_gateway].should == 'towel.blinkenlights.nl'
       end
@@ -205,29 +292,30 @@ describe Chef::Knife::Bootstrap do
       it "configures the host key verify mode" do
         @knife_ssh.config[:host_key_verify].should == true
       end
-  end
-
-  describe "when falling back to password auth when host key auth fails" do
-    before do
-      @knife.name_args = ["foo.example.com"]
-      @knife.config[:ssh_user]      = "rooty"
-      @knife.config[:identity_file] = "~/.ssh/me.rsa"
-      @knife.stub!(:read_template).and_return("")
-      @knife_ssh = @knife.knife_ssh
     end
 
-    it "prompts the user for a password " do
-      @knife.stub!(:knife_ssh).and_return(@knife_ssh)
-      @knife_ssh.stub!(:get_password).and_return('typed_in_password')
-      alternate_knife_ssh = @knife.knife_ssh_with_password_auth
-      alternate_knife_ssh.config[:ssh_password].should == 'typed_in_password'
-    end
+    describe "when falling back to password auth when host key auth fails" do
+      before do
+        @knife.name_args = ["foo.example.com"]
+        @knife.config[:ssh_user]      = "rooty"
+        @knife.config[:identity_file] = "~/.ssh/me.rsa"
+        @knife.stub!(:read_template).and_return("")
+        @knife_ssh = @knife.knife_ssh
+      end
 
-    it "configures knife not to use the identity file that didn't work previously" do
-      @knife.stub!(:knife_ssh).and_return(@knife_ssh)
-      @knife_ssh.stub!(:get_password).and_return('typed_in_password')
-      alternate_knife_ssh = @knife.knife_ssh_with_password_auth
-      alternate_knife_ssh.config[:identity_file].should be_nil
+      it "prompts the user for a password " do
+        @knife.stub!(:knife_ssh).and_return(@knife_ssh)
+        @knife_ssh.stub!(:get_password).and_return('typed_in_password')
+        alternate_knife_ssh = @knife.knife_ssh_with_password_auth
+        alternate_knife_ssh.config[:ssh_password].should == 'typed_in_password'
+      end
+
+      it "configures knife not to use the identity file that didn't work previously" do
+        @knife.stub!(:knife_ssh).and_return(@knife_ssh)
+        @knife_ssh.stub!(:get_password).and_return('typed_in_password')
+        alternate_knife_ssh = @knife.knife_ssh_with_password_auth
+        alternate_knife_ssh.config[:identity_file].should be_nil
+      end
     end
   end
 
@@ -262,6 +350,17 @@ describe Chef::Knife::Bootstrap do
       @knife.run
     end
 
+    context "Chef::Config[:encrypted_data_bag_secret] is set" do
+      let(:secret_file) { File.join(CHEF_SPEC_DATA, 'bootstrap', 'encrypted_data_bag_secret') }
+      before { Chef::Config[:encrypted_data_bag_secret] = secret_file }
+
+      it "warns the configuration option is deprecated" do
+        @knife_ssh.should_receive(:run)
+        @knife.ui.should_receive(:warn).at_least(3).times
+        @knife.run
+      end
+    end
+
   end
 
 end

data/spec/unit/knife/configure_spec.rb

@@ -21,20 +21,36 @@ describe Chef::Knife::Configure do
     @err = StringIO.new
     @knife.ui.stub!(:stderr).and_return(@err)
 
-    @ohai = Ohai::System.new
-    @ohai.stub(:require_plugin)
-    @ohai[:fqdn] = "foo.example.org"
-    Ohai::System.stub!(:new).and_return(@ohai)
+    Ohai::System.stub!(:new).and_return(ohai)
   end
 
   after do
     Chef::Config.configuration.replace(@original_config)
   end
 
+
+  let(:fqdn) { "foo.example.org" }
+
+  let(:ohai) do
+    o = {}
+    o.stub(:require_plugin)
+    o[:fqdn] = fqdn
+    o
+  end
+
+  let(:default_admin_key) { "/etc/chef-server/admin.pem" }
+  let(:default_admin_key_win32) { File.expand_path(default_admin_key) }
+
+  let(:default_validator_key) { "/etc/chef-server/chef-validator.pem" }
+  let(:default_validator_key_win32) { File.expand_path(default_validator_key) }
+
+  let(:default_server_url) { "https://#{fqdn}:443" }
+
+
   it "asks the user for the URL of the chef server" do
     @knife.ask_user_for_config
-    @out.string.should match(Regexp.escape('Please enter the chef server URL: [http://foo.example.org:4000]'))
-    @knife.chef_server.should == 'http://foo.example.org:4000'
+    @out.string.should match(Regexp.escape("Please enter the chef server URL: [#{default_server_url}]"))
+    @knife.chef_server.should == default_server_url
   end
 
   it "asks the user for the clientname they want for the new client if -i is specified" do
@@ -85,11 +101,11 @@ describe Chef::Knife::Configure do
   it "asks the user for the location of the existing admin key if -i is specified" do
     @knife.config[:initial] = true
     @knife.ask_user_for_config
-    @out.string.should match(Regexp.escape("Please enter the location of the existing admin's private key: [/etc/chef/admin.pem]"))
+    @out.string.should match(Regexp.escape("Please enter the location of the existing admin's private key: [#{default_admin_key}]"))
     if windows?
-      @knife.admin_client_key.should == 'C:/etc/chef/admin.pem'
+      @knife.admin_client_key.capitalize.should == default_admin_key_win32.capitalize
     else
-      @knife.admin_client_key.should == '/etc/chef/admin.pem'
+      @knife.admin_client_key.should == default_admin_key
     end
   end
 
@@ -99,7 +115,7 @@ describe Chef::Knife::Configure do
     @knife.ask_user_for_config
     @out.string.should_not match(Regexp.escape("Please enter the location of the existing admin client's private key:"))
     if windows?
-      @knife.admin_client_key.should == 'C:/home/you/.chef/my-webui.pem'
+      @knife.admin_client_key.should match %r{^[A-Za-z]:/home/you/\.chef/my-webui\.pem$}
     else
       @knife.admin_client_key.should == '/home/you/.chef/my-webui.pem'
     end
@@ -107,11 +123,11 @@ describe Chef::Knife::Configure do
 
   it "should not ask the user for the location of the existing admin key if -i is not specified" do
     @knife.ask_user_for_config
-    @out.string.should_not match(Regexp.escape("Please enter the location of the existing admin client's private key: [/etc/chef/webui.pem]"))
+    @out.string.should_not match(Regexp.escape("Please enter the location of the existing admin client's private key: [#{default_admin_key}]"))
     if windows?
-      @knife.admin_client_key.should_not == 'C:/etc//chef/webui.pem'
+      @knife.admin_client_key.should_not == default_admin_key_win32
     else
-      @knife.admin_client_key.should_not == '/etc/chef/webui.pem'
+      @knife.admin_client_key.should_not == default_admin_key
     end
   end
 
@@ -136,11 +152,11 @@ describe Chef::Knife::Configure do
 
   it "asks the users for the location of the validation key" do
     @knife.ask_user_for_config
-    @out.string.should match(Regexp.escape("Please enter the location of the validation key: [/etc/chef/validation.pem]"))
+    @out.string.should match(Regexp.escape("Please enter the location of the validation key: [#{default_validator_key}]"))
     if windows?
-      @knife.validation_key.should == 'C:/etc/chef/validation.pem'
+      @knife.validation_key.capitalize.should == default_validator_key_win32.capitalize
     else
-      @knife.validation_key.should == '/etc/chef/validation.pem'
+      @knife.validation_key.should == default_validator_key
     end
   end
 
@@ -149,7 +165,7 @@ describe Chef::Knife::Configure do
     @knife.ask_user_for_config
     @out.string.should_not match(Regexp.escape("Please enter the location of the validation key:"))
     if windows?
-      @knife.validation_key.should == 'C:/home/you/.chef/my-validation.pem'
+      @knife.validation_key.should match %r{^[A-Za-z]:/home/you/\.chef/my-validation\.pem$}
     else
       @knife.validation_key.should == '/home/you/.chef/my-validation.pem'
     end
@@ -174,9 +190,9 @@ describe Chef::Knife::Configure do
     @knife.chef_server.should == 'http://localhost:5000'
     @knife.admin_client_name.should == 'my-webui'
     if windows?
-      @knife.admin_client_key.should == 'C:/home/you/.chef/my-webui.pem'
-      @knife.validation_key.should == 'C:/home/you/.chef/my-validation.pem'
-      @knife.new_client_key.should == 'C:/home/you/a-new-user.pem'
+      @knife.admin_client_key.should match %r{^[A-Za-z]:/home/you/\.chef/my-webui\.pem$}
+      @knife.validation_key.should match %r{^[A-Za-z]:/home/you/\.chef/my-validation\.pem$}
+      @knife.new_client_key.should match %r{^[A-Za-z]:/home/you/a-new-user\.pem$}
     else
       @knife.admin_client_key.should == '/home/you/.chef/my-webui.pem'
       @knife.validation_key.should == '/home/you/.chef/my-validation.pem'
@@ -189,8 +205,8 @@ describe Chef::Knife::Configure do
   it "writes the new data to a config file" do
     File.stub!(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
     File.stub!(:expand_path).with("/home/you/.chef/#{Etc.getlogin}.pem").and_return("/home/you/.chef/#{Etc.getlogin}.pem")
-    File.stub!(:expand_path).with("/etc/chef/validation.pem").and_return("/etc/chef/validation.pem")
-    File.stub!(:expand_path).with("/etc/chef/webui.pem").and_return("/etc/chef/webui.pem")
+    File.stub!(:expand_path).with(default_validator_key).and_return(default_validator_key)
+    File.stub!(:expand_path).with(default_admin_key).and_return(default_admin_key)
     FileUtils.should_receive(:mkdir_p).with("/home/you/.chef")
     config_file = StringIO.new
     ::File.should_receive(:open).with("/home/you/.chef/knife.rb", "w").and_yield config_file
@@ -199,16 +215,16 @@ describe Chef::Knife::Configure do
     config_file.string.should match(/^node_name[\s]+'#{Etc.getlogin}'$/)
     config_file.string.should match(%r{^client_key[\s]+'/home/you/.chef/#{Etc.getlogin}.pem'$})
     config_file.string.should match(/^validation_client_name\s+'chef-validator'$/)
-    config_file.string.should match(%r{^validation_key\s+'/etc/chef/validation.pem'$})
-    config_file.string.should match(%r{^chef_server_url\s+'http://foo.example.org:4000'$})
+    config_file.string.should match(%r{^validation_key\s+'#{default_validator_key}'$})
+    config_file.string.should match(%r{^chef_server_url\s+'#{default_server_url}'$})
     config_file.string.should match(%r{cookbook_path\s+\[ '/home/you/chef-repo/cookbooks' \]})
   end
 
   it "creates a new client when given the --initial option" do
     File.should_receive(:expand_path).with("/home/you/.chef/knife.rb").and_return("/home/you/.chef/knife.rb")
     File.should_receive(:expand_path).with("/home/you/.chef/a-new-user.pem").and_return("/home/you/.chef/a-new-user.pem")
-    File.should_receive(:expand_path).with("/etc/chef/validation.pem").and_return("/etc/chef/validation.pem")
-    File.should_receive(:expand_path).with("/etc/chef/admin.pem").and_return("/etc/chef/admin.pem")
+    File.should_receive(:expand_path).with(default_validator_key).and_return(default_validator_key)
+    File.should_receive(:expand_path).with(default_admin_key).and_return(default_admin_key)
     Chef::Config[:node_name]  = "webmonkey.example.com"
 
     user_command = Chef::Knife::UserCreate.new

data/spec/unit/knife/cookbook_download_spec.rb

@@ -33,6 +33,13 @@ describe Chef::Knife::CookbookDownload do
       lambda { @knife.run }.should raise_error(SystemExit)
     end
 
+    it 'should exit with a fatal error when there is no cookbook on the server' do
+      @knife.name_args = ['foobar', nil]
+      @knife.should_receive(:determine_version).and_return(nil)
+      @knife.ui.should_receive(:fatal).with('No such cookbook found')
+      lambda { @knife.run }.should raise_error(SystemExit)
+    end
+
     describe 'with a cookbook name' do
       before(:each) do
         @knife.name_args = ['foobar']
@@ -136,6 +143,13 @@ describe Chef::Knife::CookbookDownload do
   end
 
   describe 'determine_version' do
+
+    it 'should return nil if there are no versions' do
+      @knife.should_receive(:available_versions).and_return(nil)
+      @knife.determine_version.should == nil
+      @knife.version.should == nil
+    end
+
     it 'should return and set the version if there is only one version' do
       @knife.should_receive(:available_versions).at_least(:once).and_return(['1.0.0'])
       @knife.determine_version.should == '1.0.0'
@@ -143,7 +157,7 @@ describe Chef::Knife::CookbookDownload do
     end
 
     it 'should ask which version to download and return it if there is more than one' do
-      @knife.should_receive(:available_versions).and_return(['1.0.0', '2.0.0'])
+      @knife.should_receive(:available_versions).at_least(:once).and_return(['1.0.0', '2.0.0'])
       @knife.should_receive(:ask_which_version).and_return('1.0.0')
       @knife.determine_version.should == '1.0.0'
     end
@@ -152,7 +166,7 @@ describe Chef::Knife::CookbookDownload do
       it 'should return and set the version to the latest version' do
         @knife.config[:latest] = true
         @knife.should_receive(:available_versions).at_least(:once).
-                                                   and_return(['1.0.0', '2.0.0', '1.1.0'])
+                                                   and_return(['1.0.0', '1.1.0', '2.0.0'])
         @knife.determine_version
         @knife.version.to_s.should == '2.0.0'
       end
@@ -164,7 +178,14 @@ describe Chef::Knife::CookbookDownload do
       @knife.cookbook_name = 'foobar'
     end
 
-    it 'should return the available vesions' do
+    it 'should return nil if there are no versions' do
+      Chef::CookbookVersion.should_receive(:available_versions).
+                            with('foobar').
+                            and_return(nil)
+      @knife.available_versions.should == nil
+    end
+
+    it 'should return the available versions' do
       Chef::CookbookVersion.should_receive(:available_versions).
                             with('foobar').
                             and_return(['1.1.0', '2.0.0', '1.0.0'])