chef 15.1.36 → 15.2.20

data/lib/chef/resource/windows_uac.rb

@@ -28,29 +28,29 @@ class Chef
 
       # https://docs.microsoft.com/en-us/windows/security/identity-protection/user-account-control/user-account-control-group-policy-and-registry-key-settings#user-account-control-virtualize-file-and-registry-write-failures-to-per-user-locations
       property :enable_uac, [TrueClass, FalseClass],
-               description: 'Enable or disable UAC Admin Approval Mode. If this is changed a system restart is required. Sets HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\EnableLUA.',
-               default: true # EnableLUA
+        description: 'Enable or disable UAC Admin Approval Mode. If this is changed a system restart is required. Sets HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\EnableLUA.',
+        default: true # EnableLUA
 
       property :require_signed_binaries, [TrueClass, FalseClass],
-               description: 'Only elevate executables that are signed and validated. Sets HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\EnableLUA\ValidateAdminCodeSignatures.',
-               default: false
+        description: 'Only elevate executables that are signed and validated. Sets HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\EnableLUA\ValidateAdminCodeSignatures.',
+        default: false
 
       property :prompt_on_secure_desktop, [TrueClass, FalseClass],
-               description: 'Switch to the secure desktop when prompting for elevation. Sets HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\EnableLUA\PromptOnSecureDesktop.',
-               default: true
+        description: 'Switch to the secure desktop when prompting for elevation. Sets HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\EnableLUA\PromptOnSecureDesktop.',
+        default: true
 
       property :detect_installers, [TrueClass, FalseClass],
-               description: 'Detect application installations and prompt for elevation. Sets HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\EnableLUA\EnableInstallerDetection.'
+        description: 'Detect application installations and prompt for elevation. Sets HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\EnableLUA\EnableInstallerDetection.'
 
       property :consent_behavior_admins, Symbol,
-               description: 'Behavior of the elevation prompt for administrators in Admin Approval Mode. Sets HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\EnableLUA\ConsentPromptBehaviorAdmin.',
-               equal_to: [:no_prompt, :secure_prompt_for_creds, :secure_prompt_for_consent, :prompt_for_creds, :prompt_for_consent, :prompt_for_consent_non_windows_binaries],
-               default: :prompt_for_consent_non_windows_binaries
+        description: 'Behavior of the elevation prompt for administrators in Admin Approval Mode. Sets HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\EnableLUA\ConsentPromptBehaviorAdmin.',
+        equal_to: %i{no_prompt secure_prompt_for_creds secure_prompt_for_consent prompt_for_creds prompt_for_consent prompt_for_consent_non_windows_binaries},
+        default: :prompt_for_consent_non_windows_binaries
 
       property :consent_behavior_users, Symbol,
-               description: 'Behavior of the elevation prompt for standard users. Sets HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\EnableLUA\ConsentPromptBehaviorUser.',
-               equal_to: [:auto_deny, :secure_prompt_for_creds, :prompt_for_creds],
-               default: :prompt_for_creds
+        description: 'Behavior of the elevation prompt for standard users. Sets HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\EnableLUA\ConsentPromptBehaviorUser.',
+        equal_to: %i{auto_deny secure_prompt_for_creds prompt_for_creds},
+        default: :prompt_for_creds
 
       action :configure do
         description 'Configures UAC by setting registry keys at \'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\''
@@ -79,14 +79,14 @@ class Chef
         #
         # @return [Integer]
         def consent_behavior_admins_symbol_to_reg(sym)
-          [:no_prompt, :secure_prompt_for_creds, :secure_prompt_for_consent, :prompt_for_creds, :prompt_for_consent, :prompt_for_consent_non_windows_binaries].index(sym)
+          %i{no_prompt secure_prompt_for_creds secure_prompt_for_consent prompt_for_creds prompt_for_consent prompt_for_consent_non_windows_binaries}.index(sym)
         end
 
         # converts the symbols we use in the consent_behavior_users property into numbers 0-2 based on their array index
         #
         # @return [Integer]
         def consent_behavior_users_symbol_to_reg(sym)
-          [:auto_deny, :secure_prompt_for_creds, :prompt_for_creds].index(sym)
+          %i{auto_deny secure_prompt_for_creds prompt_for_creds}.index(sym)
         end
       end
     end

data/lib/chef/resource/windows_workgroup.rb

@@ -31,25 +31,25 @@ class Chef
       introduced "14.5"
 
       property :workgroup_name, String,
-               description: "An optional property to set the workgroup name if it differs from the resource block's name.",
-               validation_message: "The 'workgroup_name' property must not contain spaces.",
-               regex: /^\S*$/, # no spaces
-               name_property: true
+        description: "An optional property to set the workgroup name if it differs from the resource block's name.",
+        validation_message: "The 'workgroup_name' property must not contain spaces.",
+        regex: /^\S*$/, # no spaces
+        name_property: true
 
       property :user, String,
-               description: "The local administrator user to use to change the workgroup. Required if using the password property.",
-               desired_state: false
+        description: "The local administrator user to use to change the workgroup. Required if using the password property.",
+        desired_state: false
 
       property :password, String,
-               description: "The password for the local administrator user. Required if using the user property.",
-               desired_state: false
+        description: "The password for the local administrator user. Required if using the user property.",
+        desired_state: false
 
       property :reboot, Symbol,
-               equal_to: [:never, :request_reboot, :reboot_now],
-               validation_message: "The reboot property accepts :immediate (reboot as soon as the resource completes), :delayed (reboot once the #{Chef::Dist::PRODUCT} run completes), and :never (Don't reboot)",
-               description: "Controls the system reboot behavior post workgroup joining. Reboot immediately, after the #{Chef::Dist::PRODUCT} run completes, or never. Note that a reboot is necessary for changes to take effect.",
-               coerce: proc { |x| clarify_reboot(x) },
-               default: :immediate, desired_state: false
+        equal_to: %i{never request_reboot reboot_now},
+        validation_message: "The reboot property accepts :immediate (reboot as soon as the resource completes), :delayed (reboot once the #{Chef::Dist::PRODUCT} run completes), and :never (Don't reboot)",
+        description: "Controls the system reboot behavior post workgroup joining. Reboot immediately, after the #{Chef::Dist::PRODUCT} run completes, or never. Note that a reboot is necessary for changes to take effect.",
+        coerce: proc { |x| clarify_reboot(x) },
+        default: :immediate, desired_state: false
 
       # This resource historically took `:immediate` and `:delayed` as arguments to the reboot property but then
       # tried to shove that straight to the `reboot` resource which objected strenuously. We need to convert these
@@ -69,7 +69,7 @@ class Chef
 
       # define this again so we can default it to true. Otherwise failures print the password
       property :sensitive, [TrueClass, FalseClass],
-               default: true, desired_state: false
+        default: true, desired_state: false
 
       action :join do
         description "Update the workgroup."
@@ -105,6 +105,7 @@ class Chef
         def workgroup_member?
           node_workgroup = powershell_out!("(Get-WmiObject -Class Win32_ComputerSystem).Workgroup")
           raise "Failed to determine if system already a member of workgroup #{new_resource.workgroup_name}" if node_workgroup.error?
+
           node_workgroup.stdout.downcase.strip == new_resource.workgroup_name.downcase
         end
       end

data/lib/chef/resource/yum_package.rb

@@ -40,38 +40,38 @@ class Chef
       # of variables eliminate entire classes of bugs).
       # </lecture>
       property :package_name, [ String, Array ],
-               description: "One of the following: the name of a package, the name of a package and its architecture, the name of a dependency.",
-               identity: true, coerce: proc { |x| x.is_a?(Array) ? x.to_a : x }
+        description: "One of the following: the name of a package, the name of a package and its architecture, the name of a dependency.",
+        identity: true, coerce: proc { |x| x.is_a?(Array) ? x.to_a : x }
 
       property :version, [ String, Array ],
-               description: "The version of a package to be installed or upgraded. This property is ignored when using the ':upgrade' action.",
-               coerce: proc { |x| x.is_a?(Array) ? x.to_a : x }
+        description: "The version of a package to be installed or upgraded. This property is ignored when using the ':upgrade' action.",
+        coerce: proc { |x| x.is_a?(Array) ? x.to_a : x }
 
       property :arch, [ String, Array ],
-               description: "The architecture of the package to be installed or upgraded. This value can also be passed as part of the package name.",
-               coerce: proc { |x| x.is_a?(Array) ? x.to_a : x }
+        description: "The architecture of the package to be installed or upgraded. This value can also be passed as part of the package name.",
+        coerce: proc { |x| x.is_a?(Array) ? x.to_a : x }
 
       property :flush_cache, Hash,
-               description: "Flush the in-memory cache before or after a Yum operation that installs, upgrades, or removes a package. Accepts a Hash in the form: { :before => true/false, :after => true/false } or an Array in the form [ :before, :after ].\nYum automatically synchronizes remote metadata to a local cache. The #{Chef::Dist::CLIENT} creates a copy of the local cache, and then stores it in-memory during the #{Chef::Dist::CLIENT} run. The in-memory cache allows packages to be installed during the #{Chef::Dist::CLIENT} run without the need to continue synchronizing the remote metadata to the local cache while the #{Chef::Dist::CLIENT} run is in-progress.",
-               default: { before: false, after: false },
-               coerce: proc { |v|
-                 if v.is_a?(Hash)
-                   v
-                 elsif v.is_a?(Array)
-                   v.each_with_object({}) { |arg, obj| obj[arg] = true }
-                 elsif v.is_a?(TrueClass) || v.is_a?(FalseClass)
-                   { before: v, after: v }
-                 elsif v == :before
-                   { before: true, after: false }
-                 elsif v == :after
-                   { after: true, before: false }
-                 end
-               }
+        description: "Flush the in-memory cache before or after a Yum operation that installs, upgrades, or removes a package. Accepts a Hash in the form: { :before => true/false, :after => true/false } or an Array in the form [ :before, :after ].\nYum automatically synchronizes remote metadata to a local cache. The #{Chef::Dist::CLIENT} creates a copy of the local cache, and then stores it in-memory during the #{Chef::Dist::CLIENT} run. The in-memory cache allows packages to be installed during the #{Chef::Dist::CLIENT} run without the need to continue synchronizing the remote metadata to the local cache while the #{Chef::Dist::CLIENT} run is in-progress.",
+        default: { before: false, after: false },
+        coerce: proc { |v|
+          if v.is_a?(Hash)
+            v
+          elsif v.is_a?(Array)
+            v.each_with_object({}) { |arg, obj| obj[arg] = true }
+          elsif v.is_a?(TrueClass) || v.is_a?(FalseClass)
+            { before: v, after: v }
+          elsif v == :before
+            { before: true, after: false }
+          elsif v == :after
+            { after: true, before: false }
+          end
+        }
 
       property :allow_downgrade, [ true, false ],
-               description: "Downgrade a package to satisfy requested version requirements.",
-               default: true,
-               desired_state: false
+        description: "Downgrade a package to satisfy requested version requirements.",
+        default: true,
+        desired_state: false
 
       property :yum_binary, String
     end

data/lib/chef/resource/yum_repository.rb

@@ -33,74 +33,74 @@ class Chef
       # http://linux.die.net/man/5/yum.conf as well as
       # http://dnf.readthedocs.io/en/latest/conf_ref.html
       property :baseurl, [String, Array],
-               description: "URL to the directory where the Yum repository's 'repodata' directory lives. Can be an http://, https:// or a ftp:// URL. You can specify multiple URLs in one baseurl statement."
+        description: "URL to the directory where the Yum repository's 'repodata' directory lives. Can be an http://, https:// or a ftp:// URL. You can specify multiple URLs in one baseurl statement."
 
       property :clean_headers, [TrueClass, FalseClass],
-               description: "Specifies whether you want to purge the package data files that are downloaded from a Yum repository and held in a cache directory.",
-               deprecated: true,
-               default: false # deprecated
+        description: "Specifies whether you want to purge the package data files that are downloaded from a Yum repository and held in a cache directory.",
+        deprecated: true,
+        default: false # deprecated
 
       property :clean_metadata, [TrueClass, FalseClass],
-               description: "Specifies whether you want to purge all of the packages downloaded from a Yum repository and held in a cache directory.",
-               default: true
+        description: "Specifies whether you want to purge all of the packages downloaded from a Yum repository and held in a cache directory.",
+        default: true
 
       property :cost, String, regex: /^\d+$/,
                description: "Relative cost of accessing this repository. Useful for weighing one repo's packages as greater/less than any other.",
                validation_message: "The cost property must be a numeric value!"
 
       property :description, String,
-               description: "Descriptive name for the repository channel and maps to the 'name' parameter in a repository .conf.",
-               default: "Yum Repository"
+        description: "Descriptive name for the repository channel and maps to the 'name' parameter in a repository .conf.",
+        default: "Yum Repository"
 
       property :enabled, [TrueClass, FalseClass],
-               description: "Specifies whether or not Yum should use this repository.",
-               default: true
+        description: "Specifies whether or not Yum should use this repository.",
+        default: true
 
       property :enablegroups, [TrueClass, FalseClass],
-               description: "Specifies whether Yum will allow the use of package groups for this repository."
+        description: "Specifies whether Yum will allow the use of package groups for this repository."
 
       property :exclude, String,
-               description: "List of packages to exclude from updates or installs. This should be a space separated list. Shell globs using wildcards (eg. * and ?) are allowed."
+        description: "List of packages to exclude from updates or installs. This should be a space separated list. Shell globs using wildcards (eg. * and ?) are allowed."
 
       property :failovermethod, String,
-               description: "Method to determine how to switch to a new server if the current one fails, which can either be ``roundrobin`` or ``priority``. ``roundrobin`` randomly selects a URL out of the list of URLs to start with and proceeds through each of them as it encounters a failure contacting the host. ``priority`` starts from the first ``baseurl`` listed and reads through them sequentially.",
-               equal_to: %w{priority roundrobin}
+        description: "Method to determine how to switch to a new server if the current one fails, which can either be ``roundrobin`` or ``priority``. ``roundrobin`` randomly selects a URL out of the list of URLs to start with and proceeds through each of them as it encounters a failure contacting the host. ``priority`` starts from the first ``baseurl`` listed and reads through them sequentially.",
+        equal_to: %w{priority roundrobin}
 
       property :fastestmirror_enabled, [TrueClass, FalseClass],
-               description: "Specifies whether to use the fastest mirror from a repository configuration when more than one mirror is listed in that configuration."
+        description: "Specifies whether to use the fastest mirror from a repository configuration when more than one mirror is listed in that configuration."
 
       property :gpgcheck, [TrueClass, FalseClass],
-               description: "Specifies whether or not Yum should perform a GPG signature check on the packages received from a repository.",
-               default: true
+        description: "Specifies whether or not Yum should perform a GPG signature check on the packages received from a repository.",
+        default: true
 
       property :gpgkey, [String, Array],
-               description: "URL pointing to the ASCII-armored GPG key file for the repository. This is used if Yum needs a public key to verify a package and the required key hasn't been imported into the RPM database. If this option is set, Yum will automatically import the key from the specified URL. Multiple URLs may be specified in the same manner as the baseurl option. If a GPG key is required to install a package from a repository, all keys specified for that repository will be installed.\nMultiple URLs may be specified in the same manner as the baseurl option. If a GPG key is required to install a package from a repository, all keys specified for that repository will be installed."
+        description: "URL pointing to the ASCII-armored GPG key file for the repository. This is used if Yum needs a public key to verify a package and the required key hasn't been imported into the RPM database. If this option is set, Yum will automatically import the key from the specified URL. Multiple URLs may be specified in the same manner as the baseurl option. If a GPG key is required to install a package from a repository, all keys specified for that repository will be installed.\nMultiple URLs may be specified in the same manner as the baseurl option. If a GPG key is required to install a package from a repository, all keys specified for that repository will be installed."
 
       property :http_caching, String, equal_to: %w{packages all none},
                description: "Determines how upstream HTTP caches are instructed to handle any HTTP downloads that Yum does. This option can take the following values: all (all HTTP downloads should be cached), packages (only RPM package downloads should be cached, but not repository metadata downloads), or none (no HTTP downloads should be cached)"
 
       property :include_config, String,
-               description: "An external configuration file using the format 'url://to/some/location'."
+        description: "An external configuration file using the format 'url://to/some/location'."
 
       property :includepkgs, String,
-               description: "Inverse of exclude property. This is a list of packages you want to use from a repository. If this option lists only one package then that is all Yum will ever see from the repository."
+        description: "Inverse of exclude property. This is a list of packages you want to use from a repository. If this option lists only one package then that is all Yum will ever see from the repository."
 
       property :keepalive, [TrueClass, FalseClass],
-               description: "Determines whether or not HTTP/1.1 ``keep-alive`` should be used with this repository."
+        description: "Determines whether or not HTTP/1.1 ``keep-alive`` should be used with this repository."
 
       property :make_cache, [TrueClass, FalseClass],
-               description: "Determines whether package files downloaded by Yum stay in cache directories. By using cached data, you can carry out certain operations without a network connection.",
-               default: true
+        description: "Determines whether package files downloaded by Yum stay in cache directories. By using cached data, you can carry out certain operations without a network connection.",
+        default: true
 
       property :max_retries, [String, Integer],
-               description: "Number of times any attempt to retrieve a file should retry before returning an error. Setting this to '0' makes Yum try forever."
+        description: "Number of times any attempt to retrieve a file should retry before returning an error. Setting this to '0' makes Yum try forever."
 
       property :metadata_expire, String, regex: [/^\d+$/, /^\d+[mhd]$/, /never/],
                description: "Time (in seconds) after which the metadata will expire. If the current metadata downloaded is less than the value specified, then Yum will not update the metadata against the repository. If you find that Yum is not downloading information on updates as often as you would like lower the value of this option. You can also change from the default of using seconds to using days, hours or minutes by appending a 'd', 'h' or 'm' respectively. The default is six hours to compliment yum-updates running once per hour. It is also possible to use the word ``never``, meaning that the metadata will never expire. Note: When using a metalink file, the metalink must always be newer than the metadata for the repository due to the validation, so this timeout also applies to the metalink file.",
                validation_message: "The metadata_expire property must be a numeric value for time in seconds, the string 'never', or a numeric value appended with with 'd', 'h', or 'm'!"
 
       property :metalink, String,
-               description: "Specifies a URL to a metalink file for the repomd.xml, a list of mirrors for the entire repository are generated by converting the mirrors for the repomd.xml file to a baseurl."
+        description: "Specifies a URL to a metalink file for the repomd.xml, a list of mirrors for the entire repository are generated by converting the mirrors for the repomd.xml file to a baseurl."
 
       property :mirror_expire, String, regex: [/^\d+$/, /^\d+[mhd]$/],
                description: "Time (in seconds) after which the mirrorlist locally cached will expire. If the current mirrorlist is less than this many seconds old then Yum will not download another copy of the mirrorlist, it has the same extra format as metadata_expire. If you find that Yum is not downloading the mirrorlists as often as you would like lower the value of this option. You can also change from the default of using seconds to using days, hours or minutes by appending a 'd', 'h' or 'm' respectively.",
@@ -111,69 +111,69 @@ class Chef
                validation_message: "The mirrorlist_expire property must be a numeric value for time in seconds, the string 'never', or a numeric value appended with with 'd', 'h', or 'm'!"
 
       property :mirrorlist, String,
-               description: "URL to a file containing a list of baseurls. This can be used instead of or with the baseurl option. Substitution variables, described below, can be used with this option."
+        description: "URL to a file containing a list of baseurls. This can be used instead of or with the baseurl option. Substitution variables, described below, can be used with this option."
 
       property :mode, [String, Integer],
-               description: "Permissions mode of .repo file on disk. This is useful for scenarios where secrets are in the repo file. If this value is set to '600', normal users will not be able to use Yum search, Yum info, etc.",
-               default: "0644"
+        description: "Permissions mode of .repo file on disk. This is useful for scenarios where secrets are in the repo file. If this value is set to '600', normal users will not be able to use Yum search, Yum info, etc.",
+        default: "0644"
 
       property :options, Hash,
-               description: "Specifies the repository options."
+        description: "Specifies the repository options."
 
       property :password, String,
-               description: "Password to use with the username for basic authentication."
+        description: "Password to use with the username for basic authentication."
 
       property :priority, String, regex: /^(\d?[1-9]|[0-9][0-9])$/,
                description: "Assigns a priority to a repository where the priority value is between '1' and '99' inclusive. Priorities are used to enforce ordered protection of repositories. Packages from repositories with a lower priority (higher numerical value) will never be used to upgrade packages that were installed from a repository with a higher priority (lower numerical value). The repositories with the lowest numerical priority number have the highest priority.",
                validation_message: "The priority property must be a numeric value from 1-99!"
 
       property :proxy_password, String,
-               description: "Password for this proxy."
+        description: "Password for this proxy."
 
       property :proxy_username, String,
-               description: "Username to use for proxy."
+        description: "Username to use for proxy."
 
       property :proxy, String,
-               description: "URL to the proxy server that Yum should use."
+        description: "URL to the proxy server that Yum should use."
 
       property :repo_gpgcheck, [TrueClass, FalseClass],
-               description: "Determines whether or not Yum should perform a GPG signature check on the repodata from this repository."
+        description: "Determines whether or not Yum should perform a GPG signature check on the repodata from this repository."
 
       property :report_instanceid, [TrueClass, FalseClass],
-               description: "Determines whether to report the instance ID when using Amazon Linux AMIs and repositories."
+        description: "Determines whether to report the instance ID when using Amazon Linux AMIs and repositories."
 
-      property :repositoryid, String, regex: [/^[^\/]+$/],
+      property :repositoryid, String, regex: [%r{^[^/]+$}],
                description: "An optional property to set the repository name if it differs from the resource block's name.",
                validation_message: "repositoryid property cannot contain a forward slash '/'",
                name_property: true
 
       property :skip_if_unavailable, [TrueClass, FalseClass],
-               description: "Allow yum to continue if this repository cannot be contacted for any reason."
+        description: "Allow yum to continue if this repository cannot be contacted for any reason."
 
       property :source, String,
-               description: "Use a custom template source instead of the default one."
+        description: "Use a custom template source instead of the default one."
 
       property :sslcacert, String,
-               description: "Path to the directory containing the databases of the certificate authorities Yum should use to verify SSL certificates."
+        description: "Path to the directory containing the databases of the certificate authorities Yum should use to verify SSL certificates."
 
       property :sslclientcert, String,
-               description: "Path to the SSL client certificate Yum should use to connect to repos/remote sites."
+        description: "Path to the SSL client certificate Yum should use to connect to repos/remote sites."
 
       property :sslclientkey, String,
-               description: "Path to the SSL client key Yum should use to connect to repos/remote sites."
+        description: "Path to the SSL client key Yum should use to connect to repos/remote sites."
 
       property :sslverify, [TrueClass, FalseClass],
-               description: "Determines whether Yum will verify SSL certificates/hosts."
+        description: "Determines whether Yum will verify SSL certificates/hosts."
 
       property :throttle, [String, Integer],
-               description: "Enable bandwidth throttling for downloads."
+        description: "Enable bandwidth throttling for downloads."
 
       property :timeout, String, regex: /^\d+$/,
                description: "Number of seconds to wait for a connection before timing out. Defaults to 30 seconds. This may be too short of a time for extremely overloaded sites.",
                validation_message: "The timeout property must be a numeric value!"
 
       property :username, String,
-               description: "Username to use for basic authentication to a repository."
+        description: "Username to use for basic authentication to a repository."
 
       default_action :create
       allowed_actions :create, :remove, :makecache, :add, :delete

data/lib/chef/resource/zypper_package.rb

@@ -28,19 +28,19 @@ class Chef
       description "Use the zypper_package resource to install, upgrade, and remove packages with Zypper for the SUSE Enterprise and OpenSUSE platforms."
 
       property :gpg_check, [ TrueClass, FalseClass ],
-               description: "Verify the package's GPG signature. Can also be controlled site-wide using the ``zypper_check_gpg`` config option.",
-               default: lazy { Chef::Config[:zypper_check_gpg] }, default_description: "true"
+        description: "Verify the package's GPG signature. Can also be controlled site-wide using the ``zypper_check_gpg`` config option.",
+        default: lazy { Chef::Config[:zypper_check_gpg] }, default_description: "true"
 
       property :allow_downgrade, [ TrueClass, FalseClass ],
-               description: "Allow downgrading a package to satisfy requested version requirements.",
-               default: true,
-               desired_state: false,
-               introduced: "13.6"
+        description: "Allow downgrading a package to satisfy requested version requirements.",
+        default: true,
+        desired_state: false,
+        introduced: "13.6"
 
       property :global_options, [ String, Array ],
-               description: "One (or more) additional command options that are passed to the command. For example, common zypper directives, such as '--no-recommends'. See the zypper man page at https://en.opensuse.org/SDB:Zypper_manual_(plain) for the full list.",
-               coerce: proc { |x| x.is_a?(String) ? x.shellsplit : x },
-               introduced: "14.6"
+        description: "One (or more) additional command options that are passed to the command. For example, common zypper directives, such as '--no-recommends'. See the zypper man page at https://en.opensuse.org/SDB:Zypper_manual_(plain) for the full list.",
+        coerce: proc { |x| x.is_a?(String) ? x.shellsplit : x },
+        introduced: "14.6"
     end
   end
 end

data/lib/chef/resource/zypper_repository.rb

@@ -29,68 +29,68 @@ class Chef
       introduced "13.3"
 
       property :repo_name, String,
-               regex: [/^[^\/]+$/],
-               description: "An optional property to set the repository name if it differs from the resource block's name.",
-               validation_message: "repo_name property cannot contain a forward slash '/'",
-               name_property: true
+        regex: [%r{^[^/]+$}],
+        description: "An optional property to set the repository name if it differs from the resource block's name.",
+        validation_message: "repo_name property cannot contain a forward slash '/'",
+        name_property: true
 
       property :description, String,
-               description: "The description of the repository that will be shown by the 'zypper repos' command."
+        description: "The description of the repository that will be shown by the 'zypper repos' command."
 
       property :type, String,
-               description: "Specifies the repository type.",
-               default: "NONE"
+        description: "Specifies the repository type.",
+        default: "NONE"
 
       property :enabled, [TrueClass, FalseClass],
-               description: "Determines whether or not the repository should be enabled.",
-               default: true
+        description: "Determines whether or not the repository should be enabled.",
+        default: true
 
       property :autorefresh, [TrueClass, FalseClass],
-               description: "Determines whether or not the repository should be refreshed automatically.",
-               default: true
+        description: "Determines whether or not the repository should be refreshed automatically.",
+        default: true
 
       property :gpgcheck, [TrueClass, FalseClass],
-               description: "Determines whether or not to perform a GPG signature check on the repository.",
-               default: true
+        description: "Determines whether or not to perform a GPG signature check on the repository.",
+        default: true
 
       property :gpgkey, String,
-               description: "The location of the repository key to be imported."
+        description: "The location of the repository key to be imported."
 
       property :baseurl, String,
-               description: "The base URL for the Zypper repository, such as 'http://download.opensuse.org'."
+        description: "The base URL for the Zypper repository, such as 'http://download.opensuse.org'."
 
       property :mirrorlist, String,
-               description: "The URL of the mirror list that will be used."
+        description: "The URL of the mirror list that will be used."
 
       property :path, String,
-               description: "The relative path from the repository's base URL."
+        description: "The relative path from the repository's base URL."
 
       property :priority, Integer,
-               description: "Determines the priority of the Zypper repository. ",
-               default: 99
+        description: "Determines the priority of the Zypper repository. ",
+        default: 99
 
       property :keeppackages, [TrueClass, FalseClass],
-               description: "Determines whether or not packages should be saved.",
-               default: false
+        description: "Determines whether or not packages should be saved.",
+        default: false
 
       property :mode, [String, Integer],
-               description: "The file mode of the repository file.",
-               default: "0644"
+        description: "The file mode of the repository file.",
+        default: "0644"
 
       property :refresh_cache, [TrueClass, FalseClass],
-               description: "Determines whether or not the package cache should be refreshed.",
-               default: true
+        description: "Determines whether or not the package cache should be refreshed.",
+        default: true
 
       property :source, String,
-               description: "The name of the template for the repository file. Only necessary if you're not using the built in template."
+        description: "The name of the template for the repository file. Only necessary if you're not using the built in template."
 
       property :cookbook, String,
-               description: "The cookbook to source the repository template file from. Only necessary if you're not using the built in template.",
-               desired_state: false
+        description: "The cookbook to source the repository template file from. Only necessary if you're not using the built in template.",
+        desired_state: false
 
       property :gpgautoimportkeys, [TrueClass, FalseClass],
-               description: "Automatically import the specified key when setting up the repository.",
-               default: true
+        description: "Automatically import the specified key when setting up the repository.",
+        default: true
 
       default_action :create
       allowed_actions :create, :remove, :add, :refresh