chef 15.1.36-universal-mingw32 → 15.2.20-universal-mingw32

data/lib/chef/resource/service.rb

@@ -31,7 +31,7 @@ class Chef
 
       default_action :nothing
       allowed_actions :enable, :disable, :start, :stop, :restart, :reload,
-                      :mask, :unmask
+        :mask, :unmask
 
       # this is a poor API please do not re-use this pattern
       property :supports, Hash, default: { restart: nil, reload: nil, status: nil },
@@ -39,38 +39,38 @@ class Chef
                coerce: proc { |x| x.is_a?(Array) ? x.each_with_object({}) { |i, m| m[i] = true } : x }
 
       property :service_name, String,
-               description: "An optional property to set the service name if it differs from the resource block's name.",
-               name_property: true, identity: true
+        description: "An optional property to set the service name if it differs from the resource block's name.",
+        name_property: true, identity: true
 
       # regex for match against ps -ef when !supports[:has_status] && status == nil
       property :pattern, String,
-               description: "The pattern to look for in the process table.",
-               default_description: "The value provided to 'service_name' or the resource block's name",
-               default: lazy { service_name }, desired_state: false
+        description: "The pattern to look for in the process table.",
+        default_description: "The value provided to 'service_name' or the resource block's name",
+        default: lazy { service_name }, desired_state: false
 
       # command to call to start service
       property :start_command, [ String, nil, FalseClass ],
-               description: "The command used to start a service.",
-               desired_state: false
+        description: "The command used to start a service.",
+        desired_state: false
 
       # command to call to stop service
       property :stop_command, [ String, nil, FalseClass ],
-               description: "The command used to stop a service.",
-               desired_state: false
+        description: "The command used to stop a service.",
+        desired_state: false
 
       # command to call to get status of service
       property :status_command, [ String, nil, FalseClass ],
-               description: "The command used to check the run status for a service.",
-               desired_state: false
+        description: "The command used to check the run status for a service.",
+        desired_state: false
 
       # command to call to restart service
       property :restart_command, [ String, nil, FalseClass ],
-               description: "The command used to restart a service.",
-               desired_state: false
+        description: "The command used to restart a service.",
+        desired_state: false
 
       property :reload_command, [ String, nil, FalseClass ],
-               description: "The command used to tell a service to reload its configuration.",
-               desired_state: false
+        description: "The command used to tell a service to reload its configuration.",
+        desired_state: false
 
       # The path to the init script associated with the service. On many
       # distributions this is '/etc/init.d/SERVICE_NAME' by default. In
@@ -78,8 +78,8 @@ class Chef
       # specify overrides for the start_command, stop_command and
       # restart_command properties.
       property :init_command, String,
-               description: "The path to the init script that is associated with the service. Use init_command to prevent the need to specify overrides for the start_command, stop_command, and restart_command properties. When this property is not specified, the #{Chef::Dist::CLIENT} will use the default init command for the service provider being used.",
-               desired_state: false
+        description: "The path to the init script that is associated with the service. Use init_command to prevent the need to specify overrides for the start_command, stop_command, and restart_command properties. When this property is not specified, the #{Chef::Dist::CLIENT} will use the default init command for the service provider being used.",
+        desired_state: false
 
       # if the service is enabled or not
       property :enabled, [ TrueClass, FalseClass ], skip_docs: true
@@ -91,8 +91,8 @@ class Chef
       property :masked, [ TrueClass, FalseClass ], skip_docs: true
 
       property :options, [ Array, String ],
-               description: "Solaris platform only. Options to pass to the service command. See the svcadm manual for details of possible options.",
-               coerce: proc { |x| x.respond_to?(:split) ? x.shellsplit : x }
+        description: "Solaris platform only. Options to pass to the service command. See the svcadm manual for details of possible options.",
+        coerce: proc { |x| x.respond_to?(:split) ? x.shellsplit : x }
 
       # Priority arguments can have two forms:
       #
@@ -105,22 +105,22 @@ class Chef
       #   similar for other runlevels
       #
       property :priority, [ Integer, String, Hash ],
-               description: "Debian platform only. The relative priority of the program for start and shutdown ordering. May be an integer or a Hash. An integer is used to define the start run levels; stop run levels are then 100-integer. A Hash is used to define values for specific run levels. For example, { 2 => [:start, 20], 3 => [:stop, 55] } will set a priority of twenty for run level two and a priority of fifty-five for run level three."
+        description: "Debian platform only. The relative priority of the program for start and shutdown ordering. May be an integer or a Hash. An integer is used to define the start run levels; stop run levels are then 100-integer. A Hash is used to define values for specific run levels. For example, { 2 => [:start, 20], 3 => [:stop, 55] } will set a priority of twenty for run level two and a priority of fifty-five for run level three."
 
       # timeout only applies to the windows service manager
       property :timeout, Integer,
-               description: "Microsoft Windows platform only. The amount of time (in seconds) to wait before timing out.",
-               desired_state: false
+        description: "Microsoft Windows platform only. The amount of time (in seconds) to wait before timing out.",
+        desired_state: false
 
       property :parameters, Hash,
-               description: "Upstart only: A hash of parameters to pass to the service command for use in the service definition."
+        description: "Upstart only: A hash of parameters to pass to the service command for use in the service definition."
 
       property :run_levels, Array,
-               description: "RHEL platforms only: Specific run_levels the service will run under."
+        description: "RHEL platforms only: Specific run_levels the service will run under."
 
       property :user, String,
-               description: "systemd only: A username to run the service under.",
-               introduced: "12.21"
+        description: "systemd only: A username to run the service under.",
+        introduced: "12.21"
     end
   end
 end

data/lib/chef/resource/snap_package.rb

@@ -27,10 +27,10 @@ class Chef
       introduced "15.0"
 
       property :channel, String,
-               description: "The default channel. For example: stable.",
-               default: "stable",
-               equal_to: %w{edge beta candidate stable},
-               desired_state: false
+        description: "The default channel. For example: stable.",
+        default: "stable",
+        equal_to: %w{edge beta candidate stable},
+        desired_state: false
     end
   end
 end

data/lib/chef/resource/ssh_known_hosts_entry.rb

@@ -29,43 +29,43 @@ class Chef
       introduced "14.3"
 
       property :host, String,
-               description: "The host to add to the known hosts file.",
-               name_property: true
+        description: "The host to add to the known hosts file.",
+        name_property: true
 
       property :key, String,
-               description: "An optional key for the host. If not provided this will be automatically determined."
+        description: "An optional key for the host. If not provided this will be automatically determined."
 
       property :key_type, String,
-               description: "The type of key to store.",
-               default: "rsa"
+        description: "The type of key to store.",
+        default: "rsa"
 
       property :port, Integer,
-               description: "The server port that the ssh-keyscan command will use to gather the public key.",
-               default: 22
+        description: "The server port that the ssh-keyscan command will use to gather the public key.",
+        default: 22
 
       property :timeout, Integer,
-               description: "The timeout in seconds for ssh-keyscan.",
-               default: 30
+        description: "The timeout in seconds for ssh-keyscan.",
+        default: 30
 
       property :mode, String,
-               description: "The file mode for the ssh_known_hosts file.",
-               default: "0644"
+        description: "The file mode for the ssh_known_hosts file.",
+        default: "0644"
 
       property :owner, [String, Integer],
-               description: "The file owner for the ssh_known_hosts file.",
-               default: "root"
+        description: "The file owner for the ssh_known_hosts file.",
+        default: "root"
 
       property :group, [String, Integer],
-               description: "The file group for the ssh_known_hosts file.",
-               default: lazy { node["root_group"] }
+        description: "The file group for the ssh_known_hosts file.",
+        default: lazy { node["root_group"] }
 
       property :hash_entries, [TrueClass, FalseClass],
-               description: "Hash the hostname and addresses in the ssh_known_hosts file for privacy.",
-               default: false
+        description: "Hash the hostname and addresses in the ssh_known_hosts file for privacy.",
+        default: false
 
       property :file_location, String,
-               description: "The location of the ssh known hosts file. Change this to set a known host file for a particular user.",
-               default: "/etc/ssh/ssh_known_hosts"
+        description: "The location of the ssh known hosts file. Change this to set a known host file for a particular user.",
+        default: "/etc/ssh/ssh_known_hosts"
 
       action :create do
         description "Create an entry in the ssh_known_hosts file."

data/lib/chef/resource/subversion.rb

@@ -28,24 +28,24 @@ class Chef
       allowed_actions :force_export
 
       property :svn_arguments, [String, nil, FalseClass],
-               description: "The extra arguments that are passed to the Subversion command.",
-               coerce: proc { |v| v == false ? nil : v }, # coerce false to nil
-               default: "--no-auth-cache"
+        description: "The extra arguments that are passed to the Subversion command.",
+        coerce: proc { |v| v == false ? nil : v }, # coerce false to nil
+        default: "--no-auth-cache"
 
       property :svn_info_args, [String, nil, FalseClass],
-               description: "Use when the svn info command is used by the #{Chef::Dist::CLIENT} and arguments need to be passed. The svn_arguments command does not work when the svn info command is used.",
-               coerce: proc { |v| v == false ? nil : v }, # coerce false to nil
-               default: "--no-auth-cache"
+        description: "Use when the svn info command is used by the #{Chef::Dist::CLIENT} and arguments need to be passed. The svn_arguments command does not work when the svn info command is used.",
+        coerce: proc { |v| v == false ? nil : v }, # coerce false to nil
+        default: "--no-auth-cache"
 
       property :svn_binary, String,
-               description: "The location of the svn binary."
+        description: "The location of the svn binary."
 
       property :svn_username, String,
-               description: "The username to use for interacting with subversion."
+        description: "The username to use for interacting with subversion."
 
       property :svn_password, String,
-               description: "The password to use for interacting with subversion.",
-               sensitive: true, desired_state: false
+        description: "The password to use for interacting with subversion.",
+        sensitive: true, desired_state: false
 
       # Override exception to strip password if any, so it won't appear in logs and different Chef notifications
       def custom_exception_message(e)

data/lib/chef/resource/sudo.rb

@@ -37,77 +37,77 @@ class Chef
       # acording to the sudo man pages sudo will ignore files in an include dir that have a `.` or `~`
       # We convert either to `__`
       property :filename, String,
-               description: "The name of the sudoers.d file if it differs from the name of the resource block",
-               name_property: true,
-               coerce: proc { |x| x.gsub(/[\.~]/, "__") }
+        description: "The name of the sudoers.d file if it differs from the name of the resource block",
+        name_property: true,
+        coerce: proc { |x| x.gsub(/[\.~]/, "__") }
 
       property :users, [String, Array],
-               description: "User(s) to provide sudo privileges to. This property accepts either an array or a comma separated list.",
-               default: lazy { [] },
-               coerce: proc { |x| x.is_a?(Array) ? x : x.split(/\s*,\s*/) }
+        description: "User(s) to provide sudo privileges to. This property accepts either an array or a comma separated list.",
+        default: lazy { [] },
+        coerce: proc { |x| x.is_a?(Array) ? x : x.split(/\s*,\s*/) }
 
       property :groups, [String, Array],
-               description: "Group(s) to provide sudo privileges to. This property accepts either an array or a comma separated list. Leading % on group names is optional.",
-               default: lazy { [] },
-               coerce: proc { |x| coerce_groups(x) }
+        description: "Group(s) to provide sudo privileges to. This property accepts either an array or a comma separated list. Leading % on group names is optional.",
+        default: lazy { [] },
+        coerce: proc { |x| coerce_groups(x) }
 
       property :commands, Array,
-               description: "An array of commands this sudoer can execute.",
-               default: ["ALL"]
+        description: "An array of commands this sudoer can execute.",
+        default: ["ALL"]
 
       property :host, String,
-               description: "The host to set in the sudo configuration.",
-               default: "ALL"
+        description: "The host to set in the sudo configuration.",
+        default: "ALL"
 
       property :runas, String,
-               description: "User that the command(s) can be run as.",
-               default: "ALL"
+        description: "User that the command(s) can be run as.",
+        default: "ALL"
 
       property :nopasswd, [TrueClass, FalseClass],
-               description: "Allow sudo to be run without specifying a password.",
-               default: false
+        description: "Allow sudo to be run without specifying a password.",
+        default: false
 
       property :noexec, [TrueClass, FalseClass],
-               description: "Prevent commands from shelling out.",
-               default: false
+        description: "Prevent commands from shelling out.",
+        default: false
 
       property :template, String,
-               description: "The name of the erb template in your cookbook, if you wish to supply your own template."
+        description: "The name of the erb template in your cookbook, if you wish to supply your own template."
 
       property :variables, [Hash, nil],
-               description: "The variables to pass to the custom template. This property is ignored if not using a custom template.",
-               default: nil
+        description: "The variables to pass to the custom template. This property is ignored if not using a custom template.",
+        default: nil
 
       property :defaults, Array,
-               description: "An array of defaults for the user/group.",
-               default: lazy { [] }
+        description: "An array of defaults for the user/group.",
+        default: lazy { [] }
 
       property :command_aliases, Array,
-               description: "Command aliases that can be used as allowed commands later in the configuration.",
-               default: lazy { [] }
+        description: "Command aliases that can be used as allowed commands later in the configuration.",
+        default: lazy { [] }
 
       property :setenv, [TrueClass, FalseClass],
-               description: "Determines whether or not to permit preservation of the environment with 'sudo -E'.",
-               default: false
+        description: "Determines whether or not to permit preservation of the environment with 'sudo -E'.",
+        default: false
 
       property :env_keep_add, Array,
-               description: "An array of strings to add to env_keep.",
-               default: lazy { [] }
+        description: "An array of strings to add to env_keep.",
+        default: lazy { [] }
 
       property :env_keep_subtract, Array,
-               description: "An array of strings to remove from env_keep.",
-               default: lazy { [] }
+        description: "An array of strings to remove from env_keep.",
+        default: lazy { [] }
 
       property :visudo_path, String,
-               deprecated: true
+        deprecated: true
 
       property :visudo_binary, String,
-               description: "The path to visudo for configuration verification.",
-               default: "/usr/sbin/visudo"
+        description: "The path to visudo for configuration verification.",
+        default: "/usr/sbin/visudo"
 
       property :config_prefix, String,
-               description: "The directory that contains the sudoers configuration file.",
-               default: lazy { platform_config_prefix }, default_description: "Prefix values based on the node's platform"
+        description: "The directory that contains the sudoers configuration file.",
+        default: lazy { platform_config_prefix }, default_description: "Prefix values based on the node's platform"
 
       # handle legacy cookbook property
       def after_created
@@ -222,6 +222,7 @@ class Chef
 
         def visudo_present?
           return true if ::File.exist?(new_resource.visudo_binary)
+
           Chef::Log.warn("The visudo binary cannot be found at '#{new_resource.visudo_binary}'. Skipping sudoer file validation. If visudo is on this system you can specify the path using the 'visudo_binary' property.")
         end
       end

data/lib/chef/resource/swap_file.rb

@@ -27,22 +27,22 @@ 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's name.",
-               name_property: true
+        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,
-               description: "The size (in MBs) of the swap file."
+        description: "The size (in MBs) of the swap file."
 
       property :persist, [TrueClass, FalseClass],
-               description: "Persist the swapon.",
-               default: false
+        description: "Persist the swapon.",
+        default: false
 
       property :timeout, Integer,
-               description: "Timeout for 'dd' / 'fallocate' commands.",
-               default: 600
+        description: "Timeout for 'dd' / 'fallocate' commands.",
+        default: 600
 
       property :swappiness, Integer,
-               description: "The swappiness value to set on the system."
+        description: "The swappiness value to set on the system."
 
       action :create do
         description "Create a swapfile."
@@ -51,7 +51,7 @@ class Chef
           Chef::Log.debug("#{new_resource} already created - nothing to do")
         else
           begin
-            Chef::Log.info "starting first create: #{node['virtualization']['system']}"
+            Chef::Log.info "starting first create: #{node["virtualization"]["system"]}"
             do_create(swap_creation_command)
           rescue Mixlib::ShellOut::ShellCommandFailed => e
             Chef::Log.warn("#{new_resource} Rescuing failed swapfile creation for #{new_resource.path}")

data/lib/chef/resource/sysctl.rb

@@ -33,21 +33,21 @@ class Chef
       introduced "14.0"
 
       property :key, String,
-               description: "The kernel parameter key in dotted format if it differs from the resource block's name.",
-               name_property: true
+        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],
-               description: "Ignore any errors when setting the value on the command line.",
-               default: false, desired_state: false
+        description: "Ignore any errors when setting the value on the command line.",
+        default: false, desired_state: false
 
       property :value, [Array, String, Integer, Float],
-               description: "The value to set.",
-               coerce: proc { |v| coerce_value(v) },
-               required: true
+        description: "The value to set.",
+        coerce: proc { |v| coerce_value(v) },
+        required: true
 
       property :conf_dir, String,
-               description: "The configuration directory to write the config to.",
-               default: "/etc/sysctl.d"
+        description: "The configuration directory to write the config to.",
+        default: "/etc/sysctl.d"
 
       def after_created
         raise "The sysctl resource requires Linux as it needs sysctl and the sysctl.d directory functionality." unless node["os"] == "linux"
@@ -80,12 +80,12 @@ class Chef
 
           directory new_resource.conf_dir
 
-          file "#{new_resource.conf_dir}/99-chef-#{new_resource.key.tr('/', '.')}.conf" do
+          file "#{new_resource.conf_dir}/99-chef-#{new_resource.key.tr("/", ".")}.conf" do
             content "#{new_resource.key} = #{new_resource.value}"
           end
 
           execute "Load sysctl values" do
-            command "sysctl #{'-e ' if new_resource.ignore_error}-p"
+            command "sysctl #{"-e " if new_resource.ignore_error}-p"
             default_env true
             action :run
           end
@@ -96,9 +96,9 @@ class Chef
         description "Remove a sysctl value."
 
         # only converge the resource if the file actually exists to delete
-        if ::File.exist?("#{new_resource.conf_dir}/99-chef-#{new_resource.key.tr('/', '.')}.conf")
-          converge_by "removing sysctl config at #{new_resource.conf_dir}/99-chef-#{new_resource.key.tr('/', '.')}.conf" do
-            file "#{new_resource.conf_dir}/99-chef-#{new_resource.key.tr('/', '.')}.conf" do
+        if ::File.exist?("#{new_resource.conf_dir}/99-chef-#{new_resource.key.tr("/", ".")}.conf")
+          converge_by "removing sysctl config at #{new_resource.conf_dir}/99-chef-#{new_resource.key.tr("/", ".")}.conf" do
+            file "#{new_resource.conf_dir}/99-chef-#{new_resource.key.tr("/", ".")}.conf" do
               action :delete
             end
 
@@ -113,7 +113,7 @@ class Chef
 
       action_class do
         def set_sysctl_param(key, value)
-          shell_out!("sysctl #{'-e ' if new_resource.ignore_error}-w \"#{key}=#{value}\"")
+          shell_out!("sysctl #{"-e " if new_resource.ignore_error}-w \"#{key}=#{value}\"")
         end
       end
 
@@ -133,6 +133,7 @@ class Chef
       def get_sysctl_value(key)
         val = shell_out!("sysctl -n -e #{key}").stdout.tr("\t", " ").strip
         raise unless val == get_sysctld_value(key)
+
         val
       end
 
@@ -140,10 +141,12 @@ class Chef
       # return the value. Raise in case this conf file needs to be created
       # or updated
       def get_sysctld_value(key)
-        raise unless ::File.exist?("/etc/sysctl.d/99-chef-#{key.tr('/', '.')}.conf")
-        k, v = ::File.read("/etc/sysctl.d/99-chef-#{key.tr('/', '.')}.conf").match(/(.*) = (.*)/).captures
+        raise unless ::File.exist?("/etc/sysctl.d/99-chef-#{key.tr("/", ".")}.conf")
+
+        k, v = ::File.read("/etc/sysctl.d/99-chef-#{key.tr("/", ".")}.conf").match(/(.*) = (.*)/).captures
         raise "Unknown sysctl key!" if k.nil?
         raise "Unknown sysctl value!" if v.nil?
+
         v
       end
     end