chef 13.0.113-universal-mingw32 → 13.0.118-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c93d79bf64bf645d51d6ee5b24ff4ef9ccfcecb
-  data.tar.gz: e5b74d8181ae4f16bd494c1503ed13b7c170b5be
+  metadata.gz: 7fc7f0e81269f48b6449161ed3cb8c15bdd54d6c
+  data.tar.gz: 67b0882342404cab056cb7f6bc7501861720605b
 SHA512:
-  metadata.gz: 9c33831a2db5c1d28c7b39370a6d379e15bab3c49229042ab184b48e35b41b8b9c15f5fc3b2ccc5571f1b222552e8cc9b260210302b59739c76797c5836b8236
-  data.tar.gz: 5520e7b2b6d1bad1e9e058a0d0031aebc248c8eaceb63331716d59904e84efe7d0e2bf0ae74463cc17938b4098c4d4a2246c946bc674166ed6fea61d957836b1
+  metadata.gz: 2b80bafea21ed673fe5b3d3acc65f3c1683f7a5bf23117635f158f44391fbf08fad59d6aa170bf9fe1b5a6eee0b3f8a57593f0188a1f3ba645307d363165933e
+  data.tar.gz: f82b13cddafe20163e6ab5fecdc9c616df1e8a05c8f58b5db46a456e50661ec584aaf4c55709b73f810c493e9e7f72dc199640a37f06643ef0263f6878301e4c

data/VERSION

@@ -1 +1 @@
-13.0.113
+13.0.118

data/acceptance/fips/.acceptance/acceptance-cookbook/recipes/destroy.rb

@@ -1 +1 @@
-#kitchen "destroy"
+kitchen "destroy"

data/acceptance/fips/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -1 +1 @@
-#kitchen "converge"
+kitchen "converge"

data/acceptance/fips/.acceptance/acceptance-cookbook/recipes/verify.rb

@@ -1 +1 @@
-#kitchen "verify"
+kitchen "verify"

data/lib/chef/client.rb

@@ -532,6 +532,7 @@ class Chef
     #
     def load_required_recipe(rest, run_context)
       required_recipe_contents = rest.get("required_recipe")
+      Chef::Log.info("Required Recipe found, loading it")
       Chef::FileCache.store("required_recipe", required_recipe_contents)
       required_recipe_file = Chef::FileCache.load("required_recipe", false)
 
@@ -552,7 +553,7 @@ class Chef
     rescue Net::HTTPServerException => e
       case e.response
       when Net::HTTPNotFound
-        Chef::Log.info("Required Recipe not found")
+        Chef::Log.debug("Required Recipe not configured on the server, skipping it")
       else
         raise
       end

data/lib/chef/cookbook/manifest_v0.rb

@@ -27,13 +27,14 @@ class Chef
       COOKBOOK_SEGMENTS = %w{ resources providers recipes definitions libraries attributes files templates root_files }
 
       def self.from_hash(hash)
-        response = Mash.new
+        response = Mash.new(hash)
         response[:all_files] = COOKBOOK_SEGMENTS.inject([]) do |memo, segment|
           next memo if hash[segment].nil? || hash[segment].empty?
           hash[segment].each do |file|
             file["name"] = "#{segment}/#{file["name"]}" unless segment == "root_files"
             memo << file
           end
+          response.delete(segment)
           memo
         end
         response
@@ -44,7 +45,7 @@ class Chef
         result.delete("all_files")
 
         files = manifest.by_parent_directory
-        files.keys.inject(result) do |memo, parent|
+        files.keys.each_with_object(result) do |parent, memo|
           if COOKBOOK_SEGMENTS.include?(parent)
             memo[parent] ||= []
             files[parent].each do |file|
@@ -53,7 +54,11 @@ class Chef
               memo[parent] << file
             end
           end
-          memo
+        end
+        # Ensure all segments are set to [] if they don't exist.
+        # See https://github.com/chef/chef/issues/6044
+        COOKBOOK_SEGMENTS.each do |segment|
+          result[segment] ||= []
         end
 
         result.merge({ "frozen?" => manifest.frozen_version?, "chef_type" => "cookbook_version" })

data/lib/chef/provider/package.rb

@@ -297,7 +297,11 @@ class Chef
       def expand_options(options)
         # its deprecated but still work to do to deprecate it fully
         #Chef.deprecated(:package_misc, "expand_options is deprecated, use shell_out_compact or shell_out_compact_timeout instead")
-        options ? " #{options}" : ""
+        if options
+          " #{options.is_a?(Array) ? Shellwords.join(options) : options}"
+        else
+          ""
+        end
       end
 
       # Check the current_version against either the candidate_version or the new_version

data/lib/chef/provider/package/yum.rb

@@ -194,7 +194,7 @@ class Chef
         def manage_extra_repo_control
           if new_resource.options
             repo_control = []
-            new_resource.options.split.each do |opt|
+            new_resource.options.each do |opt|
               repo_control << opt if opt =~ /--(enable|disable)repo=.+/
             end
 

data/lib/chef/version.rb

@@ -21,7 +21,7 @@
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "13.0.113"
+  VERSION = "13.0.118"
 end
 
 #

data/spec/unit/client_spec.rb

@@ -437,7 +437,7 @@ EOM
       end
 
       it "should log and continue on" do
-        expect(Chef::Log).to receive(:info)
+        expect(Chef::Log).to receive(:debug)
         client.load_required_recipe(rest, run_context)
       end
     end

data/spec/unit/cookbook/manifest_v0_spec.rb

@@ -0,0 +1,133 @@
+#
+# Copyright:: Copyright 2017, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "spec_helper"
+require "chef/cookbook_manifest"
+require "chef/digester"
+require "pathname"
+
+describe Chef::Cookbook::ManifestV0 do
+  let(:version) { "1.2.3" }
+
+  let(:identifier) { "9e10455ce2b4a4e29424b7064b1d67a1a25c9d3b" }
+
+  let(:metadata) do
+    Chef::Cookbook::Metadata.new.tap do |m|
+      m.version(version)
+    end
+  end
+
+  let(:cookbook_root) { "/tmp/blah" }
+
+  let(:cookbook_version) do
+    Chef::CookbookVersion.new("tatft", cookbook_root).tap do |c|
+      c.metadata = metadata
+      c.identifier = identifier
+    end
+  end
+
+  let(:cookbook_manifest) { Chef::CookbookManifest.new(cookbook_version) }
+
+  let(:cookbook_root) { File.join(CHEF_SPEC_DATA, "cb_version_cookbooks", "tatft") }
+
+  let(:all_files) { Dir[File.join(cookbook_root, "**", "**")].reject { |f| File.directory? f } }
+
+  let(:expected_hash) do
+    {
+      "attributes" => [{ "name" => "default.rb", "path" => "attributes/default.rb", "checksum" => "a88697db56181498a8828d5531271ad9", "specificity" => "default" }],
+      "chef_type" => "cookbook_version",
+      "cookbook_name" => "tatft",
+      "definitions" => [{ "name" => "runit_service.rb", "path" => "definitions/runit_service.rb", "checksum" => "c40cf9b4c6eb15a8e49e31602f701161", "specificity" => "default" }],
+      "files" => [{ "name" => "giant_blob.tgz", "path" => "files/default/giant_blob.tgz", "checksum" => "5b4b194bb80938bb18da7af5c823cb1b", "specificity" => "default" }],
+      "frozen?" => false,
+      "libraries" => [{ "name" => "ownage.rb", "path" => "libraries/ownage.rb", "checksum" => "4686edd9968909034692e09e058d90d9", "specificity" => "default" }],
+      "name" => "tatft-1.2.3",
+      "providers" => [{ "name" => "lwp.rb", "path" => "providers/lwp.rb", "checksum" => "bc189d68f77bb054d1070aeff7669557", "specificity" => "default" }],
+      "recipes" => [{ "name" => "default.rb", "path" => "recipes/default.rb", "checksum" => "09bc749f00c68717d288de9c8d7c644f", "specificity" => "default" }],
+      "resources" => [{ "name" => "lwr.rb", "path" => "resources/lwr.rb", "checksum" => "609c40d3d3f269e7edf230277a240ef5", "specificity" => "default" }],
+      "root_files" => [{ "name" => "README.rdoc", "path" => "README.rdoc", "checksum" => "cd7be9a1b9b1f33e3bcd9c3f4bc8dde5", "specificity" => "default" }],
+      "templates" => [{ "name" => "configuration.erb", "path" => "templates/default/configuration.erb", "checksum" => "d41d8cd98f00b204e9800998ecf8427e", "specificity" => "default" }],
+      "version" => "1.2.3",
+    }
+  end
+
+  describe "#from_hash" do
+    let(:source_hash) do
+      {
+      "attributes" => [{ "name" => "default.rb", "path" => "attributes/default.rb", "checksum" => "a88697db56181498a8828d5531271ad9", "specificity" => "default" }],
+      "recipes" => [{ "name" => "default.rb", "path" => "recipes/default.rb", "checksum" => "09bc749f00c68717d288de9c8d7c644f", "specificity" => "default" }],
+      "root_files" => [{ "name" => "README.rdoc", "path" => "README.rdoc", "checksum" => "cd7be9a1b9b1f33e3bcd9c3f4bc8dde5", "specificity" => "default" }],
+      "name" => "tatft-1.2.3",
+      "version" => "1.2.3",
+      }
+    end
+
+    it "preserves the version" do
+      result = described_class.from_hash(source_hash)
+      expect(result["version"]).to eq "1.2.3"
+    end
+
+    it "creates an all_files key and populates it" do
+      result = described_class.from_hash(source_hash)
+      expect(result[:all_files].map { |f| f["name"] }).to match_array %w{ recipes/default.rb attributes/default.rb README.rdoc }
+    end
+
+    it "deletes unwanted segment types" do
+      result = described_class.from_hash(source_hash)
+      expect(result["attributes"]).to be_nil
+    end
+
+    it "preserves frozeness" do
+      source_hash["frozen?"] = true
+      result = described_class.from_hash(source_hash)
+      expect(result["frozen?"]).to be true
+    end
+  end
+
+  describe "#to_hash" do
+    it "accepts a cookbook manifest" do
+      result = described_class.to_hash(cookbook_manifest)
+      expect(result).to be_a(Hash)
+    end
+
+    it "preserves frozeness" do
+      cookbook_version.freeze_version
+      expect(described_class.to_hash(cookbook_manifest)["frozen?"]).to be true
+    end
+  end
+
+  context "ensures that all segments exist" do
+    Chef::Cookbook::ManifestV0::COOKBOOK_SEGMENTS.each do |segment|
+      it "with #{segment}" do
+        result = described_class.to_hash(cookbook_manifest)
+        expect(result[segment]).to be_empty
+      end
+    end
+  end
+
+  context "when given a cookbook with some files" do
+    before do
+      cookbook_version.all_files = all_files
+    end
+
+    Chef::Cookbook::ManifestV0::COOKBOOK_SEGMENTS.each do |segment|
+      it "places the files for #{segment} correctly" do
+        result = described_class.to_hash(cookbook_manifest)
+        expect(result[segment]).to eq(expected_hash[segment])
+      end
+    end
+  end
+end

data/spec/unit/cookbook/manifest_v2_spec.rb

@@ -0,0 +1,70 @@
+#
+# Copyright:: Copyright 2017, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "spec_helper"
+require "chef/cookbook_manifest"
+require "chef/digester"
+require "pathname"
+
+describe Chef::Cookbook::ManifestV2 do
+  let(:version) { "1.2.3" }
+
+  let(:identifier) { "9e10455ce2b4a4e29424b7064b1d67a1a25c9d3b" }
+
+  let(:metadata) do
+    Chef::Cookbook::Metadata.new.tap do |m|
+      m.version(version)
+    end
+  end
+
+  let(:cookbook_root) { "/tmp/blah" }
+
+  let(:cookbook_version) do
+    Chef::CookbookVersion.new("tatft", cookbook_root).tap do |c|
+      c.metadata = metadata
+      c.identifier = identifier
+    end
+  end
+
+  let(:cookbook_manifest) { Chef::CookbookManifest.new(cookbook_version) }
+
+  let(:cookbook_root) { File.join(CHEF_SPEC_DATA, "cb_version_cookbooks", "tatft") }
+
+  let(:all_files) { Dir[File.join(cookbook_root, "**", "**")].reject { |f| File.directory? f } }
+
+  describe "#to_hash" do
+    it "accepts a cookbook manifest" do
+      result = described_class.to_hash(cookbook_manifest)
+      expect(result).to be_a(Hash)
+    end
+
+    it "preserves frozeness" do
+      cookbook_version.freeze_version
+      expect(described_class.to_hash(cookbook_manifest)["frozen?"]).to be true
+    end
+  end
+
+  context "when given a cookbook with some files" do
+    before do
+      cookbook_version.all_files = all_files
+    end
+
+    it "populates all_files correctly" do
+      result = described_class.to_hash(cookbook_manifest)
+      expect(result["all_files"][0]).not_to include(:full_path)
+    end
+  end
+end

data/spec/unit/provider/package/yum_spec.rb

@@ -278,31 +278,31 @@ describe Chef::Provider::Package::Yum do
     end
 
     it "should flush the cache if :before is true" do
-      allow(@new_resource).to receive(:flush_cache).and_return({ :after => false, :before => true })
+      @new_resource.flush_cache({ :after => false, :before => true })
       expect(@yum_cache).to receive(:reload).once
       @provider.load_current_resource
     end
 
     it "should flush the cache if :before is false" do
-      allow(@new_resource).to receive(:flush_cache).and_return({ :after => false, :before => false })
+      @new_resource.flush_cache({ :after => false, :before => false })
       expect(@yum_cache).not_to receive(:reload)
       @provider.load_current_resource
     end
 
     it "should detect --enablerepo or --disablerepo when passed among options, collect them preserving order and notify the yum cache" do
-      allow(@new_resource).to receive(:options).and_return("--stuff --enablerepo=foo --otherthings --disablerepo=a,b,c  --enablerepo=bar")
+      @new_resource.options("--stuff --enablerepo=foo --otherthings --disablerepo=a,b,c  --enablerepo=bar")
       expect(@yum_cache).to receive(:enable_extra_repo_control).with("--enablerepo=foo --disablerepo=a,b,c --enablerepo=bar")
       @provider.load_current_resource
     end
 
     it "should let the yum cache know extra repos are disabled if --enablerepo or --disablerepo aren't among options" do
-      allow(@new_resource).to receive(:options).and_return("--stuff --otherthings")
+      @new_resource.options("--stuff --otherthings")
       expect(@yum_cache).to receive(:disable_extra_repo_control)
       @provider.load_current_resource
     end
 
     it "should let the yum cache know extra repos are disabled if options aren't set" do
-      allow(@new_resource).to receive(:options).and_return(nil)
+      @new_resource.options(nil)
       expect(@yum_cache).to receive(:disable_extra_repo_control)
       @provider.load_current_resource
     end
@@ -558,7 +558,7 @@ describe Chef::Provider::Package::Yum do
     it "installs the package with the options given in the resource" do
       @provider.load_current_resource
       allow(@provider).to receive(:candidate_version).and_return("11")
-      allow(@new_resource).to receive(:options).and_return("--disablerepo epmd")
+      @new_resource.options("--disablerepo epmd")
       allow(Chef::Provider::Package::Yum::RPMUtils).to receive(:rpmvercmp).and_return(-1)
       expect(@provider).to receive(:yum_command).with(
         "-d0 -e0 -y --disablerepo epmd install cups-11"
@@ -2261,7 +2261,7 @@ describe "Chef::Provider::Package::Yum - Multi" do
       expect(@provider).to receive(:yum_command).with(
         "-d0 -e0 -y --disablerepo epmd install cups-1.2.4-11.19.el5 vim-1.0"
       )
-      allow(@new_resource).to receive(:options).and_return("--disablerepo epmd")
+      @new_resource.options("--disablerepo epmd")
       @provider.install_package(%w{cups vim}, ["1.2.4-11.19.el5", "1.0"])
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 13.0.113
+  version: 13.0.118
 platform: universal-mingw32
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.0.113
+        version: 13.0.118
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.0.113
+        version: 13.0.118
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -2295,6 +2295,8 @@ files:
 - spec/unit/cookbook/cookbook_version_loader_spec.rb
 - spec/unit/cookbook/file_vendor_spec.rb
 - spec/unit/cookbook/gem_installer_spec.rb
+- spec/unit/cookbook/manifest_v0_spec.rb
+- spec/unit/cookbook/manifest_v2_spec.rb
 - spec/unit/cookbook/metadata_spec.rb
 - spec/unit/cookbook/synchronizer_spec.rb
 - spec/unit/cookbook/syntax_check_spec.rb