chef 18.7.10 → 18.8.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fabe2b150e8e4c5d896ff16118a5d7c7b93a4cbb61b1eb322e42b02bb0e2df1a
-  data.tar.gz: 422fbcf9e1baf1be9836c9ac068cfeae656aa30f7dc14752713d5d1a2d1b2b0a
+  metadata.gz: 0f4e28a14baf5774c1b8dff4a079b94f339eed4e24cc396bb150063533d3463c
+  data.tar.gz: 9cff2d9315f6f7a152de4aed1ca77fcd4f792a3ee9f87b4b7a726f200d371c13
 SHA512:
-  metadata.gz: 2159cd19d094c057d47b326beba0b596948c32b8ea5be5dca61633a283c26d485e3aaa71ae154e31b997468c524796dc4ff7b2108bb300e1d13ff7981c4b6656
-  data.tar.gz: 1ec8346ff872c8b27077216e53461a680c26e8cef5aef0cf431b1ebab1749e58e1430885299854c3ad06c271f4b00b7f085d5cf6604b3fb37fb5692554899e0c
+  metadata.gz: c74732fd5036484b0f1f1ebed6f58b08dda62bc1885f3a2617ca3fa839fba909294c9d05d53a8a54b759a3c8f463daf08639e8498ea9e159a3ad51b48e5131df
+  data.tar.gz: 3936737df589950016f0d2a36dd52dd090b2fc521108de5f8c9691328ebd16d3d04b242bd2afccffd8214a0d4503e77666951b2e5c07b7fdd42b7ab8e303421b

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
@@ -74,22 +75,3 @@ instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
 # If you want to load debugging tools into the bundle exec sandbox,
 # add these additional dependencies into Gemfile.local
 eval_gemfile("./Gemfile.local") if File.exist?("./Gemfile.local")
-
-# These lines added for Windows development only.
-# For FFI to call into PowerShell we need the binaries and assemblies located
-# in the Ruby bindir.
-# The Powershell DLL source lives here: https://github.com/chef/chef-powershell-shim
-# Every merge into that repo triggers a Habitat build and promotion. Running
-# the rake :update_chef_exec_dll task in this (chef/chef) repo will pull down
-# the built packages and copy the binaries to distro/ruby_bin_folder.
-#
-# We copy (and overwrite) these files every time "bundle <exec|install>" is
-# executed, just in case they have changed.
-if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
-  instance_eval do
-    ruby_exe_dir = RbConfig::CONFIG["bindir"]
-    assemblies = Dir.glob(File.expand_path("distro/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}", __dir__) + "**/*")
-    FileUtils.cp_r assemblies, ruby_exe_dir, verbose: false unless ENV["_BUNDLER_WINDOWS_DLLS_COPIED"]
-    ENV["_BUNDLER_WINDOWS_DLLS_COPIED"] = "1"
-  end
-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,9 +31,10 @@ Gem::Specification.new do |s|
     s.required_ruby_version = ">= 3.1.0"
   end
 
+  s.add_dependency "activesupport", ">= 4.2.7.1", "<= 7.1.5.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"
+  s.add_dependency "train-core", "~> 3.13", ">= 3.13.4"
   s.add_dependency "train-winrm", "~> 0.2.17"
   s.add_dependency "train-rest", ">= 0.4.1" # target mode with rest APIs
 
@@ -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"
@@ -75,9 +83,8 @@ Gem::Specification.new do |s|
 
   s.require_paths = %w{ lib }
   s.files = %w{Gemfile Rakefile LICENSE README.md} +
-    Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } +
-    Dir.glob("*.gemspec") +
-    Dir.glob("tasks/rspec.rb")
+    Dir.glob("{lib}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } +
+    Dir.glob("*.gemspec")
 
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/chef/chef/issues",

data/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb

@@ -204,6 +204,10 @@ class Chef
               end
             end
           end
+
+          def cookbook_frozen?
+            @frozen ||= (chef_object&.frozen_version? || false)
+          end
         end
       end
     end

data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb

@@ -100,10 +100,6 @@ class Chef
             raise
           end
 
-          def children
-            super.select { |entry| !(entry.dir? && entry.children.size == 0 ) }
-          end
-
           def can_have_child?(name, is_dir)
             if is_dir && !%w{ root_files .. . }.include?(name)
               # Only the given directories will be uploaded.
@@ -132,7 +128,7 @@ class Chef
           end
 
           def can_upload?
-            File.exist?(uploaded_cookbook_version_path) || children.size > 0
+            File.exist?(uploaded_cookbook_version_path) || any_children?
           end
 
           protected

data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb

@@ -89,6 +89,18 @@ class Chef
             true
           end
 
+          # This is a lighter (than `#children.size == 0`) existence check.
+          # return earlier where we only care if 1 or more children exist
+          def any_children?
+            Dir.entries(file_path).any? { |child_name|
+              (child = make_child_entry(child_name)) &&
+                can_have_child?(child.name, child.dir?) &&
+                !(child.dir? && !child.any_children? )
+            }
+          rescue Errno::ENOENT
+            raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
+          end
+
           def write_pretty_json
             false
           end

data/lib/chef/chef_fs/file_system.rb

@@ -129,6 +129,10 @@ class Chef
       #     actually different (which will take time to determine).
       #   - +dry_run+ - if +true+, action will not actually be taken;
       #     things will be printed out instead.
+      #   - +skip_frozen_cookbook_status+ - if +true+ (default), status.json files will
+      #     NOT be created for cookbook directories. If +false+, status.json files
+      #     containing frozen cookbook information will be created.
+      #     Used primarily by knife-ec-backup.
       #
       # ==== Examples
       #
@@ -312,6 +316,7 @@ class Chef
                     new_dest_parent.create_child_from(src_entry)
                     ui.output "Created #{dest_path}" if ui
                   end
+                  create_cookbook_status_file(src_entry, dest_entry, options, ui)
                   return
                 end
 
@@ -331,6 +336,7 @@ class Chef
                       error ||= child_error
                     end
                   end
+                  create_cookbook_status_file(src_entry, new_dest_dir, options, ui)
                 else
                   if options[:dry_run]
                     ui.output "Would create #{dest_path}" if ui
@@ -355,6 +361,7 @@ class Chef
                     ui.output "Updated #{dest_path}" if ui
                   end
                 end
+                create_cookbook_status_file(src_entry, dest_entry, options, ui)
                 return
               end
 
@@ -368,6 +375,7 @@ class Chef
                       error ||= child_error
                     end
                   end
+                  create_cookbook_status_file(src_entry, dest_entry, options, ui)
                 else
                   # If they are different types.
                   ui.error("File #{src_path} is a directory while file #{dest_path} is a regular file\n") if ui
@@ -439,6 +447,16 @@ class Chef
           parent
         end
 
+        def create_cookbook_status_file(src_entry, dest_entry, options, ui = nil)
+          # Skip status.json creation by default, unless explicitly disabled
+          skip_creation = options.key?(:skip_frozen_cookbook_status) ? options[:skip_frozen_cookbook_status] : true
+          return if skip_creation || !src_entry.is_a?(Chef::ChefFS::FileSystem::ChefServer::CookbookDir)
+
+          status_file = dest_entry.child("status.json")
+          frozen_status = src_entry.cookbook_frozen? || false
+          status_file.write({ "frozen": frozen_status }.to_json)
+          ui.output "Created status.json with frozen: #{frozen_status} for #{src_entry.name}" if ui
+        end
       end
     end
   end

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