summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-03-05 10:16:11 -0800
committerGitHub <noreply@github.com>2018-03-05 10:16:11 -0800
commite6b9ac43cb8906f1b998c1393d38fa6689b83ec3 (patch)
tree80c6a5a1e77df944981f4bc854f0d74588f4ba74
parent3cf017dfd506770d06ad3b5341fca1215ad470a9 (diff)
parent012f732bd53c4426c6ba92d9091cb3b7a96daaa5 (diff)
downloadchef-e6b9ac43cb8906f1b998c1393d38fa6689b83ec3.tar.gz
Merge pull request #6943 from chef/misc_resource
Add more description fields, style fixes, add missing requires
-rw-r--r--lib/chef/resource/build_essential.rb7
-rw-r--r--lib/chef/resource/chef_gem.rb2
-rw-r--r--lib/chef/resource/file.rb6
-rw-r--r--lib/chef/resource/gem_package.rb2
-rw-r--r--lib/chef/resource/hostname.rb15
-rw-r--r--lib/chef/resource/ips_package.rb2
-rw-r--r--lib/chef/resource/macos_userdefaults.rb27
-rw-r--r--lib/chef/resource/macosx_service.rb2
-rw-r--r--lib/chef/resource/macports_package.rb3
-rw-r--r--lib/chef/resource/mdadm.rb9
-rw-r--r--lib/chef/resource/ohai.rb6
-rw-r--r--lib/chef/resource/ohai_hint.rb12
-rw-r--r--lib/chef/resource/openssl_rsa_private_key.rb4
-rw-r--r--lib/chef/resource/osx_profile.rb11
-rw-r--r--lib/chef/resource/rhsm_errata.rb3
-rw-r--r--lib/chef/resource/rhsm_errata_level.rb3
-rw-r--r--lib/chef/resource/rhsm_register.rb24
-rw-r--r--lib/chef/resource/rhsm_repo.rb3
-rw-r--r--lib/chef/resource/rhsm_subscription.rb3
-rw-r--r--lib/chef/resource/windows_env.rb2
-rw-r--r--lib/chef/resource/windows_feature.rb7
-rw-r--r--lib/chef/resource/windows_feature_dism.rb4
-rw-r--r--lib/chef/resource/windows_feature_powershell.rb6
-rw-r--r--lib/chef/resource/windows_pagefile.rb6
-rw-r--r--lib/chef/resource/windows_printer.rb7
-rw-r--r--lib/chef/resource/windows_printer_port.rb4
-rw-r--r--lib/chef/resource/zypper_package.rb2
-rw-r--r--lib/chef/resource/zypper_repository.rb12
28 files changed, 94 insertions, 100 deletions
diff --git a/lib/chef/resource/build_essential.rb b/lib/chef/resource/build_essential.rb
index 881f932b30..8977444692 100644
--- a/lib/chef/resource/build_essential.rb
+++ b/lib/chef/resource/build_essential.rb
@@ -22,7 +22,12 @@ class Chef
resource_name :build_essential
provides :build_essential
- property :compile_time, [true, false], default: false
+ description "Use the build_essential resource to install packages required for compiling C software from source"
+ introduced "14.0"
+
+ property :compile_time, [TrueClass, FalseClass],
+ description: "Install build essential packages at compile time.",
+ default: false
action :install do
case node["platform_family"]
diff --git a/lib/chef/resource/chef_gem.rb b/lib/chef/resource/chef_gem.rb
index b6bbd0e209..3304690901 100644
--- a/lib/chef/resource/chef_gem.rb
+++ b/lib/chef/resource/chef_gem.rb
@@ -40,7 +40,7 @@ class Chef
callbacks: {
"The chef_gem resource is restricted to the current gem environment, use gem_package to install to other environments." => proc { |v| v == "#{RbConfig::CONFIG['bindir']}/gem" },
}
- property :compile_time, [ true, false ], default: false, desired_state: false
+ property :compile_time, [TrueClass, FalseClass], default: false, desired_state: false
# force the resource to compile time if the compile time property has been set
def after_created
diff --git a/lib/chef/resource/file.rb b/lib/chef/resource/file.rb
index 98341ff940..341b106720 100644
--- a/lib/chef/resource/file.rb
+++ b/lib/chef/resource/file.rb
@@ -52,13 +52,13 @@ class Chef
allowed_actions :create, :delete, :touch, :create_if_missing
property :path, String, name_property: true, identity: true
- property :atomic_update, [ true, false ], desired_state: false, default: lazy { |r| r.docker? && r.special_docker_files?(r.path) ? false : Chef::Config[:file_atomic_update] }
+ property :atomic_update, [ TrueClass, FalseClass ], desired_state: false, default: lazy { |r| r.docker? && r.special_docker_files?(r.path) ? false : Chef::Config[:file_atomic_update] }
property :backup, [ Integer, false ], desired_state: false, default: 5
property :checksum, [ /^[a-zA-Z0-9]{64}$/, nil ]
property :content, [ String, nil ], desired_state: false
property :diff, [ String, nil ], desired_state: false
- property :force_unlink, [ true, false ], desired_state: false, default: false
- property :manage_symlink_source, [ true, false ], desired_state: false
+ property :force_unlink, [ TrueClass, FalseClass ], desired_state: false, default: false
+ property :manage_symlink_source, [ TrueClass, FalseClass ], desired_state: false
property :verifications, Array, default: lazy { [] }
def verify(command = nil, opts = {}, &block)
diff --git a/lib/chef/resource/gem_package.rb b/lib/chef/resource/gem_package.rb
index 1f9bae614d..ee1262cb47 100644
--- a/lib/chef/resource/gem_package.rb
+++ b/lib/chef/resource/gem_package.rb
@@ -40,7 +40,7 @@ class Chef
# FIXME? the array form of installing paths most likely does not work?
#
property :source, [ String, Array ]
- property :clear_sources, [ true, false ], default: false, desired_state: false
+ property :clear_sources, [ TrueClass, FalseClass ], default: false, desired_state: false
# Sets a custom gem_binary to run for gem commands.
property :gem_binary, String, desired_state: false
diff --git a/lib/chef/resource/hostname.rb b/lib/chef/resource/hostname.rb
index 16986c09a3..dfc7ee2ff0 100644
--- a/lib/chef/resource/hostname.rb
+++ b/lib/chef/resource/hostname.rb
@@ -9,28 +9,23 @@ class Chef
description "Sets the systems hostname, ensures that reboot will preserve the hostname, and re-runs the ohai plugin so the hostname will be available in subsequent cookbooks."
introduced "14.0"
- property :hostname,
- String,
+ property :hostname, String,
description: "The hostname if different than the resource's name",
name_property: true
- property :compile_time,
- [ TrueClass, FalseClass ],
+ property :compile_time, [ TrueClass, FalseClass ],
description: "Should the resource run at compile time or not.",
default: true
- property :ipaddress,
- String,
+ property :ipaddress, String,
description: "The ip address to use when configuring the hosts file",
default: lazy { node["ipaddress"] }
- property :aliases,
- [ Array, nil ],
+ property :aliases, [ Array, nil ],
description: "An array of hostname aliases to use when configuring the hosts file",
default: nil
- property :windows_reboot,
- [ TrueClass, FalseClass ],
+ property :windows_reboot, [ TrueClass, FalseClass ],
description: "Should Windows nodes be rebooted upon changing the name so it can take effect",
default: true
diff --git a/lib/chef/resource/ips_package.rb b/lib/chef/resource/ips_package.rb
index 88a9f182d4..079cc27231 100644
--- a/lib/chef/resource/ips_package.rb
+++ b/lib/chef/resource/ips_package.rb
@@ -30,7 +30,7 @@ class Chef
allowed_actions :install, :remove, :upgrade
- property :accept_license, [ true, false ], default: false, desired_state: false
+ property :accept_license, [TrueClass, FalseClass], default: false, desired_state: false
end
end
end
diff --git a/lib/chef/resource/macos_userdefaults.rb b/lib/chef/resource/macos_userdefaults.rb
index c0066c84b5..45be356d1b 100644
--- a/lib/chef/resource/macos_userdefaults.rb
+++ b/lib/chef/resource/macos_userdefaults.rb
@@ -25,50 +25,41 @@ class Chef
provides :mac_os_x_userdefaults
provides :macos_userdefaults
- introduced "14.0"
-
description "Use the macos_userdefaults resource to manage the macOS user defaults"\
" system. The properties to the resource are passed to the defaults command"\
" and the parameters follow convention of the macOS command. See the defaults(1)"\
" man page for details on how the tool works."
+ introduced "14.0"
- property :domain,
- String,
+ property :domain, String,
description: "The domain the defaults belong to.",
required: true
- property :global,
- [true, false],
+ property :global, [TrueClass, FalseClass],
description: "Whether the domain is global.",
default: false
- property :key,
- String,
+ property :key, String,
description: "The preference key."
- property :value,
- [Integer, Float, String, true, false, Hash, Array],
+ property :value, [Integer, Float, String, TrueClass, FalseClass, Hash, Array],
description: "The value of the key.",
coerce: proc { |v| coerce_booleans(v) },
required: true
- property :type,
- String,
+ property :type, String,
description: "Value type of the preference key.",
default: ""
- property :user,
- String,
+ property :user, String,
description: "User for which to set the default."
- property :sudo,
- [true, false],
+ property :sudo, [TrueClass, FalseClass],
description: "Set to true if the setting requires privileged access to modify.",
default: false,
desired_state: false
- property :is_set,
- [true, false],
+ property :is_set, [TrueClass, FalseClass],
description: "",
default: false,
desired_state: false
diff --git a/lib/chef/resource/macosx_service.rb b/lib/chef/resource/macosx_service.rb
index a12add2109..9a88e3bbfc 100644
--- a/lib/chef/resource/macosx_service.rb
+++ b/lib/chef/resource/macosx_service.rb
@@ -25,6 +25,8 @@ class Chef
provides :macosx_service, os: "darwin"
provides :service, os: "darwin"
+ description "Use the macosx_service resource to manage services on the macOS platform."
+
identity_attr :service_name
state_attrs :enabled, :running
diff --git a/lib/chef/resource/macports_package.rb b/lib/chef/resource/macports_package.rb
index e787529f48..254d7e7c5f 100644
--- a/lib/chef/resource/macports_package.rb
+++ b/lib/chef/resource/macports_package.rb
@@ -20,9 +20,10 @@ require "chef/resource/package"
class Chef
class Resource
- # Use the macports_package resource to manage packages for the macOS platform.
class MacportsPackage < Chef::Resource::Package
resource_name :macports_package
+
+ description "Use the macports_package resource to manage packages for the macOS platform."
end
end
end
diff --git a/lib/chef/resource/mdadm.rb b/lib/chef/resource/mdadm.rb
index 6d4014b110..c8752ba038 100644
--- a/lib/chef/resource/mdadm.rb
+++ b/lib/chef/resource/mdadm.rb
@@ -21,13 +21,14 @@ require "chef/resource"
class Chef
class Resource
- # Use the mdadm resource to manage RAID devices in a Linux environment using the mdadm utility. The mdadm resource
- # will create and assemble an array, but it will not create the config file that is used to persist the array upon
- # reboot. If the config file is required, it must be done by specifying a template with the correct array layout,
- # and then by using the mount provider to create a file systems table (fstab) entry.
class Mdadm < Chef::Resource
resource_name :mdadm
+ description "Use the mdadm resource to manage RAID devices in a Linux environment using the mdadm utility. The mdadm resource"\
+ " will create and assemble an array, but it will not create the config file that is used to persist the array upon"\
+ " reboot. If the config file is required, it must be done by specifying a template with the correct array layout,"\
+ " and then by using the mount provider to create a file systems table (fstab) entry."
+
default_action :create
allowed_actions :create, :assemble, :stop
diff --git a/lib/chef/resource/ohai.rb b/lib/chef/resource/ohai.rb
index f2534413ea..b506d511ba 100644
--- a/lib/chef/resource/ohai.rb
+++ b/lib/chef/resource/ohai.rb
@@ -19,12 +19,14 @@
class Chef
class Resource
- # Use the ohai resource to reload the Ohai configuration on a node. This allows recipes that change system attributes
- # (like a recipe that adds a user) to refer to those attributes later on during the chef-client run.
class Ohai < Chef::Resource
resource_name :ohai
provides :ohai
+ description "Use the ohai resource to reload the Ohai configuration on a node."\
+ " This allows recipes that change system attributes (like a recipe"\
+ " that adds a user) to refer to those attributes later on during the chef-client run."
+
property :ohai_name, name_property: true
property :plugin, [String]
diff --git a/lib/chef/resource/ohai_hint.rb b/lib/chef/resource/ohai_hint.rb
index 26b76806d7..90755300ca 100644
--- a/lib/chef/resource/ohai_hint.rb
+++ b/lib/chef/resource/ohai_hint.rb
@@ -21,17 +21,15 @@ class Chef
resource_name :ohai_hint
provides :ohai_hint
- description "A resource to pass hint data to Ohai to aid in configuration detection."
+ description "Use the ohai_hint resource to pass hint data to Ohai to aid in configuration detection."
introduced "14.0"
- property :hint_name,
- String,
- description: "The name of hints file if different from the resource name",
+ property :hint_name, String,
+ description: "The name of hints file if different from the resource name.",
name_property: true
- property :content,
- Hash,
- description: "Values to include in the hint file"
+ property :content, Hash,
+ description: "Values to include in the hint file."
property :compile_time,
[TrueClass, FalseClass],
diff --git a/lib/chef/resource/openssl_rsa_private_key.rb b/lib/chef/resource/openssl_rsa_private_key.rb
index 729d5a585a..352d802175 100644
--- a/lib/chef/resource/openssl_rsa_private_key.rb
+++ b/lib/chef/resource/openssl_rsa_private_key.rb
@@ -27,12 +27,12 @@ class Chef
provides :openssl_rsa_private_key
provides :openssl_rsa_key # legacy cookbook resource name
- introduced "14.0"
description "Use the openssl_rsa_private_key resource to generate RSA private key files."\
" If a valid RSA key file can be opened at the specified location, no new file"\
" will be created. If the RSA key file cannot be opened, either because it does"\
" not exist or because the password to the RSA key file does not match the"\
" password in the recipe, it will be overwritten."
+ introduced "14.0"
property :path, String,
description: "The path to write the file to it's different than the resource name.",
@@ -63,7 +63,7 @@ class Chef
description: "The permission mode of all files created by the resource.",
default: "0600"
- property :force, [true, false],
+ property :force, [TrueClass, FalseClass],
description: "Force creating the key even if the existing key exists.",
default: false
diff --git a/lib/chef/resource/osx_profile.rb b/lib/chef/resource/osx_profile.rb
index 569c02aa27..cf857cec6f 100644
--- a/lib/chef/resource/osx_profile.rb
+++ b/lib/chef/resource/osx_profile.rb
@@ -20,18 +20,17 @@ require "chef/resource"
class Chef
class Resource
- # Use the osx_profile resource to manage configuration profiles (.mobileconfig files)
- # on the macOS platform. The osx_profile resource installs profiles by using
- # the uuidgen library to generate a unique ProfileUUID, and then using the
- # profiles command to install the profile on the system.
class OsxProfile < Chef::Resource
provides :osx_profile, os: "darwin"
provides :osx_config_profile, os: "darwin"
- description "12.7"
+ description "Use the osx_profile resource to manage configuration profiles (.mobileconfig files)"\
+ " on the macOS platform. The osx_profile resource installs profiles by using"\
+ " the uuidgen library to generate a unique ProfileUUID, and then using the"\
+ " profiles command to install the profile on the system."
+ introduced "12.7"
default_action :install
-
allowed_actions :install, :remove
property :profile_name, String, name_property: true, identity: true
diff --git a/lib/chef/resource/rhsm_errata.rb b/lib/chef/resource/rhsm_errata.rb
index 56779909f5..ca3e71648f 100644
--- a/lib/chef/resource/rhsm_errata.rb
+++ b/lib/chef/resource/rhsm_errata.rb
@@ -27,8 +27,7 @@ class Chef
" to mitigate a single vulnerability must be installed on your hosts."
introduced "14.0"
- property :errata_id,
- String,
+ property :errata_id, String,
description: "An optional property for specifying the errata ID if not using the resource's name.",
name_property: true
diff --git a/lib/chef/resource/rhsm_errata_level.rb b/lib/chef/resource/rhsm_errata_level.rb
index 3aa289ac2e..bab4d6ef26 100644
--- a/lib/chef/resource/rhsm_errata_level.rb
+++ b/lib/chef/resource/rhsm_errata_level.rb
@@ -28,8 +28,7 @@ class Chef
" security level are installed."
introduced "14.0"
- property :errata_level,
- String,
+ property :errata_level, String,
coerce: proc { |x| x.downcase },
equal_to: %w{critical moderate important low},
description: "The errata level of packages to install.",
diff --git a/lib/chef/resource/rhsm_register.rb b/lib/chef/resource/rhsm_register.rb
index 47fe67d1cf..fe2c6a2391 100644
--- a/lib/chef/resource/rhsm_register.rb
+++ b/lib/chef/resource/rhsm_register.rb
@@ -27,29 +27,23 @@ class Chef
" or a local Red Hat Satellite server."
introduced "14.0"
- property :activation_key,
- [String, Array],
+ property :activation_key, [String, Array],
coerce: proc { |x| Array(x) },
description: "A String or array of the activation keys to use when registering. You must also specify the organization property if using activation_key."
- property :satellite_host,
- String,
+ property :satellite_host, String,
description: "The FQDN of the Satellite host to register with. If not specified, the host will be registered with Red Hat's public RHSM service."
- property :organization,
- String,
+ property :organization, String,
description: "The organization to use when registering, required when using an activation key"
- property :environment,
- String,
+ property :environment, String,
description: "The environment to use when registering, required when using username and password"
- property :username,
- String,
+ property :username, String,
description: "The username to use when registering. Not applicable if using an activation key. If specified, password and environment are also required."
- property :password,
- String,
+ property :password, String,
description: "The password to use when registering. Not applicable if using an activation key. If specified, username and environment are also required."
property :auto_attach,
@@ -57,13 +51,11 @@ class Chef
description: "If true, RHSM will attempt to automatically attach the host to applicable subscriptions. It is generally better to use an activation key with the subscriptions pre-defined.",
default: false
- property :install_katello_agent,
- [TrueClass, FalseClass],
+ property :install_katello_agent, [TrueClass, FalseClass],
description: "If true, the 'katello-agent' RPM will be installed.",
default: true
- property :force,
- [TrueClass, FalseClass],
+ property :force, [TrueClass, FalseClass],
description: "If true, the system will be registered even if it is already registered. Normally, any register operations will fail if the machine is has already registered.",
default: false
diff --git a/lib/chef/resource/rhsm_repo.rb b/lib/chef/resource/rhsm_repo.rb
index aef4dd43d6..689874a774 100644
--- a/lib/chef/resource/rhsm_repo.rb
+++ b/lib/chef/resource/rhsm_repo.rb
@@ -26,8 +26,7 @@ class Chef
" repositories that are made available via attached subscriptions."
introduced "14.0"
- property :repo_name,
- String,
+ property :repo_name, String,
description: "An optional property for specifying the repository name if not using the resource's name.",
name_property: true
diff --git a/lib/chef/resource/rhsm_subscription.rb b/lib/chef/resource/rhsm_subscription.rb
index 41dd398cd5..21ee539dda 100644
--- a/lib/chef/resource/rhsm_subscription.rb
+++ b/lib/chef/resource/rhsm_subscription.rb
@@ -27,8 +27,7 @@ class Chef
" does not attach all necessary subscriptions to your host."
introduced "14.0"
- property :pool_id,
- String,
+ property :pool_id, String,
description: "An optional property for specifying the Pool ID if not using the resource's name.",
name_property: true
diff --git a/lib/chef/resource/windows_env.rb b/lib/chef/resource/windows_env.rb
index f5f0bd126d..b970a397aa 100644
--- a/lib/chef/resource/windows_env.rb
+++ b/lib/chef/resource/windows_env.rb
@@ -17,6 +17,8 @@
# limitations under the License.
#
+require "chef/resource"
+
class Chef
class Resource
class WindowsEnv < Chef::Resource
diff --git a/lib/chef/resource/windows_feature.rb b/lib/chef/resource/windows_feature.rb
index 42f5524cc1..84778e2bcb 100644
--- a/lib/chef/resource/windows_feature.rb
+++ b/lib/chef/resource/windows_feature.rb
@@ -15,6 +15,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
+require "chef/resource"
+
class Chef
class Resource
class WindowsFeature < Chef::Resource
@@ -33,11 +36,11 @@ class Chef
property :source, String,
description: "Use a local repository for the feature install."
- property :all, [true, false],
+ property :all, [TrueClass, FalseClass],
description: "Install all sub features.",
default: false
- property :management_tools, [true, false],
+ property :management_tools, [TrueClass, FalseClass],
description: "Install all applicable management tools of the roles, role services, or features (PowerShell only).",
default: false
diff --git a/lib/chef/resource/windows_feature_dism.rb b/lib/chef/resource/windows_feature_dism.rb
index 6ffaf318d5..00fc7f71ca 100644
--- a/lib/chef/resource/windows_feature_dism.rb
+++ b/lib/chef/resource/windows_feature_dism.rb
@@ -16,6 +16,8 @@
# limitations under the License.
#
+require "chef/resource"
+
class Chef
class Resource
class WindowsFeatureDism < Chef::Resource
@@ -34,7 +36,7 @@ class Chef
property :source, String,
description: "Use a local repository for the feature install."
- property :all, [true, false],
+ property :all, [TrueClass, FalseClass],
description: "Install all sub features. This is the equivalent of specifying the /All switch to dism.exe",
default: false
diff --git a/lib/chef/resource/windows_feature_powershell.rb b/lib/chef/resource/windows_feature_powershell.rb
index 30f8f6da83..7e7fb6c160 100644
--- a/lib/chef/resource/windows_feature_powershell.rb
+++ b/lib/chef/resource/windows_feature_powershell.rb
@@ -16,6 +16,8 @@
# limitations under the License.
#
+require "chef/resource"
+
class Chef
class Resource
class WindowsFeaturePowershell < Chef::Resource
@@ -37,7 +39,7 @@ class Chef
property :source, String,
description: "Use a local repository for the feature install."
- property :all, [true, false],
+ property :all, [TrueClass, FalseClass],
description: "Install all sub features. This is equivalent to using the"\
" -InstallAllSubFeatures switch with Add-WindowsFeature.",
default: false
@@ -46,7 +48,7 @@ class Chef
description: "Specifies a timeout (in seconds) for feature install.",
default: 600
- property :management_tools, [true, false],
+ property :management_tools, [TrueClass, FalseClass],
description: "",
default: false
diff --git a/lib/chef/resource/windows_pagefile.rb b/lib/chef/resource/windows_pagefile.rb
index 069e76107c..b87134171b 100644
--- a/lib/chef/resource/windows_pagefile.rb
+++ b/lib/chef/resource/windows_pagefile.rb
@@ -15,6 +15,8 @@
# limitations under the License.
#
+require "chef/resource"
+
class Chef
class Resource
class WindowsPagefile < Chef::Resource
@@ -29,10 +31,10 @@ class Chef
description: "The path to the pagefile if different from the resource name.",
name_property: true
- property :system_managed, [true, false],
+ property :system_managed, [TrueClass, FalseClass],
description: "Configures whether the system manages the pagefile size."
- property :automatic_managed, [true, false],
+ property :automatic_managed, [TrueClass, FalseClass],
description: "Enable automatic management of pagefile initial and maximum size. Setting this to true ignores 'initial_size' and 'maximum_size' properties.",
default: false
diff --git a/lib/chef/resource/windows_printer.rb b/lib/chef/resource/windows_printer.rb
index c134e27bf7..3ad12e35c7 100644
--- a/lib/chef/resource/windows_printer.rb
+++ b/lib/chef/resource/windows_printer.rb
@@ -39,7 +39,7 @@ class Chef
property :comment, String,
description: "Optional descriptor for the printer queue."
- property :default, [true, false],
+ property :default, [TrueClass, FalseClass],
description: "Should this be the system's default printer.",
default: false
@@ -50,7 +50,7 @@ class Chef
property :location, String,
description: "Printer location, e.g. 'Fifth floor copy room'."
- property :shared, [true, false],
+ property :shared, [TrueClass, FalseClass],
description: "Should the printer be shared.",
default: false
@@ -62,7 +62,8 @@ class Chef
validation_message: "The ipv4_address property must be in the IPv4 format of WWW.XXX.YYY.ZZZ",
regex: Resolv::IPv4::Regex
- property :exists, [true, false], desired_state: true
+ property :exists, [TrueClass, FalseClass],
+ desired_state: true
PRINTERS_REG_KEY = 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers\\'.freeze unless defined?(PRINTERS_REG_KEY)
diff --git a/lib/chef/resource/windows_printer_port.rb b/lib/chef/resource/windows_printer_port.rb
index 9da43948f6..6d2b293e9f 100644
--- a/lib/chef/resource/windows_printer_port.rb
+++ b/lib/chef/resource/windows_printer_port.rb
@@ -46,7 +46,7 @@ class Chef
property :port_description, String,
description: "The description of the port."
- property :snmp_enabled, [true, false],
+ property :snmp_enabled, [TrueClass, FalseClass],
description: "Should SNMP be enabled on the port.",
default: false
@@ -55,7 +55,7 @@ class Chef
validation_message: "port_protocol must be either 1 for RAW or 2 for LPR!",
default: 1, equal_to: [1, 2]
- property :exists, [true, false],
+ property :exists, [TrueClass, FalseClass],
desired_state: true
PORTS_REG_KEY = 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Print\Monitors\Standard TCP/IP Port\Ports\\'.freeze unless defined?(PORTS_REG_KEY)
diff --git a/lib/chef/resource/zypper_package.rb b/lib/chef/resource/zypper_package.rb
index 2e48caef55..23b8779f25 100644
--- a/lib/chef/resource/zypper_package.rb
+++ b/lib/chef/resource/zypper_package.rb
@@ -29,7 +29,7 @@ class Chef
" packages with Zypper for the SUSE Enterprise and OpenSUSE platforms."
property :gpg_check, [ TrueClass, FalseClass ], default: lazy { Chef::Config[:zypper_check_gpg] }
- property :allow_downgrade, [ true, false ], default: false
+ property :allow_downgrade, [ TrueClass, FalseClass ], default: false
end
end
end
diff --git a/lib/chef/resource/zypper_repository.rb b/lib/chef/resource/zypper_repository.rb
index 298373b87d..776c7a407f 100644
--- a/lib/chef/resource/zypper_repository.rb
+++ b/lib/chef/resource/zypper_repository.rb
@@ -33,20 +33,20 @@ class Chef
property :repo_name, String, name_property: true
property :description, String
property :type, String, default: "NONE"
- property :enabled, [true, false], default: true
- property :autorefresh, [true, false], default: true
- property :gpgcheck, [true, false], default: true
+ property :enabled, [TrueClass, FalseClass], default: true
+ property :autorefresh, [TrueClass, FalseClass], default: true
+ property :gpgcheck, [TrueClass, FalseClass], default: true
property :gpgkey, String
property :baseurl, String
property :mirrorlist, String
property :path, String
property :priority, Integer, default: 99
- property :keeppackages, [true, false], default: false
+ property :keeppackages, [TrueClass, FalseClass], default: false
property :mode, default: "0644"
- property :refresh_cache, [true, false], default: true
+ property :refresh_cache, [TrueClass, FalseClass], default: true
property :source, String
property :cookbook, String
- property :gpgautoimportkeys, [true, false], default: true
+ property :gpgautoimportkeys, [TrueClass, FalseClass], default: true
default_action :create
allowed_actions :create, :remove, :add, :refresh