chef 16.3.38-universal-mingw32 → 16.5.64-universal-mingw32

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,8 +20,6 @@
 require "rubygems"
 require "rake"
 
-CHEF_ROOT = File.join(File.dirname(__FILE__), "..")
-
 begin
   require "rspec/core/rake_task"
 
@@ -30,7 +28,7 @@ begin
     %w{chef-utils chef-config}.each do |gem|
       Dir.chdir(gem) do
         Bundler.with_unbundled_env do
-          sh("bundle install")
+          sh("bundle install --jobs=3 --retry=3")
           sh("bundle exec rake spec")
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 16.3.38
+  version: 16.5.64
 platform: universal-mingw32
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-25 00:00:00.000000000 Z
+date: 2020-09-17 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.3.38
+        version: 16.5.64
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.3.38
+        version: 16.5.64
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.3.38
+        version: 16.5.64
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.3.38
+        version: 16.5.64
 - !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.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -578,20 +592,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.3
-- !ruby/object:Gem::Dependency
-  name: win32-dir
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: win32-event
   requirement: !ruby/object:Gem::Requirement
@@ -930,7 +930,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
@@ -1044,7 +1043,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
@@ -1286,11 +1288,11 @@ 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
 - lib/chef/provider/noop.rb
-- lib/chef/provider/osx_profile.rb
 - lib/chef/provider/package.rb
 - lib/chef/provider/package/apt.rb
 - lib/chef/provider/package/bff.rb
@@ -1416,8 +1418,10 @@ files:
 - lib/chef/resource/build_essential.rb
 - lib/chef/resource/cab_package.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
@@ -2145,6 +2149,7 @@ 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_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
@@ -2184,10 +2189,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
@@ -2233,6 +2237,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
@@ -2356,6 +2361,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
@@ -2587,11 +2593,11 @@ 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
 - spec/unit/provider/mount_spec.rb
-- spec/unit/provider/osx_profile_spec.rb
 - spec/unit/provider/package/apt_spec.rb
 - spec/unit/provider/package/bff_spec.rb
 - spec/unit/provider/package/cab_spec.rb
@@ -2691,8 +2697,10 @@ files:
 - spec/unit/resource/build_essential_spec.rb
 - spec/unit/resource/cab_package_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
@@ -2824,6 +2832,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

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/provider/osx_profile.rb

@@ -1,255 +0,0 @@
-#
-# Author:: Nate Walck (<nate.walck@gmail.com>)
-# Copyright:: Copyright 2015-2016, Facebook, 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 "../log"
-require_relative "../provider"
-require_relative "../resource"
-require_relative "../resource/file"
-require "uuidtools"
-require "plist"
-
-class Chef
-  class Provider
-    class OsxProfile < Chef::Provider
-      provides :osx_profile
-      provides :osx_config_profile
-
-      def load_current_resource
-        @current_resource = Chef::Resource::OsxProfile.new(new_resource.name)
-        current_resource.profile_name(new_resource.profile_name)
-
-        all_profiles = get_installed_profiles
-        # FIXME: stop mutating the desired state
-        new_resource.profile(
-          new_resource.profile ||
-          new_resource.profile_name
-        )
-
-        @new_profile_hash = get_profile_hash(new_resource.profile)
-        if @new_profile_hash
-          @new_profile_hash["PayloadUUID"] =
-            config_uuid(@new_profile_hash)
-        end
-
-        if @new_profile_hash
-          @new_profile_identifier = @new_profile_hash["PayloadIdentifier"]
-        else
-          @new_profile_identifier = new_resource.identifier ||
-            new_resource.profile_name
-        end
-
-        current_profile = nil
-        if all_profiles && all_profiles.key?("_computerlevel")
-          current_profile = all_profiles["_computerlevel"].find do |item|
-            item["ProfileIdentifier"] == @new_profile_identifier
-          end
-        end
-        current_resource.profile(current_profile)
-      end
-
-      def define_resource_requirements
-        requirements.assert(:remove) do |a|
-          if @new_profile_identifier
-            a.assertion do
-              !@new_profile_identifier.nil? &&
-                !@new_profile_identifier.end_with?(".mobileconfig") &&
-                /^\w+(?:(\.| )\w+)+$/.match(@new_profile_identifier)
-            end
-            a.failure_message RuntimeError, "when removing using the identifier property, it must match the profile identifier"
-          else
-            new_profile_name = new_resource.profile_name
-            a.assertion do
-              !new_profile_name.end_with?(".mobileconfig") &&
-                /^\w+(?:(\.| )\w+)+$/.match(new_profile_name)
-            end
-            a.failure_message RuntimeError, "When removing by resource name, it must match the profile identifier "
-          end
-        end
-
-        requirements.assert(:install) do |a|
-          if @new_profile_hash.is_a?(Hash)
-            a.assertion do
-              @new_profile_hash.include?("PayloadIdentifier")
-            end
-            a.failure_message RuntimeError, "The specified profile does not seem to be valid"
-          end
-          if @new_profile_hash.is_a?(String)
-            a.assertion do
-              @new_profile_hash.end_with?(".mobileconfig")
-            end
-            a.failure_message RuntimeError, "#{new_profile_hash}' is not a valid profile"
-          end
-        end
-      end
-
-      action :install do
-        unless profile_installed?
-          converge_by("install profile #{@new_profile_identifier}") do
-            profile_path = write_profile_to_disk
-            install_profile(profile_path)
-            get_installed_profiles(true)
-          end
-        end
-      end
-
-      action :remove do
-        # Clean up profile after removing it
-        if profile_installed?
-          converge_by("remove profile #{@new_profile_identifier}") do
-            remove_profile
-            get_installed_profiles(true)
-          end
-        end
-      end
-
-      def load_profile_hash(new_profile)
-        # file must exist in cookbook
-        if new_profile.end_with?(".mobileconfig")
-          unless cookbook_file_available?(new_profile)
-            error_string = "#{self}: '#{new_profile}' not found in cookbook"
-            raise Chef::Exceptions::FileNotFound, error_string
-          end
-          cookbook_profile = cache_cookbook_profile(new_profile)
-          read_plist(cookbook_profile)
-        else
-          nil
-        end
-      end
-
-      def cookbook_file_available?(cookbook_file)
-        run_context.has_cookbook_file_in_cookbook?(
-          new_resource.cookbook_name, cookbook_file
-        )
-      end
-
-      def get_cache_dir
-        cache_dir = Chef::FileCache.create_cache_path(
-          "profiles/#{new_resource.cookbook_name}"
-        )
-      end
-
-      def cache_cookbook_profile(cookbook_file)
-        Chef::FileCache.create_cache_path(
-          ::File.join(
-            "profiles",
-            new_resource.cookbook_name,
-            ::File.dirname(cookbook_file)
-          )
-        )
-        # FIXME: should use a real cookbook file, or document what this craziness is
-        remote_file = Chef::Resource::CookbookFile.new(
-          ::File.join(
-            get_cache_dir,
-            "#{cookbook_file}.remote"
-          ),
-          run_context
-        )
-        remote_file.cookbook_name = new_resource.cookbook_name
-        remote_file.source(cookbook_file)
-        remote_file.backup(false)
-        remote_file.run_action(:create)
-        remote_file.path
-      end
-
-      def get_profile_hash(new_profile)
-        if new_profile.is_a?(Hash)
-          new_profile
-        elsif new_profile.is_a?(String)
-          load_profile_hash(new_profile)
-        end
-      end
-
-      def config_uuid(profile)
-        # Make a UUID of the profile contents and return as string
-        UUIDTools::UUID.sha1_create(
-          UUIDTools::UUID_DNS_NAMESPACE,
-          profile.to_s
-        ).to_s
-      end
-
-      def write_profile_to_disk
-        # FIXME: use a real chef file resource and stop hacking up tempfiles directly
-        new_resource.path(Chef::FileCache.create_cache_path("profiles"))
-        tempfile = Chef::FileContentManagement::Tempfile.new(new_resource).tempfile
-        tempfile.write(@new_profile_hash.to_plist)
-        tempfile.close
-        tempfile.path
-      end
-
-      def install_profile(profile_path)
-        cmd = [ "/usr/bin/profiles", "-I", "-F", profile_path ]
-        logger.trace("cmd: #{cmd.join(" ")}")
-        shellout_results = shell_out(*cmd)
-        shellout_results.exitstatus
-      end
-
-      def remove_profile
-        cmd = [ "/usr/bin/profiles", "-R", "-p", @new_profile_identifier ]
-        logger.trace("cmd: #{cmd.join(" ")}")
-        shellout_results = shell_out(*cmd)
-        shellout_results.exitstatus
-      end
-
-      def get_installed_profiles(update = nil)
-        if update
-          node.run_state[:config_profiles] = query_installed_profiles
-        else
-          node.run_state[:config_profiles] ||= query_installed_profiles
-        end
-      end
-
-      def query_installed_profiles
-        # Dump all profile metadata to a tempfile
-        tempfile = generate_tempfile
-        write_installed_profiles(tempfile)
-        installed_profiles = read_plist(tempfile)
-        logger.trace("Saved profiles to run_state")
-        # Clean up the temp file as we do not need it anymore
-        ::File.unlink(tempfile)
-        installed_profiles
-      end
-
-      def generate_tempfile
-        tempfile = ::Dir::Tmpname.create("allprofiles.plist") {}
-      end
-
-      def write_installed_profiles(tempfile)
-        shell_out!( "/usr/bin/profiles", "-P", "-o", tempfile )
-      end
-
-      def read_plist(xml_file)
-        ::Plist.parse_xml(xml_file)
-      end
-
-      def profile_installed?
-        # Profile Identifier and UUID must match a currently installed profile
-        if current_resource.profile.nil? || current_resource.profile.empty?
-          false
-        else
-          if new_resource.action.include?(:remove)
-            true
-          else
-            current_resource.profile["ProfileUUID"] ==
-              @new_profile_hash["PayloadUUID"]
-          end
-        end
-      end
-
-    end
-  end
-end