chef 15.11.3 → 15.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 284b837896f77e4369e5cf591eb17b9a71761df8524a920f36afd7112093eab4
-  data.tar.gz: 8d750cfd693024f1a1a0fd4b0cec42086be4562593dbfb426baece630fe6f2e2
+  metadata.gz: e2df99a745fd7cfaf51e23b8bae5790d83153e773f3dbb371595b237f123ec35
+  data.tar.gz: e25709142e35f3df576f7346f5355fc85b08a3c56bafe9ad73ea2f2ab6a394bf
 SHA512:
-  metadata.gz: eb3a42ffe7ac30522a82e35cb852bdf2593ca4d174bc751db126cd40cd8a4eafab1e71c2525242b0889ada8539e135d087ad7d835f3f42cff1863e41c22ca77d
-  data.tar.gz: e6c0733787eef6eff73bb4a0017f431c5cb7683ef9ff72ea5c673418b8ea4cc737f5559bf13f651f2737b11db4fef011a95220572b0ff9bd2e78ff3fb5d482e9
+  metadata.gz: 75d116789c0412f953543c5cb30ac3d454b14e073949c002a060650500406b92a72b726bb1fd689866fa978d6a2091d632cf330ddd9655f217cbe562518ec3f1
+  data.tar.gz: f3146ac9f1a70433f8a510aefd5af9ed48e80a9505716c4b9cd6cabe929d94d8d94a837c877f9b82dd5d909bc59ae1bad16431957fd89c2c7ab4b1b072a27856

data/lib/chef/knife/bootstrap.rb

@@ -1108,7 +1108,8 @@ class Chef
       # These keys are available in Chef::Config, and are prefixed with the protocol name.
       # For example, :user CLI option will map to :winrm_user and :ssh_user Chef::Config keys,
       # based on the connection protocol in use.
-      def knife_key_for_protocol(protocol, option)
+      def knife_key_for_protocol(new_option, option = nil)
+        option = new_option if option.nil? # hacky compat with both old Chef-15 style and new Chef-16 style API signature
         "#{connection_protocol}_#{option}".to_sym
       end
 

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = Chef::VersionString.new("15.11.3")
+  VERSION = Chef::VersionString.new("15.11.8")
 end
 
 #

data/spec/spec_helper.rb

@@ -25,9 +25,10 @@ module Shell
 end
 
 $LOAD_PATH.unshift File.expand_path("../..", __FILE__)
-
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 $LOAD_PATH.unshift File.expand_path("../../chef-config/lib", __FILE__)
 $LOAD_PATH.unshift File.expand_path("../../chef-utils/lib", __FILE__)
+$LOAD_PATH.unshift File.dirname(__FILE__)
 
 require "rubygems"
 require "rspec/mocks"
@@ -103,6 +104,12 @@ resource_priority_map ||= nil
 provider_handler_map ||= nil
 resource_handler_map ||= nil
 
+class UnexpectedSystemExit < RuntimeError
+  def self.from(system_exit)
+    new(system_exit.message).tap { |e| e.set_backtrace(system_exit.backtrace) }
+  end
+end
+
 RSpec.configure do |config|
   config.include(Matchers)
   config.include(MockShellout::RSpec)
@@ -282,6 +289,15 @@ RSpec.configure do |config|
   config.before(:suite) do
     ARGV.clear
   end
+
+  # Protect Rspec from accidental exit(0) causing rspec to terminate without error
+  config.around(:example) do |ex|
+    begin
+      ex.run
+    rescue SystemExit => e
+      raise UnexpectedSystemExit.from(e)
+    end
+  end
 end
 
 require "webrick/utils"

data/spec/support/chef_helpers.rb

@@ -27,7 +27,7 @@ Chef::Log.level(Chef::Config.log_level)
 Chef::Config.solo(false)
 
 def sha256_checksum(path)
-  OpenSSL::Digest::SHA256.hexdigest(File.read(path))
+  OpenSSL::Digest.hexdigest("SHA256", File.read(path))
 end
 
 # extracted from Ruby < 2.5 to return a unique temp file name without creating it

data/spec/unit/data_collector_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require File.expand_path("../../spec_helper", __FILE__)
+require_relative "../spec_helper"
 require "chef/data_collector"
 require "socket"
 

data/spec/unit/file_access_control_spec.rb

@@ -93,7 +93,7 @@ describe Chef::FileAccessControl do
     end
 
     it "wraps uids to their negative complements to correctly handle negative uids" do
-      # More: Mac OS X (at least) has negative UIDs for 'nobody' and some other
+      # More: macOS (at least) has negative UIDs for 'nobody' and some other
       # users. Ruby doesn't believe in negative UIDs so you get the diminished radix
       # complement (i.e., it wraps around the maximum size of C unsigned int) of these
       # uids. So we have to get ruby and negative uids to smoke the peace pipe

data/spec/unit/json_compat_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path("../../spec_helper", __FILE__)
+require_relative "../spec_helper"
 require "chef/json_compat"
 
 describe Chef::JSONCompat do

data/spec/unit/provider/apt_repository_spec.rb

@@ -38,7 +38,7 @@ EOF
 
 # Output of the command:
 # => gpg --with-fingerprint --with-colons [FILE]
-GPG_FINGER = <<~EOF.freeze
+APT_GPG_FINGER = <<~EOF.freeze
   pub:-:1024:17:327574EE02A818DD:2009-04-22:::-:Cloudera Apt Repository:
   fpr:::::::::F36A89E33CC1BD0F71079007327574EE02A818DD:
   sub:-:2048:16:84080586D1CA74A1:2009-04-22::::
@@ -63,7 +63,7 @@ describe Chef::Provider::AptRepository do
   end
 
   let(:gpg_finger) do
-    double("shell_out", stdout: GPG_FINGER, exitstatus: 0, error?: false)
+    double("shell_out", stdout: APT_GPG_FINGER, exitstatus: 0, error?: false)
   end
 
   let(:gpg_shell_out_success) do

data/spec/unit/provider/zypper_repository_spec.rb

@@ -27,7 +27,7 @@ EOF
 
 # Output of the command:
 # => gpg --with-fingerprint [FILE]
-GPG_FINGER = <<~EOF.freeze
+ZYPPER_GPG_FINGER = <<~EOF.freeze
   pub  2048R/3DBDC284 2011-08-19 [expires: 2024-06-14]
         Key fingerprint = 573B FD6B 3D8F BC64 1079  A6AB ABF5 BD82 7BD9 BF62
   uid                            nginx signing key <signing-key@nginx.com>
@@ -49,7 +49,7 @@ describe Chef::Provider::ZypperRepository do
   end
 
   let(:gpg_finger) do
-    double("shell_out", stdout: GPG_FINGER, exitstatus: 0, error?: false)
+    double("shell_out", stdout: ZYPPER_GPG_FINGER, exitstatus: 0, error?: false)
   end
 
   it "responds to load_current_resource" do

data/spec/unit/resource_reporter_spec.rb

@@ -19,7 +19,7 @@
 # limitations under the License.
 #
 
-require File.expand_path("../../spec_helper", __FILE__)
+require_relative "../spec_helper"
 require "chef/resource_reporter"
 require "socket"
 

data/spec/unit/run_lock_spec.rb

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path("../../spec_helper", __FILE__)
+require_relative "../spec_helper"
 require "chef/client"
 
 describe Chef::RunLock do

data/spec/unit/scan_access_control_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require File.expand_path("../../spec_helper", __FILE__)
+require_relative "../spec_helper"
 require "chef/scan_access_control"
 
 describe Chef::ScanAccessControl do

data/tasks/rspec.rb

@@ -41,39 +41,31 @@ begin
 
   task spec: :component_specs
 
-  desc "Run standard specs (minus long running specs)"
+  desc "Run all specs in spec directory"
   RSpec::Core::RakeTask.new(:spec) do |t|
+    t.verbose = false
     t.rspec_opts = %w{--profile}
-    # right now this just limits to functional + unit, but could also remove
-    # individual tests marked long-running
     t.pattern = FileList["spec/**/*_spec.rb"]
   end
 
   namespace :spec do
-    desc "Run all specs in spec directory with RCov"
-    RSpec::Core::RakeTask.new(:rcov) do |t|
-      t.rspec_opts = %w{--profile}
-      t.pattern = FileList["spec/**/*_spec.rb"]
-      t.rcov = true
-      t.rcov_opts = lambda do
-        IO.readlines("#{CHEF_ROOT}/spec/rcov.opts").map { |l| l.chomp.split " " }.flatten
-      end
-    end
-
     desc "Run all specs in spec directory"
     RSpec::Core::RakeTask.new(:all) do |t|
+      t.verbose = false
       t.rspec_opts = %w{--profile}
       t.pattern = FileList["spec/**/*_spec.rb"]
     end
 
     desc "Print Specdoc for all specs"
     RSpec::Core::RakeTask.new(:doc) do |t|
+      t.verbose = false
       t.rspec_opts = %w{--format specdoc --dry-run --profile}
       t.pattern = FileList["spec/**/*_spec.rb"]
     end
 
     desc "Run the specs under spec/unit with activesupport loaded"
     RSpec::Core::RakeTask.new(:activesupport) do |t|
+      t.verbose = false
       t.rspec_opts = %w{--require active_support/core_ext --profile}
       # Only node_spec and role_spec specifically have issues, target those tests
       t.pattern = FileList["spec/unit/node_spec.rb", "spec/unit/role_spec.rb"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 15.11.3
+  version: 15.11.8
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.11.3
+        version: 15.11.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.11.3
+        version: 15.11.8
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.11.3
+        version: 15.11.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.11.3
+        version: 15.11.8
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement