chef 14.14.14 → 14.14.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 373ee3f28e219feb4d8fb512941d45bd481984e5322ef179e3af8613687c24ac
-  data.tar.gz: 454388074999eaedeb51f8675b5adb3d9d94e3b5bed6259ccb61280443bf04c0
+  metadata.gz: 8f9eaae19a63a8cff9278ec4d58c2900d1abfdfc9f2c882328a1fd405b38e66e
+  data.tar.gz: 139bd109c7ebb0025cb2535e9bc98e89b0cabae3f31552a614454c87304b3629
 SHA512:
-  metadata.gz: 24dff4719939d387ffbc11832121d581163a95f1c1b4b4f0c1e8a75510f367d54847b4094284ab16c305ff1fff98b8200196ae51b0969e5f7b0de4df07347cf2
-  data.tar.gz: b1fb6a6dd54b49081c99d07eb7dd112b6985e9834553a75b9a0992dc823a8e1ac84d88984843ec435dd8f35a31eccfd0219c589ca315b10ea4bc60d4b5d161d1
+  metadata.gz: b78137d16d8a95b383192c1cd38c77bc9292457f8aa8d2fcf57d256605620ded1c72eab56f42ce258bcf47f39f2372ea61d4b7976f515ee1109b4d3383b31114
+  data.tar.gz: 29ea5757e164fad7d3f45859451e1f4cd70ffdc064c0b41e3f79735e3f4a327e579018e2fd98a0a36533498121048b25f1faea15edc8f150ff63676be61e1088

data/lib/chef/cookbook/gem_installer.rb

@@ -69,7 +69,8 @@ class Chef
                 # Skip installation only if Chef::Config[:skip_gem_metadata_installation] option is true
                 unless Chef::Config[:skip_gem_metadata_installation]
                   # Add additional options to bundle install
-                  cmd = [ "bundle", "install", Chef::Config[:gem_installer_bundler_options] ]
+                  cmd = "bundle install"
+                  cmd += " #{Chef::Config[:gem_installer_bundler_options]}" if Chef::Config[:gem_installer_bundler_options]
                   so = shell_out!(cmd, cwd: dir, env: { "PATH" => path_with_prepended_ruby_bin })
                   Chef::Log.info(so.stdout)
                 end

data/lib/chef/knife.rb

@@ -63,6 +63,12 @@ class Chef
     attr_accessor :name_args
     attr_accessor :ui
 
+    # knife acl subcommands are grouped in this category using this constant to verify.
+    OPSCODE_HOSTED_CHEF_ACCESS_CONTROL = %w{acl group user}.freeze
+
+    # knife opc subcommands are grouped in this category using this constant to verify.
+    CHEF_ORGANIZATION_MANAGEMENT = %w{opc}.freeze
+
     # Configure mixlib-cli to always separate defaults from user-supplied CLI options
     def self.use_separate_defaults?
       true
@@ -269,7 +275,11 @@ class Chef
           ui.info("If this is a recently installed plugin, please run 'knife rehash' to update the subcommands cache.")
         end
 
-        if category_commands = guess_category(args)
+        if CHEF_ORGANIZATION_MANAGEMENT.include?(args[0])
+          list_commands("CHEF ORGANIZATION MANAGEMENT")
+        elsif OPSCODE_HOSTED_CHEF_ACCESS_CONTROL.include?(args[0])
+          list_commands("OPSCODE HOSTED CHEF ACCESS CONTROL")
+        elsif category_commands = guess_category(args)
           list_commands(category_commands)
         elsif OFFICIAL_PLUGINS.include?(args[0]) # command was an uninstalled official chef knife plugin
           ui.info("Use `chef gem install knife-#{args[0]}` to install the plugin into ChefDK")

data/lib/chef/knife/cookbook_metadata_from_file.rb

@@ -28,7 +28,7 @@ class Chef
         require "chef/cookbook/metadata"
       end
 
-      banner "knife cookbook metadata from FILE (options)"
+      banner "knife cookbook metadata from file FILE (options)"
 
       def run
         file = @name_args[0]

data/lib/chef/knife/ssh.rb

@@ -620,7 +620,7 @@ class Chef
           end
 
         session.close
-        if exit_status != 0
+        if exit_status && exit_status != 0
           exit exit_status
         else
           exit_status

data/lib/chef/provider/ifconfig.rb

@@ -108,19 +108,21 @@ class Chef
           #       RX errors 0  dropped 0  overruns 0  frame 0
           #       TX packets 1244218  bytes 977339327 (932.0 MiB)
           #       TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
+          #
+          # Permalink for addr_regex : https://rubular.com/r/JrykUpfjRnYeQD
           @status = shell_out("ifconfig")
           @status.stdout.each_line do |line|
-            addr_regex = /^(\w+):?(\d*):?\ .+$/
+            addr_regex = /^(\w+)(-?):?(\d*):?\ .+$/
             if line =~ addr_regex
               if line.match(addr_regex).nil?
                 @int_name = "nil"
-              elsif line.match(addr_regex)[2] == ""
+              elsif line.match(addr_regex)[3] == ""
                 @int_name = line.match(addr_regex)[1]
                 @interfaces[@int_name] = Hash.new
                 @interfaces[@int_name]["mtu"] = (line =~ /mtu (\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /mtu/ && @interfaces[@int_name]["mtu"].nil?
               else
-                @int_name = "#{line.match(addr_regex)[1]}:#{line.match(addr_regex)[2]}"
-                @interfaces[@int_name] = Hash.new
+                @int_name = "#{line.match(addr_regex)[1]}:#{line.match(addr_regex)[3]}"
+                @interfaces[@int_name] = {}
                 @interfaces[@int_name]["mtu"] = (line =~ /mtu (\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /mtu/ && @interfaces[@int_name]["mtu"].nil?
               end
             else

data/lib/chef/provider/user.rb

@@ -34,7 +34,7 @@ class Chef
       end
 
       def convert_group_name
-        if new_resource.gid.is_a? String
+        if new_resource.gid.is_a?(String) && new_resource.gid.to_i == 0
           new_resource.gid(Etc.getgrnam(new_resource.gid).gid)
         end
       rescue ArgumentError

data/lib/chef/provider/windows_task.rb

@@ -444,7 +444,7 @@ class Chef
         def days_of_month
           days_of_month = []
           if new_resource.day
-            days = new_resource.day.split(",")
+            days = new_resource.day.to_s.split(",")
             days.map! { |day| day.to_s.strip.upcase }
             days.delete("LAST") if days.include?("LAST")
             days.delete("LASTDAY") if days.include?("LASTDAY")
@@ -464,7 +464,7 @@ class Chef
           if new_resource.day
             # this line of code is just to support backward compatibility of wild card *
             new_resource.day = "mon, tue, wed, thu, fri, sat, sun" if new_resource.day == "*" && new_resource.frequency == :weekly
-            days = new_resource.day.split(",")
+            days = new_resource.day.to_s.split(",")
             days.map! { |day| day.to_s.strip.upcase }
             weeks_days = get_binary_values_from_constants(days, DAYS_OF_WEEK)
           else

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require "chef/version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = Chef::VersionString.new("14.14.14")
+  VERSION = Chef::VersionString.new("14.14.25")
 end
 
 #

data/spec/unit/cookbook/gem_installer_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require "bundler/dsl"
+require "bundler"
 
 describe Chef::Cookbook::GemInstaller do
   let(:cookbook_collection) do
@@ -106,7 +106,7 @@ describe Chef::Cookbook::GemInstaller do
 
   it "install from local cache when Chef::Config[:gem_installer_bundler_options] is set to local" do
     Chef::Config[:gem_installer_bundler_options] = "--local"
-    expect(gem_installer).to receive(:shell_out!).with(["bundle", "install", "--local"], any_args).and_return(shell_out)
+    expect(gem_installer).to receive(:shell_out!).with("bundle install --local", any_args).and_return(shell_out)
     expect(Chef::Log).to receive(:info).and_return("")
     expect(gem_installer.install).to be_empty
   end

data/spec/unit/provider/ifconfig_spec.rb

@@ -94,6 +94,17 @@ EOS
       expect(@new_resource).not_to be_updated
     end
 
+    it "should add a bridge interface" do
+      allow(@provider).to receive(:load_current_resource)
+      @new_resource.device "br-1234"
+      command = "ifconfig br-1234 10.0.0.1 netmask 255.255.254.0 metric 1 mtu 1500"
+      expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
+      expect(@provider).to receive(:generate_config)
+
+      @provider.run_action(:add)
+      expect(@new_resource).to be_updated
+    end
+
     # We are not testing this case with the assumption that anyone writing the cookbook would not make a typo == lo
     # it "should add a blank command if the #{@new_resource.device} == lo" do
     # end

data/spec/unit/provider/user_spec.rb

@@ -444,35 +444,51 @@ describe Chef::Provider::User do
 
   describe "convert_group_name" do
     before do
-      @new_resource.gid("999")
       @group = EtcGrnamIsh.new("wheel", "*", 999, [])
     end
 
-    it "should lookup the group name locally" do
-      expect(Etc).to receive(:getgrnam).with("999").and_return(@group)
-      expect(@provider.convert_group_name).to eq(999)
-    end
+    context "when user passes group name in gid" do
+      before do
+        @new_resource.gid("wheel")
+      end
 
-    it "should raise an error if we can't translate the group name during resource assertions" do
-      expect(Etc).to receive(:getgrnam).and_raise(ArgumentError)
-      @provider.action = :create
-      @provider.define_resource_requirements
-      @provider.convert_group_name
-      expect { @provider.process_resource_requirements }.to raise_error(Chef::Exceptions::User)
-    end
+      it "should lookup the group name locally" do
+        expect(Etc).to receive(:getgrnam).with("wheel").and_return(@group)
+        expect(@provider.convert_group_name).to eq(999)
+      end
+
+      it "should raise an error if we can't translate the group name during resource assertions" do
+        expect(Etc).to receive(:getgrnam).and_raise(ArgumentError)
+        @provider.action = :create
+        @provider.define_resource_requirements
+        @provider.convert_group_name
+        expect { @provider.process_resource_requirements }.to raise_error(Chef::Exceptions::User)
+      end
 
-    it "does not raise an error if we can't translate the group name during resource assertions if we are removing the user" do
-      expect(Etc).to receive(:getgrnam).and_raise(ArgumentError)
-      @provider.action = :remove
-      @provider.define_resource_requirements
-      @provider.convert_group_name
-      expect { @provider.process_resource_requirements }.not_to raise_error
+      it "does not raise an error if we can't translate the group name during resource assertions if we are removing the user" do
+        expect(Etc).to receive(:getgrnam).and_raise(ArgumentError)
+        @provider.action = :remove
+        @provider.define_resource_requirements
+        @provider.convert_group_name
+        expect { @provider.process_resource_requirements }.not_to raise_error
+      end
+
+      it "should set the new resources gid to the integerized version if available" do
+        expect(Etc).to receive(:getgrnam).with("wheel").and_return(@group)
+        @provider.convert_group_name
+        expect(@new_resource.gid).to eq(999)
+      end
     end
 
-    it "should set the new resources gid to the integerized version if available" do
-      expect(Etc).to receive(:getgrnam).with("999").and_return(@group)
-      @provider.convert_group_name
-      expect(@new_resource.gid).to eq(999)
+    context "when user passes group id in gid" do
+      before do
+        @new_resource.gid(999)
+      end
+
+      it "should not call getgrnam" do
+        expect(Etc).not_to receive(:getgrnam)
+        @provider.convert_group_name
+      end
     end
   end
 end

data/spec/unit/provider/windows_task_spec.rb

@@ -265,11 +265,16 @@ describe Chef::Provider::WindowsTask, :windows_only do
 
   # REF: https://msdn.microsoft.com/en-us/library/windows/desktop/aa382063(v=vs.85).aspx
   describe "#days_of_month" do
-    it "returns the binary value 1 if day is set as 1" do
+    it "returns the binary value 1 if day is set as string 1" do
       new_resource.day "1"
       expect(provider.send(:days_of_month)).to eq(1)
     end
 
+    it "returns the binary value 1 if day is set as integer 1" do
+      new_resource.day 1
+      expect(provider.send(:days_of_month)).to eq(1)
+    end
+
     it "returns the binary value 2 if day is set as 2" do
       new_resource.day "2"
       expect(provider.send(:days_of_month)).to eq(2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 14.14.14
+  version: 14.14.25
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 14.14.14
+        version: 14.14.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 14.14.14
+        version: 14.14.25
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -497,9 +497,7 @@ files:
 - bin/knife
 - chef-universal-mingw32.gemspec
 - chef.gemspec
-- lib/.DS_Store
 - lib/chef.rb
-- lib/chef/.DS_Store
 - lib/chef/api_client.rb
 - lib/chef/api_client/registration.rb
 - lib/chef/api_client_v1.rb
@@ -660,7 +658,6 @@ files:
 - lib/chef/deprecation/warnings.rb
 - lib/chef/digester.rb
 - lib/chef/dsl.rb
-- lib/chef/dsl/.DS_Store
 - lib/chef/dsl/audit.rb
 - lib/chef/dsl/chef_provisioning.rb
 - lib/chef/dsl/cheffish.rb
@@ -748,7 +745,6 @@ files:
 - lib/chef/json_compat.rb
 - lib/chef/key.rb
 - lib/chef/knife.rb
-- lib/chef/knife/.DS_Store
 - lib/chef/knife/bootstrap.rb
 - lib/chef/knife/bootstrap/chef_vault_handler.rb
 - lib/chef/knife/bootstrap/client_builder.rb
@@ -904,7 +900,6 @@ files:
 - lib/chef/log/syslog.rb
 - lib/chef/log/winevt.rb
 - lib/chef/mash.rb
-- lib/chef/mixin/.DS_Store
 - lib/chef/mixin/api_version_request_handling.rb
 - lib/chef/mixin/checksum.rb
 - lib/chef/mixin/convert_to_class_name.rb
@@ -977,7 +972,6 @@ files:
 - lib/chef/powershell.rb
 - lib/chef/property.rb
 - lib/chef/provider.rb
-- lib/chef/provider/.DS_Store
 - lib/chef/provider/apt_preference.rb
 - lib/chef/provider/apt_repository.rb
 - lib/chef/provider/apt_update.rb
@@ -1024,7 +1018,6 @@ files:
 - lib/chef/provider/ohai.rb
 - lib/chef/provider/osx_profile.rb
 - lib/chef/provider/package.rb
-- lib/chef/provider/package/.DS_Store
 - lib/chef/provider/package/apt.rb
 - lib/chef/provider/package/bff.rb
 - lib/chef/provider/package/cab.rb
@@ -1034,7 +1027,6 @@ files:
 - lib/chef/provider/package/dnf/python_helper.rb
 - lib/chef/provider/package/dnf/version.rb
 - lib/chef/provider/package/dpkg.rb
-- lib/chef/provider/package/freebsd/.DS_Store
 - lib/chef/provider/package/freebsd/base.rb
 - lib/chef/provider/package/freebsd/pkg.rb
 - lib/chef/provider/package/freebsd/pkgng.rb
@@ -1136,7 +1128,6 @@ files:
 - lib/chef/request_id.rb
 - lib/chef/reserved_names.rb
 - lib/chef/resource.rb
-- lib/chef/resource/.DS_Store
 - lib/chef/resource/action_class.rb
 - lib/chef/resource/apt_package.rb
 - lib/chef/resource/apt_preference.rb
@@ -1168,7 +1159,6 @@ files:
 - lib/chef/resource/dsc_script.rb
 - lib/chef/resource/execute.rb
 - lib/chef/resource/file.rb
-- lib/chef/resource/file/.DS_Store
 - lib/chef/resource/file/verification.rb
 - lib/chef/resource/file/verification/systemd_unit.rb
 - lib/chef/resource/freebsd_package.rb
@@ -1378,8 +1368,6 @@ files:
 - lib/chef/win32/version.rb
 - lib/chef/win32_service_constants.rb
 - lib/chef/workstation_config_loader.rb
-- spec/.DS_Store
-- spec/data/.DS_Store
 - spec/data/apt/chef-integration-test-1.0/debian/changelog
 - spec/data/apt/chef-integration-test-1.0/debian/compat
 - spec/data/apt/chef-integration-test-1.0/debian/control
@@ -1477,7 +1465,6 @@ files:
 - spec/data/client.d_01/foo/bar.rb
 - spec/data/client.d_02/foo.rb/foo.txt
 - spec/data/config.rb
-- spec/data/cookbooks/.DS_Store
 - spec/data/cookbooks/angrybash/metadata.rb
 - spec/data/cookbooks/angrybash/recipes/default.rb
 - spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl
@@ -1492,8 +1479,6 @@ files:
 - spec/data/cookbooks/ignorken/recipes/default.rb
 - spec/data/cookbooks/ignorken/recipes/ignoreme.rb
 - spec/data/cookbooks/ignorken/templates/ubuntu-12.10/not_me.rb
-- spec/data/cookbooks/java/.DS_Store
-- spec/data/cookbooks/java/files/.DS_Store
 - spec/data/cookbooks/java/files/default/java.response
 - spec/data/cookbooks/java/metadata.rb
 - spec/data/cookbooks/name-mismatch-versionnumber/README.md
@@ -1590,7 +1575,6 @@ files:
 - spec/data/lwrp_const_scoping/resources/conflict.rb
 - spec/data/lwrp_override/providers/buck_passer.rb
 - spec/data/lwrp_override/resources/foo.rb
-- spec/data/mac_users/.DS_Store
 - spec/data/mac_users/10.7-8.plist.xml
 - spec/data/mac_users/10.7-8.shadow.xml
 - spec/data/mac_users/10.7.plist.xml
@@ -1603,8 +1587,6 @@ files:
 - spec/data/mixin/invalid_data.rb
 - spec/data/mixin/real_data.rb
 - spec/data/nested.json
-- spec/data/nodes/Tim.local.json
-- spec/data/nodes/Tims-MBP.local.json
 - spec/data/nodes/default.rb
 - spec/data/nodes/test.example.com.rb
 - spec/data/nodes/test.rb
@@ -1641,8 +1623,6 @@ files:
 - spec/data/root_alias_cookbooks/simple/attributes.rb
 - spec/data/root_alias_cookbooks/simple/metadata.rb
 - spec/data/root_alias_cookbooks/simple/recipe.rb
-- spec/data/run_context/.DS_Store
-- spec/data/run_context/cookbooks/.DS_Store
 - spec/data/run_context/cookbooks/circular-dep1/attributes/default.rb
 - spec/data/run_context/cookbooks/circular-dep1/definitions/circular_dep1_res.rb
 - spec/data/run_context/cookbooks/circular-dep1/libraries/lib.rb
@@ -1735,7 +1715,6 @@ files:
 - spec/data/windows_certificates/test.p7b
 - spec/data/windows_certificates/test.pem
 - spec/data/windows_certificates/test.pfx
-- spec/functional/.DS_Store
 - spec/functional/application_spec.rb
 - spec/functional/assets/PkgA.1.0.0.0.bff
 - spec/functional/assets/PkgA.2.0.0.0.bff
@@ -1809,7 +1788,6 @@ files:
 - spec/functional/provider/remote_file/cache_control_data_spec.rb
 - spec/functional/provider/whyrun_safe_ruby_block_spec.rb
 - spec/functional/rebooter_spec.rb
-- spec/functional/resource/.DS_Store
 - spec/functional/resource/aix_service_spec.rb
 - spec/functional/resource/aixinit_service_spec.rb
 - spec/functional/resource/apt_package_spec.rb
@@ -1857,7 +1835,6 @@ files:
 - spec/functional/run_lock_spec.rb
 - spec/functional/shell_spec.rb
 - spec/functional/tiny_server_spec.rb
-- spec/functional/util/.DS_Store
 - spec/functional/util/path_helper_spec.rb
 - spec/functional/util/powershell/cmdlet_spec.rb
 - spec/functional/version_spec.rb
@@ -1868,7 +1845,6 @@ files:
 - spec/functional/win32/sid_spec.rb
 - spec/functional/win32/version_info_spec.rb
 - spec/functional/win32/versions_spec.rb
-- spec/integration/.DS_Store
 - spec/integration/client/client_spec.rb
 - spec/integration/client/exit_code_spec.rb
 - spec/integration/client/ipv6_spec.rb
@@ -1952,11 +1928,9 @@ files:
 - spec/rcov.opts
 - spec/scripts/ssl-serve.rb
 - spec/spec_helper.rb
-- spec/stress/.DS_Store
 - spec/stress/win32/file_spec.rb
 - spec/stress/win32/memory_spec.rb
 - spec/stress/win32/security_spec.rb
-- spec/support/.DS_Store
 - spec/support/chef_helpers.rb
 - spec/support/key_helpers.rb
 - spec/support/lib/chef/provider/easy.rb
@@ -2011,7 +1985,6 @@ files:
 - spec/support/shared/unit/user_and_client_shared.rb
 - spec/support/shared/unit/windows_script_resource.rb
 - spec/tiny_server.rb
-- spec/unit/.DS_Store
 - spec/unit/api_client/registration_spec.rb
 - spec/unit/api_client_spec.rb
 - spec/unit/api_client_v1_spec.rb
@@ -2575,7 +2548,6 @@ files:
 - spec/unit/win32/registry_spec.rb
 - spec/unit/win32/security_spec.rb
 - spec/unit/windows_service_spec.rb
-- tasks/.DS_Store
 - tasks/announce.rb
 - tasks/bin/run_external_test
 - tasks/dependencies.rb
@@ -2602,7 +2574,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: A systems integration framework, built to bring the benefits of configuration

data/spec/data/nodes/Tim.local.json

@@ -1,3 +0,0 @@
-{
-  "name": "Tim.local"
-}

data/spec/data/nodes/Tims-MBP.local.json

@@ -1,3 +0,0 @@
-{
-  "name": "Tims-MBP.local"
-}