chef 16.4.38 → 16.7.61

data/spec/unit/util/selinux_spec.rb

@@ -31,6 +31,8 @@ describe Chef::Util::Selinux do
 
   before do
     allow(ChefUtils).to receive(:windows?).and_return(false)
+    allow(ENV).to receive(:[]).with("PATHEXT").and_return(nil)
+    allow(ENV).to receive(:[]).with("PATH").and_call_original
     TestClass.reset_state
     @test_instance = TestClass.new
   end

data/tasks/rspec.rb

@@ -20,12 +20,10 @@
 require "rubygems"
 require "rake"
 
-CHEF_ROOT = File.join(File.dirname(__FILE__), "..")
-
 begin
   require "rspec/core/rake_task"
 
-  desc "Run specs for Chef's Components"
+  desc "Run specs for Chef's Gem Components"
   task :component_specs do
     %w{chef-utils chef-config}.each do |gem|
       Dir.chdir(gem) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 16.4.38
+  version: 16.7.61
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.4.38
+        version: 16.7.61
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.4.38
+        version: 16.7.61
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.4.38
+        version: 16.7.61
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.4.38
+        version: 16.7.61
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -76,22 +76,22 @@ dependencies:
   name: license-acceptance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -370,6 +370,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: tty-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -740,7 +754,6 @@ files:
 - lib/chef/deprecated.rb
 - lib/chef/deprecation/warnings.rb
 - lib/chef/digester.rb
-- lib/chef/dist.rb
 - lib/chef/dsl.rb
 - lib/chef/dsl/chef_vault.rb
 - lib/chef/dsl/cheffish.rb
@@ -854,7 +867,10 @@ files:
 - lib/chef/knife/client_show.rb
 - lib/chef/knife/config_get.rb
 - lib/chef/knife/config_get_profile.rb
+- lib/chef/knife/config_list.rb
 - lib/chef/knife/config_list_profiles.rb
+- lib/chef/knife/config_show.rb
+- lib/chef/knife/config_use.rb
 - lib/chef/knife/config_use_profile.rb
 - lib/chef/knife/configure.rb
 - lib/chef/knife/configure_client.rb
@@ -1027,7 +1043,6 @@ files:
 - lib/chef/mixin/windows_env_helper.rb
 - lib/chef/mixin/xml_escape.rb
 - lib/chef/mixins.rb
-- lib/chef/monkey_patches/net_http.rb
 - lib/chef/monkey_patches/webrick-utils.rb
 - lib/chef/monkey_patches/win32/registry.rb
 - lib/chef/monologger.rb
@@ -1096,6 +1111,7 @@ files:
 - lib/chef/provider/lwrp_base.rb
 - lib/chef/provider/mount.rb
 - lib/chef/provider/mount/aix.rb
+- lib/chef/provider/mount/linux.rb
 - lib/chef/provider/mount/mount.rb
 - lib/chef/provider/mount/solaris.rb
 - lib/chef/provider/mount/windows.rb
@@ -1199,14 +1215,12 @@ files:
 - lib/chef/provider/user/solaris.rb
 - lib/chef/provider/user/windows.rb
 - lib/chef/provider/whyrun_safe_ruby_block.rb
-- lib/chef/provider/windows_env.rb
-- lib/chef/provider/windows_path.rb
 - lib/chef/provider/windows_script.rb
-- lib/chef/provider/windows_task.rb
 - lib/chef/provider/yum_repository.rb
 - lib/chef/provider/zypper_repository.rb
 - lib/chef/provider_resolver.rb
 - lib/chef/providers.rb
+- lib/chef/pwsh.rb
 - lib/chef/recipe.rb
 - lib/chef/request_id.rb
 - lib/chef/reserved_names.rb
@@ -1224,9 +1238,12 @@ files:
 - lib/chef/resource/breakpoint.rb
 - lib/chef/resource/build_essential.rb
 - lib/chef/resource/cab_package.rb
+- lib/chef/resource/chef_client_config.rb
 - lib/chef/resource/chef_client_cron.rb
+- lib/chef/resource/chef_client_launchd.rb
 - lib/chef/resource/chef_client_scheduled_task.rb
 - lib/chef/resource/chef_client_systemd_timer.rb
+- lib/chef/resource/chef_client_trusted_certificate.rb
 - lib/chef/resource/chef_gem.rb
 - lib/chef/resource/chef_handler.rb
 - lib/chef/resource/chef_sleep.rb
@@ -1325,6 +1342,7 @@ files:
 - lib/chef/resource/solaris_package.rb
 - lib/chef/resource/ssh_known_hosts_entry.rb
 - lib/chef/resource/sudo.rb
+- lib/chef/resource/support/client.erb
 - lib/chef/resource/support/cron.d.erb
 - lib/chef/resource/support/cron_access.erb
 - lib/chef/resource/support/ssh_known_hosts.erb
@@ -1941,6 +1959,7 @@ files:
 - spec/functional/resource/mount_spec.rb
 - spec/functional/resource/msu_package_spec.rb
 - spec/functional/resource/ohai_spec.rb
+- spec/functional/resource/powershell_package_source_spec.rb
 - spec/functional/resource/powershell_script_spec.rb
 - spec/functional/resource/reboot_spec.rb
 - spec/functional/resource/registry_spec.rb
@@ -1954,11 +1973,13 @@ files:
 - spec/functional/resource/user/windows_spec.rb
 - spec/functional/resource/windows_certificate_spec.rb
 - spec/functional/resource/windows_env_spec.rb
+- spec/functional/resource/windows_firewall_rule_spec.rb
 - spec/functional/resource/windows_font_spec.rb
 - spec/functional/resource/windows_package_spec.rb
 - spec/functional/resource/windows_path_spec.rb
 - spec/functional/resource/windows_security_policy_spec.rb
 - spec/functional/resource/windows_service_spec.rb
+- spec/functional/resource/windows_share_spec.rb
 - spec/functional/resource/windows_task_spec.rb
 - spec/functional/resource/windows_user_privilege_spec.rb
 - spec/functional/resource/yum_package_spec.rb
@@ -1994,10 +2015,9 @@ files:
 - spec/integration/knife/client_list_spec.rb
 - spec/integration/knife/client_show_spec.rb
 - spec/integration/knife/common_options_spec.rb
-- spec/integration/knife/config_get_profile_spec.rb
-- spec/integration/knife/config_get_spec.rb
-- spec/integration/knife/config_list_profiles_spec.rb
-- spec/integration/knife/config_use_profile_spec.rb
+- spec/integration/knife/config_list_spec.rb
+- spec/integration/knife/config_show_spec.rb
+- spec/integration/knife/config_use_spec.rb
 - spec/integration/knife/cookbook_api_ipv6_spec.rb
 - spec/integration/knife/cookbook_bulk_delete_spec.rb
 - spec/integration/knife/cookbook_download_spec.rb
@@ -2043,6 +2063,7 @@ files:
 - spec/integration/knife/serve_spec.rb
 - spec/integration/knife/show_spec.rb
 - spec/integration/knife/upload_spec.rb
+- spec/integration/ohai/ohai_spec.rb
 - spec/integration/recipes/accumulator_spec.rb
 - spec/integration/recipes/lwrp_inline_resources_spec.rb
 - spec/integration/recipes/lwrp_spec.rb
@@ -2077,7 +2098,6 @@ files:
 - spec/support/lib/chef/resource/zen_master.rb
 - spec/support/lib/library_load_order.rb
 - spec/support/matchers/leak.rb
-- spec/support/mock/constant.rb
 - spec/support/mock/platform.rb
 - spec/support/platform_helpers.rb
 - spec/support/platforms/prof/gc.rb
@@ -2166,6 +2186,7 @@ files:
 - spec/unit/daemon_spec.rb
 - spec/unit/data_bag_item_spec.rb
 - spec/unit/data_bag_spec.rb
+- spec/unit/data_collector/config_validation_spec.rb
 - spec/unit/data_collector_spec.rb
 - spec/unit/decorator/lazy_array_spec.rb
 - spec/unit/decorator/lazy_spec.rb
@@ -2346,7 +2367,6 @@ files:
 - spec/unit/mixin/which.rb
 - spec/unit/mixin/windows_architecture_helper_spec.rb
 - spec/unit/mixin/xml_escape_spec.rb
-- spec/unit/monkey_patches/uri_spec.rb
 - spec/unit/monologger_spec.rb
 - spec/unit/node/attribute_spec.rb
 - spec/unit/node/immutable_collections_spec.rb
@@ -2397,6 +2417,7 @@ files:
 - spec/unit/provider/log_spec.rb
 - spec/unit/provider/mdadm_spec.rb
 - spec/unit/provider/mount/aix_spec.rb
+- spec/unit/provider/mount/linux_spec.rb
 - spec/unit/provider/mount/mount_spec.rb
 - spec/unit/provider/mount/solaris_spec.rb
 - spec/unit/provider/mount/windows_spec.rb
@@ -2483,7 +2504,6 @@ files:
 - spec/unit/provider/windows_task_spec.rb
 - spec/unit/provider/yum_repository_spec.rb
 - spec/unit/provider/zypper_repository_spec.rb
-- spec/unit/provider_resolver_spec.rb
 - spec/unit/provider_spec.rb
 - spec/unit/pure_application_spec.rb
 - spec/unit/recipe_spec.rb
@@ -2499,9 +2519,12 @@ files:
 - spec/unit/resource/breakpoint_spec.rb
 - spec/unit/resource/build_essential_spec.rb
 - spec/unit/resource/cab_package_spec.rb
+- spec/unit/resource/chef_client_config_spec.rb
 - spec/unit/resource/chef_client_cron_spec.rb
+- spec/unit/resource/chef_client_launchd_spec.rb
 - spec/unit/resource/chef_client_scheduled_task_spec.rb
 - spec/unit/resource/chef_client_systemd_timer_spec.rb
+- spec/unit/resource/chef_client_trusted_certificate_spec.rb
 - spec/unit/resource/chef_gem_spec.rb
 - spec/unit/resource/chef_handler_spec.rb
 - spec/unit/resource/chef_sleep_spec.rb
@@ -2517,8 +2540,6 @@ files:
 - spec/unit/resource/cron_d_spec.rb
 - spec/unit/resource/cron_spec.rb
 - spec/unit/resource/csh_spec.rb
-- spec/unit/resource/data/InstallHistory_with_CLT.plist
-- spec/unit/resource/data/InstallHistory_without_CLT.plist
 - spec/unit/resource/directory_spec.rb
 - spec/unit/resource/dmg_package_spec.rb
 - spec/unit/resource/dnf_package_spec.rb
@@ -2633,6 +2654,7 @@ files:
 - spec/unit/resource/windows_shortcut_spec.rb
 - spec/unit/resource/windows_task_spec.rb
 - spec/unit/resource/windows_uac_spec.rb
+- spec/unit/resource/windows_user_privilege_spec.rb
 - spec/unit/resource/windows_workgroup_spec.rb
 - spec/unit/resource/yum_package_spec.rb
 - spec/unit/resource/yum_repository_spec.rb
@@ -2713,7 +2735,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A systems integration framework, built to bring the benefits of configuration

data/lib/chef/dist.rb

@@ -1,68 +0,0 @@
-class Chef
-  class Dist
-    require "chef-config/dist"
-    require "chef-config/config"
-
-    # This class is not fully implemented, depending on it is not recommended!
-    # When referencing a product directly, like Chef (Now Chef Infra)
-    PRODUCT = "Chef Infra Client".freeze
-
-    # A short designation for the product, used in Windows event logs
-    # and some nomenclature.
-    SHORT = ChefConfig::Dist::SHORT.freeze
-
-    # The name of the server product
-    SERVER_PRODUCT = "Chef Infra Server".freeze
-
-    # The client's alias (chef-client)
-    CLIENT = ChefConfig::Dist::CLIENT.freeze
-
-    # name of the automate product
-    AUTOMATE = "Chef Automate".freeze
-
-    # The chef executable, as in `chef gem install` or `chef generate cookbook`
-    EXEC = ChefConfig::Dist::EXEC.freeze
-
-    # product website address
-    WEBSITE = "https://chef.io".freeze
-
-    # Chef-Zero's product name
-    ZERO = "Chef Infra Zero".freeze
-
-    # Chef-Solo's product name
-    SOLO = "Chef Infra Solo".freeze
-
-    # The chef-zero executable (local mode)
-    ZEROEXEC = "chef-zero".freeze
-
-    # The chef-solo executable (legacy local mode)
-    SOLOEXEC = "chef-solo".freeze
-
-    # The chef-shell executable
-    SHELL = "chef-shell".freeze
-
-    # The chef-apply executable
-    APPLY = "chef-apply".freeze
-
-    # Configuration related constants
-    # The chef-shell configuration file
-    SHELL_CONF = "chef_shell.rb".freeze
-
-    # The configuration directory
-    CONF_DIR = ChefConfig::Config.etc_chef_dir.freeze
-
-    # The user's configuration directory
-    USER_CONF_DIR = ChefConfig::Dist::USER_CONF_DIR.freeze
-
-    # The suffix for Chef's /etc/chef, /var/chef and C:\\Chef directories
-    # "cinc" => /etc/cinc, /var/cinc, C:\\cinc
-    DIR_SUFFIX = ChefConfig::Dist::DIR_SUFFIX.freeze
-
-    # The legacy conf folder: C:/opscode/chef. Specifically the "opscode" part
-    # DIR_SUFFIX is appended to it in code where relevant
-    LEGACY_CONF_DIR = ChefConfig::Dist::LEGACY_CONF_DIR.freeze
-
-    # The server's configuration directory
-    SERVER_CONF_DIR = "/etc/chef-server".freeze
-  end
-end

data/lib/chef/monkey_patches/net_http.rb

@@ -1,22 +0,0 @@
-
-# Module gets mixed in to Net::HTTP exception classes so we can attach our
-# RESTRequest object to them and get the request parameters back out later.
-module ChefNetHTTPExceptionExtensions
-  attr_accessor :chef_rest_request
-end
-
-require "net/http" unless defined?(Net::HTTP)
-module Net
-  class HTTPError
-    include ChefNetHTTPExceptionExtensions
-  end
-  class HTTPRetriableError
-    include ChefNetHTTPExceptionExtensions
-  end
-  class HTTPClientException
-    include ChefNetHTTPExceptionExtensions
-  end
-  class HTTPFatalError
-    include ChefNetHTTPExceptionExtensions
-  end
-end

data/lib/chef/provider/windows_env.rb

@@ -1,210 +0,0 @@
-#
-# Author:: Doug MacEachern (<dougm@vmware.com>)
-# Copyright:: Copyright 2010-2016, VMware, 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_relative "../provider"
-require_relative "../resource/windows_env"
-require_relative "../mixin/windows_env_helper"
-
-class Chef
-  class Provider
-    class WindowsEnv < Chef::Provider
-      include Chef::Mixin::WindowsEnvHelper
-      attr_accessor :key_exists
-
-      provides :env
-      provides :windows_env
-
-      def whyrun_supported?
-        false
-      end
-
-      def initialize(new_resource, run_context)
-        super
-        @key_exists = true
-      end
-
-      def load_current_resource
-        @current_resource = Chef::Resource::WindowsEnv.new(new_resource.name)
-        current_resource.key_name(new_resource.key_name)
-
-        if env_key_exists(new_resource.key_name)
-          current_resource.value(env_value(new_resource.key_name))
-        else
-          @key_exists = false
-          logger.trace("#{new_resource} key does not exist")
-        end
-
-        current_resource
-      end
-
-      def env_key_exists(key_name)
-        env_value(key_name) ? true : false
-      end
-
-      # Check to see if value needs any changes
-      #
-      # ==== Returns
-      # <true>:: If a change is required
-      # <false>:: If a change is not required
-      def requires_modify_or_create?
-        if new_resource.delim
-          # e.g. check for existing value within PATH
-          new_values.inject(0) do |index, val|
-            next_index = current_values.find_index val
-            return true if next_index.nil? || next_index < index
-
-            next_index
-          end
-          false
-        else
-          new_resource.value != current_resource.value
-        end
-      end
-
-      alias_method :compare_value, :requires_modify_or_create?
-
-      action :create do
-        if @key_exists
-          if requires_modify_or_create?
-            modify_env
-            logger.info("#{new_resource} altered")
-            new_resource.updated_by_last_action(true)
-          end
-        else
-          create_env
-          logger.info("#{new_resource} created")
-          new_resource.updated_by_last_action(true)
-        end
-      end
-
-      # e.g. delete a PATH element
-      #
-      # ==== Returns
-      # <true>:: If we handled the element case and caller should not delete the key
-      # <false>:: Caller should delete the key, either no :delim was specific or value was empty
-      #           after we removed the element.
-      def delete_element
-        return false unless new_resource.delim # no delim: delete the key
-
-        needs_delete = new_values.any? { |v| current_values.include?(v) }
-        if !needs_delete
-          logger.trace("#{new_resource} element '#{new_resource.value}' does not exist")
-          true # do not delete the key
-        else
-          new_value =
-            current_values.select do |item|
-              not new_values.include?(item)
-            end.join(new_resource.delim)
-
-          if new_value.empty?
-            false # nothing left here, delete the key
-          else
-            old_value = new_resource.value(new_value)
-            create_env
-            logger.trace("#{new_resource} deleted #{old_value} element")
-            new_resource.updated_by_last_action(true)
-            true # we removed the element and updated; do not delete the key
-          end
-        end
-      end
-
-      action :delete do
-        if ( ENV[new_resource.key_name] || @key_exists ) && !delete_element
-          delete_env
-          logger.info("#{new_resource} deleted")
-          new_resource.updated_by_last_action(true)
-        end
-      end
-
-      action :modify do
-        if @key_exists
-          if requires_modify_or_create?
-            modify_env
-            logger.info("#{new_resource} modified")
-            new_resource.updated_by_last_action(true)
-          end
-        else
-          raise Chef::Exceptions::WindowsEnv, "Cannot modify #{new_resource} - key does not exist!"
-        end
-      end
-
-      def create_env
-        obj = env_obj(@new_resource.key_name)
-        unless obj
-          obj = WIN32OLE.connect("winmgmts://").get("Win32_Environment").spawninstance_
-          obj.name = @new_resource.key_name
-          obj.username = new_resource.user
-        end
-        obj.variablevalue = @new_resource.value
-        obj.put_
-        value = @new_resource.value
-        value = expand_path(value) if @new_resource.key_name.casecmp("PATH") == 0
-        ENV[@new_resource.key_name] = value
-        broadcast_env_change
-      end
-
-      def delete_env
-        obj = env_obj(@new_resource.key_name)
-        if obj
-          obj.delete_
-          broadcast_env_change
-        end
-        if ENV[@new_resource.key_name]
-          ENV.delete(@new_resource.key_name)
-        end
-      end
-
-      def modify_env
-        if new_resource.delim
-          new_resource.value((new_values + current_values).uniq.join(new_resource.delim))
-        end
-        create_env
-      end
-
-      # Returns the current values to split by delimiter
-      def current_values
-        @current_values ||= current_resource.value.split(new_resource.delim)
-      end
-
-      # Returns the new values to split by delimiter
-      def new_values
-        @new_values ||= new_resource.value.split(new_resource.delim)
-      end
-
-      def env_value(key_name)
-        obj = env_obj(key_name)
-        obj.variablevalue if obj
-      end
-
-      def env_obj(key_name)
-        return @env_obj if @env_obj
-
-        wmi = WmiLite::Wmi.new
-        # Note that by design this query is case insensitive with regard to key_name
-        environment_variables = wmi.query("select * from Win32_Environment where name = '#{key_name}'")
-        if environment_variables && environment_variables.length > 0
-          environment_variables.each do |env|
-            @env_obj = env.wmi_ole_object
-            return @env_obj if @env_obj.username.split('\\').last.casecmp(new_resource.user) == 0
-          end
-        end
-        @env_obj = nil
-      end
-    end
-  end
-end