chef 10.14.4 → 10.16.0.rc.0

data/lib/chef/rest.rb

@@ -233,16 +233,20 @@ class Chef
       end
     end
 
-    # Runs an HTTP request to a JSON API. File Download not supported.
+    # Runs an HTTP request to a JSON API with JSON body. File Download not supported.
     def api_request(method, url, headers={}, data=false)
       json_body = data ? Chef::JSONCompat.to_json(data) : nil
       # Force encoding to binary to fix SSL related EOFErrors
       # cf. http://tickets.opscode.com/browse/CHEF-2363
       # http://redmine.ruby-lang.org/issues/5233
       json_body.force_encoding(Encoding::BINARY) if json_body.respond_to?(:force_encoding)
-      headers = build_headers(method, url, headers, json_body)
-
-      retriable_rest_request(method, url, json_body, headers) do |rest_request|
+      raw_http_request(method, url, headers, json_body)
+    end
+    
+    # Runs an HTTP request to a JSON API with raw body. File Download not supported.
+    def raw_http_request(method, url, headers, body)
+      headers = build_headers(method, url, headers, body)
+      retriable_rest_request(method, url, body, headers) do |rest_request|
         begin
           response = rest_request.call {|r| r.read_body}
 

data/lib/chef/run_list.rb

@@ -29,7 +29,7 @@ class Chef
     include Enumerable
     include Chef::Mixin::ParamsValidate
 
-    # @run_list_items is an array of RunListItems that describe the items to 
+    # @run_list_items is an array of RunListItems that describe the items to
     # execute in order. RunListItems can load from and convert to the string
     # forms users set on roles and nodes.
     # For example:
@@ -67,6 +67,7 @@ class Chef
     end
 
     alias :push :<<
+    alias :add :<<
 
     def ==(other)
       if other.kind_of?(Chef::RunList)
@@ -162,4 +163,3 @@ class Chef
 
   end
 end
-

data/lib/chef/scan_access_control.rb

@@ -46,7 +46,7 @@ class Chef
 
     # Modifies @current_resource, setting the current access control state.
     def set_all!
-      if File.exist?(new_resource.path)
+      if ::File.exist?(new_resource.path)
         set_owner
         set_group
         set_mode

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '10.14.4'
+  VERSION = '10.16.0.rc.0'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/unit/client_spec.rb

@@ -239,12 +239,16 @@ shared_examples_for Chef::Client do
       @node.chef_environment("_default")
       @node[:platform] = "example-platform"
       @node[:platform_version] = "example-platform-1.0"
+    end
 
-      @client = Chef::Client.new(nil, :override_runlist => 'role[test_role]')
-      @client.node = @node
+    it "should permit spaces in overriding run list" do
+      @client = Chef::Client.new(nil, :override_runlist => 'role[a], role[b]')
     end
 
     it "should override the run list and save original runlist" do
+      @client = Chef::Client.new(nil, :override_runlist => 'role[test_role]')
+      @client.node = @node
+
       @node.run_list << "role[role_containing_cookbook1]"
 
       override_role = Chef::Role.new

data/spec/unit/knife/configure_spec.rb

@@ -45,6 +45,15 @@ describe Chef::Knife::Configure do
     @knife.new_client_name.should == Etc.getlogin
   end
 
+  it "should not ask the user for the clientname they want for the new client if -i and --node_name are specified" do
+    @knife.config[:initial] = true
+    @knife.config[:node_name] = 'testnode'
+    Etc.stub!(:getlogin).and_return("a-new-user")
+    @knife.ask_user_for_config
+    @out.string.should_not match(Regexp.escape("Please enter a clientname for the new client"))
+    @knife.new_client_name.should == 'testnode'
+  end
+
   it "asks the user for the existing API username or clientname if -i is not specified" do
     Etc.stub!(:getlogin).and_return("a-new-user")
     @knife.ask_user_for_config
@@ -53,30 +62,58 @@ describe Chef::Knife::Configure do
   end
 
   it "asks the user for the existing admin client's name if -i is specified" do
-     @knife.config[:initial] = true
-     @knife.ask_user_for_config
-     @out.string.should match(Regexp.escape("Please enter the existing admin clientname: [chef-webui]"))
-     @knife.admin_client_name.should == 'chef-webui'
-   end
-
-   it "should not ask the user for the existing admin client's name if -i is not specified" do
-     @knife.ask_user_for_config
-     @out.string.should_not match(Regexp.escape("Please enter the existing admin clientname: [chef-webui]"))
-     @knife.admin_client_name.should_not == 'chef-webui'
-   end
-
-   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 client's private key: [/etc/chef/webui.pem]"))
-     @knife.admin_client_key.should == '/etc/chef/webui.pem'
-   end
-
-   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]"))
-     @knife.admin_client_key.should_not == '/etc/chef/webui.pem'
-   end
+    @knife.config[:initial] = true
+    @knife.ask_user_for_config
+    @out.string.should match(Regexp.escape("Please enter the existing admin clientname: [chef-webui]"))
+    @knife.admin_client_name.should == 'chef-webui'
+  end
+
+  it "should not ask the user for the existing admin client's name if -i and --admin-client_name are specified" do
+    @knife.config[:initial] = true
+    @knife.config[:admin_client_name] = 'my-webui'
+    @knife.ask_user_for_config
+    @out.string.should_not match(Regexp.escape("Please enter the existing admin clientname:"))
+    @knife.admin_client_name.should == 'my-webui'
+  end
+
+  it "should not ask the user for the existing admin client's name if -i is not specified" do
+    @knife.ask_user_for_config
+    @out.string.should_not match(Regexp.escape("Please enter the existing admin clientname: [chef-webui]"))
+    @knife.admin_client_name.should_not == 'chef-webui'
+  end
+
+  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 client's private key: [/etc/chef/webui.pem]"))
+    if windows?
+      @knife.admin_client_key.should == 'C:/etc/chef/webui.pem'
+    else
+      @knife.admin_client_key.should == '/etc/chef/webui.pem'
+    end
+  end
+
+  it "should not ask the user for the location of the existing admin key if -i and --admin_client_key are specified" do
+    @knife.config[:initial] = true
+    @knife.config[:admin_client_key] = '/home/you/.chef/my-webui.pem'
+    @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'
+    else
+      @knife.admin_client_key.should == '/home/you/.chef/my-webui.pem'
+    end
+  end
+
+  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]"))
+    if windows?
+      @knife.admin_client_key.should_not == 'C:/etc//chef/webui.pem'
+    else
+      @knife.admin_client_key.should_not == '/etc/chef/webui.pem' 
+    end
+  end
 
   it "asks the user for the location of a chef repo" do
     @knife.ask_user_for_config
@@ -90,14 +127,70 @@ describe Chef::Knife::Configure do
     @knife.validation_client_name.should == 'chef-validator'
   end
 
+  it "should not ask the users for the name of the validation client if --validation_client_name is specified" do
+    @knife.config[:validation_client_name] = 'my-validator'
+    @knife.ask_user_for_config
+    @out.string.should_not match(Regexp.escape("Please enter the validation clientname:"))
+    @knife.validation_client_name.should == 'my-validator'
+  end
+
   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]"))
-    @knife.validation_key.should == '/etc/chef/validation.pem'
+    if windows?
+      @knife.validation_key.should == 'C:/etc/chef/validation.pem'
+    else
+      @knife.validation_key.should == '/etc/chef/validation.pem' 
+    end
+  end
+
+  it "should not ask the users for the location of the validation key if --validation_key is specified" do
+    @knife.config[:validation_key] = '/home/you/.chef/my-validation.pem'
+    @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'
+    else
+      @knife.validation_key.should == '/home/you/.chef/my-validation.pem'
+    end
+  end
+
+  it "should not ask the user for anything if -i and all other properties are specified" do
+    @knife.config[:initial] = true
+    @knife.config[:chef_server_url] = 'http://localhost:5000'
+    @knife.config[:node_name] = 'testnode'
+    @knife.config[:admin_client_name] = 'my-webui'
+    @knife.config[:admin_client_key] = '/home/you/.chef/my-webui.pem'
+    @knife.config[:validation_client_name] = 'my-validator'
+    @knife.config[:validation_key] = '/home/you/.chef/my-validation.pem'
+    @knife.config[:repository] = ''
+    @knife.config[:client_key] = '/home/you/a-new-user.pem'
+    Etc.stub!(:getlogin).and_return('a-new-user')
+
+    @knife.ask_user_for_config
+    @out.string.should match(/\s*/)
+
+    @knife.new_client_name.should == 'testnode'
+    @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'
+    else
+      @knife.admin_client_key.should == '/home/you/.chef/my-webui.pem'
+      @knife.validation_key.should == '/home/you/.chef/my-validation.pem'
+      @knife.new_client_key.should == '/home/you/a-new-user.pem'
+    end
+    @knife.validation_client_name.should == 'my-validator'
+    @knife.chef_repo.should == ''
   end
 
   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")
     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
@@ -113,6 +206,9 @@ describe Chef::Knife::Configure do
 
   it "creates a new client when given the --initial option" 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/a-new-user.pem").and_return("/home/you/.chef/a-new-user.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")
     Chef::Config[:node_name]  = "webmonkey.example.com"
     client_command = Chef::Knife::ClientCreate.new
     client_command.should_receive(:run)

data/spec/unit/knife/data_bag_from_file_spec.rb

@@ -33,11 +33,12 @@ describe Chef::Knife::DataBagFromFile do
     @knife.stub!(:rest).and_return(@rest)
     @stdout = StringIO.new
     @knife.ui.stub!(:stdout).and_return(@stdout)
-    @db_folder = File.join(Dir.tmpdir, 'data_bags', 'bag_name')
+    @tmp_dir = Dir.mktmpdir
+    @db_folder = File.join(@tmp_dir, 'data_bags', 'bag_name')
     FileUtils.mkdir_p(@db_folder)
     @db_file = Tempfile.new(["data_bag_from_file_test", ".json"], @db_folder)
     @db_file2 = Tempfile.new(["data_bag_from_file_test2", ".json"], @db_folder)
-    @db_folder2 = File.join(Dir.tmpdir, 'data_bags', 'bag_name2')
+    @db_folder2 = File.join(@tmp_dir, 'data_bags', 'bag_name2')
     FileUtils.mkdir_p(@db_folder2)
     @db_file3 = Tempfile.new(["data_bag_from_file_test3", ".json"], @db_folder2)
     @plain_data = {
@@ -57,6 +58,7 @@ describe Chef::Knife::DataBagFromFile do
     @db_file3.close
     FileUtils.rm_rf(@db_folder)
     FileUtils.rm_rf(@db_folder2)
+    FileUtils.remove_entry_secure @tmp_dir
   end
 
   it "loads from a file and saves" do
@@ -98,7 +100,7 @@ describe Chef::Knife::DataBagFromFile do
 
     before do
       @pwd = Dir.pwd
-      Dir.chdir(Dir.tmpdir)
+      Dir.chdir(@tmp_dir)
     end
 
     after do

data/spec/unit/knife/environment_from_file_spec.rb

@@ -43,6 +43,29 @@ describe Chef::Knife::EnvironmentFromFile do
       @knife.run
     end
 
+    context "when handling multiple environments" do
+      before(:each) do
+        @env_apple = @environment.dup
+        @env_apple.name("apple")
+        @knife.loader.stub!(:load_from).with("apple.rb").and_return @env_apple
+      end
+  
+      it "loads multiple environments if given" do
+        @knife.name_args = [ "spec.rb", "apple.rb" ]
+        @environment.should_receive(:save).twice
+        @knife.run
+      end
+  
+      it "loads all environments with -a" do
+        File.stub!(:expand_path).with("./environments/*.{json,rb}").and_return("/tmp/environments")
+        Dir.stub!(:glob).with("/tmp/environments").and_return(["spec.rb", "apple.rb"])
+        @knife.name_args = []
+        @knife.stub!(:config).and_return({:all => true})
+        @environment.should_receive(:save).twice
+        @knife.run
+      end
+    end
+
     it "should not print the environment" do
       @knife.should_not_receive(:output)
       @knife.run

data/spec/unit/provider/cookbook_file_spec.rb

@@ -104,6 +104,7 @@ EXPECTED
     it "installs the file from the cookbook cache" do
       @new_resource.path(@install_to)
       @provider.should_receive(:backup_new_resource)
+      @provider.stub!(:update_new_file_state)
       @provider.run_action(:create)
       actual = IO.read(@install_to)
       actual.should == @file_content
@@ -112,6 +113,7 @@ EXPECTED
     it "installs the file for create_if_missing --> from Provider::File" do
       @new_resource.path(@install_to)
       @provider.should_receive(:backup_new_resource)
+      @provider.stub!(:update_new_file_state)
       @provider.run_action(:create_if_missing)
       actual = IO.read(@install_to)
       actual.should == @file_content
@@ -121,6 +123,7 @@ EXPECTED
       @new_resource.path(@install_to)
       @provider.stub!(:backup_new_resource)
       @provider.stub!(:set_file_access_controls)
+      @provider.stub!(:update_new_file_state)
       @provider.run_action(:create)
       @new_resource.should be_updated
       @new_resource.should be_updated_by_last_action

data/spec/unit/provider/directory_spec.rb

@@ -39,7 +39,7 @@ describe Chef::Provider::Directory do
     cstats.stub!(:uid).and_return(500)
     cstats.stub!(:gid).and_return(500)
     cstats.stub!(:mode).and_return(0755)
-    File.should_receive(:stat).once.and_return(cstats)
+    File.should_receive(:stat).twice.and_return(cstats)
     @directory.load_current_resource
     @directory.current_resource.path.should eql(@new_resource.path)
     @directory.current_resource.owner.should eql(500)
@@ -48,11 +48,13 @@ describe Chef::Provider::Directory do
   end
 
   it "should create a new directory on create, setting updated to true" do
-    load_mock_provider
     @new_resource.path "/tmp/foo"
-    File.should_receive(:exist?).twice.and_return(false)
+
+    File.should_receive(:exist?).exactly(3).and_return(false)
     Dir.should_receive(:mkdir).with(@new_resource.path).once.and_return(true)
+
     @directory.should_receive(:set_all_access_controls)
+    @directory.stub!(:update_new_file_state)
     @directory.run_action(:create)
     @directory.new_resource.should be_updated
   end
@@ -64,10 +66,11 @@ describe Chef::Provider::Directory do
   end
 
   it "should create a new directory when parent directory does not exist if recursive is true and permissions are correct" do
-    load_mock_provider
     @new_resource.path "/path/to/dir"
     @new_resource.recursive true
     File.should_receive(:exist?).with(@new_resource.path).ordered.and_return(false)
+    File.should_receive(:exist?).with(@new_resource.path).ordered.and_return(false)
+
     File.should_receive(:exist?).with('/path/to').ordered.and_return(false)
     File.should_receive(:exist?).with('/path').ordered.and_return(true)
     File.should_receive(:writable?).with('/path').ordered.and_return(true)
@@ -75,6 +78,7 @@ describe Chef::Provider::Directory do
  
     FileUtils.should_receive(:mkdir_p).with(@new_resource.path).and_return(true) 
     @directory.should_receive(:set_all_access_controls)
+    @directory.stub!(:update_new_file_state)
     @directory.run_action(:create)
     @new_resource.should be_updated
   end
@@ -84,7 +88,6 @@ describe Chef::Provider::Directory do
   # end
 
   it "should raise an error when creating a directory when parent directory is a file" do
-    load_mock_provider
     File.should_receive(:directory?).and_return(false)
     Dir.should_not_receive(:mkdir).with(@new_resource.path)
     lambda { @directory.run_action(:create) }.should raise_error(Chef::Exceptions::EnclosingDirectoryDoesNotExist)
@@ -92,16 +95,15 @@ describe Chef::Provider::Directory do
   end
   
   it "should not create the directory if it already exists" do
-    load_mock_provider
+    stub_file_cstats
     @new_resource.path "/tmp/foo"
-    File.should_receive(:exist?).twice.and_return(true)
+    File.should_receive(:exist?).exactly(3).and_return(true)
     Dir.should_not_receive(:mkdir).with(@new_resource.path)
     @directory.should_receive(:set_all_access_controls)
     @directory.run_action(:create)
   end
 
   it "should delete the directory if it exists, and is writable with action_delete" do
-    load_mock_provider
     File.should_receive(:directory?).and_return(true)
     File.should_receive(:writable?).once.and_return(true)
     Dir.should_receive(:delete).with(@new_resource.path).once.and_return(true)
@@ -109,7 +111,6 @@ describe Chef::Provider::Directory do
   end
 
   it "should raise an exception if it cannot delete the directory due to bad permissions" do
-    load_mock_provider
     File.stub!(:exist?).and_return(true)
     File.stub!(:writable?).and_return(false)
     lambda {  @directory.run_action(:delete) }.should raise_error(RuntimeError)
@@ -124,25 +125,23 @@ describe Chef::Provider::Directory do
   end
 
   it "should raise an exception when deleting a directory when target directory is a file" do
-    load_mock_provider
+    stub_file_cstats
     @new_resource.path "/an/invalid/path"
     File.stub!(:exist?).and_return(true)
     File.should_receive(:directory?).and_return(false)
     Dir.should_not_receive(:delete).with(@new_resource.path)
     lambda { @directory.run_action(:delete) }.should raise_error(RuntimeError)
     @directory.new_resource.should_not be_updated
-
   end
 
-
-  def load_mock_provider
-    File.stub!(:exist?).and_return(true)
-    File.stub!(:directory?).and_return(true)
+  def stub_file_cstats
     cstats = mock("stats")
     cstats.stub!(:uid).and_return(500)
     cstats.stub!(:gid).and_return(500)
     cstats.stub!(:mode).and_return(0755)
-    File.stub!(:stat).once.and_return(cstats)
-  #  @directory.load_current_resource
+    # File.stat is called in:
+    # - Chef::Provider::File.load_current_resource_attrs
+    # - Chef::ScanAccessControl via Chef::Provider::File.setup_acl
+    File.stub!(:stat).and_return(cstats)
   end
 end