chef 15.0.300-universal-mingw32 → 15.1.36-universal-mingw32

data/lib/chef/resource/windows_feature_dism.rb

@@ -1,222 +1,222 @@
-#
-# Author:: Seth Chisamore (<schisamo@chef.io>)
-#
-# Copyright:: 2011-2018, Chef Software, Inc.
-#
-# 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_relative "../resource"
-require_relative "../platform/query_helpers"
-
-class Chef
-  class Resource
-    class WindowsFeatureDism < Chef::Resource
-      resource_name :windows_feature_dism
-      provides(:windows_feature_dism) { true }
-
-      description "Use the windows_feature_dism resource to add, remove, or entirely delete Windows features and roles using DISM."
-      introduced "14.0"
-
-      property :feature_name, [Array, String],
-               description: "The name of the feature(s) or role(s) to install if they differ from the resource name.",
-               coerce: proc { |x| to_formatted_array(x) },
-               name_property: true
-
-      property :source, String,
-               description: "Specify a local repository for the feature install."
-
-      property :all, [TrueClass, FalseClass],
-               description: "Install all sub-features. When set to 'true', this is the equivalent of specifying the /All switch to dism.exe",
-               default: false
-
-      property :timeout, Integer,
-               description: "Specifies a timeout (in seconds) for the feature installation.",
-               default: 600
-
-      # @return [Array] lowercase the array unless we're on < Windows 2012
-      def to_formatted_array(x)
-        x = x.split(/\s*,\s*/) if x.is_a?(String) # split multiple forms of a comma separated list
-
-        # feature installs on windows < 2012 are case sensitive so only downcase when on 2012+
-        older_than_win_2012_or_8? ? x : x.map(&:downcase)
-      end
-
-      action :install do
-        description "Install a Windows role/feature using DISM"
-
-        reload_cached_dism_data unless node["dism_features_cache"]
-        fail_if_unavailable # fail if the features don't exist
-
-        logger.trace("Windows features needing installation: #{features_to_install.empty? ? 'none' : features_to_install.join(',')}")
-        unless features_to_install.empty?
-          message = "install Windows feature#{'s' if features_to_install.count > 1} #{features_to_install.join(',')}"
-          converge_by(message) do
-            install_command = "dism.exe /online /enable-feature #{features_to_install.map { |f| "/featurename:#{f}" }.join(' ')} /norestart"
-            install_command << " /LimitAccess /Source:\"#{new_resource.source}\"" if new_resource.source
-            install_command << " /All" if new_resource.all
-            begin
-              shell_out!(install_command, returns: [0, 42, 127, 3010], timeout: new_resource.timeout)
-            rescue Mixlib::ShellOut::ShellCommandFailed => e
-              raise "Error 50 returned by DISM related to parent features, try setting the 'all' property to 'true' on the 'windows_feature_dism' resource." if required_parent_feature?(e.inspect)
-              raise e.message
-            end
-
-            reload_cached_dism_data # Reload cached dism feature state
-          end
-        end
-      end
-
-      action :remove do
-        description "Remove a Windows role/feature using DISM"
-
-        reload_cached_dism_data unless node["dism_features_cache"]
-
-        logger.trace("Windows features needing removal: #{features_to_remove.empty? ? 'none' : features_to_remove.join(',')}")
-        unless features_to_remove.empty?
-          message = "remove Windows feature#{'s' if features_to_remove.count > 1} #{features_to_remove.join(',')}"
-
-          converge_by(message) do
-            shell_out!("dism.exe /online /disable-feature #{features_to_remove.map { |f| "/featurename:#{f}" }.join(' ')} /norestart", returns: [0, 42, 127, 3010], timeout: new_resource.timeout)
-
-            reload_cached_dism_data # Reload cached dism feature state
-          end
-        end
-      end
-
-      action :delete do
-        description "Remove a Windows role/feature from the image using DISM"
-
-        raise_if_delete_unsupported
-
-        reload_cached_dism_data unless node["dism_features_cache"]
-
-        fail_if_unavailable # fail if the features don't exist
-
-        logger.trace("Windows features needing deletion: #{features_to_delete.empty? ? 'none' : features_to_delete.join(',')}")
-        unless features_to_delete.empty?
-          message = "delete Windows feature#{'s' if features_to_delete.count > 1} #{features_to_delete.join(',')} from the image"
-          converge_by(message) do
-            shell_out!("dism.exe /online /disable-feature #{features_to_delete.map { |f| "/featurename:#{f}" }.join(' ')} /Remove /norestart", returns: [0, 42, 127, 3010], timeout: new_resource.timeout)
-
-            reload_cached_dism_data # Reload cached dism feature state
-          end
-        end
-      end
-
-      action_class do
-        # @return [Array] features the user has requested to install which need installation
-        def features_to_install
-          @install ||= begin
-            # disabled features are always available to install
-            available_for_install = node["dism_features_cache"]["disabled"].dup
-
-            # removed features are also available for installation
-            available_for_install.concat(node["dism_features_cache"]["removed"])
-
-            # the intersection of the features to install & disabled/removed features are what needs installing
-            new_resource.feature_name & available_for_install
-          end
-        end
-
-        # @return [Array] features the user has requested to remove which need removing
-        def features_to_remove
-          # the intersection of the features to remove & enabled features are what needs removing
-          @remove ||= new_resource.feature_name & node["dism_features_cache"]["enabled"]
-        end
-
-        # @return [Array] features the user has requested to delete which need deleting
-        def features_to_delete
-          # the intersection of the features to remove & enabled/disabled features are what needs removing
-          @remove ||= begin
-            all_available = node["dism_features_cache"]["enabled"] +
-              node["dism_features_cache"]["disabled"]
-            new_resource.feature_name & all_available
-          end
-        end
-
-        # if any features are not supported on this release of Windows or
-        # have been deleted raise with a friendly message. At one point in time
-        # we just warned, but this goes against the behavior of ever other package
-        # provider in Chef and it isn't clear what you'd want if you passed an array
-        # and some features were available and others were not.
-        # @return [void]
-        def fail_if_unavailable
-          all_available = node["dism_features_cache"]["enabled"] +
-            node["dism_features_cache"]["disabled"] +
-            node["dism_features_cache"]["removed"]
-
-          # the difference of desired features to install to all features is what's not available
-          unavailable = (new_resource.feature_name - all_available)
-          raise "The Windows feature#{'s' if unavailable.count > 1} #{unavailable.join(',')} #{unavailable.count > 1 ? 'are' : 'is'} not available on this version of Windows. Run 'dism /online /Get-Features' to see the list of available feature names." unless unavailable.empty?
-        end
-
-        # run dism.exe to get a list of all available features and their state
-        # and save that to the node at node.override level.
-        # We do this because getting a list of features in dism takes at least a second
-        # and this data will be persisted across multiple resource runs which gives us
-        # a much faster run when no features actually need to be installed / removed.
-        # @return [void]
-        def reload_cached_dism_data
-          logger.trace("Caching Windows features available via dism.exe.")
-          node.override["dism_features_cache"] = Mash.new
-          node.override["dism_features_cache"]["enabled"] = []
-          node.override["dism_features_cache"]["disabled"] = []
-          node.override["dism_features_cache"]["removed"] = []
-
-          # Grab raw feature information from dism command line
-          raw_list_of_features = shell_out("dism.exe /Get-Features /Online /Format:Table /English").stdout
-
-          # Split stdout into an array by windows line ending
-          features_list = raw_list_of_features.split("\r\n")
-          features_list.each do |feature_details_raw|
-            case feature_details_raw
-            when /Payload Removed/ # matches 'Disabled with Payload Removed'
-              add_to_feature_mash("removed", feature_details_raw)
-            when /Enable/ # matches 'Enabled' and 'Enable Pending' aka after reboot
-              add_to_feature_mash("enabled", feature_details_raw)
-            when /Disable/ # matches 'Disabled' and 'Disable Pending' aka after reboot
-              add_to_feature_mash("disabled", feature_details_raw)
-            end
-          end
-          logger.trace("The cache contains\n#{node['dism_features_cache']}")
-        end
-
-        # parse the feature string and add the values to the appropriate array
-        # in the
-        # strips trailing whitespace characters then split on n number of spaces
-        # + | +  n number of spaces
-        # @return [void]
-        def add_to_feature_mash(feature_type, feature_string)
-          feature_details = feature_string.strip.split(/\s+[|]\s+/).first
-
-          # dism on windows 2012+ isn't case sensitive so it's best to compare
-          # lowercase lists so the user input doesn't need to be case sensitive
-          # @todo when we're ready to remove windows 2008R2 the gating here can go away
-          feature_details.downcase! unless older_than_win_2012_or_8?
-          node.override["dism_features_cache"][feature_type] << feature_details
-        end
-
-        # Fail unless we're on windows 8+ / 2012+ where deleting a feature is supported
-        # @return [void]
-        def raise_if_delete_unsupported
-          raise Chef::Exceptions::UnsupportedAction, "#{self} :delete action not supported on Windows releases before Windows 8/2012. Cannot continue!" if older_than_win_2012_or_8?
-        end
-
-        def required_parent_feature?(error_message)
-          error_message.include?("Error: 50") && error_message.include?("required parent feature")
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+#
+# Copyright:: 2011-2018, Chef Software, Inc.
+#
+# 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_relative "../resource"
+require_relative "../platform/query_helpers"
+
+class Chef
+  class Resource
+    class WindowsFeatureDism < Chef::Resource
+      resource_name :windows_feature_dism
+      provides(:windows_feature_dism) { true }
+
+      description "Use the windows_feature_dism resource to add, remove, or entirely delete Windows features and roles using DISM."
+      introduced "14.0"
+
+      property :feature_name, [Array, String],
+               description: "The name of the feature(s) or role(s) to install if they differ from the resource name.",
+               coerce: proc { |x| to_formatted_array(x) },
+               name_property: true
+
+      property :source, String,
+               description: "Specify a local repository for the feature install."
+
+      property :all, [TrueClass, FalseClass],
+               description: "Install all sub-features. When set to 'true', this is the equivalent of specifying the /All switch to dism.exe",
+               default: false
+
+      property :timeout, Integer,
+               description: "Specifies a timeout (in seconds) for the feature installation.",
+               default: 600
+
+      # @return [Array] lowercase the array unless we're on < Windows 2012
+      def to_formatted_array(x)
+        x = x.split(/\s*,\s*/) if x.is_a?(String) # split multiple forms of a comma separated list
+
+        # feature installs on windows < 2012 are case sensitive so only downcase when on 2012+
+        older_than_win_2012_or_8? ? x : x.map(&:downcase)
+      end
+
+      action :install do
+        description "Install a Windows role/feature using DISM"
+
+        reload_cached_dism_data unless node["dism_features_cache"]
+        fail_if_unavailable # fail if the features don't exist
+
+        logger.trace("Windows features needing installation: #{features_to_install.empty? ? 'none' : features_to_install.join(',')}")
+        unless features_to_install.empty?
+          message = "install Windows feature#{'s' if features_to_install.count > 1} #{features_to_install.join(',')}"
+          converge_by(message) do
+            install_command = "dism.exe /online /enable-feature #{features_to_install.map { |f| "/featurename:#{f}" }.join(' ')} /norestart"
+            install_command << " /LimitAccess /Source:\"#{new_resource.source}\"" if new_resource.source
+            install_command << " /All" if new_resource.all
+            begin
+              shell_out!(install_command, returns: [0, 42, 127, 3010], timeout: new_resource.timeout)
+            rescue Mixlib::ShellOut::ShellCommandFailed => e
+              raise "Error 50 returned by DISM related to parent features, try setting the 'all' property to 'true' on the 'windows_feature_dism' resource." if required_parent_feature?(e.inspect)
+              raise e.message
+            end
+
+            reload_cached_dism_data # Reload cached dism feature state
+          end
+        end
+      end
+
+      action :remove do
+        description "Remove a Windows role/feature using DISM"
+
+        reload_cached_dism_data unless node["dism_features_cache"]
+
+        logger.trace("Windows features needing removal: #{features_to_remove.empty? ? 'none' : features_to_remove.join(',')}")
+        unless features_to_remove.empty?
+          message = "remove Windows feature#{'s' if features_to_remove.count > 1} #{features_to_remove.join(',')}"
+
+          converge_by(message) do
+            shell_out!("dism.exe /online /disable-feature #{features_to_remove.map { |f| "/featurename:#{f}" }.join(' ')} /norestart", returns: [0, 42, 127, 3010], timeout: new_resource.timeout)
+
+            reload_cached_dism_data # Reload cached dism feature state
+          end
+        end
+      end
+
+      action :delete do
+        description "Remove a Windows role/feature from the image using DISM"
+
+        raise_if_delete_unsupported
+
+        reload_cached_dism_data unless node["dism_features_cache"]
+
+        fail_if_unavailable # fail if the features don't exist
+
+        logger.trace("Windows features needing deletion: #{features_to_delete.empty? ? 'none' : features_to_delete.join(',')}")
+        unless features_to_delete.empty?
+          message = "delete Windows feature#{'s' if features_to_delete.count > 1} #{features_to_delete.join(',')} from the image"
+          converge_by(message) do
+            shell_out!("dism.exe /online /disable-feature #{features_to_delete.map { |f| "/featurename:#{f}" }.join(' ')} /Remove /norestart", returns: [0, 42, 127, 3010], timeout: new_resource.timeout)
+
+            reload_cached_dism_data # Reload cached dism feature state
+          end
+        end
+      end
+
+      action_class do
+        # @return [Array] features the user has requested to install which need installation
+        def features_to_install
+          @install ||= begin
+            # disabled features are always available to install
+            available_for_install = node["dism_features_cache"]["disabled"].dup
+
+            # removed features are also available for installation
+            available_for_install.concat(node["dism_features_cache"]["removed"])
+
+            # the intersection of the features to install & disabled/removed features are what needs installing
+            new_resource.feature_name & available_for_install
+          end
+        end
+
+        # @return [Array] features the user has requested to remove which need removing
+        def features_to_remove
+          # the intersection of the features to remove & enabled features are what needs removing
+          @remove ||= new_resource.feature_name & node["dism_features_cache"]["enabled"]
+        end
+
+        # @return [Array] features the user has requested to delete which need deleting
+        def features_to_delete
+          # the intersection of the features to remove & enabled/disabled features are what needs removing
+          @remove ||= begin
+            all_available = node["dism_features_cache"]["enabled"] +
+              node["dism_features_cache"]["disabled"]
+            new_resource.feature_name & all_available
+          end
+        end
+
+        # if any features are not supported on this release of Windows or
+        # have been deleted raise with a friendly message. At one point in time
+        # we just warned, but this goes against the behavior of ever other package
+        # provider in Chef and it isn't clear what you'd want if you passed an array
+        # and some features were available and others were not.
+        # @return [void]
+        def fail_if_unavailable
+          all_available = node["dism_features_cache"]["enabled"] +
+            node["dism_features_cache"]["disabled"] +
+            node["dism_features_cache"]["removed"]
+
+          # the difference of desired features to install to all features is what's not available
+          unavailable = (new_resource.feature_name - all_available)
+          raise "The Windows feature#{'s' if unavailable.count > 1} #{unavailable.join(',')} #{unavailable.count > 1 ? 'are' : 'is'} not available on this version of Windows. Run 'dism /online /Get-Features' to see the list of available feature names." unless unavailable.empty?
+        end
+
+        # run dism.exe to get a list of all available features and their state
+        # and save that to the node at node.override level.
+        # We do this because getting a list of features in dism takes at least a second
+        # and this data will be persisted across multiple resource runs which gives us
+        # a much faster run when no features actually need to be installed / removed.
+        # @return [void]
+        def reload_cached_dism_data
+          logger.trace("Caching Windows features available via dism.exe.")
+          node.override["dism_features_cache"] = Mash.new
+          node.override["dism_features_cache"]["enabled"] = []
+          node.override["dism_features_cache"]["disabled"] = []
+          node.override["dism_features_cache"]["removed"] = []
+
+          # Grab raw feature information from dism command line
+          raw_list_of_features = shell_out("dism.exe /Get-Features /Online /Format:Table /English").stdout
+
+          # Split stdout into an array by windows line ending
+          features_list = raw_list_of_features.split("\r\n")
+          features_list.each do |feature_details_raw|
+            case feature_details_raw
+            when /Payload Removed/ # matches 'Disabled with Payload Removed'
+              add_to_feature_mash("removed", feature_details_raw)
+            when /Enable/ # matches 'Enabled' and 'Enable Pending' aka after reboot
+              add_to_feature_mash("enabled", feature_details_raw)
+            when /Disable/ # matches 'Disabled' and 'Disable Pending' aka after reboot
+              add_to_feature_mash("disabled", feature_details_raw)
+            end
+          end
+          logger.trace("The cache contains\n#{node['dism_features_cache']}")
+        end
+
+        # parse the feature string and add the values to the appropriate array
+        # in the
+        # strips trailing whitespace characters then split on n number of spaces
+        # + | +  n number of spaces
+        # @return [void]
+        def add_to_feature_mash(feature_type, feature_string)
+          feature_details = feature_string.strip.split(/\s+[|]\s+/).first
+
+          # dism on windows 2012+ isn't case sensitive so it's best to compare
+          # lowercase lists so the user input doesn't need to be case sensitive
+          # @todo when we're ready to remove windows 2008R2 the gating here can go away
+          feature_details.downcase! unless older_than_win_2012_or_8?
+          node.override["dism_features_cache"][feature_type] << feature_details
+        end
+
+        # Fail unless we're on windows 8+ / 2012+ where deleting a feature is supported
+        # @return [void]
+        def raise_if_delete_unsupported
+          raise Chef::Exceptions::UnsupportedAction, "#{self} :delete action not supported on Windows releases before Windows 8/2012. Cannot continue!" if older_than_win_2012_or_8?
+        end
+
+        def required_parent_feature?(error_message)
+          error_message.include?("Error: 50") && error_message.include?("required parent feature")
+        end
+      end
+    end
+  end
+end

data/lib/chef/resource/windows_feature_powershell.rb

@@ -1,262 +1,262 @@
-#
-# Author:: Greg Zapp (<greg.zapp@gmail.com>)
-#
-# Copyright:: 2015-2018, Chef Software, Inc
-#
-# 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_relative "../mixin/powershell_out"
-require_relative "../json_compat"
-require_relative "../resource"
-require_relative "../platform/query_helpers"
-
-class Chef
-  class Resource
-    class WindowsFeaturePowershell < Chef::Resource
-      resource_name :windows_feature_powershell
-      provides(:windows_feature_powershell) { true }
-
-      description "Use the windows_feature_powershell resource to add, remove, or entirely delete Windows features and roles using PowerShell. This resource offers significant speed benefits over the windows_feature_dism resource, but requires installing the Remote Server Administration Tools on non-server releases of Windows."
-      introduced "14.0"
-
-      property :feature_name, [Array, String],
-               description: "The name of the feature(s) or role(s) to install if they differ from the resource block's name.",
-               coerce: proc { |x| to_formatted_array(x) },
-               name_property: true
-
-      property :source, String,
-               description: "Specify a local repository for the feature install."
-
-      property :all, [TrueClass, FalseClass],
-               description: "Install all subfeatures. When set to 'true', this is the equivalent of specifying the '-InstallAllSubFeatures' switch with 'Add-WindowsFeature'.",
-               default: false
-
-      property :timeout, Integer,
-               description: "Specifies a timeout (in seconds) for the feature installation.",
-               default: 600
-
-      property :management_tools, [TrueClass, FalseClass],
-               description: "Install all applicable management tools for the roles, role services, or features.",
-               default: false
-
-      # Converts strings of features into an Array. Array objects are lowercased unless we're on < 8/2k12+.
-      # @return [Array] array of features
-      def to_formatted_array(x)
-        x = x.split(/\s*,\s*/) if x.is_a?(String) # split multiple forms of a comma separated list
-
-        # feature installs on windows < 8/2012 are case sensitive so only downcase when on 2012+
-        older_than_win_2012_or_8? ? x : x.map(&:downcase)
-      end
-
-      include Chef::Mixin::PowershellOut
-
-      action :install do
-        raise_on_old_powershell
-
-        reload_cached_powershell_data unless node["powershell_features_cache"]
-        fail_if_unavailable # fail if the features don't exist
-        fail_if_removed # fail if the features are in removed state
-
-        Chef::Log.debug("Windows features needing installation: #{features_to_install.empty? ? 'none' : features_to_install.join(',')}")
-        unless features_to_install.empty?
-          converge_by("install Windows feature#{'s' if features_to_install.count > 1} #{features_to_install.join(',')}") do
-            install_command = "#{install_feature_cmdlet} #{features_to_install.join(',')}"
-            install_command << " -IncludeAllSubFeature"  if new_resource.all
-            if older_than_win_2012_or_8? && (new_resource.source || new_resource.management_tools)
-              Chef::Log.warn("The 'source' and 'management_tools' properties are only available on Windows 8/2012 or greater. Skipping these properties!")
-            else
-              install_command << " -Source \"#{new_resource.source}\"" if new_resource.source
-              install_command << " -IncludeManagementTools" if new_resource.management_tools
-            end
-
-            cmd = powershell_out!(install_command, timeout: new_resource.timeout)
-            Chef::Log.info(cmd.stdout)
-
-            reload_cached_powershell_data # Reload cached powershell feature state
-          end
-        end
-      end
-
-      action :remove do
-        raise_on_old_powershell
-
-        reload_cached_powershell_data unless node["powershell_features_cache"]
-
-        Chef::Log.debug("Windows features needing removal: #{features_to_remove.empty? ? 'none' : features_to_remove.join(',')}")
-
-        unless features_to_remove.empty?
-          converge_by("remove Windows feature#{'s' if features_to_remove.count > 1} #{features_to_remove.join(',')}") do
-            cmd = powershell_out!("#{remove_feature_cmdlet} #{features_to_remove.join(',')}", timeout: new_resource.timeout)
-            Chef::Log.info(cmd.stdout)
-
-            reload_cached_powershell_data # Reload cached powershell feature state
-          end
-        end
-      end
-
-      action :delete do
-        raise_on_old_powershell
-        raise_if_delete_unsupported
-
-        reload_cached_powershell_data unless node["powershell_features_cache"]
-
-        fail_if_unavailable # fail if the features don't exist
-
-        Chef::Log.debug("Windows features needing deletion: #{features_to_delete.empty? ? 'none' : features_to_delete.join(',')}")
-
-        unless features_to_delete.empty?
-          converge_by("delete Windows feature#{'s' if features_to_delete.count > 1} #{features_to_delete.join(',')} from the image") do
-            cmd = powershell_out!("Uninstall-WindowsFeature #{features_to_delete.join(',')} -Remove", timeout: new_resource.timeout)
-            Chef::Log.info(cmd.stdout)
-
-            reload_cached_powershell_data # Reload cached powershell feature state
-          end
-        end
-      end
-
-      action_class do
-        # shellout to determine the actively installed version of powershell
-        # we have this same data in ohai, but it doesn't get updated if powershell is installed mid run
-        # @return [Integer] the powershell version or 0 for nothing
-        def powershell_version
-          cmd = powershell_out("$PSVersionTable.psversion.major")
-          return 1 if cmd.stdout.empty? # PowerShell 1.0 doesn't have a $PSVersionTable
-          Regexp.last_match(1).to_i if cmd.stdout =~ /^(\d+)/
-        rescue Errno::ENOENT
-          0 # zero as in nothing is installed
-        end
-
-        # raise if we're running powershell less than 3.0 since we need convertto-json
-        # check the powershell version via ohai data and if we're < 3.0 also shellout to make sure as
-        # a newer version could be installed post ohai run. Yes we're double checking. It's fine.
-        # @todo this can go away when we fully remove support for Windows 2008 R2
-        # @raise [RuntimeError] Raise if powershell is < 3.0
-        def raise_on_old_powershell
-          # be super defensive about the powershell lang plugin not being there
-          return if node["languages"] && node["languages"]["powershell"] && node["languages"]["powershell"]["version"].to_i >= 3
-          raise "The windows_feature_powershell resource requires PowerShell 3.0 or later. Please install PowerShell 3.0+ before running this resource." if powershell_version < 3
-        end
-
-        # The appropriate cmdlet to install a windows feature based on windows release
-        # @return [String]
-        def install_feature_cmdlet
-          older_than_win_2012_or_8? ? "Add-WindowsFeature" : "Install-WindowsFeature"
-        end
-
-        # The appropriate cmdlet to remove a windows feature based on windows release
-        # @return [String]
-        def remove_feature_cmdlet
-          older_than_win_2012_or_8? ? "Remove-WindowsFeature" : "Uninstall-WindowsFeature"
-        end
-
-        # @return [Array] features the user has requested to install which need installation
-        def features_to_install
-          # the intersection of the features to install & disabled features are what needs installing
-          @install ||= new_resource.feature_name & node["powershell_features_cache"]["disabled"]
-        end
-
-        # @return [Array] features the user has requested to remove which need removing
-        def features_to_remove
-          # the intersection of the features to remove & enabled features are what needs removing
-          @remove ||= new_resource.feature_name & node["powershell_features_cache"]["enabled"]
-        end
-
-        # @return [Array] features the user has requested to delete which need deleting
-        def features_to_delete
-          # the intersection of the features to remove & enabled/disabled features are what needs removing
-          @remove ||= begin
-            all_available = node["powershell_features_cache"]["enabled"] +
-              node["powershell_features_cache"]["disabled"]
-            new_resource.feature_name & all_available
-          end
-        end
-
-        # if any features are not supported on this release of Windows or
-        # have been deleted raise with a friendly message. At one point in time
-        # we just warned, but this goes against the behavior of ever other package
-        # provider in Chef and it isn't clear what you'd want if you passed an array
-        # and some features were available and others were not.
-        # @return [void]
-        def fail_if_unavailable
-          all_available = node["powershell_features_cache"]["enabled"] +
-            node["powershell_features_cache"]["disabled"] +
-            node["powershell_features_cache"]["removed"]
-
-          # the difference of desired features to install to all features is what's not available
-          unavailable = (new_resource.feature_name - all_available)
-          raise "The Windows feature#{'s' if unavailable.count > 1} #{unavailable.join(',')} #{unavailable.count > 1 ? 'are' : 'is'} not available on this version of Windows. Run 'Get-WindowsFeature' to see the list of available feature names." unless unavailable.empty?
-        end
-
-        # run Get-WindowsFeature to get a list of all available features and their state
-        # and save that to the node at node.override level.
-        # @return [void]
-        def reload_cached_powershell_data
-          Chef::Log.debug("Caching Windows features available via Get-WindowsFeature.")
-          node.override["powershell_features_cache"] = Mash.new
-          node.override["powershell_features_cache"]["enabled"] = []
-          node.override["powershell_features_cache"]["disabled"] = []
-          node.override["powershell_features_cache"]["removed"] = []
-
-          parsed_feature_list.each do |feature_details_raw|
-            case feature_details_raw["InstallState"]
-            when 5 # matches 'Removed' InstallState
-              add_to_feature_mash("removed", feature_details_raw["Name"])
-            when 1, 3 # matches 'Installed' or 'InstallPending' states
-              add_to_feature_mash("enabled", feature_details_raw["Name"])
-            when 0, 2 # matches 'Available' or 'UninstallPending' states
-              add_to_feature_mash("disabled", feature_details_raw["Name"])
-            end
-          end
-          Chef::Log.debug("The powershell cache contains\n#{node['powershell_features_cache']}")
-        end
-
-        # fetch the list of available feature names and state in JSON and parse the JSON
-        def parsed_feature_list
-          # Grab raw feature information from dism command line
-          # Windows < 2012 doesn't present a state value so we have to check if the feature is installed or not
-          raw_list_of_features = if older_than_win_2012_or_8? # make the older format look like the new format, warts and all
-                                   powershell_out!('Get-WindowsFeature | Select-Object -Property Name, @{Name="InstallState"; Expression = {If ($_.Installed) { 1 } Else { 0 }}} | ConvertTo-Json -Compress', timeout: new_resource.timeout).stdout
-                                 else
-                                   powershell_out!("Get-WindowsFeature | Select-Object -Property Name,InstallState | ConvertTo-Json -Compress", timeout: new_resource.timeout).stdout
-                                 end
-
-          Chef::JSONCompat.from_json(raw_list_of_features)
-        end
-
-        # add the features values to the appropriate array
-        # @return [void]
-        def add_to_feature_mash(feature_type, feature_details)
-          # add the lowercase feature name to the mash unless we're on < 2012 where they're case sensitive
-          node.override["powershell_features_cache"][feature_type] << (older_than_win_2012_or_8? ? feature_details : feature_details.downcase)
-        end
-
-        # Fail if any of the packages are in a removed state
-        # @return [void]
-        def fail_if_removed
-          return if new_resource.source # if someone provides a source then all is well
-          if node["platform_version"].to_f > 6.2 # 2012R2 or later
-            return if registry_key_exists?('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing') && registry_value_exists?('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing', name: "LocalSourcePath") # if source is defined in the registry, still fine
-          end
-          removed = new_resource.feature_name & node["powershell_features_cache"]["removed"]
-          raise "The Windows feature#{'s' if removed.count > 1} #{removed.join(',')} #{removed.count > 1 ? 'are' : 'is'} removed from the host and cannot be installed." unless removed.empty?
-        end
-
-        # Fail unless we're on windows 8+ / 2012+ where deleting a feature is supported
-        def raise_if_delete_unsupported
-          raise Chef::Exceptions::UnsupportedAction, "#{self} :delete action not supported on Windows releases before Windows 8/2012. Cannot continue!" if older_than_win_2012_or_8?
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Greg Zapp (<greg.zapp@gmail.com>)
+#
+# Copyright:: 2015-2018, Chef Software, Inc
+#
+# 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_relative "../mixin/powershell_out"
+require_relative "../json_compat"
+require_relative "../resource"
+require_relative "../platform/query_helpers"
+
+class Chef
+  class Resource
+    class WindowsFeaturePowershell < Chef::Resource
+      resource_name :windows_feature_powershell
+      provides(:windows_feature_powershell) { true }
+
+      description "Use the windows_feature_powershell resource to add, remove, or entirely delete Windows features and roles using PowerShell. This resource offers significant speed benefits over the windows_feature_dism resource, but requires installing the Remote Server Administration Tools on non-server releases of Windows."
+      introduced "14.0"
+
+      property :feature_name, [Array, String],
+               description: "The name of the feature(s) or role(s) to install if they differ from the resource block's name.",
+               coerce: proc { |x| to_formatted_array(x) },
+               name_property: true
+
+      property :source, String,
+               description: "Specify a local repository for the feature install."
+
+      property :all, [TrueClass, FalseClass],
+               description: "Install all subfeatures. When set to 'true', this is the equivalent of specifying the '-InstallAllSubFeatures' switch with 'Add-WindowsFeature'.",
+               default: false
+
+      property :timeout, Integer,
+               description: "Specifies a timeout (in seconds) for the feature installation.",
+               default: 600
+
+      property :management_tools, [TrueClass, FalseClass],
+               description: "Install all applicable management tools for the roles, role services, or features.",
+               default: false
+
+      # Converts strings of features into an Array. Array objects are lowercased unless we're on < 8/2k12+.
+      # @return [Array] array of features
+      def to_formatted_array(x)
+        x = x.split(/\s*,\s*/) if x.is_a?(String) # split multiple forms of a comma separated list
+
+        # feature installs on windows < 8/2012 are case sensitive so only downcase when on 2012+
+        older_than_win_2012_or_8? ? x : x.map(&:downcase)
+      end
+
+      include Chef::Mixin::PowershellOut
+
+      action :install do
+        raise_on_old_powershell
+
+        reload_cached_powershell_data unless node["powershell_features_cache"]
+        fail_if_unavailable # fail if the features don't exist
+        fail_if_removed # fail if the features are in removed state
+
+        Chef::Log.debug("Windows features needing installation: #{features_to_install.empty? ? 'none' : features_to_install.join(',')}")
+        unless features_to_install.empty?
+          converge_by("install Windows feature#{'s' if features_to_install.count > 1} #{features_to_install.join(',')}") do
+            install_command = "#{install_feature_cmdlet} #{features_to_install.join(',')}"
+            install_command << " -IncludeAllSubFeature"  if new_resource.all
+            if older_than_win_2012_or_8? && (new_resource.source || new_resource.management_tools)
+              Chef::Log.warn("The 'source' and 'management_tools' properties are only available on Windows 8/2012 or greater. Skipping these properties!")
+            else
+              install_command << " -Source \"#{new_resource.source}\"" if new_resource.source
+              install_command << " -IncludeManagementTools" if new_resource.management_tools
+            end
+
+            cmd = powershell_out!(install_command, timeout: new_resource.timeout)
+            Chef::Log.info(cmd.stdout)
+
+            reload_cached_powershell_data # Reload cached powershell feature state
+          end
+        end
+      end
+
+      action :remove do
+        raise_on_old_powershell
+
+        reload_cached_powershell_data unless node["powershell_features_cache"]
+
+        Chef::Log.debug("Windows features needing removal: #{features_to_remove.empty? ? 'none' : features_to_remove.join(',')}")
+
+        unless features_to_remove.empty?
+          converge_by("remove Windows feature#{'s' if features_to_remove.count > 1} #{features_to_remove.join(',')}") do
+            cmd = powershell_out!("#{remove_feature_cmdlet} #{features_to_remove.join(',')}", timeout: new_resource.timeout)
+            Chef::Log.info(cmd.stdout)
+
+            reload_cached_powershell_data # Reload cached powershell feature state
+          end
+        end
+      end
+
+      action :delete do
+        raise_on_old_powershell
+        raise_if_delete_unsupported
+
+        reload_cached_powershell_data unless node["powershell_features_cache"]
+
+        fail_if_unavailable # fail if the features don't exist
+
+        Chef::Log.debug("Windows features needing deletion: #{features_to_delete.empty? ? 'none' : features_to_delete.join(',')}")
+
+        unless features_to_delete.empty?
+          converge_by("delete Windows feature#{'s' if features_to_delete.count > 1} #{features_to_delete.join(',')} from the image") do
+            cmd = powershell_out!("Uninstall-WindowsFeature #{features_to_delete.join(',')} -Remove", timeout: new_resource.timeout)
+            Chef::Log.info(cmd.stdout)
+
+            reload_cached_powershell_data # Reload cached powershell feature state
+          end
+        end
+      end
+
+      action_class do
+        # shellout to determine the actively installed version of powershell
+        # we have this same data in ohai, but it doesn't get updated if powershell is installed mid run
+        # @return [Integer] the powershell version or 0 for nothing
+        def powershell_version
+          cmd = powershell_out("$PSVersionTable.psversion.major")
+          return 1 if cmd.stdout.empty? # PowerShell 1.0 doesn't have a $PSVersionTable
+          Regexp.last_match(1).to_i if cmd.stdout =~ /^(\d+)/
+        rescue Errno::ENOENT
+          0 # zero as in nothing is installed
+        end
+
+        # raise if we're running powershell less than 3.0 since we need convertto-json
+        # check the powershell version via ohai data and if we're < 3.0 also shellout to make sure as
+        # a newer version could be installed post ohai run. Yes we're double checking. It's fine.
+        # @todo this can go away when we fully remove support for Windows 2008 R2
+        # @raise [RuntimeError] Raise if powershell is < 3.0
+        def raise_on_old_powershell
+          # be super defensive about the powershell lang plugin not being there
+          return if node["languages"] && node["languages"]["powershell"] && node["languages"]["powershell"]["version"].to_i >= 3
+          raise "The windows_feature_powershell resource requires PowerShell 3.0 or later. Please install PowerShell 3.0+ before running this resource." if powershell_version < 3
+        end
+
+        # The appropriate cmdlet to install a windows feature based on windows release
+        # @return [String]
+        def install_feature_cmdlet
+          older_than_win_2012_or_8? ? "Add-WindowsFeature" : "Install-WindowsFeature"
+        end
+
+        # The appropriate cmdlet to remove a windows feature based on windows release
+        # @return [String]
+        def remove_feature_cmdlet
+          older_than_win_2012_or_8? ? "Remove-WindowsFeature" : "Uninstall-WindowsFeature"
+        end
+
+        # @return [Array] features the user has requested to install which need installation
+        def features_to_install
+          # the intersection of the features to install & disabled features are what needs installing
+          @install ||= new_resource.feature_name & node["powershell_features_cache"]["disabled"]
+        end
+
+        # @return [Array] features the user has requested to remove which need removing
+        def features_to_remove
+          # the intersection of the features to remove & enabled features are what needs removing
+          @remove ||= new_resource.feature_name & node["powershell_features_cache"]["enabled"]
+        end
+
+        # @return [Array] features the user has requested to delete which need deleting
+        def features_to_delete
+          # the intersection of the features to remove & enabled/disabled features are what needs removing
+          @remove ||= begin
+            all_available = node["powershell_features_cache"]["enabled"] +
+              node["powershell_features_cache"]["disabled"]
+            new_resource.feature_name & all_available
+          end
+        end
+
+        # if any features are not supported on this release of Windows or
+        # have been deleted raise with a friendly message. At one point in time
+        # we just warned, but this goes against the behavior of ever other package
+        # provider in Chef and it isn't clear what you'd want if you passed an array
+        # and some features were available and others were not.
+        # @return [void]
+        def fail_if_unavailable
+          all_available = node["powershell_features_cache"]["enabled"] +
+            node["powershell_features_cache"]["disabled"] +
+            node["powershell_features_cache"]["removed"]
+
+          # the difference of desired features to install to all features is what's not available
+          unavailable = (new_resource.feature_name - all_available)
+          raise "The Windows feature#{'s' if unavailable.count > 1} #{unavailable.join(',')} #{unavailable.count > 1 ? 'are' : 'is'} not available on this version of Windows. Run 'Get-WindowsFeature' to see the list of available feature names." unless unavailable.empty?
+        end
+
+        # run Get-WindowsFeature to get a list of all available features and their state
+        # and save that to the node at node.override level.
+        # @return [void]
+        def reload_cached_powershell_data
+          Chef::Log.debug("Caching Windows features available via Get-WindowsFeature.")
+          node.override["powershell_features_cache"] = Mash.new
+          node.override["powershell_features_cache"]["enabled"] = []
+          node.override["powershell_features_cache"]["disabled"] = []
+          node.override["powershell_features_cache"]["removed"] = []
+
+          parsed_feature_list.each do |feature_details_raw|
+            case feature_details_raw["InstallState"]
+            when 5 # matches 'Removed' InstallState
+              add_to_feature_mash("removed", feature_details_raw["Name"])
+            when 1, 3 # matches 'Installed' or 'InstallPending' states
+              add_to_feature_mash("enabled", feature_details_raw["Name"])
+            when 0, 2 # matches 'Available' or 'UninstallPending' states
+              add_to_feature_mash("disabled", feature_details_raw["Name"])
+            end
+          end
+          Chef::Log.debug("The powershell cache contains\n#{node['powershell_features_cache']}")
+        end
+
+        # fetch the list of available feature names and state in JSON and parse the JSON
+        def parsed_feature_list
+          # Grab raw feature information from dism command line
+          # Windows < 2012 doesn't present a state value so we have to check if the feature is installed or not
+          raw_list_of_features = if older_than_win_2012_or_8? # make the older format look like the new format, warts and all
+                                   powershell_out!('Get-WindowsFeature | Select-Object -Property Name, @{Name="InstallState"; Expression = {If ($_.Installed) { 1 } Else { 0 }}} | ConvertTo-Json -Compress', timeout: new_resource.timeout).stdout
+                                 else
+                                   powershell_out!("Get-WindowsFeature | Select-Object -Property Name,InstallState | ConvertTo-Json -Compress", timeout: new_resource.timeout).stdout
+                                 end
+
+          Chef::JSONCompat.from_json(raw_list_of_features)
+        end
+
+        # add the features values to the appropriate array
+        # @return [void]
+        def add_to_feature_mash(feature_type, feature_details)
+          # add the lowercase feature name to the mash unless we're on < 2012 where they're case sensitive
+          node.override["powershell_features_cache"][feature_type] << (older_than_win_2012_or_8? ? feature_details : feature_details.downcase)
+        end
+
+        # Fail if any of the packages are in a removed state
+        # @return [void]
+        def fail_if_removed
+          return if new_resource.source # if someone provides a source then all is well
+          if node["platform_version"].to_f > 6.2 # 2012R2 or later
+            return if registry_key_exists?('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing') && registry_value_exists?('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing', name: "LocalSourcePath") # if source is defined in the registry, still fine
+          end
+          removed = new_resource.feature_name & node["powershell_features_cache"]["removed"]
+          raise "The Windows feature#{'s' if removed.count > 1} #{removed.join(',')} #{removed.count > 1 ? 'are' : 'is'} removed from the host and cannot be installed." unless removed.empty?
+        end
+
+        # Fail unless we're on windows 8+ / 2012+ where deleting a feature is supported
+        def raise_if_delete_unsupported
+          raise Chef::Exceptions::UnsupportedAction, "#{self} :delete action not supported on Windows releases before Windows 8/2012. Cannot continue!" if older_than_win_2012_or_8?
+        end
+      end
+    end
+  end
+end