chef 18.7.10-universal-mingw-ucrt → 18.8.9-universal-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2060e62f1ea9a5040ff2a77cbf48501fb112680103f92eec997230823040c30f
-  data.tar.gz: abf40e76a347dcfe730c574311f7902851e52633c9f223e96e6c266a9d86d781
+  metadata.gz: ab2cc0700322ba6f0f6da1dc9087aa567e34a256d1f6b36aa5a8238aa431fdc4
+  data.tar.gz: daf19fef61ca71f7fda162e234d5c2332cc5ee5f8d2b283e6a7f98c750759324
 SHA512:
-  metadata.gz: 247e8ff6a3690f23281582656d2952a1ba3486db4baa7eda71160245b5fca4bbedf0d7986124253fe786bdb64d075f2fe54acb294c79695ab206a60801d24f9a
-  data.tar.gz: 6f6550fbd5213c021bda5aa25dfe642141e8f377ca7a47949cbdc27bbec04fa352147433b12e032426e0b33558fc75380fa83ccbe4a6c6dc8cf44d5406de0ae5
+  metadata.gz: 5d3b1b2023b5dfb9bf8631e93b8ca0811425f72c71942acc8696511441c449cd9216bab9b0d73c23e121c52d945838ec2b437dcb30e9712aea49a19eae596081
+  data.tar.gz: '0821e20a19a1905594bd7ad4bfff584c3d488480ca77d2a38332d88a275efa35dde2a9b813d4d8ce6f27c18f8b06ff47f7667ac41b0b7c4ac5c8b955ae67a304'

data/Gemfile

@@ -13,7 +13,7 @@ gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?
 
 # required for FIPS or bundler will pick up default openssl
 install_if -> { RUBY_PLATFORM !~ /darwin/ } do
-  gem "openssl", "= 3.2.0"
+  gem "openssl", "= 3.3.0"
 end
 
 if File.exist?(File.expand_path("chef-bin", __dir__))
@@ -29,8 +29,9 @@ gem "cheffish", ">= 17"
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
-  gem "inspec-core-bin", ">= 5", "< 6" # need to provide the binaries for inspec
   gem "chef-vault"
+
+  gem "inspec-core-bin", ">= 5", "< 6"
 end
 
 group(:omnibus_package, :pry) do
@@ -44,7 +45,7 @@ end
 
 # Everything except AIX and Windows
 group(:ruby_shadow) do
-  install_if -> { !RUBY_PLATFORM.match?(/mingw/) } do
+  install_if -> { RUBY_PLATFORM.match?(/linux|darwin|bsd|solaris/i) } do
     # if ruby-shadow does a release that supports ruby-3.0 this can be removed
     gem "ruby-shadow", git: "https://github.com/chef/ruby-shadow", branch: "lcg/ruby-3.0", platforms: :ruby
   end

data/Rakefile

@@ -25,6 +25,7 @@ begin
   require_relative "tasks/dependencies"
   require_relative "tasks/docs"
   require_relative "tasks/spellcheck"
+  require_relative "tasks/bundle"
   require_relative "chef-utils/lib/chef-utils/dist" unless defined?(ChefUtils::Dist)
 rescue LoadError => e
   puts "Skipping missing rake dep: #{e}"

data/chef.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     s.required_ruby_version = ">= 3.1.0"
   end
 
+  s.add_dependency "activesupport", ">= 4.2.7.1", "<= 7.1.3.2"
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
   s.add_dependency "chef-utils", "= #{Chef::VERSION}"
   s.add_dependency "train-core", "~> 3.10", "<= 3.12.13"
@@ -44,7 +45,13 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-shellout", ">= 3.1.1", "< 4.0"
   s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
   s.add_dependency "ohai", "~> 18.0"
-  s.add_dependency "inspec-core", ">= 5", "< 6"
+
+  # AIX Gemfile.aix.lock uses this, but currently a manual process
+  if RUBY_PLATFORM.include?("aix") || ENV["GENERATE_AIX"] == "true"
+    s.add_dependency "inspec-core", ">= 5", "<= 5.22.80"
+  else
+    s.add_dependency "inspec-core", ">= 5", "< 6"
+  end
 
   s.add_dependency "ffi", ">= 1.15.5", "<= 1.16.3"
   s.add_dependency "ffi-yajl", "~> 2.2"
@@ -53,7 +60,7 @@ Gem::Specification.new do |s|
   s.add_dependency "erubis", "~> 2.7" # template resource / cookbook syntax check
   s.add_dependency "diff-lcs", ">= 1.2.4", "!= 1.4.0", "< 1.6.0" # 1.4 breaks output. Used in lib/chef/util/diff
   s.add_dependency "ffi-libarchive", "~> 1.0", ">= 1.0.3" # archive_file resource
-  s.add_dependency "chef-zero", ">= 15.0.17"
+  s.add_dependency "chef-zero", ">= 15.0.21"
   s.add_dependency "chef-vault" # chef-vault resources and helpers
 
   s.add_dependency "plist", "~> 3.2" # launchd, dscl/mac user, macos_userdefaults, osx_profile and plist resources
@@ -62,6 +69,7 @@ Gem::Specification.new do |s|
   s.add_dependency "syslog-logger", "~> 1.6"
   s.add_dependency "uuidtools", ">= 2.1.5", "< 3.0" # osx_profile resource
   s.add_dependency "unf_ext", "~> 0.0.8.2" # older platforms
+  s.add_dependency "uri", "~> 1.0.3" # This is used by net-http. We are forcing a version to get past a CVE in 1.0.2
   s.add_dependency "corefoundation", "~> 0.3.4" # macos_userdefaults resource
 
   s.add_dependency "proxifier2", "~> 1.1"

data/lib/chef/cookbook_version.rb

@@ -152,6 +152,20 @@ class Chef
       end
     end
 
+    def recipe_json_filenames_by_name
+      @recipe_json_filenames_by_name ||= begin
+        name_map = json_filenames_by_name(files_for("recipes"))
+        root_alias = cookbook_manifest.root_files.find { |record|
+          record[:name] == "root_files/recipe.json"
+        }
+        if root_alias
+          Chef::Log.error("Cookbook #{name} contains both recipe.json and recipes/default.json, ignoring recipes/default.json") if name_map["default"]
+          name_map["default"] = root_alias[:full_path]
+        end
+        name_map
+      end
+    end
+
     def recipe_filenames_by_name
       @recipe_filenames_by_name ||= begin
         name_map = filenames_by_name(files_for("recipes"))
@@ -203,11 +217,26 @@ class Chef
         load_ruby_recipe(recipe_name, run_context)
       elsif recipe_yml_filenames_by_name.key?(recipe_name)
         load_yml_recipe(recipe_name, run_context)
+      elsif recipe_json_filenames_by_name.key?(recipe_name)
+        load_json_recipe(recipe_name, run_context)
       else
         raise Chef::Exceptions::RecipeNotFound, "could not find recipe #{recipe_name} for cookbook #{name}"
       end
     end
 
+    def load_json_recipe(recipe_name, run_context)
+      Chef::Log.trace("Found recipe #{recipe_name} in cookbook #{name}")
+      recipe = Chef::Recipe.new(name, recipe_name, run_context)
+      recipe_filename = recipe_json_filenames_by_name[recipe_name]
+
+      unless recipe_filename
+        raise Chef::Exceptions::RecipeNotFound, "could not find #{recipe_name} files for cookbook #{name}"
+      end
+
+      recipe.from_json_file(recipe_filename)
+      recipe
+    end
+
     def load_yml_recipe(recipe_name, run_context)
       Chef::Log.trace("Found recipe #{recipe_name} in cookbook #{name}")
       recipe = Chef::Recipe.new(name, recipe_name, run_context)
@@ -608,6 +637,11 @@ class Chef
       result
     end
 
+    # Filters JSON files from the superset of provided files.
+    def json_filenames_by_name(records)
+      records.select { |record| record[:name].end_with?(".json") }.inject({}) { |memo, record| memo[File.basename(record[:name], ".json")] = record[:full_path]; memo }
+    end
+
     def file_vendor
       @file_vendor ||= Chef::Cookbook::FileVendor.create_from_manifest(cookbook_manifest)
     end

data/lib/chef/http/basic_client.rb

@@ -23,6 +23,7 @@
 autoload :URI, "uri"
 module Net
   autoload :HTTP, "net/http"
+  autoload :Protocol, "net/protocol"
 end
 require_relative "ssl_policies"
 require_relative "http_request"

data/lib/chef/http.rb

@@ -27,6 +27,7 @@ autoload :URI, "uri"
 module Net
   autoload :HTTP, "net/http"
   autoload :HTTPClientException, "net/http"
+  autoload :Protocol, "net/protocol"
 end
 require_relative "http/basic_client"
 require_relative "config"

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

@@ -46,7 +46,7 @@ class Chef
 
           requirements.assert(:all_actions) do |a|
             a.assertion { !new_resource.source }
-            a.failure_message(Chef::Exceptions::Package, "apt package provider cannot handle source property. Use dpkg provider instead")
+            a.failure_message Chef::Exceptions::Package, "apt package provider cannot handle source property. Use dpkg provider instead"
           end
         end
 

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

@@ -41,6 +41,11 @@ class Chef
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "would assume #{new_resource.source} would be have previously been made available"
           end
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
         end
 
         def load_current_resource

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

@@ -41,6 +41,15 @@ class Chef
           current_resource
         end
 
+        def define_resource_requirements
+          super
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
+        end
+
         def cab_file_source
           @cab_file_source ||= uri_scheme?(new_resource.source) ? download_source_file : new_resource.source
         end

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

@@ -71,9 +71,14 @@ class Chef
           # so we want to assert candidates exist for the alternate source
           requirements.assert(:upgrade, :install) do |a|
             a.assertion { candidates_exist_for_all_uninstalled? }
-            a.failure_message(Chef::Exceptions::Package, "No candidate version available for #{packages_missing_candidates.join(", ")}")
+            a.failure_message Chef::Exceptions::Package, "No candidate version available for #{packages_missing_candidates.join(", ")}"
             a.whyrun("Assuming a repository that offers #{packages_missing_candidates.join(", ")} would have been configured")
           end
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
         end
 
         # Lazy initializer for candidate_version.  A nil value means that there is no candidate

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

@@ -111,7 +111,7 @@ class Chef
             # Runs command via shell_out with magic environment to disable
             # interactive prompts.
             def run_noninteractive(*command)
-              shell_out!(*command, env: { "DEBIAN_FRONTEND" => "noninteractive" })
+              shell_out!(*command, env: { "DEBIAN_FRONTEND" => "noninteractive" }.merge(new_resource.environment))
             end
 
             private

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

@@ -83,13 +83,13 @@ class Chef
         end
 
         def define_resource_requirements
+          super
+
           requirements.assert(:install, :upgrade, :remove, :purge) do |a|
             a.assertion { !new_resource.source || ::File.exist?(new_resource.source) }
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "assuming #{new_resource.source} would have previously been created"
           end
-
-          super
         end
 
         def candidate_version
@@ -250,7 +250,7 @@ class Chef
         end
 
         def dnf(*args)
-          shell_out!("dnf", *args)
+          shell_out!("dnf", *args, env: new_resource.environment)
         end
 
         def safe_version_array

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

@@ -39,6 +39,15 @@ class Chef
           current_resource
         end
 
+        def define_resource_requirements
+          super
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
+        end
+
         def install_package(names, versions)
           names.zip(versions).map do |n, v|
             opts = ["pkg", "install", "--channel", new_resource.channel, "--url", new_resource.bldr_url]

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

@@ -41,6 +41,15 @@ class Chef
           current_resource
         end
 
+        def define_resource_requirements
+          super
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
+        end
+
         def candidate_version
           package_name_array.map do |package_name|
             available_version(package_name)

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

@@ -39,6 +39,11 @@ class Chef
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found"
             a.whyrun "Assuming package #{new_resource.package_name} would have been made available."
           end
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
         end
 
         def get_current_version

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

@@ -22,6 +22,15 @@ class Chef
           current_resource
         end
 
+        def define_resource_requirements
+          super
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
+        end
+
         def current_installed_version
           command = [ "port", "installed", new_resource.package_name ]
           output = get_response_from_command(command)

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

@@ -59,6 +59,15 @@ class Chef
           current_resource
         end
 
+        def define_resource_requirements
+          super
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
+        end
+
         def get_current_versions
           @cab_files.map do |cabfile|
             cab_pkg = get_cab_package(cabfile)

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

@@ -53,7 +53,7 @@ class Chef
           # Below are incomplete/missing features for this package provider
           requirements.assert(:all_actions) do |a|
             a.assertion { !new_resource.source }
-            a.failure_message(Chef::Exceptions::Package, "The openbsd package provider does not support the source property")
+            a.failure_message Chef::Exceptions::Package, "The openbsd package provider does not support the source property"
           end
           requirements.assert(:all_actions) do |a|
             a.assertion do
@@ -63,7 +63,12 @@ class Chef
                 true
               end
             end
-            a.failure_message(Chef::Exceptions::Package, "The openbsd package provider does not support providing a version and flavor")
+            a.failure_message Chef::Exceptions::Package, "The openbsd package provider does not support providing a version and flavor"
+          end
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
           end
         end
 

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

@@ -68,6 +68,15 @@ class Chef
           current_resource
         end
 
+        def define_resource_requirements
+          super
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
+        end
+
         def candidate_version
           @candidate_version
         end

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

@@ -53,6 +53,15 @@ class Chef
           current_resource
         end
 
+        def define_resource_requirements
+          super
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
+        end
+
         def install_package(name, version)
           pkg = if version
                   "=#{name}-#{version}"

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

@@ -59,6 +59,15 @@ class Chef
           current_resource
         end
 
+        def define_resource_requirements
+          super
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
+        end
+
         def raise_error_for_query(msg)
           raise Chef::Exceptions::Package, "Query for '#{new_resource.package_name}' #{msg}"
         end

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

@@ -42,9 +42,14 @@ class Chef
 
           requirements.assert(:install) do |a|
             a.assertion { candidates_exist_for_all_uninstalled? }
-            a.failure_message(Chef::Exceptions::Package, "No candidate version available for #{packages_missing_candidates.join(", ")}")
+            a.failure_message Chef::Exceptions::Package, "No candidate version available for #{packages_missing_candidates.join(", ")}"
             a.whyrun("Assuming a repository that offers #{packages_missing_candidates.join(", ")} would have been configured")
           end
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
         end
 
         def candidate_version

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

@@ -88,12 +88,12 @@ class Chef
         def install_package(name, version)
           if current_resource.version
             if allow_downgrade
-              shell_out!("rpm", options, "-U", "--oldpackage", new_resource.source)
+              shell_out!("rpm", options, "-U", "--oldpackage", new_resource.source, env: new_resource.environment)
             else
-              shell_out!("rpm", options, "-U", new_resource.source)
+              shell_out!("rpm", options, "-U", new_resource.source, env: new_resource.environment)
             end
           else
-            shell_out!("rpm", options, "-i", new_resource.source)
+            shell_out!("rpm", options, "-i", new_resource.source, env: new_resource.environment)
           end
         end
 

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

@@ -515,6 +515,15 @@ class Chef
           current_resource
         end
 
+        def define_resource_requirements
+          super
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
+        end
+
         def cleanup_after_converge
           if @cleanup_gem_env
             logger.trace { "#{new_resource} resetting gem environment to default" }

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

@@ -40,6 +40,15 @@ class Chef
           current_resource # modified by check_package_state
         end
 
+        def define_resource_requirements
+          super
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
+        end
+
         def check_package_state(name)
           logger.trace("#{new_resource} checking package #{name}")
           version = nil

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

@@ -41,13 +41,18 @@ class Chef
         end
 
         def define_resource_requirements
+          super
+
           requirements.assert(:install, :upgrade, :remove, :purge) do |a|
             a.assertion { !new_resource.source || ::File.exist?(new_resource.source) }
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "assuming #{new_resource.source} would have previously been created"
           end
 
-          super
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
         end
 
         def candidate_version

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

@@ -43,6 +43,11 @@ class Chef
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "would assume #{new_resource.source} would be have previously been made available"
           end
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
         end
 
         def load_current_resource

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

@@ -55,6 +55,11 @@ class Chef
               a.whyrun "Assuming source file #{new_resource.source} would have been created."
             end
           end
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
         end
 
         def load_current_resource

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

@@ -76,13 +76,13 @@ class Chef
         end
 
         def define_resource_requirements
+          super
+
           requirements.assert(:install, :upgrade, :remove, :purge) do |a|
             a.assertion { !new_resource.source || ::File.exist?(new_resource.source) }
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "assuming #{new_resource.source} would have previously been created"
           end
-
-          super
         end
 
         def candidate_version
@@ -277,7 +277,7 @@ class Chef
         end
 
         def yum(*args)
-          shell_out!(yum_binary, *args)
+          shell_out!(yum_binary, *args, env: new_resource.environment)
         end
 
         def safe_version_array

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

@@ -40,6 +40,11 @@ class Chef
             a.failure_message Chef::Exceptions::Package, "#{new_resource} source file(s) do not exist: #{missing_sources}"
             a.whyrun "Assuming they would have been previously created."
           end
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
         end
 
         def load_current_resource

data/lib/chef/recipe.rb

@@ -18,6 +18,7 @@
 #
 
 autoload :YAML, "yaml"
+require_relative "json_compat"
 require_relative "dsl/recipe"
 require_relative "mixin/from_file"
 require_relative "mixin/deprecation"
@@ -101,6 +102,25 @@ class Chef
       from_hash(res)
     end
 
+    def from_json_file(filename)
+      self.source_file = filename
+      if File.file?(filename) && File.readable?(filename)
+        json_contents = IO.read(filename)
+        from_json(json_contents)
+      else
+        raise IOError, "Cannot open or read file '#{filename}'!"
+      end
+    end
+
+    def from_json(string)
+      res = JSONCompat.from_json(string)
+      unless res.is_a?(Hash) && res.key?("resources")
+        raise ArgumentError, "JSON recipe '#{source_file}' must contain a top-level 'resources' hash"
+      end
+
+      from_hash(res)
+    end
+
     def from_hash(hash)
       hash["resources"].each do |rhash|
         type = rhash.delete("type").to_sym

data/lib/chef/resource/apt_package.rb

@@ -94,6 +94,11 @@ class Chef
         introduced: "18.3",
         description: "A Boolean flag that indicates whether the package name, which can be a regular expression, must match the entire name of the package (true) or if the regular expression is allowed to match a subset of the name (false).",
         default: false
+
+      property :environment, Hash,
+        introduced: "18.8",
+        description: "A Hash of environment variables in the form of {'ENV_VARIABLE' => 'VALUE'} to be set before running the command.",
+        default: {}, desired_state: false
     end
   end
 end