chef 15.4.45 → 15.5.9

data/lib/chef/resource/remote_file.rb

@@ -27,6 +27,7 @@ class Chef
   class Resource
     class RemoteFile < Chef::Resource::File
       include Chef::Mixin::Securable
+      unified_mode true
 
       description "Use the remote_file resource to transfer a file from a remote location"\
                   " using file specificity. This resource is similar to the file resource."

data/lib/chef/resource/ruby.rb

@@ -22,6 +22,8 @@ require_relative "../provider/script"
 class Chef
   class Resource
     class Ruby < Chef::Resource::Script
+      unified_mode true
+
       description "Use the ruby resource to execute scripts using the Ruby interpreter. This"\
                   " resource may also use any of the actions and properties that are available"\
                   " to the execute resource. Commands that are executed with this resource are (by"\

data/lib/chef/resource/ruby_block.rb

@@ -24,6 +24,8 @@ require_relative "../dist"
 class Chef
   class Resource
     class RubyBlock < Chef::Resource
+      unified_mode true
+
       provides :ruby_block, target_mode: true
 
       description "Use the ruby_block resource to execute Ruby code during a #{Chef::Dist::PRODUCT} run."\

data/lib/chef/resource/scm.rb

@@ -21,6 +21,8 @@ require_relative "../resource"
 class Chef
   class Resource
     class Scm < Chef::Resource
+      unified_mode true
+
       default_action :sync
       allowed_actions :checkout, :export, :sync, :diff, :log
 

data/lib/chef/resource/script.rb

@@ -22,6 +22,8 @@ require_relative "execute"
 class Chef
   class Resource
     class Script < Chef::Resource::Execute
+      unified_mode true
+
       resource_name :script
 
       identity_attr :name

data/lib/chef/resource/service.rb

@@ -1,7 +1,7 @@
 #
 # Author:: AJ Christensen (<aj@hjksolutions.com>)
 # Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright 2008-2018, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+require "chef-utils/dsl/service" unless defined?(ChefUtils::DSL::Service)
 require_relative "../resource"
 require "shellwords" unless defined?(Shellwords)
 require_relative "../dist"
@@ -24,7 +25,11 @@ require_relative "../dist"
 class Chef
   class Resource
     class Service < Chef::Resource
+      include ChefUtils::DSL::Service
+      extend ChefUtils::DSL::Service
+
       provides :service, target_mode: true
+
       identity_attr :service_name
 
       description "Use the service resource to manage a service."
@@ -90,6 +95,9 @@ class Chef
       # if the service is masked or not
       property :masked, [ TrueClass, FalseClass ], skip_docs: true
 
+      # if the service is indirect or not
+      property :indirect, [ TrueClass, FalseClass ], skip_docs: true
+
       property :options, [ Array, String ],
         description: "Solaris platform only. Options to pass to the service command. See the svcadm manual for details of possible options.",
         coerce: proc { |x| x.respond_to?(:split) ? x.shellsplit : x }

data/lib/chef/resource/solaris_package.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Toomas Pelberg (<toomasp@gmx.net>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/resource/subversion.rb

@@ -23,6 +23,8 @@ require_relative "../dist"
 class Chef
   class Resource
     class Subversion < Chef::Resource::Scm
+      unified_mode true
+
       description "Use the subversion resource to manage source control resources that exist in a Subversion repository."
 
       allowed_actions :force_export

data/lib/chef/resource/sudo.rb

@@ -30,7 +30,7 @@ class Chef
       description "Use the sudo resource to add or remove individual sudo entries using sudoers.d files."\
                   " Sudo version 1.7.2 or newer is required to use the sudo resource, as it relies on the"\
                   " '#includedir' directive introduced in version 1.7.2. This resource does not enforce"\
-                  " installation of the required sudo version. Supported releases of Ubuntu, SuSE, Debian,"\
+                  " installation of the required sudo version. Chef-supported releases of Ubuntu, SuSE, Debian,"\
                   " and RHEL (6+) all support this feature."
       introduced "14.0"
 

data/lib/chef/resource/systemd_unit.rb

@@ -43,6 +43,7 @@ class Chef
       property :active, [TrueClass, FalseClass], skip_docs: true
       property :masked, [TrueClass, FalseClass], skip_docs: true
       property :static, [TrueClass, FalseClass], skip_docs: true
+      property :indirect, [TrueClass, FalseClass], skip_docs: true
 
       # User-provided properties
       property :user, String, desired_state: false,

data/lib/chef/resource/template.rb

@@ -34,6 +34,8 @@ class Chef
     # chef-client. This resource includes actions and properties from the file resource. Template files managed by the
     # template resource follow the same file specificity rules as the remote_file and file resources.
     class Template < Chef::Resource::File
+      unified_mode true
+
       resource_name :template
       provides :template
 

data/lib/chef/resource/user.rb

@@ -21,6 +21,8 @@ require_relative "../resource"
 class Chef
   class Resource
     class User < Chef::Resource
+      unified_mode true
+
       resource_name :user_resource_abstract_base_class # this prevents magickal class name DSL wiring
 
       description "Use the user resource to add users, update existing users, remove users, and to lock/unlock user passwords."

data/lib/chef/resource/user/aix_user.rb

@@ -21,6 +21,8 @@ class Chef
   class Resource
     class User
       class AixUser < Chef::Resource::User
+        unified_mode true
+
         resource_name :aix_user
 
         provides :aix_user

data/lib/chef/resource/user/linux_user.rb

@@ -21,6 +21,8 @@ class Chef
   class Resource
     class User
       class LinuxUser < Chef::Resource::User
+        unified_mode true
+
         resource_name :linux_user
 
         provides :linux_user

data/lib/chef/resource/user/pw_user.rb

@@ -21,6 +21,8 @@ class Chef
   class Resource
     class User
       class PwUser < Chef::Resource::User
+        unified_mode true
+
         resource_name :pw_user
 
         provides :pw_user

data/lib/chef/resource/user/solaris_user.rb

@@ -21,6 +21,8 @@ class Chef
   class Resource
     class User
       class SolarisUser < Chef::Resource::User
+        unified_mode true
+
         resource_name :solaris_user
 
         provides :solaris_user

data/lib/chef/resource/user/windows_user.rb

@@ -21,6 +21,8 @@ class Chef
   class Resource
     class User
       class WindowsUser < Chef::Resource::User
+        unified_mode true
+
         resource_name :windows_user
 
         provides :windows_user

data/lib/chef/resource/whyrun_safe_ruby_block.rb

@@ -19,6 +19,7 @@
 class Chef
   class Resource
     class WhyrunSafeRubyBlock < Chef::Resource::RubyBlock
+      unified_mode true
     end
   end
 end

data/lib/chef/resource/windows_ad_join.rb

@@ -59,7 +59,7 @@ class Chef
 
       property :workgroup_name, String,
         description: "Specifies the name of a workgroup to which the computer is added to when it is removed from the domain. The default value is WORKGROUP. This property is only applicable to the :leave action.",
-        introduced: "15.0"
+        introduced: "15.4"
 
       # define this again so we can default it to true. Otherwise failures print the password
       property :sensitive, [TrueClass, FalseClass],

data/lib/chef/resource/windows_env.rb

@@ -26,7 +26,7 @@ class Chef
       provides :windows_env
       provides :env # backwards compat with the pre-Chef 14 resource name
 
-      description "Use the env resource to manage environment keys in Microsoft Windows. After an environment key is set, Microsoft Windows must be restarted before the environment key will be available to the Task Scheduler."
+      description "Use the windows_env resource to manage environment keys in Microsoft Windows. After an environment key is set, Microsoft Windows must be restarted before the environment key will be available to the Task Scheduler."
 
       default_action :create
       allowed_actions :create, :delete, :modify

data/lib/chef/resource/windows_feature.rb

@@ -24,7 +24,7 @@ class Chef
       resource_name :windows_feature
       provides(:windows_feature) { true }
 
-      description "Use the windows_feature resource to add, remove or entirely delete Windows features and roles. This resource calls the 'windows_feature_dism' or 'windows_feature_powershell' resources depending on the specified installation method and defaults to dism, which is available on both Workstation and Server editions of Windows."
+      description "Use the windows_feature resource to add, remove or entirely delete Windows features and roles. This resource calls the 'windows_feature_dism' or 'windows_feature_powershell' resources depending on the specified installation method, and defaults to DISM, which is available on both Workstation and Server editions of Windows."
       introduced "14.0"
 
       property :feature_name, [Array, String],
@@ -35,7 +35,7 @@ class Chef
         description: "Specify a local repository for the feature install."
 
       property :all, [TrueClass, FalseClass],
-        description: "Install all sub features.",
+        description: "Install all sub-features.",
         default: false
 
       property :management_tools, [TrueClass, FalseClass],

data/lib/chef/resource/windows_feature_powershell.rb

@@ -27,7 +27,7 @@ class Chef
       resource_name :windows_feature_powershell
       provides(:windows_feature_powershell) { true }
 
-      description "Use the windows_feature_powershell resource to add, remove, or entirely delete Windows features and roles using PowerShell. This resource offers significant speed benefits over the windows_feature_dism resource, but requires installing the Remote Server Administration Tools on non-server releases of Windows."
+      description "Use the windows_feature_powershell resource to add, remove, or entirely delete Windows features and roles using PowerShell. This resource offers significant speed benefits over the windows_feature_dism resource, but requires installation of the Remote Server Administration Tools on non-server releases of Windows."
       introduced "14.0"
 
       property :feature_name, [Array, String],

data/lib/chef/resource/windows_firewall_rule.rb

@@ -67,10 +67,15 @@ class Chef
         description: "The action of the firewall rule.",
         coerce: proc { |f| f.is_a?(String) ? f.downcase.to_sym : f }
 
-      property :profile, [Symbol, String],
-        default: :any, equal_to: %i{public private domain any notapplicable},
+      property :profile, [Symbol, String, Array],
+        default: :any,
         description: "The profile the firewall rule applies to.",
-        coerce: proc { |p| p.is_a?(String) ? p.downcase.to_sym : p }
+        coerce: proc { |p| Array(p).map(&:downcase).map(&:to_sym).sort },
+        callbacks: {
+          "contains values not in :public, :private :domain, :any or :notapplicable" => lambda { |p|
+            p.all? { |e| %i{public private domain any notapplicable}.include?(e) }
+          },
+        }
 
       property :program, String,
         description: "The program the firewall rule applies to."
@@ -152,13 +157,13 @@ class Chef
           cmd << " -DisplayName '#{new_resource.rule_name}'" if cmdlet_type == "New"
           cmd << " -Description '#{new_resource.description}'" if new_resource.description
           cmd << " -LocalAddress '#{new_resource.local_address}'" if new_resource.local_address
-          cmd << " -LocalPort #{new_resource.local_port.join(",")}" if new_resource.local_port
+          cmd << " -LocalPort '#{new_resource.local_port.join("', '")}'" if new_resource.local_port
           cmd << " -RemoteAddress '#{new_resource.remote_address}'" if new_resource.remote_address
-          cmd << " -RemotePort #{new_resource.remote_port.join(",")}" if new_resource.remote_port
+          cmd << " -RemotePort '#{new_resource.remote_port.join("', '")}'" if new_resource.remote_port
           cmd << " -Direction '#{new_resource.direction}'" if new_resource.direction
           cmd << " -Protocol '#{new_resource.protocol}'" if new_resource.protocol
           cmd << " -Action '#{new_resource.firewall_action}'" if new_resource.firewall_action
-          cmd << " -Profile '#{new_resource.profile}'" if new_resource.profile
+          cmd << " -Profile '#{new_resource.profile.join("', '")}'" if new_resource.profile
           cmd << " -Program '#{new_resource.program}'" if new_resource.program
           cmd << " -Service '#{new_resource.service}'" if new_resource.service
           cmd << " -InterfaceType '#{new_resource.interface_type}'" if new_resource.interface_type

data/lib/chef/resource/windows_script.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Edwards (<adamed@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,6 +23,8 @@ require_relative "../mixin/windows_architecture_helper"
 class Chef
   class Resource
     class WindowsScript < Chef::Resource::Script
+      unified_mode true
+
       # This is an abstract resource meant to be subclasses; thus no 'provides'
 
       set_guard_inherited_attributes(:architecture)

data/lib/chef/resource/yum_package.rb

@@ -23,7 +23,7 @@ class Chef
   class Resource
     class YumPackage < Chef::Resource::Package
       resource_name :yum_package
-      provides :package, platform_family: %w{rhel fedora amazon}
+      provides :package, platform_family: "fedora_derived"
 
       description "Use the yum_package resource to install, upgrade, and remove packages with Yum"\
                   " for the Red Hat and CentOS platforms. The yum_package resource is able to resolve"\

data/lib/chef/resource_reporter.rb

@@ -183,7 +183,7 @@ class Chef
 
     # get only the top level resources and strip out the subcollections
     def updated_resources
-      @updated_resources ||= action_collection.filtered_collection(max_nesting: 0, up_to_date: false, skipped: false, unprocessed: false)
+      @updated_resources ||= action_collection&.filtered_collection(max_nesting: 0, up_to_date: false, skipped: false, unprocessed: false) || {}
     end
 
     def total_res_count

data/lib/chef/resources.rb

@@ -28,6 +28,7 @@ require_relative "resource/build_essential"
 require_relative "resource/cookbook_file"
 require_relative "resource/chef_gem"
 require_relative "resource/chef_handler"
+require_relative "resource/chef_sleep"
 require_relative "resource/chocolatey_config"
 require_relative "resource/chocolatey_feature"
 require_relative "resource/chocolatey_package"

data/lib/chef/run_context.rb

@@ -635,7 +635,7 @@ class Chef
     # @return [Train::Plugins::Transport::BaseConnection]
     #
     def transport_connection
-      @transport_connection ||= transport.connection
+      @transport_connection ||= transport&.connection
     end
 
     #

data/lib/chef/run_lock.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# Copyright:: Copyright 2012-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
 
 require_relative "mixin/create_path"
 require "fcntl"
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require_relative "win32/mutex"
 end
 require_relative "config"
@@ -97,7 +97,7 @@ class Chef
     #
     def wait
       Chef::Log.warn("#{Chef::Dist::PRODUCT} #{runpid} is running, will wait for it to finish and then run.")
-      if Chef::Platform.windows?
+      if ChefUtils.windows?
         mutex.wait
       else
         runlock.flock(File::LOCK_EX)
@@ -116,7 +116,7 @@ class Chef
     # Release the system-wide lock.
     def release
       if runlock
-        if Chef::Platform.windows?
+        if ChefUtils.windows?
           mutex.release
         else
           runlock.flock(File::LOCK_UN)
@@ -138,7 +138,7 @@ class Chef
 
     # @api private solely for race condition tests
     def acquire_lock
-      if Chef::Platform.windows?
+      if ChefUtils.windows?
         acquire_win32_mutex
       else
         # If we support FD_CLOEXEC, then use it.

data/lib/chef/search/query.rb

@@ -126,9 +126,6 @@ class Chef
         return args.first if args.first.is_a?(Hash)
 
         args_h = {}
-        # If we have 4 arguments, the first is the now-removed sort option, so
-        # just ignore it.
-        args.pop(0) if args.length == 4
         args_h[:start] = args[0] if args[0]
         args_h[:rows] = args[1]
         args_h[:filter_result] = args[2]

data/lib/chef/train_transport.rb

@@ -1,5 +1,5 @@
 # Author:: Bryan McLellan <btm@loftninjas.org>
-# Copyright:: Copyright 2018, Chef Software, Inc.
+# Copyright:: Copyright 2018-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -92,6 +92,8 @@ class Chef
     end
 
     def self.build_transport(logger = Chef::Log.with_child(subsystem: "transport"))
+      return nil unless Chef::Config.target_mode?
+
       # TODO: Consider supporting parsing the protocol from a URI passed to `--target`
       #
       train_config = {}

data/lib/chef/util/powershell/ps_credential.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Jay Mundrawala (<jdm@chef.io>)
 #
-# Copyright:: Copyright 2015-2016, Chef Software, Inc.
+# Copyright:: Copyright 2015-2019, Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../win32/crypto" if Chef::Platform.windows?
+require_relative "../../win32/crypto" if ChefUtils.windows?
 
 class Chef::Util::Powershell
   class PSCredential

data/lib/chef/util/selinux.rb

@@ -3,7 +3,7 @@
 # Author:: Kevin Keane
 # Author:: Lamont Granquist (<lamont@chef.io>)
 #
-# Copyright:: Copyright 2011-2016, Chef Software Inc.
+# Copyright:: Copyright 2011-2019, Chef Software Inc.
 # Copyright:: Copyright 2013-2016, North County Tech Center, LLC
 #
 # License:: Apache License, Version 2.0

data/lib/chef/util/windows/logon_session.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Edwards (<adamed@chef.io>)
 #
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright (c) 2015-2019, Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../win32/api/security" if Chef::Platform.windows?
+require_relative "../../win32/api/security" if ChefUtils.windows?
 require_relative "../../mixin/wide_string"
 
 class Chef