chef 14.7.17 → 14.8.12

data/lib/chef/resource/execute.rb

@@ -65,7 +65,7 @@ class Chef
                description: "The current working directory from which the command will be run."
 
       property :environment, Hash,
-               description: "Specify a Hash of environment variables to be set."
+               description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'})."
 
       alias :env :environment
 
@@ -87,7 +87,7 @@ class Chef
                description: "The amount of time (in seconds) a command is to wait before timing out."
 
       property :user, [ String, Integer ],
-               description: "The user name of the user identity with which to launch the new process. The user name may optionally be specifed with a domain, i.e. domainuser or user@my.dns.domain.com via Universal Principal Name (UPN)format. It can also be specified without a domain simply as user if the domain is instead specified using the domain attribute. On Windows only, if this property is specified, the password property must be specified."
+               description: "The user name of the user identity with which to launch the new process. The user name may optionally be specifed with a domain, i.e. domainuser or user@my.dns.domain.com via Universal Principal Name (UPN)format. It can also be specified without a domain simply as user if the domain is instead specified using the domain property. On Windows only, if this property is specified, the password property must be specified."
 
       property :domain, String,
                introduced: "12.21",

data/lib/chef/resource/homebrew_cask.rb

@@ -32,7 +32,7 @@ class Chef
       include Chef::Mixin::HomebrewUser
 
       property :cask_name, String,
-               description: "The name of the Homebrew cask, if it differs from the resource block name.",
+               description: "An optional property to set the cask name if it differs from the resource block's name.",
                regex: %r{^[\w/-]+$},
                validation_message: "The provided Homebrew cask name is not valid. Cask names can contain alphanumeric characters, _, -, or / only!",
                name_property: true

data/lib/chef/resource/homebrew_tap.rb

@@ -32,7 +32,7 @@ class Chef
       include Chef::Mixin::HomebrewUser
 
       property :tap_name, String,
-               description: "Optional tap name to override the resource name",
+               description: "An optional property to set the tap name if it differs from the resource block's name.",
                validation_message: "Homebrew tap names must be in the form REPO/TAP format!",
                regex: %r{^[\w-]+(?:\/[\w-]+)+$},
                name_property: true

data/lib/chef/resource/hostname.rb

@@ -27,7 +27,7 @@ class Chef
       introduced "14.0"
 
       property :hostname, String,
-               description: "Used to specify the hostname if it is different than the resource's name.",
+               description: "An optional property to set the hostname if it differs from the resource block's name.",
                name_property: true
 
       property :compile_time, [ TrueClass, FalseClass ],
@@ -36,7 +36,7 @@ class Chef
 
       property :ipaddress, String,
                description: "The IP address to use when configuring the hosts file.",
-               default: lazy { node["ipaddress"] }
+               default: lazy { node["ipaddress"] }, default_description: "The node's IP address as determined by Ohai."
 
       property :aliases, [ Array, nil ],
                description: "An array of hostname aliases to use when configuring the hosts file.",

data/lib/chef/resource/kernel_module.rb

@@ -18,7 +18,7 @@ class Chef
       introduced "14.3"
 
       property :modname, String,
-               description: "The name of the kernel module.",
+               description: "An optional property to set the kernel module name if it differs from the resource block's name.",
                name_property: true, identity: true
 
       property :load_dir, String,

data/lib/chef/resource/link.rb

@@ -48,7 +48,7 @@ class Chef
       end
 
       property :target_file, String,
-               description: "The name of the link. Default value: the name of the resource block.",
+               description: "An optional property to set the target file if it differs from the resource block's name.",
                name_property: true, identity: true
 
       property :to, String,

data/lib/chef/resource/ohai_hint.rb

@@ -27,7 +27,7 @@ class Chef
       introduced "14.0"
 
       property :hint_name, String,
-               description: "The name of the hints file, if it differs from the resource name.",
+               description: "An optional property to set the hint name if it differs from the resource block's name.",
                name_property: true
 
       property :content, Hash,

data/lib/chef/resource/package.rb

@@ -42,7 +42,7 @@ class Chef
       end
 
       property :package_name, [ String, Array ],
-               description: "The name of the package. Defaults to the name of the resourse block unless specified.",
+               description: "An optional property to set the package name if it differs from the resource block's name.",
                identity: true
 
       property :version, [ String, Array ],

data/lib/chef/resource/scm.rb

@@ -66,7 +66,7 @@ class Chef
                default: "deploy"
 
       property :environment, [Hash, nil],
-               description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}). (These variables must exist for a command to be run successfully.)",
+               description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}).",
                default: nil
 
       alias :env :environment

data/lib/chef/resource/swap_file.rb

@@ -27,7 +27,7 @@ class Chef
       introduced "14.0"
 
       property :path, String,
-               description: "The path where the swap file will be created on the system, if it differs from the resource block name.",
+               description: "The path where the swap file will be created on the system, if it differs from the resource block's name.",
                name_property: true
 
       property :size, Integer,

data/lib/chef/resource/sysctl.rb

@@ -33,7 +33,7 @@ class Chef
       introduced "14.0"
 
       property :key, String,
-               description: "The kernel parameter key in dotted format, if it differs from the resource block name.",
+               description: "The kernel parameter key in dotted format, if it differs from the resource block's name.",
                name_property: true
 
       property :ignore_error, [TrueClass, FalseClass],

data/lib/chef/resource/systemd_unit.rb

@@ -60,7 +60,7 @@ class Chef
 
       property :unit_name, String, desired_state: false,
                identity: true, name_property: true,
-               description: "The name of the unit file if it differs from the resource block name.",
+               description: "The name of the unit file if it differs from the resource block's name.",
                introduced: "13.7"
 
       def to_ini

data/lib/chef/resource/template.rb

@@ -57,9 +57,17 @@ class Chef
         )
       end
 
-      property :variables, Hash, default: lazy { Hash.new }
-      property :cookbook, String
-      property :local, [ TrueClass, FalseClass ], default: false
+      property :variables, Hash,
+               description: "The variables property of the template resource can be used to reference a partial template file by using a Hash.",
+               default: lazy { Hash.new }
+
+      property :cookbook, String,
+               description: "The cookbook in which a file is located (if it is not located in the current cookbook). The default value is the current cookbook.",
+               desired_state: false
+
+      property :local, [ TrueClass, FalseClass ],
+               default: false, desired_state: false,
+               description: "Load a template from a local path. By default, the chef-client loads templates from a cookbook’s /templates directory. When this property is set to true, use the source property to specify the path to a template on the local node."
 
       # Declares a helper method to be defined in the template context when
       # rendering.

data/lib/chef/resource/windows_ad_join.rb

@@ -65,7 +65,7 @@ class Chef
 
         unless on_domain?
           cmd = "$pswd = ConvertTo-SecureString \'#{new_resource.domain_password}\' -AsPlainText -Force;"
-          cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{new_resource.domain_user}\",$pswd);"
+          cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{new_resource.domain_user}@#{new_resource.domain_name}\",$pswd);"
           cmd << "Add-Computer -DomainName #{new_resource.domain_name} -Credential $credential"
           cmd << " -OUPath \"#{new_resource.ou_path}\"" if new_resource.ou_path
           cmd << " -NewName \"#{new_resource.new_hostname}\"" if new_resource.new_hostname

data/lib/chef/resource/windows_auto_run.rb

@@ -28,7 +28,7 @@ class Chef
       introduced "14.0"
 
       property :program_name, String,
-               description: "The name of the program to run at login, if it differs from the resource block name.",
+               description: "The name of the program to run at login, if it differs from the resource block's name.",
                name_property: true
 
       property :path, String,

data/lib/chef/resource/windows_certificate.rb

@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+require "chef/util/path_helper"
 require "chef/resource"
 require "win32-certstore" if Chef::Platform.windows?
 require "openssl"
@@ -180,7 +181,7 @@ class Chef
 
         def cert_script(persist)
           cert_script = "$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2"
-          file = win_friendly_path(new_resource.source)
+          file = Chef::Util::PathHelper.cleanpath(new_resource.source)
           cert_script << " \"#{file}\""
           if ::File.extname(file.downcase) == ".pfx"
             cert_script << ", \"#{new_resource.pfx_password}\""

data/lib/chef/resource/windows_feature.rb

@@ -28,7 +28,7 @@ class Chef
       introduced "14.0"
 
       property :feature_name, [Array, String],
-               description: "The name of the feature(s) or role(s) to install, if it differs from the resource block name. The same feature may have different names depending on the underlying installation method being used (ie DHCPServer vs DHCP; DNS-Server-Full-Role vs DNS).",
+               description: "The name of the feature(s) or role(s) to install, if it differs from the resource block's name. The same feature may have different names depending on the underlying installation method being used (ie DHCPServer vs DHCP; DNS-Server-Full-Role vs DNS).",
                name_property: true
 
       property :source, String,
@@ -44,7 +44,8 @@ class Chef
 
       property :install_method, Symbol,
                description: "The underlying installation method to use for feature installation. Specify ':windows_feature_dism' for DISM or ':windows_feature_powershell' for PowerShell.",
-               equal_to: [:windows_feature_dism, :windows_feature_powershell, :windows_feature_servermanagercmd]
+               equal_to: [:windows_feature_dism, :windows_feature_powershell, :windows_feature_servermanagercmd],
+               default: :windows_feature_dism
 
       property :timeout, Integer,
                description: "Specifies a timeout (in seconds) for the feature installation.",
@@ -72,16 +73,15 @@ class Chef
         # call the appropriate windows_feature resource based on the specified subresource
         # @return [void]
         def run_default_subresource(desired_action)
-          raise "Support for Windows feature installation via servermanagercmd.exe has been removed as this support is no longer needed in Windows 2008 R2 and above. You will need to update your cookbook to install either via dism or powershell (preferred)." if new_resource.install_method == :windows_feature_servermanagercmd
+          raise "Support for Windows feature installation via servermanagercmd.exe has been removed as this support is no longer needed in Windows 2008 R2 and above. You will need to update your recipe to install either via dism or powershell (preferred)." if new_resource.install_method == :windows_feature_servermanagercmd
 
-          subresource = new_resource.install_method || :windows_feature_dism
-          declare_resource(subresource, new_resource.name) do
+          declare_resource(new_resource.install_method, new_resource.name) do
             action desired_action
             feature_name new_resource.feature_name
             source new_resource.source if new_resource.source
             all new_resource.all
             timeout new_resource.timeout
-            management_tools new_resource.management_tools if subresource == :windows_feature_powershell
+            management_tools new_resource.management_tools if new_resource.install_method == :windows_feature_powershell
           end
         end
       end

data/lib/chef/resource/windows_feature_dism.rb

@@ -57,7 +57,6 @@ class Chef
 
         reload_cached_dism_data unless node["dism_features_cache"]
         fail_if_unavailable # fail if the features don't exist
-        fail_if_removed # fail if the features are in removed state
 
         logger.trace("Windows features needing installation: #{features_to_install.empty? ? 'none' : features_to_install.join(',')}")
         unless features_to_install.empty?
@@ -66,8 +65,12 @@ class Chef
             install_command = "dism.exe /online /enable-feature #{features_to_install.map { |f| "/featurename:#{f}" }.join(' ')} /norestart"
             install_command << " /LimitAccess /Source:\"#{new_resource.source}\"" if new_resource.source
             install_command << " /All" if new_resource.all
-
-            shell_out!(install_command, returns: [0, 42, 127, 3010], timeout: new_resource.timeout)
+            begin
+              shell_out!(install_command, returns: [0, 42, 127, 3010], timeout: new_resource.timeout)
+            rescue Mixlib::ShellOut::ShellCommandFailed => e
+              raise "Error 50 returned by DISM related to parent features, try setting the 'all' property to 'true' on the 'windows_feature_dism' resource." if required_parent_feature?(e.inspect)
+              raise e.message
+            end
 
             reload_cached_dism_data # Reload cached dism feature state
           end
@@ -118,10 +121,10 @@ class Chef
             # disabled features are always available to install
             available_for_install = node["dism_features_cache"]["disabled"].dup
 
-            # if the user passes a source then removed features are also available for installation
-            available_for_install.concat(node["dism_features_cache"]["removed"]) if new_resource.source
+            # removed features are also available for installation
+            available_for_install.concat(node["dism_features_cache"]["removed"])
 
-            # the intersection of the features to install & disabled/removed(if passing source) features are what needs installing
+            # the intersection of the features to install & disabled/removed features are what needs installing
             new_resource.feature_name & available_for_install
           end
         end
@@ -204,22 +207,15 @@ class Chef
           node.override["dism_features_cache"][feature_type] << feature_details
         end
 
-        # Fail if any of the packages are in a removed state
-        # @return [void]
-        def fail_if_removed
-          return if new_resource.source # if someone provides a source then all is well
-          if node["platform_version"].to_f > 6.2 # 2012R2 or later
-            return if registry_key_exists?('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing') && registry_value_exists?('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing', name: "LocalSourcePath") # if source is defined in the registry, still fine
-          end
-          removed = new_resource.feature_name & node["dism_features_cache"]["removed"]
-          raise "The Windows feature#{'s' if removed.count > 1} #{removed.join(',')} #{removed.count > 1 ? 'are' : 'is'} removed from the host and cannot be installed." unless removed.empty?
-        end
-
         # Fail unless we're on windows 8+ / 2012+ where deleting a feature is supported
         # @return [void]
         def raise_if_delete_unsupported
           raise Chef::Exceptions::UnsupportedAction, "#{self} :delete action not supported on Windows releases before Windows 8/2012. Cannot continue!" if older_than_win_2012_or_8?
         end
+
+        def required_parent_feature?(error_message)
+          error_message.include?("Error: 50") && error_message.include?("required parent feature")
+        end
       end
     end
   end

data/lib/chef/resource/windows_feature_powershell.rb

@@ -31,7 +31,7 @@ class Chef
       introduced "14.0"
 
       property :feature_name, [Array, String],
-               description: "The name of the feature(s) or role(s) to install, if it differs from the resource block name.",
+               description: "The name of the feature(s) or role(s) to install, if it differs from the resource block's name.",
                coerce: proc { |x| to_formatted_array(x) },
                name_property: true
 

data/lib/chef/resource/windows_share.rb

@@ -102,7 +102,7 @@ class Chef
         # this command selects individual objects because EncryptData & CachingMode have underlying
         # types that get converted to their Integer values by ConvertTo-Json & we need to make sure
         # those get written out as strings
-        share_state_cmd = "Get-SmbShare -Name '#{desired.share_name}' | Select-Object Name,Path, Description, Temporary, CATimeout, ContinuouslyAvailable, ConcurrentUserLimit, EncryptData | ConvertTo-Json"
+        share_state_cmd = "Get-SmbShare -Name '#{desired.share_name}' | Select-Object Name,Path, Description, Temporary, CATimeout, ContinuouslyAvailable, ConcurrentUserLimit, EncryptData | ConvertTo-Json -Compress"
 
         Chef::Log.debug("Running '#{share_state_cmd}' to determine share state'")
         ps_results = powershell_out(share_state_cmd)
@@ -126,7 +126,7 @@ class Chef
         encrypt_data results["EncryptData"]
         # folder_enumeration_mode results['FolderEnumerationMode']
 
-        perm_state_cmd = %{Get-SmbShareAccess -Name "#{desired.share_name}" | Select-Object AccountName,AccessControlType,AccessRight | ConvertTo-Json}
+        perm_state_cmd = %{Get-SmbShareAccess -Name "#{desired.share_name}" | Select-Object AccountName,AccessControlType,AccessRight | ConvertTo-Json -Compress}
 
         Chef::Log.debug("Running '#{perm_state_cmd}' to determine share permissions state'")
         ps_perm_results = powershell_out(perm_state_cmd)
@@ -242,6 +242,10 @@ class Chef
 
           Chef::Log.debug("Running '#{share_cmd}' to create the share")
           powershell_out!(share_cmd)
+
+          # New-SmbShare adds the "Everyone" user with read access no matter what so we need to remove it
+          # before we add our permissions
+          revoke_user_permissions(["Everyone"])
         end
 
         # determine what users in the current state don't exist in the desired state
@@ -297,8 +301,10 @@ class Chef
           false
         end
 
+        # revoke user permissions from a share
+        # @param [Array] users
         def revoke_user_permissions(users)
-          revoke_command = "Revoke-SmbShareAccess -Name '#{new_resource.share_name}' -AccountName \"#{users.join(',')}\" -Force"
+          revoke_command = "Revoke-SmbShareAccess -Name '#{new_resource.share_name}' -AccountName \"#{users.join('","')}\" -Force"
           Chef::Log.debug("Running '#{revoke_command}' to revoke share permissions")
           powershell_out!(revoke_command)
         end

data/lib/chef/resource/windows_task.rb

@@ -22,319 +22,318 @@ require "chef/win32/security" if Chef::Platform.windows?
 class Chef
   class Resource
     class WindowsTask < Chef::Resource
-      if Chef::Platform.windows?
-        resource_name :windows_task
-        provides(:windows_task) { true }
+      resource_name :windows_task
+      provides(:windows_task) { true }
 
-        description "Use the windows_task resource to create, delete or run a Windows scheduled task. Requires Windows Server 2008 or later due to API usage."
-        introduced "13.0"
+      description "Use the windows_task resource to create, delete or run a Windows scheduled task. Requires Windows Server 2008 or later due to API usage."
+      introduced "13.0"
 
-        allowed_actions :create, :delete, :run, :end, :enable, :disable, :change
-        default_action :create
+      allowed_actions :create, :delete, :run, :end, :enable, :disable, :change
+      default_action :create
 
-        property :task_name, String, regex: [/\A[^\/\:\*\?\<\>\|]+\z/],
-                 description: "The task name, such as 'Task Name' or '/Task Name'",
-                 name_property: true
+      property :task_name, String, regex: [/\A[^\/\:\*\?\<\>\|]+\z/],
+               description: "The task name, such as 'Task Name' or '/Task Name'",
+               name_property: true
 
-        property :command, String,
-                 description: "The command to be executed by the windows scheduled task."
+      property :command, String,
+               description: "The command to be executed by the windows scheduled task."
 
-        property :cwd, String,
-                 description: "The directory the task will be run from."
+      property :cwd, String,
+               description: "The directory the task will be run from."
 
-        property :user, String,
-                 description: "The user to run the task as.",
-                 default: Chef::ReservedNames::Win32::Security::SID.LocalSystem.account_simple_name
+      property :user, String,
+               description: "The user to run the task as.",
+               default: lazy { Chef::ReservedNames::Win32::Security::SID.LocalSystem.account_simple_name if Chef::Platform.windows? },
+               default_description: "The localized SYSTEM user for the node."
 
-        property :password, String,
-                 description: "The user’s password. The user property must be set if using this property."
+      property :password, String,
+               description: "The user’s password. The user property must be set if using this property."
 
-        property :run_level, Symbol, equal_to: [:highest, :limited],
-                 description: "Run with ':limited' or ':highest' privileges.",
-                 default: :limited
+      property :run_level, Symbol, equal_to: [:highest, :limited],
+               description: "Run with ':limited' or ':highest' privileges.",
+               default: :limited
 
-        property :force, [TrueClass, FalseClass],
-                 description: "When used with create, will update the task.",
-                 default: false
+      property :force, [TrueClass, FalseClass],
+               description: "When used with create, will update the task.",
+               default: false
 
-        property :interactive_enabled, [TrueClass, FalseClass],
-                 description: "Allow task to run interactively or non-interactively. Requires user and password to also be set.",
-                 default: false
+      property :interactive_enabled, [TrueClass, FalseClass],
+               description: "Allow task to run interactively or non-interactively. Requires user and password to also be set.",
+               default: false
 
-        property :frequency_modifier, [Integer, String],
-                 default: 1
+      property :frequency_modifier, [Integer, String],
+               default: 1
 
-        property :frequency, Symbol, equal_to: [:minute,
-                                                :hourly,
-                                                :daily,
-                                                :weekly,
-                                                :monthly,
-                                                :once,
-                                                :on_logon,
-                                                :onstart,
-                                                :on_idle,
-                                                :none],
-                 description: "The frequency with which to run the task."
+      property :frequency, Symbol, equal_to: [:minute,
+                                              :hourly,
+                                              :daily,
+                                              :weekly,
+                                              :monthly,
+                                              :once,
+                                              :on_logon,
+                                              :onstart,
+                                              :on_idle,
+                                              :none],
+               description: "The frequency with which to run the task."
 
-        property :start_day, String,
-                 description: "Specifies the first date on which the task runs in MM/DD/YYYY format."
+      property :start_day, String,
+               description: "Specifies the first date on which the task runs in MM/DD/YYYY format."
 
-        property :start_time, String,
-                 description: "Specifies the start time to run the task, in HH:mm format."
+      property :start_time, String,
+               description: "Specifies the start time to run the task, in HH:mm format."
 
-        property :day, [String, Integer],
-                 description: "The day(s) on which the task runs."
+      property :day, [String, Integer],
+               description: "The day(s) on which the task runs."
 
-        property :months, String,
-                 description: "The Months of the year on which the task runs, such as: 'JAN, FEB' or '\*'. Multiple months should be comma delimited. e.g. 'Jan, Feb, Mar, Dec'."
+      property :months, String,
+               description: "The Months of the year on which the task runs, such as: 'JAN, FEB' or '\*'. Multiple months should be comma delimited. e.g. 'Jan, Feb, Mar, Dec'."
 
-        property :idle_time, Integer,
-                 description: "For :on_idle frequency, the time (in minutes) without user activity that must pass to trigger the task, from 1 - 999."
+      property :idle_time, Integer,
+               description: "For :on_idle frequency, the time (in minutes) without user activity that must pass to trigger the task, from 1 - 999."
 
-        property :random_delay, [String, Integer],
-                 description: "Delays the task up to a given time (in seconds)."
+      property :random_delay, [String, Integer],
+               description: "Delays the task up to a given time (in seconds)."
 
-        property :execution_time_limit, [String, Integer],
-                 description: "The maximum time (in seconds) the task will run.",
-                 default: "PT72H" # 72 hours in ISO8601 duration format
+      property :execution_time_limit, [String, Integer],
+               description: "The maximum time (in seconds) the task will run.",
+               default: "PT72H" # 72 hours in ISO8601 duration format
 
-        property :minutes_duration, [String, Integer],
-                 description: ""
+      property :minutes_duration, [String, Integer],
+               description: ""
 
-        property :minutes_interval, [String, Integer],
-                 description: ""
+      property :minutes_interval, [String, Integer],
+               description: ""
 
-        property :priority, Integer,
-                 description: "Use to set Priority Levels range from 0 to 10.",
-                 default: 7, callbacks: { "should be in range of 0 to 10" => proc { |v| v >= 0 && v <= 10 } }
+      property :priority, Integer,
+               description: "Use to set Priority Levels range from 0 to 10.",
+               default: 7, callbacks: { "should be in range of 0 to 10" => proc { |v| v >= 0 && v <= 10 } }
 
-        property :disallow_start_if_on_batteries, [TrueClass, FalseClass],
-                 introduced: "14.4", default: false,
-                 description: "Disallow start of the task if the system is running on battery power."
+      property :disallow_start_if_on_batteries, [TrueClass, FalseClass],
+               introduced: "14.4", default: false,
+               description: "Disallow start of the task if the system is running on battery power."
 
-        property :stop_if_going_on_batteries, [TrueClass, FalseClass],
-                 introduced: "14.4", default: false,
-                 description: "Scheduled task option when system is switching on battery."
+      property :stop_if_going_on_batteries, [TrueClass, FalseClass],
+               introduced: "14.4", default: false,
+               description: "Scheduled task option when system is switching on battery."
 
-        property :description, String,
-                 introduced: "14.7",
-                 description: "The task description."
+      property :description, String,
+               introduced: "14.7",
+               description: "The task description."
 
-        attr_accessor :exists, :task, :command_arguments
+      attr_accessor :exists, :task, :command_arguments
 
-        VALID_WEEK_DAYS = %w{ mon tue wed thu fri sat sun * }.freeze
-        VALID_DAYS_OF_MONTH = ("1".."31").to_a << "last" << "lastday"
-        VALID_MONTHS = %w{JAN FEB MAR APR MAY JUN JUL AUG SEP OCT NOV DEC *}.freeze
-        VALID_WEEKS = %w{FIRST SECOND THIRD FOURTH LAST LASTDAY}.freeze
+      VALID_WEEK_DAYS = %w{ mon tue wed thu fri sat sun * }.freeze
+      VALID_DAYS_OF_MONTH = ("1".."31").to_a << "last" << "lastday"
+      VALID_MONTHS = %w{JAN FEB MAR APR MAY JUN JUL AUG SEP OCT NOV DEC *}.freeze
+      VALID_WEEKS = %w{FIRST SECOND THIRD FOURTH LAST LASTDAY}.freeze
 
-        def after_created
-          if random_delay
-            validate_random_delay(random_delay, frequency)
-            random_delay(sec_to_min(random_delay))
-          end
-
-          if execution_time_limit
-            execution_time_limit(259200) if execution_time_limit == "PT72H"
-            raise ArgumentError, "Invalid value passed for `execution_time_limit`. Please pass seconds as an Integer (e.g. 60) or a String with numeric values only (e.g. '60')." unless numeric_value_in_string?(execution_time_limit)
-            execution_time_limit(sec_to_min(execution_time_limit))
-          end
+      def after_created
+        if random_delay
+          validate_random_delay(random_delay, frequency)
+          random_delay(sec_to_min(random_delay))
+        end
 
-          validate_frequency(frequency) if action.include?(:create) || action.include?(:change)
-          validate_start_time(start_time, frequency)
-          validate_start_day(start_day, frequency) if start_day
-          validate_user_and_password(user, password)
-          validate_interactive_setting(interactive_enabled, password)
-          validate_create_frequency_modifier(frequency, frequency_modifier) if frequency_modifier
-          validate_create_day(day, frequency, frequency_modifier) if day
-          validate_create_months(months, frequency) if months
-          validate_frequency_monthly(frequency_modifier, months, day) if frequency == :monthly
-          validate_idle_time(idle_time, frequency)
-          idempotency_warning_for_frequency_weekly(day, start_day) if frequency == :weekly
+        if execution_time_limit
+          execution_time_limit(259200) if execution_time_limit == "PT72H"
+          raise ArgumentError, "Invalid value passed for `execution_time_limit`. Please pass seconds as an Integer (e.g. 60) or a String with numeric values only (e.g. '60')." unless numeric_value_in_string?(execution_time_limit)
+          execution_time_limit(sec_to_min(execution_time_limit))
         end
 
-        private
+        validate_frequency(frequency) if action.include?(:create) || action.include?(:change)
+        validate_start_time(start_time, frequency)
+        validate_start_day(start_day, frequency) if start_day
+        validate_user_and_password(user, password)
+        validate_interactive_setting(interactive_enabled, password)
+        validate_create_frequency_modifier(frequency, frequency_modifier) if frequency_modifier
+        validate_create_day(day, frequency, frequency_modifier) if day
+        validate_create_months(months, frequency) if months
+        validate_frequency_monthly(frequency_modifier, months, day) if frequency == :monthly
+        validate_idle_time(idle_time, frequency)
+        idempotency_warning_for_frequency_weekly(day, start_day) if frequency == :weekly
+      end
+
+      private
 
         ## Resource is not idempotent when day, start_day is not provided with frequency :weekly
         ## we set start_day when not given by user as current date based on which we set the day property for current current date day is monday ..
         ## we set the monday as the day so at next run when  new_resource.day is nil and current_resource day is monday due to which udpate gets called
-        def idempotency_warning_for_frequency_weekly(day, start_day)
-          if start_day.nil? && day.nil?
-            logger.warn "To maintain idempotency for frequency :weekly provide start_day, start_time and day."
-          end
+      def idempotency_warning_for_frequency_weekly(day, start_day)
+        if start_day.nil? && day.nil?
+          logger.warn "To maintain idempotency for frequency :weekly provide start_day, start_time and day."
         end
+      end
 
         # Validate the passed value is numeric values only if it is a string
-        def numeric_value_in_string?(val)
-          return true if Integer(val)
-        rescue ArgumentError
-          false
-        end
+      def numeric_value_in_string?(val)
+        return true if Integer(val)
+      rescue ArgumentError
+        false
+      end
 
-        def validate_frequency(frequency)
-          if frequency.nil? || !([:minute, :hourly, :daily, :weekly, :monthly, :once, :on_logon, :onstart, :on_idle, :none].include?(frequency))
-            raise ArgumentError, "Frequency needs to be provided. Valid frequencies are :minute, :hourly, :daily, :weekly, :monthly, :once, :on_logon, :onstart, :on_idle, :none."
-          end
+      def validate_frequency(frequency)
+        if frequency.nil? || !([:minute, :hourly, :daily, :weekly, :monthly, :once, :on_logon, :onstart, :on_idle, :none].include?(frequency))
+          raise ArgumentError, "Frequency needs to be provided. Valid frequencies are :minute, :hourly, :daily, :weekly, :monthly, :once, :on_logon, :onstart, :on_idle, :none."
         end
+      end
 
-        def validate_frequency_monthly(frequency_modifier, months, day)
-          # validates the frequency :monthly and raises error if frequency_modifier is first, second, thrid etc and day is not provided
-          if (frequency_modifier != 1) && (frequency_modifier_includes_days_of_weeks?(frequency_modifier)) && !(day)
-            raise ArgumentError, "Please select day on which you want to run the task e.g. 'Mon, Tue'. Multiple values must be seprated by comma."
-          end
-
-          # frequency_modifer 2-12 is used to set every (n) months, so using :months propety with frequency_modifer is not valid since they both used to set months.
-          # Not checking value 1 here for frequecy_modifier since we are setting that as default value it won't break anything since preference is given to months property
-          if (frequency_modifier.to_i.between?(2, 12)) && !(months.nil?)
-            raise ArgumentError, "For frequency :monthly either use property months or frequency_modifier to set months."
-          end
+      def validate_frequency_monthly(frequency_modifier, months, day)
+        # validates the frequency :monthly and raises error if frequency_modifier is first, second, thrid etc and day is not provided
+        if (frequency_modifier != 1) && (frequency_modifier_includes_days_of_weeks?(frequency_modifier)) && !(day)
+          raise ArgumentError, "Please select day on which you want to run the task e.g. 'Mon, Tue'. Multiple values must be seprated by comma."
         end
 
-        # returns true if frequency_modifer has values First, second, third, fourth, last, lastday
-        def frequency_modifier_includes_days_of_weeks?(frequency_modifier)
-          frequency_modifier = frequency_modifier.to_s.split(",")
-          frequency_modifier.map! { |value| value.strip.upcase }
-          (frequency_modifier - VALID_WEEKS).empty?
+        # frequency_modifer 2-12 is used to set every (n) months, so using :months propety with frequency_modifer is not valid since they both used to set months.
+        # Not checking value 1 here for frequecy_modifier since we are setting that as default value it won't break anything since preference is given to months property
+        if (frequency_modifier.to_i.between?(2, 12)) && !(months.nil?)
+          raise ArgumentError, "For frequency :monthly either use property months or frequency_modifier to set months."
         end
+      end
 
-        def validate_random_delay(random_delay, frequency)
-          if [:on_logon, :onstart, :on_idle, :none].include? frequency
-            raise ArgumentError, "`random_delay` property is supported only for frequency :once, :minute, :hourly, :daily, :weekly and :monthly"
-          end
+        # returns true if frequency_modifer has values First, second, third, fourth, last, lastday
+      def frequency_modifier_includes_days_of_weeks?(frequency_modifier)
+        frequency_modifier = frequency_modifier.to_s.split(",")
+        frequency_modifier.map! { |value| value.strip.upcase }
+        (frequency_modifier - VALID_WEEKS).empty?
+      end
 
-          raise ArgumentError, "Invalid value passed for `random_delay`. Please pass seconds as an Integer (e.g. 60) or a String with numeric values only (e.g. '60')." unless numeric_value_in_string?(random_delay)
+      def validate_random_delay(random_delay, frequency)
+        if [:on_logon, :onstart, :on_idle, :none].include? frequency
+          raise ArgumentError, "`random_delay` property is supported only for frequency :once, :minute, :hourly, :daily, :weekly and :monthly"
         end
 
+        raise ArgumentError, "Invalid value passed for `random_delay`. Please pass seconds as an Integer (e.g. 60) or a String with numeric values only (e.g. '60')." unless numeric_value_in_string?(random_delay)
+      end
+
         # @todo when we drop ruby 2.3 support this should be converted to .match?() instead of =~f
-        def validate_start_day(start_day, frequency)
-          if start_day && frequency == :none
-            raise ArgumentError, "`start_day` property is not supported with frequency: #{frequency}"
-          end
+      def validate_start_day(start_day, frequency)
+        if start_day && frequency == :none
+          raise ArgumentError, "`start_day` property is not supported with frequency: #{frequency}"
+        end
 
-          # make sure the start_day is in MM/DD/YYYY format: http://rubular.com/r/cgjHemtWl5
-          if start_day
-            raise ArgumentError, "`start_day` property must be in the MM/DD/YYYY format." unless /^(0[1-9]|1[012])[- \/.](0[1-9]|[12][0-9]|3[01])[- \/.](19|20)\d\d$/ =~ start_day
-          end
+        # make sure the start_day is in MM/DD/YYYY format: http://rubular.com/r/cgjHemtWl5
+        if start_day
+          raise ArgumentError, "`start_day` property must be in the MM/DD/YYYY format." unless /^(0[1-9]|1[012])[- \/.](0[1-9]|[12][0-9]|3[01])[- \/.](19|20)\d\d$/ =~ start_day
         end
+      end
 
         # @todo when we drop ruby 2.3 support this should be converted to .match?() instead of =~
-        def validate_start_time(start_time, frequency)
-          if start_time
-            raise ArgumentError, "`start_time` property is not supported with `frequency :none`" if frequency == :none
-            raise ArgumentError, "`start_time` property must be in the HH:mm format (e.g. 6:20pm -> 18:20)." unless /^[0-2][0-9]:[0-5][0-9]$/ =~ start_time
-          else
-            raise ArgumentError, "`start_time` needs to be provided with `frequency :once`" if frequency == :once
-          end
+      def validate_start_time(start_time, frequency)
+        if start_time
+          raise ArgumentError, "`start_time` property is not supported with `frequency :none`" if frequency == :none
+          raise ArgumentError, "`start_time` property must be in the HH:mm format (e.g. 6:20pm -> 18:20)." unless /^[0-2][0-9]:[0-5][0-9]$/ =~ start_time
+        else
+          raise ArgumentError, "`start_time` needs to be provided with `frequency :once`" if frequency == :once
         end
+      end
 
-        def validate_user_and_password(user, password)
-          if password_required?(user) && password.nil?
-            raise ArgumentError, "Cannot specify a user other than the system users without specifying a password!. Valid passwordless users: '#{Chef::ReservedNames::Win32::Security::SID::SYSTEM_USER.join("', '")}'"
-          end
+      def validate_user_and_password(user, password)
+        if password_required?(user) && password.nil?
+          raise ArgumentError, "Cannot specify a user other than the system users without specifying a password!. Valid passwordless users: '#{Chef::ReservedNames::Win32::Security::SID::SYSTEM_USER.join("', '")}'"
         end
+      end
 
-        def password_required?(user)
-          return false if user.nil?
-          @password_required ||= !Chef::ReservedNames::Win32::Security::SID.system_user?(user)
-        end
+      def password_required?(user)
+        return false if user.nil?
+        @password_required ||= !Chef::ReservedNames::Win32::Security::SID.system_user?(user)
+      end
+
+      def validate_interactive_setting(interactive_enabled, password)
+        raise ArgumentError, "Please provide the password when attempting to set interactive/non-interactive." if interactive_enabled && password.nil?
+      end
 
-        def validate_interactive_setting(interactive_enabled, password)
-          raise ArgumentError, "Please provide the password when attempting to set interactive/non-interactive." if interactive_enabled && password.nil?
+      def validate_create_frequency_modifier(frequency, frequency_modifier)
+        if ([:on_logon, :onstart, :on_idle, :none].include?(frequency)) && ( frequency_modifier != 1)
+          raise ArgumentError, "frequency_modifier property not supported with frequency :#{frequency}"
         end
 
-        def validate_create_frequency_modifier(frequency, frequency_modifier)
-          if ([:on_logon, :onstart, :on_idle, :none].include?(frequency)) && ( frequency_modifier != 1)
-            raise ArgumentError, "frequency_modifier property not supported with frequency :#{frequency}"
+        if frequency == :monthly
+          unless (1..12).cover?(frequency_modifier.to_i) || frequency_modifier_includes_days_of_weeks?(frequency_modifier)
+            raise ArgumentError, "frequency_modifier value #{frequency_modifier} is invalid. Valid values for :monthly frequency are 1 - 12, 'FIRST', 'SECOND', 'THIRD', 'FOURTH', 'LAST'."
           end
-
-          if frequency == :monthly
-            unless (1..12).cover?(frequency_modifier.to_i) || frequency_modifier_includes_days_of_weeks?(frequency_modifier)
-              raise ArgumentError, "frequency_modifier value #{frequency_modifier} is invalid. Valid values for :monthly frequency are 1 - 12, 'FIRST', 'SECOND', 'THIRD', 'FOURTH', 'LAST'."
-            end
-          else
-            unless frequency.nil? || frequency_modifier.nil?
-              frequency_modifier = frequency_modifier.to_i
-              min = 1
-              max = case frequency
-                      when :minute
-                        1439
-                      when :hourly
-                        23
-                      when :daily
-                        365
-                      when :weekly
-                        52
-                      else
-                        min
-                    end
-              unless frequency_modifier.between?(min, max)
-                raise ArgumentError, "frequency_modifier value #{frequency_modifier} is invalid. Valid values for :#{frequency} frequency are #{min} - #{max}."
-              end
+        else
+          unless frequency.nil? || frequency_modifier.nil?
+            frequency_modifier = frequency_modifier.to_i
+            min = 1
+            max = case frequency
+                    when :minute
+                      1439
+                    when :hourly
+                      23
+                    when :daily
+                      365
+                    when :weekly
+                      52
+                    else
+                      min
+                  end
+            unless frequency_modifier.between?(min, max)
+              raise ArgumentError, "frequency_modifier value #{frequency_modifier} is invalid. Valid values for :#{frequency} frequency are #{min} - #{max}."
             end
           end
         end
+      end
 
-        def validate_create_day(day, frequency, frequency_modifier)
-          raise ArgumentError, "day property is only valid for tasks that run monthly or weekly" unless [:weekly, :monthly].include?(frequency)
-
-          # This has been verified with schtask.exe https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/schtasks#d-dayday--
-          # verified with earlier code if day "*" is given with frequency it raised exception Invalid value for /D option
-          raise ArgumentError, "day wild card (*) is only valid with frequency :weekly" if frequency == :monthly && day == "*"
-
-          if day.is_a?(String) && day.to_i.to_s != day
-            days = day.split(",")
-            if days_includes_days_of_months?(days)
-              # Following error will be raise if day is set as 1-31 and frequency is selected as :weekly since those values are valid with only frequency :monthly
-              raise ArgumentError, "day values 1-31 or last is only valid with frequency :monthly" if frequency == :weekly
-            else
-              days.map! { |day| day.to_s.strip.downcase }
-              unless (days - VALID_WEEK_DAYS).empty?
-                raise ArgumentError, "day property invalid. Only valid values are: #{VALID_WEEK_DAYS.map(&:upcase).join(', ')}. Multiple values must be separated by a comma."
-              end
+      def validate_create_day(day, frequency, frequency_modifier)
+        raise ArgumentError, "day property is only valid for tasks that run monthly or weekly" unless [:weekly, :monthly].include?(frequency)
+
+        # This has been verified with schtask.exe https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/schtasks#d-dayday--
+        # verified with earlier code if day "*" is given with frequency it raised exception Invalid value for /D option
+        raise ArgumentError, "day wild card (*) is only valid with frequency :weekly" if frequency == :monthly && day == "*"
+
+        if day.is_a?(String) && day.to_i.to_s != day
+          days = day.split(",")
+          if days_includes_days_of_months?(days)
+            # Following error will be raise if day is set as 1-31 and frequency is selected as :weekly since those values are valid with only frequency :monthly
+            raise ArgumentError, "day values 1-31 or last is only valid with frequency :monthly" if frequency == :weekly
+          else
+            days.map! { |day| day.to_s.strip.downcase }
+            unless (days - VALID_WEEK_DAYS).empty?
+              raise ArgumentError, "day property invalid. Only valid values are: #{VALID_WEEK_DAYS.map(&:upcase).join(', ')}. Multiple values must be separated by a comma."
             end
           end
         end
+      end
 
-        def validate_create_months(months, frequency)
-          raise ArgumentError, "months property is only valid for tasks that run monthly" if frequency != :monthly
-          if months.is_a?(String)
-            months = months.split(",")
-            months.map! { |month| month.strip.upcase }
-            unless (months - VALID_MONTHS).empty?
-              raise ArgumentError, "months property invalid. Only valid values are: #{VALID_MONTHS.join(', ')}. Multiple values must be separated by a comma."
-            end
+      def validate_create_months(months, frequency)
+        raise ArgumentError, "months property is only valid for tasks that run monthly" if frequency != :monthly
+        if months.is_a?(String)
+          months = months.split(",")
+          months.map! { |month| month.strip.upcase }
+          unless (months - VALID_MONTHS).empty?
+            raise ArgumentError, "months property invalid. Only valid values are: #{VALID_MONTHS.join(', ')}. Multiple values must be separated by a comma."
           end
         end
+      end
 
         # This method returns true if day has values from 1-31 which is a days of moths and used with frequency :monthly
-        def days_includes_days_of_months?(days)
-          days.map! { |day| day.to_s.strip.downcase }
-          (days - VALID_DAYS_OF_MONTH).empty?
-        end
+      def days_includes_days_of_months?(days)
+        days.map! { |day| day.to_s.strip.downcase }
+        (days - VALID_DAYS_OF_MONTH).empty?
+      end
 
-        def validate_idle_time(idle_time, frequency)
-          if !idle_time.nil? && frequency != :on_idle
-            raise ArgumentError, "idle_time property is only valid for tasks that run on_idle"
-          end
-          if idle_time.nil? && frequency == :on_idle
-            raise ArgumentError, "idle_time value should be set for :on_idle frequency."
-          end
-          unless idle_time.nil? || idle_time > 0 && idle_time <= 999
-            raise ArgumentError, "idle_time value #{idle_time} is invalid. Valid values for :on_idle frequency are 1 - 999."
-          end
+      def validate_idle_time(idle_time, frequency)
+        if !idle_time.nil? && frequency != :on_idle
+          raise ArgumentError, "idle_time property is only valid for tasks that run on_idle"
+        end
+        if idle_time.nil? && frequency == :on_idle
+          raise ArgumentError, "idle_time value should be set for :on_idle frequency."
         end
+        unless idle_time.nil? || idle_time > 0 && idle_time <= 999
+          raise ArgumentError, "idle_time value #{idle_time} is invalid. Valid values for :on_idle frequency are 1 - 999."
+        end
+      end
 
         # Converts the number of seconds to an ISO8601 duration format and returns it.
         # Ref : https://github.com/arnau/ISO8601/blob/master/lib/iso8601/duration.rb#L18-L23
         # e.g.
         # ISO8601::Duration.new(65707200).to_s
         # returns 'PT65707200S'
-        def sec_to_dur(seconds)
-          ISO8601::Duration.new(seconds.to_i).to_s
-        end
+      def sec_to_dur(seconds)
+        ISO8601::Duration.new(seconds.to_i).to_s
+      end
 
-        def sec_to_min(seconds)
-          seconds.to_i / 60
-        end
+      def sec_to_min(seconds)
+        seconds.to_i / 60
       end
     end
   end