chef 14.13.11-universal-mingw32 → 14.14.14-universal-mingw32

data/lib/chef/resource/smartos_package.rb

@@ -1,31 +1,31 @@
-#
-# Author:: Toomas Pelberg (<toomasp@gmx.net>)
-# Copyright:: Copyright 2010-2016, Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "chef/resource/package"
-
-class Chef
-  class Resource
-    class SmartosPackage < Chef::Resource::Package
-      resource_name :smartos_package
-      provides :smartos_package
-      provides :package, platform_family: "smartos"
-
-      description "Use the smartos_package resource to manage packages for the SmartOS platform."
-    end
-  end
-end
+#
+# Author:: Toomas Pelberg (<toomasp@gmx.net>)
+# Copyright:: Copyright 2010-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/resource/package"
+
+class Chef
+  class Resource
+    class SmartosPackage < Chef::Resource::Package
+      resource_name :smartos_package
+      provides :smartos_package
+      provides :package, platform_family: "smartos"
+
+      description "Use the smartos_package resource to manage packages for the SmartOS platform."
+    end
+  end
+end

data/lib/chef/resource/solaris_package.rb

@@ -1,33 +1,33 @@
-#
-# Author:: Toomas Pelberg (<toomasp@gmx.net>)
-# Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "chef/resource/package"
-
-class Chef
-  class Resource
-    class SolarisPackage < Chef::Resource::Package
-      resource_name :solaris_package
-      provides :solaris_package
-      provides :package, os: "solaris2", platform_family: "nexentacore"
-      provides :package, os: "solaris2", platform_family: "solaris2", platform_version: "<= 5.10"
-
-      description "The solaris_package resource is used to manage packages for the Solaris platform."
-    end
-  end
-end
+#
+# Author:: Toomas Pelberg (<toomasp@gmx.net>)
+# Author:: Prabhu Das (<prabhu.das@clogeny.com>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/resource/package"
+
+class Chef
+  class Resource
+    class SolarisPackage < Chef::Resource::Package
+      resource_name :solaris_package
+      provides :solaris_package
+      provides :package, os: "solaris2", platform_family: "nexentacore"
+      provides :package, os: "solaris2", platform_family: "solaris2", platform_version: "<= 5.10"
+
+      description "The solaris_package resource is used to manage packages for the Solaris platform."
+    end
+  end
+end

data/lib/chef/resource/ssh_known_hosts_entry.rb

@@ -1,146 +1,146 @@
-#
-# Author:: Seth Vargo (<sethvargo@gmail.com>)
-#
-# Copyright:: 2013-2018, Seth Vargo
-# Copyright:: 2017-2018, Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require "chef/resource"
-
-class Chef
-  class Resource
-    class SshKnownHostsEntry < Chef::Resource
-      preview_resource true
-      resource_name :ssh_known_hosts_entry
-
-      description "Use the ssh_known_hosts_entry resource to add an entry for the specified host in /etc/ssh/ssh_known_hosts or a user's known hosts file if specified."
-      introduced "14.3"
-
-      property :host, String,
-               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."
-
-      property :key_type, String,
-               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
-
-      property :timeout, Integer,
-               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"
-
-      property :owner, String,
-               description: "The file owner for the ssh_known_hosts file.",
-               default: "root"
-
-      property :group, String,
-               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
-
-      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"
-
-      action :create do
-        description "Create an entry in the ssh_known_hosts file."
-
-        key =
-          if new_resource.key
-            hoststr = (new_resource.port != 22) ? "[#{new_resource.host}]:#{new_resource.port}" : new_resource.host
-            "#{hoststr} #{type_string(new_resource.key_type)} #{new_resource.key}"
-          else
-            keyscan_cmd = ["ssh-keyscan", "-t#{new_resource.key_type}", "-p #{new_resource.port}"]
-            keyscan_cmd << "-H" if new_resource.hash_entries
-            keyscan_cmd << new_resource.host
-            keyscan = shell_out!(keyscan_cmd.join(" "), timeout: new_resource.timeout)
-            keyscan.stdout
-          end
-
-        key.sub!(/^#{new_resource.host}/, "[#{new_resource.host}]:#{new_resource.port}") if new_resource.port != 22
-
-        comment = key.split("\n").first || ""
-
-        r = with_run_context :root do
-          find_resource(:template, "update ssh known hosts file #{new_resource.file_location}") do
-            source ::File.expand_path("../support/ssh_known_hosts.erb", __FILE__)
-            local true
-            path new_resource.file_location
-            owner new_resource.owner
-            group new_resource.group
-            mode new_resource.mode
-            action :nothing
-            delayed_action :create
-            backup false
-            variables(entries: [])
-          end
-        end
-
-        keys = r.variables[:entries].reject(&:empty?)
-
-        if key_exists?(keys, key, comment)
-          Chef::Log.debug "Known hosts key for #{new_resource.host} already exists - skipping"
-        else
-          r.variables[:entries].push(key)
-        end
-      end
-
-      # all this does is send an immediate run_action(:create) to the template resource
-      action :flush do
-        description "Immediately flush the entries to the config file. Without this the actual writing of the file is delayed in the Chef run so all entries can be accumulated before writing the file out."
-
-        with_run_context :root do
-          # if you haven't ever called ssh_known_hosts_entry before you're definitely doing it wrong so we blow up hard.
-          find_resource!(:template, "update ssh known hosts file #{new_resource.file_location}").run_action(:create)
-          # it is the user's responsibility to only call this *after* all the ssh_known_hosts_entry resources have been called.
-          # if you call this too early in your run_list you will get a partial known_host file written to disk, and the resource
-          # behavior will not be idempotent (template resources will flap and never show 0 resources updated on converged boxes).
-          Chef::Log.warn "flushed ssh_known_hosts entries to file, later ssh_known_hosts_entry resources will not have been written"
-        end
-      end
-
-      action_class do
-        def key_exists?(keys, key, comment)
-          keys.any? do |line|
-            line.match(/#{Regexp.escape(comment)}|#{Regexp.escape(key)}/)
-          end
-        end
-
-        def type_string(key_type)
-          type_map = {
-            "rsa" => "ssh-rsa",
-            "dsa" => "ssh-dss",
-            "ecdsa" => "ecdsa-sha2-nistp256",
-            "ed25519" => "ssh-ed25519",
-          }
-          type_map[key_type] || key_type
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Seth Vargo (<sethvargo@gmail.com>)
+#
+# Copyright:: 2013-2018, Seth Vargo
+# Copyright:: 2017-2018, Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "chef/resource"
+
+class Chef
+  class Resource
+    class SshKnownHostsEntry < Chef::Resource
+      preview_resource true
+      resource_name :ssh_known_hosts_entry
+
+      description "Use the ssh_known_hosts_entry resource to add an entry for the specified host in /etc/ssh/ssh_known_hosts or a user's known hosts file if specified."
+      introduced "14.3"
+
+      property :host, String,
+               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."
+
+      property :key_type, String,
+               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
+
+      property :timeout, Integer,
+               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"
+
+      property :owner, String,
+               description: "The file owner for the ssh_known_hosts file.",
+               default: "root"
+
+      property :group, String,
+               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
+
+      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"
+
+      action :create do
+        description "Create an entry in the ssh_known_hosts file."
+
+        key =
+          if new_resource.key
+            hoststr = (new_resource.port != 22) ? "[#{new_resource.host}]:#{new_resource.port}" : new_resource.host
+            "#{hoststr} #{type_string(new_resource.key_type)} #{new_resource.key}"
+          else
+            keyscan_cmd = ["ssh-keyscan", "-t#{new_resource.key_type}", "-p #{new_resource.port}"]
+            keyscan_cmd << "-H" if new_resource.hash_entries
+            keyscan_cmd << new_resource.host
+            keyscan = shell_out!(keyscan_cmd.join(" "), timeout: new_resource.timeout)
+            keyscan.stdout
+          end
+
+        key.sub!(/^#{new_resource.host}/, "[#{new_resource.host}]:#{new_resource.port}") if new_resource.port != 22
+
+        comment = key.split("\n").first || ""
+
+        r = with_run_context :root do
+          find_resource(:template, "update ssh known hosts file #{new_resource.file_location}") do
+            source ::File.expand_path("../support/ssh_known_hosts.erb", __FILE__)
+            local true
+            path new_resource.file_location
+            owner new_resource.owner
+            group new_resource.group
+            mode new_resource.mode
+            action :nothing
+            delayed_action :create
+            backup false
+            variables(entries: [])
+          end
+        end
+
+        keys = r.variables[:entries].reject(&:empty?)
+
+        if key_exists?(keys, key, comment)
+          Chef::Log.debug "Known hosts key for #{new_resource.host} already exists - skipping"
+        else
+          r.variables[:entries].push(key)
+        end
+      end
+
+      # all this does is send an immediate run_action(:create) to the template resource
+      action :flush do
+        description "Immediately flush the entries to the config file. Without this the actual writing of the file is delayed in the Chef run so all entries can be accumulated before writing the file out."
+
+        with_run_context :root do
+          # if you haven't ever called ssh_known_hosts_entry before you're definitely doing it wrong so we blow up hard.
+          find_resource!(:template, "update ssh known hosts file #{new_resource.file_location}").run_action(:create)
+          # it is the user's responsibility to only call this *after* all the ssh_known_hosts_entry resources have been called.
+          # if you call this too early in your run_list you will get a partial known_host file written to disk, and the resource
+          # behavior will not be idempotent (template resources will flap and never show 0 resources updated on converged boxes).
+          Chef::Log.warn "flushed ssh_known_hosts entries to file, later ssh_known_hosts_entry resources will not have been written"
+        end
+      end
+
+      action_class do
+        def key_exists?(keys, key, comment)
+          keys.any? do |line|
+            line.match(/#{Regexp.escape(comment)}|#{Regexp.escape(key)}/)
+          end
+        end
+
+        def type_string(key_type)
+          type_map = {
+            "rsa" => "ssh-rsa",
+            "dsa" => "ssh-dss",
+            "ecdsa" => "ecdsa-sha2-nistp256",
+            "ed25519" => "ssh-ed25519",
+          }
+          type_map[key_type] || key_type
+        end
+      end
+    end
+  end
+end

data/lib/chef/resource/subversion.rb

@@ -1,55 +1,55 @@
-#
-# Author:: Daniel DeLeo (<dan@kallistec.com>)
-# Author:: Tyler Cloke (<tyler@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "chef/resource/scm"
-
-class Chef
-  class Resource
-    class Subversion < Chef::Resource::Scm
-      description "Use the subversion resource to manage source control resources that exist in a Subversion repository."
-
-      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"
-
-      property :svn_info_args, [String, nil, FalseClass],
-               description: "Use when the svn info command is used by the chef-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."
-
-      property :svn_username, String,
-               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
-
-      # Override exception to strip password if any, so it won't appear in logs and different Chef notifications
-      def custom_exception_message(e)
-        "#{self} (#{defined_at}) had an error: #{e.class.name}: #{svn_password ? e.message.gsub(svn_password, "[hidden_password]") : e.message}"
-      end
-    end
-  end
-end
+#
+# Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Author:: Tyler Cloke (<tyler@chef.io>)
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/resource/scm"
+
+class Chef
+  class Resource
+    class Subversion < Chef::Resource::Scm
+      description "Use the subversion resource to manage source control resources that exist in a Subversion repository."
+
+      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"
+
+      property :svn_info_args, [String, nil, FalseClass],
+               description: "Use when the svn info command is used by the chef-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."
+
+      property :svn_username, String,
+               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
+
+      # Override exception to strip password if any, so it won't appear in logs and different Chef notifications
+      def custom_exception_message(e)
+        "#{self} (#{defined_at}) had an error: #{e.class.name}: #{svn_password ? e.message.gsub(svn_password, "[hidden_password]") : e.message}"
+      end
+    end
+  end
+end