chef 15.17.4-universal-mingw32 → 16.0.257-universal-mingw32

data/lib/chef/resource/powershell_package.rb

@@ -16,14 +16,12 @@
 #
 
 require_relative "package"
-require_relative "../mixin/uris"
 
 class Chef
   class Resource
     class PowershellPackage < Chef::Resource::Package
-      include Chef::Mixin::Uris
+      unified_mode true
 
-      resource_name :powershell_package
       provides :powershell_package
 
       description "Use the powershell_package resource to install and manage packages via the PowerShell Package Manager for the Microsoft Windows platform. The powershell_package resource requires administrative access, and a source must be configured in the PowerShell Package Manager via the powershell_package_source resource."

data/lib/chef/resource/powershell_package_source.rb

@@ -21,7 +21,9 @@ require_relative "../json_compat"
 class Chef
   class Resource
     class PowershellPackageSource < Chef::Resource
-      resource_name "powershell_package_source"
+      unified_mode true
+
+      provides :powershell_package_source
 
       description "Use the powershell_package_source resource to register a PowerShell package repository."
       introduced "14.3"

data/lib/chef/resource/powershell_script.rb

@@ -20,6 +20,8 @@ require_relative "windows_script"
 class Chef
   class Resource
     class PowershellScript < Chef::Resource::WindowsScript
+      unified_mode true
+
       provides :powershell_script, os: "windows"
 
       property :flags, String,
@@ -71,24 +73,12 @@ class Chef
       end
 
       # Options that will be passed to Windows PowerShell command
+      #
+      # @returns [String]
       def default_flags
-        return "" if Chef::Platform.windows_nano_server?
-
-        # Execution policy 'Bypass' is preferable since it doesn't require
-        # user input confirmation for files such as PowerShell modules
-        # downloaded from the Internet. However, 'Bypass' is not supported
-        # prior to PowerShell 3.0, so the fallback is 'Unrestricted'
-        execution_policy = Chef::Platform.supports_powershell_execution_bypass?(run_context.node) ? "Bypass" : "Unrestricted"
-
-        [
-          "-NoLogo",
-          "-NonInteractive",
-          "-NoProfile",
-          "-ExecutionPolicy #{execution_policy}",
-          # PowerShell will hang if STDIN is redirected
-          # http://connect.microsoft.com/PowerShell/feedback/details/572313/powershell-exe-can-hang-if-stdin-is-redirected
-          "-InputFormat None",
-        ].join(" ")
+        # Set InputFormat to None as PowerShell will hang if STDIN is redirected
+        # http://connect.microsoft.com/PowerShell/feedback/details/572313/powershell-exe-can-hang-if-stdin-is-redirected
+        "-NoLogo -NonInteractive -NoProfile -ExecutionPolicy Bypass -InputFormat None"
       end
     end
   end

data/lib/chef/resource/python.rb

@@ -23,6 +23,8 @@ class Chef
     class Python < Chef::Resource::Script
       unified_mode true
 
+      provides :python
+
       def initialize(name, run_context = nil)
         super
         @interpreter = "python"

data/lib/chef/resource/reboot.rb

@@ -24,7 +24,6 @@ class Chef
     class Reboot < Chef::Resource
       unified_mode true
 
-      resource_name :reboot
       provides :reboot
 
       description "Use the reboot resource to reboot a node, a necessary step with some"\

data/lib/chef/resource/registry_key.rb

@@ -24,7 +24,6 @@ class Chef
     class RegistryKey < Chef::Resource
       unified_mode true
 
-      resource_name :registry_key
       provides(:registry_key) { true }
 
       description "Use the registry_key resource to create and delete registry keys in Microsoft Windows."
@@ -71,7 +70,7 @@ class Chef
         @values, @unscrubbed_values = [], []
       end
 
-      property :key, String, name_property: true, identity: true
+      property :key, String, name_property: true
 
       def values(arg = nil)
         if not arg.nil?

data/lib/chef/resource/remote_directory.rb

@@ -27,6 +27,8 @@ class Chef
       include Chef::Mixin::Securable
       unified_mode true
 
+      provides :remote_directory
+
       description "Use the remote_directory resource to incrementally transfer a directory from a cookbook to a node. The director that is copied from the cookbook should be located under COOKBOOK_NAME/files/default/REMOTE_DIRECTORY. The remote_directory resource will obey file specificity."
 
       default_action :create

data/lib/chef/resource/remote_file.rb

@@ -29,6 +29,8 @@ class Chef
       include Chef::Mixin::Securable
       unified_mode true
 
+      provides :remote_file
+
       description "Use the remote_file resource to transfer a file from a remote location"\
                   " using file specificity. This resource is similar to the file resource."
 

data/lib/chef/resource/rhsm_errata.rb

@@ -21,7 +21,6 @@ class Chef
   class Resource
     class RhsmErrata < Chef::Resource
       unified_mode true
-      resource_name :rhsm_errata
       provides(:rhsm_errata) { true }
 
       description "Use the rhsm_errata resource to install packages associated with a given Red"\

data/lib/chef/resource/rhsm_errata_level.rb

@@ -21,7 +21,6 @@ class Chef
   class Resource
     class RhsmErrataLevel < Chef::Resource
       unified_mode true
-      resource_name :rhsm_errata_level
       provides(:rhsm_errata_level) { true }
 
       description "Use the rhsm_errata_level resource to install all packages of a specified errata level from the Red Hat Subscription Manager. For example, you can ensure that all packages associated with errata marked at a 'Critical' security level are installed."

data/lib/chef/resource/rhsm_register.rb

@@ -23,7 +23,6 @@ class Chef
   class Resource
     class RhsmRegister < Chef::Resource
       unified_mode true
-      resource_name :rhsm_register
       provides(:rhsm_register) { true }
 
       description "Use the rhsm_register resource to register a node with the Red Hat Subscription Manager"\
@@ -128,12 +127,14 @@ class Chef
         end
 
         def registered_with_rhsm?
+          # FIXME: use shell_out
           cmd = Mixlib::ShellOut.new("subscription-manager status", env: { LANG: "en_US" })
           cmd.run_command
           !cmd.stdout.match(/Overall Status: Unknown/)
         end
 
         def katello_cert_rpm_installed?
+          # FIXME: use shell_out
           cmd = Mixlib::ShellOut.new("rpm -qa | grep katello-ca-consumer")
           cmd.run_command
           !cmd.stdout.match(/katello-ca-consumer/).nil?

data/lib/chef/resource/rhsm_repo.rb

@@ -20,7 +20,8 @@ require_relative "../resource"
 class Chef
   class Resource
     class RhsmRepo < Chef::Resource
-      resource_name :rhsm_repo
+      unified_mode true
+
       provides(:rhsm_repo) { true }
 
       description "Use the rhsm_repo resource to enable or disable Red Hat Subscription Manager"\
@@ -55,6 +56,7 @@ class Chef
 
       action_class do
         def repo_enabled?(repo)
+          # FIXME: use shell_out()
           cmd = Mixlib::ShellOut.new("subscription-manager repos --list-enabled", env: { LANG: "en_US" })
           cmd.run_command
           repo == "*" || !cmd.stdout.match(/Repo ID:\s+#{repo}$/).nil?

data/lib/chef/resource/rhsm_subscription.rb

@@ -20,7 +20,8 @@ require_relative "../resource"
 class Chef
   class Resource
     class RhsmSubscription < Chef::Resource
-      resource_name :rhsm_subscription
+      unified_mode true
+
       provides(:rhsm_subscription) { true }
 
       description "Use the rhsm_subscription resource to add or remove Red Hat Subscription Manager"\
@@ -56,6 +57,7 @@ class Chef
 
       action_class do
         def subscription_attached?(subscription)
+          # FIXME: use shell_out
           cmd = Mixlib::ShellOut.new("subscription-manager list --consumed | grep #{subscription}", env: { LANG: "en_US" })
           cmd.run_command
           !cmd.stdout.match(/Pool ID:\s+#{subscription}$/).nil?
@@ -66,6 +68,7 @@ class Chef
           pool = nil
           serial = nil
 
+          # FIXME: use shell_out
           cmd = Mixlib::ShellOut.new("subscription-manager list --consumed", env: { LANG: "en_US" })
           cmd.run_command
           cmd.stdout.lines.each do |line|

data/lib/chef/resource/route.rb

@@ -22,6 +22,10 @@ require_relative "../resource"
 class Chef
   class Resource
     class Route < Chef::Resource
+      unified_mode true
+
+      provides :route
+
       default_action :add
       allowed_actions :add, :delete
 
@@ -29,7 +33,7 @@ class Chef
 
       property :target, String,
         description: "The IP address of the target route.",
-        identity: true, name_property: true
+        name_property: true
 
       property :comment, [String, nil],
         description: "Add a comment for the route.",

data/lib/chef/resource/rpm_package.rb

@@ -21,13 +21,20 @@ require_relative "package"
 class Chef
   class Resource
     class RpmPackage < Chef::Resource::Package
-      resource_name :rpm_package
+      unified_mode true
+
       provides :rpm_package
 
-      description "Use the rpm_package resource to manage packages for the RPM Package Manager platform."
+      description "Use the rpm_package resource to manage packages using the RPM Package Manager."
 
       property :allow_downgrade, [ true, false ], default: true, desired_state: false
 
+      property :package_name, String,
+        description: "An optional property to set the package name if it differs from the resource block's name.",
+        identity: true
+
+      property :version, String,
+        description: "The version of a package to be installed or upgraded."
     end
   end
 end

data/lib/chef/resource/ruby.rb

@@ -24,6 +24,8 @@ class Chef
     class Ruby < Chef::Resource::Script
       unified_mode true
 
+      provides :ruby
+
       description "Use the ruby resource to execute scripts using the Ruby interpreter. This"\
                   " resource may also use any of the actions and properties that are available"\
                   " to the execute resource. Commands that are executed with this resource are (by"\

data/lib/chef/resource/ruby_block.rb

@@ -44,7 +44,7 @@ class Chef
         end
       end
 
-      property :block_name, String, name_property: true, identity: true
+      property :block_name, String, name_property: true
     end
   end
 end

data/lib/chef/resource/scm/_scm.rb

@@ -0,0 +1,48 @@
+#
+# Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Copyright:: Copyright (c) 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.
+#
+
+unified_mode true
+
+default_action :sync
+allowed_actions :checkout, :export, :sync, :diff, :log
+
+property :destination, String,
+  description: "The location path to which the source is to be cloned, checked out, or exported. Default value: the name of the resource block.",
+  name_property: true
+
+property :repository, String
+
+property :revision, String,
+  description: "The revision to checkout.",
+  default: "HEAD"
+
+property :user, [String, Integer],
+  description: "The system user that should own the checked-out code."
+
+property :group, [String, Integer],
+  description: "The system group that should own the checked-out code."
+
+property :timeout, Integer,
+  description: "The amount of time (in seconds) to wait before timing out.",
+  desired_state: false
+
+property :environment, [Hash, nil],
+  description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}).",
+  default: nil
+
+alias :env :environment

data/lib/chef/resource/{scm.rb → scm/git.rb}

@@ -16,33 +16,23 @@
 # limitations under the License.
 #
 
-require_relative "../resource"
+require_relative "../../resource"
 
 class Chef
   class Resource
-    class Scm < Chef::Resource
-      unified_mode true
-
-      default_action :sync
-      allowed_actions :checkout, :export, :sync, :diff, :log
-
-      property :destination, String,
-        description: "The location path to which the source is to be cloned, checked out, or exported. Default value: the name of the resource block.",
-        name_property: true, identity: true
+    class Git < Chef::Resource
+      use "scm"
 
-      property :repository, String
+      unified_mode true
 
-      property :revision, String,
-        description: "The revision to checkout.",
-        default: "HEAD"
+      provides :git
 
-      property :user, [String, Integer],
-        description: "The system user that is responsible for the checked-out code."
+      description "Use the git resource to manage source control resources that exist in a git repository. git version 1.6.5 (or higher) is required to use all of the functionality in the git resource."
 
-      property :group, [String, Integer],
-        description: "The system group that is responsible for the checked-out code."
+      property :additional_remotes, Hash,
+        description: "A Hash of additional remotes that are added to the git repository configuration.",
+        default: lazy { {} }
 
-      # Capistrano and git-deploy use ``shallow clone''
       property :depth, Integer,
         description: "The number of past revisions to be included in the git shallow clone. Unless specified the default behavior will do a full clone."
 
@@ -55,23 +45,19 @@ class Chef
         default: true
 
       property :remote, String,
+        description: "The remote repository to use when synchronizing an existing clone.",
         default: "origin"
 
       property :ssh_wrapper, String,
-        desired_state: false
-
-      property :timeout, Integer,
-        desired_state: false
+        desired_state: false,
+        description: "The path to the wrapper script used when running SSH with git. The `GIT_SSH` environment variable is set to this."
 
       property :checkout_branch, String,
-        description: "Do a one-time checkout **or** use when a branch in the upstream repository is named 'deploy'. To prevent the resource from attempting to check out master from master, set 'enable_checkout' to 'false' when using the 'checkout_branch' property.",
-        default: "deploy"
-
-      property :environment, [Hash, nil],
-        description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}).",
-        default: nil
+        description: "Set this to use a local branch to avoid checking SHAs or tags to a detatched head state."
 
-      alias :env :environment
+      alias :branch :revision
+      alias :reference :revision
+      alias :repo :repository
     end
   end
 end

data/lib/chef/resource/{subversion.rb → scm/subversion.rb}

@@ -17,14 +17,17 @@
 # limitations under the License.
 #
 
-require_relative "scm"
-require_relative "../dist"
+require_relative "../../dist"
 
 class Chef
   class Resource
-    class Subversion < Chef::Resource::Scm
+    class Subversion < Chef::Resource
+      use "scm"
+
       unified_mode true
 
+      provides :subversion
+
       description "Use the subversion resource to manage source control resources that exist in a Subversion repository."
 
       allowed_actions :force_export
@@ -43,10 +46,10 @@ class Chef
         description: "The location of the svn binary."
 
       property :svn_username, String,
-        description: "The username to use for interacting with subversion."
+        description: "The user name for a user that has access to the Subversion repository."
 
       property :svn_password, String,
-        description: "The password to use for interacting with subversion.",
+        description: "The password for a user that has access to the Subversion repository.",
         sensitive: true, desired_state: false
 
       # Override exception to strip password if any, so it won't appear in logs and different Chef notifications

data/lib/chef/resource/script.rb

@@ -24,7 +24,7 @@ class Chef
     class Script < Chef::Resource::Execute
       unified_mode true
 
-      resource_name :script
+      provides :script
 
       identity_attr :name
 
@@ -47,10 +47,13 @@ class Chef
         end
       end
 
-      property :code, String, required: true
+      property :code, String, required: true,
+        description: "A quoted string of code to be executed."
+
       property :interpreter, String
-      property :flags, String
 
+      property :flags, String,
+        description: "One or more command line flags that are passed to the interpreter when a command is invoked."
     end
   end
 end