chef 14.2.0 → 14.3.37

data/spec/unit/cookbook_loader_spec.rb

@@ -44,10 +44,10 @@ describe Chef::CookbookLoader do
     cookbook_paths.delete_if { |path| File.basename(path) == "chefignore" }
 
     cookbook_paths.each do |cookbook_path|
-      expect(Chef::Cookbook::CookbookVersionLoader).to receive(:new).
-        with(cookbook_path, anything).
-        once.
-        and_call_original
+      expect(Chef::Cookbook::CookbookVersionLoader).to receive(:new)
+        .with(cookbook_path, anything)
+        .once
+        .and_call_original
     end
     expect(Chef::Log).to receive(:deprecation).with(/The cookbook\(s\): openldap exist in multiple places in your cookbook_path./)
     cookbook_loader.load_cookbooks
@@ -59,13 +59,18 @@ describe Chef::CookbookLoader do
       cookbook_loader.load_cookbooks
     end
 
-    it "should be possible to reload all the cookbooks without triggering deprecation warnings on all of them" do
+    it "should be possible to reload all the cookbooks without triggering deprecation warnings on all of them", chef: "< 15" do
       start_merged_cookbooks = cookbook_loader.merged_cookbooks
       expect(Chef::Log).to receive(:deprecation).with(/The cookbook\(s\): openldap exist in multiple places in your cookbook_path./)
       cookbook_loader.load_cookbooks
       expect(cookbook_loader.merged_cookbooks).to eql(start_merged_cookbooks)
     end
 
+    it "should not support multiple merged cookbooks in the cookbook path", chef: ">= 15" do
+      start_merged_cookbooks = cookbook_loader.merged_cookbooks
+      expect { cookbook_loader.load_cookbooks }.to raise_error("FIXME WITH THE CLASS YOU DECIDE TO USE HERE")
+    end
+
     describe "[]" do
       it "should return cookbook objects with []" do
         expect(cookbook_loader[:openldap]).to be_a_kind_of(Chef::CookbookVersion)

data/spec/unit/cookbook_site_streaming_uploader_spec.rb

@@ -102,22 +102,22 @@ describe Chef::CookbookSiteStreamingUploader do
 
     it "should be able to receive files to attach as argument" do
       Chef::CookbookSiteStreamingUploader.make_request(:put, @uri, "bill", @secret_filename, {
-        :myfile => File.new(File.join(CHEF_SPEC_DATA, "config.rb")), # a dummy file
+        myfile: File.new(File.join(CHEF_SPEC_DATA, "config.rb")), # a dummy file
       })
     end
 
     it "should be able to receive strings to attach as argument" do
       Chef::CookbookSiteStreamingUploader.make_request(:put, @uri, "bill", @secret_filename, {
-        :mystring => "Lorem ipsum",
+        mystring: "Lorem ipsum",
       })
     end
 
     it "should be able to receive strings and files as argument at the same time" do
       Chef::CookbookSiteStreamingUploader.make_request(:put, @uri, "bill", @secret_filename, {
-        :myfile1 => File.new(File.join(CHEF_SPEC_DATA, "config.rb")),
-        :mystring1 => "Lorem ipsum",
-        :myfile2 => File.new(File.join(CHEF_SPEC_DATA, "config.rb")),
-        :mystring2 => "Dummy text",
+        myfile1: File.new(File.join(CHEF_SPEC_DATA, "config.rb")),
+        mystring1: "Lorem ipsum",
+        myfile2: File.new(File.join(CHEF_SPEC_DATA, "config.rb")),
+        mystring2: "Dummy text",
       })
     end
 

data/spec/unit/cookbook_uploader_spec.rb

@@ -85,9 +85,9 @@ describe Chef::CookbookUploader do
     end
 
     def expect_sandbox_create
-      expect(http_client).to receive(:post).
-        with("sandboxes", { :checksums => checksums_set }).
-        and_return(sandbox_response)
+      expect(http_client).to receive(:post)
+        .with("sandboxes", { checksums: checksums_set })
+        .and_return(sandbox_response)
     end
 
     def expect_checksum_upload
@@ -100,8 +100,8 @@ describe Chef::CookbookUploader do
           "accept"       => "application/json",
         }
 
-        expect(http_client).to receive(:put).
-          with(url_for(md5), IO.binread(file_path), upload_headers)
+        expect(http_client).to receive(:put)
+          .with(url_for(md5), IO.binread(file_path), upload_headers)
 
       end
     end
@@ -111,14 +111,14 @@ describe Chef::CookbookUploader do
     end
 
     def expect_sandbox_commit
-      expect(http_client).to receive(:put).with(sandbox_commit_uri, { :is_completed => true })
+      expect(http_client).to receive(:put).with(sandbox_commit_uri, { is_completed: true })
     end
 
     def expect_cookbook_create
       cookbooks_to_upload.each do |cookbook|
 
-        expect(http_client).to receive(:put).
-          with(expected_save_url(cookbook), cookbook)
+        expect(http_client).to receive(:put)
+          .with(expected_save_url(cookbook), cookbook)
 
       end
     end

data/spec/unit/cookbook_version_file_specificity_spec.rb

@@ -27,202 +27,202 @@ describe Chef::CookbookVersion, "file specificity" do
       [
        # afile.rb
        {
-         :name => "files/afile.rb",
-         :path => "files/host-examplehost.example.org/afile.rb",
-         :full_path => "/cookbook-folder/files/host-examplehost.example.org/afile.rb",
-         :checksum => "csum-host",
-         :specificity => "host-examplehost.example.org",
+         name: "files/afile.rb",
+         path: "files/host-examplehost.example.org/afile.rb",
+         full_path: "/cookbook-folder/files/host-examplehost.example.org/afile.rb",
+         checksum: "csum-host",
+         specificity: "host-examplehost.example.org",
        },
        {
-         :name => "files/afile.rb",
-         :path => "files/ubuntu-9.10/afile.rb",
-         :full_path => "/cookbook-folder/files/ubuntu-9.10/afile.rb",
-         :checksum => "csum-platver-full",
-         :specificity => "ubuntu-9.10",
+         name: "files/afile.rb",
+         path: "files/ubuntu-9.10/afile.rb",
+         full_path: "/cookbook-folder/files/ubuntu-9.10/afile.rb",
+         checksum: "csum-platver-full",
+         specificity: "ubuntu-9.10",
        },
        {
-         :name => "files/afile.rb",
-         :path => "files/newubuntu-9/afile.rb",
-         :full_path => "/cookbook-folder/files/newubuntu-9/afile.rb",
-         :checksum => "csum-platver-partial",
-         :specificity => "newubuntu-9",
+         name: "files/afile.rb",
+         path: "files/newubuntu-9/afile.rb",
+         full_path: "/cookbook-folder/files/newubuntu-9/afile.rb",
+         checksum: "csum-platver-partial",
+         specificity: "newubuntu-9",
        },
        {
-         :name => "files/afile.rb",
-         :path => "files/ubuntu/afile.rb",
-         :full_path => "/cookbook-folder/files/ubuntu/afile.rb",
-         :checksum => "csum-plat",
-         :specificity => "ubuntu",
+         name: "files/afile.rb",
+         path: "files/ubuntu/afile.rb",
+         full_path: "/cookbook-folder/files/ubuntu/afile.rb",
+         checksum: "csum-plat",
+         specificity: "ubuntu",
        },
        {
-         :name => "files/afile.rb",
-         :path => "files/default/afile.rb",
-         :full_path => "/cookbook-folder/files/default/afile.rb",
-         :checksum => "csum-default",
-         :specificity => "default",
+         name: "files/afile.rb",
+         path: "files/default/afile.rb",
+         full_path: "/cookbook-folder/files/default/afile.rb",
+         checksum: "csum-default",
+         specificity: "default",
        },
 
        # for different/odd platform_versions
        {
-         :name => "files/bfile.rb",
-         :path => "files/fakeos-2.0.rc.1/bfile.rb",
-         :full_path => "/cookbook-folder/files/fakeos-2.0.rc.1/bfile.rb",
-         :checksum => "csum2-platver-full",
-         :specificity => "fakeos-2.0.rc.1",
+         name: "files/bfile.rb",
+         path: "files/fakeos-2.0.rc.1/bfile.rb",
+         full_path: "/cookbook-folder/files/fakeos-2.0.rc.1/bfile.rb",
+         checksum: "csum2-platver-full",
+         specificity: "fakeos-2.0.rc.1",
        },
        {
-         :name => "files/bfile.rb",
-         :path => "files/newfakeos-2.0.rc/bfile.rb",
-         :full_path => "/cookbook-folder/files/newfakeos-2.0.rc/bfile.rb",
-         :checksum => "csum2-platver-partial",
-         :specificity => "newfakeos-2.0.rc",
+         name: "files/bfile.rb",
+         path: "files/newfakeos-2.0.rc/bfile.rb",
+         full_path: "/cookbook-folder/files/newfakeos-2.0.rc/bfile.rb",
+         checksum: "csum2-platver-partial",
+         specificity: "newfakeos-2.0.rc",
        },
        {
-         :name => "files/bfile.rb",
-         :path => "files/fakeos-maple tree/bfile.rb",
-         :full_path => "/cookbook-folder/files/fakeos-maple tree/bfile.rb",
-         :checksum => "csum3-platver-full",
-         :specificity => "maple tree",
+         name: "files/bfile.rb",
+         path: "files/fakeos-maple tree/bfile.rb",
+         full_path: "/cookbook-folder/files/fakeos-maple tree/bfile.rb",
+         checksum: "csum3-platver-full",
+         specificity: "maple tree",
        },
        {
-         :name => "files/bfile.rb",
-         :path => "files/fakeos-1/bfile.rb",
-         :full_path => "/cookbook-folder/files/fakeos-1/bfile.rb",
-         :checksum => "csum4-platver-full",
-         :specificity => "fakeos-1",
+         name: "files/bfile.rb",
+         path: "files/fakeos-1/bfile.rb",
+         full_path: "/cookbook-folder/files/fakeos-1/bfile.rb",
+         checksum: "csum4-platver-full",
+         specificity: "fakeos-1",
        },
 
        # directory adirectory
        {
-         :name => "files/anotherfile1.rb",
-         :path => "files/host-examplehost.example.org/adirectory/anotherfile1.rb.host",
-         :full_path => "/cookbook-folder/files/host-examplehost.example.org/adirectory/anotherfile1.rb.host",
-         :checksum => "csum-host-1",
-         :specificity => "host-examplehost.example.org",
+         name: "files/anotherfile1.rb",
+         path: "files/host-examplehost.example.org/adirectory/anotherfile1.rb.host",
+         full_path: "/cookbook-folder/files/host-examplehost.example.org/adirectory/anotherfile1.rb.host",
+         checksum: "csum-host-1",
+         specificity: "host-examplehost.example.org",
        },
        {
-         :name => "files/anotherfile2.rb",
-         :path => "files/host-examplehost.example.org/adirectory/anotherfile2.rb.host",
-         :full_path => "/cookbook-folder/files/host-examplehost.example.org/adirectory/anotherfile2.rb.host",
-         :checksum => "csum-host-2",
-         :specificity => "host-examplehost.example.org",
+         name: "files/anotherfile2.rb",
+         path: "files/host-examplehost.example.org/adirectory/anotherfile2.rb.host",
+         full_path: "/cookbook-folder/files/host-examplehost.example.org/adirectory/anotherfile2.rb.host",
+         checksum: "csum-host-2",
+         specificity: "host-examplehost.example.org",
        },
 
        {
-         :name => "files/anotherfile1.rb",
-         :path => "files/ubuntu-9.10/adirectory/anotherfile1.rb.platform-full-version",
-         :full_path => "/cookbook-folder/files/ubuntu-9.10/adirectory/anotherfile1.rb.platform-full-version",
-         :checksum => "csum-platver-full-1",
-         :specificity => "ubuntu-9.10",
+         name: "files/anotherfile1.rb",
+         path: "files/ubuntu-9.10/adirectory/anotherfile1.rb.platform-full-version",
+         full_path: "/cookbook-folder/files/ubuntu-9.10/adirectory/anotherfile1.rb.platform-full-version",
+         checksum: "csum-platver-full-1",
+         specificity: "ubuntu-9.10",
        },
        {
-         :name => "files/anotherfile2.rb",
-         :path => "files/ubuntu-9.10/adirectory/anotherfile2.rb.platform-full-version",
-         :full_path => "/cookbook-folder/files/ubuntu-9.10/adirectory/anotherfile2.rb.platform-full-version",
-         :checksum => "csum-platver-full-2",
-         :specificity => "ubuntu-9.10",
+         name: "files/anotherfile2.rb",
+         path: "files/ubuntu-9.10/adirectory/anotherfile2.rb.platform-full-version",
+         full_path: "/cookbook-folder/files/ubuntu-9.10/adirectory/anotherfile2.rb.platform-full-version",
+         checksum: "csum-platver-full-2",
+         specificity: "ubuntu-9.10",
        },
 
        {
-         :name => "files/anotherfile1.rb",
-         :path => "files/newubuntu-9/adirectory/anotherfile1.rb.platform-partial-version",
-         :full_path => "/cookbook-folder/files/newubuntu-9/adirectory/anotherfile1.rb.platform-partial-version",
-         :checksum => "csum-platver-partial-1",
-         :specificity => "newubuntu-9",
+         name: "files/anotherfile1.rb",
+         path: "files/newubuntu-9/adirectory/anotherfile1.rb.platform-partial-version",
+         full_path: "/cookbook-folder/files/newubuntu-9/adirectory/anotherfile1.rb.platform-partial-version",
+         checksum: "csum-platver-partial-1",
+         specificity: "newubuntu-9",
        },
        {
-         :name => "files/anotherfile2.rb",
-         :path => "files/newubuntu-9/adirectory/anotherfile2.rb.platform-partial-version",
-         :full_path => "/cookbook-folder/files/newubuntu-9/adirectory/anotherfile2.rb.platform-partial-version",
-         :checksum => "csum-platver-partial-2",
-         :specificity => "nweubuntu-9",
+         name: "files/anotherfile2.rb",
+         path: "files/newubuntu-9/adirectory/anotherfile2.rb.platform-partial-version",
+         full_path: "/cookbook-folder/files/newubuntu-9/adirectory/anotherfile2.rb.platform-partial-version",
+         checksum: "csum-platver-partial-2",
+         specificity: "nweubuntu-9",
        },
 
        {
-         :name => "files/anotherfile1.rb",
-         :path => "files/ubuntu/adirectory/anotherfile1.rb.platform",
-         :full_path => "/cookbook-folder/files/ubuntu/adirectory/anotherfile1.rb.platform",
-         :checksum => "csum-plat-1",
-         :specificity => "ubuntu",
+         name: "files/anotherfile1.rb",
+         path: "files/ubuntu/adirectory/anotherfile1.rb.platform",
+         full_path: "/cookbook-folder/files/ubuntu/adirectory/anotherfile1.rb.platform",
+         checksum: "csum-plat-1",
+         specificity: "ubuntu",
        },
        {
-         :name => "files/anotherfile2.rb",
-         :path => "files/ubuntu/adirectory/anotherfile2.rb.platform",
-         :full_path => "/cookbook-folder/files/ubuntu/adirectory/anotherfile2.rb.platform",
-         :checksum => "csum-plat-2",
-         :specificity => "ubuntu",
+         name: "files/anotherfile2.rb",
+         path: "files/ubuntu/adirectory/anotherfile2.rb.platform",
+         full_path: "/cookbook-folder/files/ubuntu/adirectory/anotherfile2.rb.platform",
+         checksum: "csum-plat-2",
+         specificity: "ubuntu",
        },
 
        {
-         :name => "files/anotherfile1.rb",
-         :path => "files/default/adirectory/anotherfile1.rb.default",
-         :full_path => "/cookbook-folder/files/default/adirectory/anotherfile1.rb.default",
-         :checksum => "csum-default-1",
-         :specificity => "default",
+         name: "files/anotherfile1.rb",
+         path: "files/default/adirectory/anotherfile1.rb.default",
+         full_path: "/cookbook-folder/files/default/adirectory/anotherfile1.rb.default",
+         checksum: "csum-default-1",
+         specificity: "default",
        },
        {
-         :name => "files/anotherfile2.rb",
-         :path => "files/default/adirectory/anotherfile2.rb.default",
-         :full_path => "/cookbook-folder/files/default/adirectory/anotherfile2.rb.default",
-         :checksum => "csum-default-2",
-         :specificity => "default",
+         name: "files/anotherfile2.rb",
+         path: "files/default/adirectory/anotherfile2.rb.default",
+         full_path: "/cookbook-folder/files/default/adirectory/anotherfile2.rb.default",
+         checksum: "csum-default-2",
+         specificity: "default",
        },
        # for different/odd platform_versions
        {
-         :name => "files/anotherfile1.rb",
-         :path => "files/fakeos-2.0.rc.1/adirectory/anotherfile1.rb.platform-full-version",
-         :full_path => "/cookbook-folder/files/fakeos-2.0.rc.1/adirectory/anotherfile1.rb.platform-full-version",
-         :checksum => "csum2-platver-full-1",
-         :specificity => "fakeos-2.0.rc.1",
+         name: "files/anotherfile1.rb",
+         path: "files/fakeos-2.0.rc.1/adirectory/anotherfile1.rb.platform-full-version",
+         full_path: "/cookbook-folder/files/fakeos-2.0.rc.1/adirectory/anotherfile1.rb.platform-full-version",
+         checksum: "csum2-platver-full-1",
+         specificity: "fakeos-2.0.rc.1",
        },
        {
-         :name => "files/anotherfile2.rb",
-         :path => "files/fakeos-2.0.rc.1/adirectory/anotherfile2.rb.platform-full-version",
-         :full_path => "/cookbook-folder/files/fakeos-2.0.rc.1/adirectory/anotherfile2.rb.platform-full-version",
-         :checksum => "csum2-platver-full-2",
-         :specificity => "fakeos-2.0.rc.1",
+         name: "files/anotherfile2.rb",
+         path: "files/fakeos-2.0.rc.1/adirectory/anotherfile2.rb.platform-full-version",
+         full_path: "/cookbook-folder/files/fakeos-2.0.rc.1/adirectory/anotherfile2.rb.platform-full-version",
+         checksum: "csum2-platver-full-2",
+         specificity: "fakeos-2.0.rc.1",
        },
        {
-         :name => "files/anotherfile1.rb",
-         :path => "files/newfakeos-2.0.rc.1/adirectory/anotherfile1.rb.platform-partial-version",
-         :full_path => "/cookbook-folder/files/newfakeos-2.0.rc.1/adirectory/anotherfile1.rb.platform-partial-version",
-         :checksum => "csum2-platver-partial-1",
-         :specificity => "newfakeos-2.0.rc",
+         name: "files/anotherfile1.rb",
+         path: "files/newfakeos-2.0.rc.1/adirectory/anotherfile1.rb.platform-partial-version",
+         full_path: "/cookbook-folder/files/newfakeos-2.0.rc.1/adirectory/anotherfile1.rb.platform-partial-version",
+         checksum: "csum2-platver-partial-1",
+         specificity: "newfakeos-2.0.rc",
        },
        {
-         :name => "files/anotherfile2.rb",
-         :path => "files/newfakeos-2.0.rc.1/adirectory/anotherfile2.rb.platform-partial-version",
-         :full_path => "/cookbook-folder/files/newfakeos-2.0.rc.1/adirectory/anotherfile2.rb.platform-partial-version",
-         :checksum => "csum2-platver-partial-2",
-         :specificity => "newfakeos-2.0.rc",
+         name: "files/anotherfile2.rb",
+         path: "files/newfakeos-2.0.rc.1/adirectory/anotherfile2.rb.platform-partial-version",
+         full_path: "/cookbook-folder/files/newfakeos-2.0.rc.1/adirectory/anotherfile2.rb.platform-partial-version",
+         checksum: "csum2-platver-partial-2",
+         specificity: "newfakeos-2.0.rc",
        },
        {
-         :name => "files/anotherfile1.rb",
-         :path => "files/fakeos-maple tree/adirectory/anotherfile1.rb.platform-full-version",
-         :full_path => "/cookbook-folder/files/fakeos-maple tree/adirectory/anotherfile1.rb.platform-full-version",
-         :checksum => "csum3-platver-full-1",
-         :specificity => "fakeos-maple tree",
+         name: "files/anotherfile1.rb",
+         path: "files/fakeos-maple tree/adirectory/anotherfile1.rb.platform-full-version",
+         full_path: "/cookbook-folder/files/fakeos-maple tree/adirectory/anotherfile1.rb.platform-full-version",
+         checksum: "csum3-platver-full-1",
+         specificity: "fakeos-maple tree",
        },
        {
-         :name => "files/anotherfile2.rb",
-         :path => "files/fakeos-maple tree/adirectory/anotherfile2.rb.platform-full-version",
-         :full_path => "/cookbook-folder/files/fakeos-maple tree/adirectory/anotherfile2.rb.platform-full-version",
-         :checksum => "csum3-platver-full-2",
-         :specificity => "fakeos-maple tree",
+         name: "files/anotherfile2.rb",
+         path: "files/fakeos-maple tree/adirectory/anotherfile2.rb.platform-full-version",
+         full_path: "/cookbook-folder/files/fakeos-maple tree/adirectory/anotherfile2.rb.platform-full-version",
+         checksum: "csum3-platver-full-2",
+         specificity: "fakeos-maple tree",
        },
        {
-         :name => "files/anotherfile1.rb",
-         :path => "files/fakeos-1/adirectory/anotherfile1.rb.platform-full-version",
-         :full_path => "/cookbook-folder/files/fakeos-1/adirectory/anotherfile1.rb.platform-full-version",
-         :checksum => "csum4-platver-full-1",
-         :specificity => "fakeos-1",
+         name: "files/anotherfile1.rb",
+         path: "files/fakeos-1/adirectory/anotherfile1.rb.platform-full-version",
+         full_path: "/cookbook-folder/files/fakeos-1/adirectory/anotherfile1.rb.platform-full-version",
+         checksum: "csum4-platver-full-1",
+         specificity: "fakeos-1",
        },
        {
-         :name => "files/anotherfile2.rb",
-         :path => "files/fakeos-1/adirectory/anotherfile2.rb.platform-full-version",
-         :full_path => "/cookbook-folder/files/fakeos-1/adirectory/anotherfile2.rb.platform-full-version",
-         :checksum => "csum4-platver-full-2",
-         :specificity => "fakeos-1",
+         name: "files/anotherfile2.rb",
+         path: "files/fakeos-1/adirectory/anotherfile2.rb.platform-full-version",
+         full_path: "/cookbook-folder/files/fakeos-1/adirectory/anotherfile2.rb.platform-full-version",
+         checksum: "csum4-platver-full-2",
+         specificity: "fakeos-1",
        },
       ],
     }

data/spec/unit/daemon_spec.rb

@@ -24,8 +24,8 @@ describe Chef::Daemon do
 
   before do
     if windows?
-      mock_struct = #Struct::Passwd.new(nil, nil, 111, 111)
-        mock_struct = OpenStruct.new(:uid => 2342, :gid => 2342)
+      mock_struct = # Struct::Passwd.new(nil, nil, 111, 111)
+        mock_struct = OpenStruct.new(uid: 2342, gid: 2342)
       allow(Etc).to receive(:getpwnam).and_return mock_struct
       allow(Etc).to receive(:getgrnam).and_return mock_struct
       # mock unimplemented methods
@@ -126,8 +126,8 @@ describe Chef::Daemon do
       allow(Process::UID).to receive(:change_privilege).and_return(nil)
       allow(Process::GID).to receive(:change_privilege).and_return(nil)
 
-      @pw_user = double("Struct::Passwd", :uid => 501)
-      @pw_group = double("Struct::Group", :gid => 20)
+      @pw_user = double("Struct::Passwd", uid: 501)
+      @pw_group = double("Struct::Group", gid: 20)
 
       allow(Process).to receive(:initgroups).and_return(true)