chef 15.17.4 → 16.0.257

data/lib/chef/resource/user/solaris_user.rb

@@ -23,8 +23,6 @@ class Chef
       class SolarisUser < Chef::Resource::User
         unified_mode true
 
-        resource_name :solaris_user
-
         provides :solaris_user
         provides :user, os: %w{omnios solaris2}
       end

data/lib/chef/resource/user/windows_user.rb

@@ -23,8 +23,6 @@ class Chef
       class WindowsUser < Chef::Resource::User
         unified_mode true
 
-        resource_name :windows_user
-
         provides :windows_user
         provides :user, os: "windows"
 

data/lib/chef/resource/user_ulimit.rb

@@ -0,0 +1,114 @@
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: 2012, Brightcove, 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_relative "../resource"
+
+class Chef
+  class Resource
+    class UserUlimit < Chef::Resource
+      unified_mode true
+
+      provides :user_ulimit
+
+      introduced "16.0"
+      description "Use the user_ulimit resource to create individual ulimit files that are installed into the `/etc/security/limits.d/` directory."
+      examples <<~DOC
+        set filehandle limit for the tomcat user
+        ```ruby
+        user_ulimit 'tomcat' do
+          filehandle_limit 8192
+        end
+        ```
+
+        specify a username that differs from the name given to the resource block
+        ```ruby
+        user_ulimit 'Bump filehandle limits for tomcat user' do
+          username 'tomcat'
+          filehandle_limit 8192
+        end
+        ```
+
+        specify a non-default filename
+        set filehandle limit for the tomcat user
+        ```ruby
+        user_ulimit 'tomcat' do
+          filehandle_limit 8192
+          filename 'tomcat_filehandle_limits.conf'
+        end
+        ```
+      DOC
+
+      property :username, String, name_property: true
+      property :filehandle_limit, [String, Integer]
+      property :filehandle_soft_limit, [String, Integer]
+      property :filehandle_hard_limit, [String, Integer]
+      property :process_limit, [String, Integer]
+      property :process_soft_limit, [String, Integer]
+      property :process_hard_limit, [String, Integer]
+      property :memory_limit, [String, Integer]
+      property :core_limit, [String, Integer]
+      property :core_soft_limit, [String, Integer]
+      property :core_hard_limit, [String, Integer]
+      property :stack_limit, [String, Integer]
+      property :stack_soft_limit, [String, Integer]
+      property :stack_hard_limit, [String, Integer]
+      property :rtprio_limit, [String, Integer]
+      property :rtprio_soft_limit, [String, Integer]
+      property :rtprio_hard_limit, [String, Integer]
+      property :virt_limit, [String, Integer]
+      property :filename, String,
+               coerce: proc { |m| m.end_with?(".conf") ? m : m + ".conf" },
+               default: lazy { |r| r.username == "*" ? "00_all_limits.conf" : "#{r.username}_limits.conf" }
+
+      action :create do
+        template "/etc/security/limits.d/#{new_resource.filename}" do
+          source ::File.expand_path("../support/ulimit.erb", __FILE__)
+          local true
+          mode "0644"
+          variables(
+            ulimit_user: new_resource.username,
+            filehandle_limit: new_resource.filehandle_limit,
+            filehandle_soft_limit: new_resource.filehandle_soft_limit,
+            filehandle_hard_limit: new_resource.filehandle_hard_limit,
+            process_limit: new_resource.process_limit,
+            process_soft_limit: new_resource.process_soft_limit,
+            process_hard_limit: new_resource.process_hard_limit,
+            memory_limit: new_resource.memory_limit,
+            core_limit: new_resource.core_limit,
+            core_soft_limit: new_resource.core_soft_limit,
+            core_hard_limit: new_resource.core_hard_limit,
+            stack_limit: new_resource.stack_limit,
+            stack_soft_limit: new_resource.stack_soft_limit,
+            stack_hard_limit: new_resource.stack_hard_limit,
+            rtprio_limit: new_resource.rtprio_limit,
+            rtprio_soft_limit: new_resource.rtprio_soft_limit,
+            rtprio_hard_limit: new_resource.rtprio_hard_limit,
+            virt_limit: new_resource.virt_limit
+          )
+        end
+      end
+
+      action :delete do
+        file "/etc/security/limits.d/#{new_resource.filename}" do
+          action :delete
+        end
+      end
+    end
+  end
+end

data/lib/chef/resource/whyrun_safe_ruby_block.rb

@@ -19,6 +19,7 @@
 class Chef
   class Resource
     class WhyrunSafeRubyBlock < Chef::Resource::RubyBlock
+      provides :whyrun_safe_ruby_block
       unified_mode true
     end
   end

data/lib/chef/resource/windows_ad_join.rb

@@ -16,17 +16,13 @@
 #
 
 require_relative "../resource"
-require_relative "../mixin/powershell_out"
 require_relative "../dist"
 
 class Chef
   class Resource
     class WindowsAdJoin < Chef::Resource
-      resource_name :windows_ad_join
       provides :windows_ad_join
 
-      include Chef::Mixin::PowershellOut
-
       description "Use the windows_ad_join resource to join a Windows Active Directory domain."
       introduced "14.0"
 
@@ -70,7 +66,7 @@ class Chef
 
         unless on_desired_domain?
           cmd = "$pswd = ConvertTo-SecureString \'#{new_resource.domain_password}\' -AsPlainText -Force;"
-          cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{new_resource.domain_user}@#{new_resource.domain_name}\",$pswd);"
+          cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{sanitize_usename}\",$pswd);"
           cmd << "Add-Computer -DomainName #{new_resource.domain_name} -Credential $credential"
           cmd << " -OUPath \"#{new_resource.ou_path}\"" if new_resource.ou_path
           cmd << " -NewName \"#{new_resource.new_hostname}\"" if new_resource.new_hostname
@@ -102,7 +98,7 @@ class Chef
         if joined_to_domain?
           cmd = ""
           cmd << "$pswd = ConvertTo-SecureString \'#{new_resource.domain_password}\' -AsPlainText -Force;"
-          cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{new_resource.domain_user}@#{new_resource.domain_name}\",$pswd);"
+          cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{sanitize_usename}\",$pswd);"
           cmd << "Remove-Computer"
           cmd << " -UnjoinDomainCredential $credential"
           cmd << " -NewName \"#{new_resource.new_hostname}\"" if new_resource.new_hostname
@@ -169,6 +165,23 @@ class Chef
           node_domain == new_resource.domain_name.downcase
         end
 
+        #
+        # @return [String] the correct user and domain to use.
+        #   if the domain_user property contains an @ symbol followed by any number of non white space characters
+        #   then we assume it is a user from another domain than the one specified in the resource domain_name property.
+        #   if this is the case we do not append the domain_name property to the domain_user property
+        #   the domain_user and domain_name form the UPN (userPrincipalName)
+        #   The specification for the UPN format is RFC 822
+        #   links: https://docs.microsoft.com/en-us/windows/win32/ad/naming-properties#userprincipalname https://tools.ietf.org/html/rfc822
+        #   regex: https://rubular.com/r/isAWojpTMKzlnp
+        def sanitize_usename
+          if new_resource.domain_user =~ /@/
+            new_resource.domain_user
+          else
+            "#{new_resource.domain_user}@#{new_resource.domain_name}"
+          end
+        end
+
         # This resource historically took `:immediate` and `:delayed` as arguments to the reboot property but then
         # tried to shove that straight to the `reboot` resource which objected strenuously
         def clarify_reboot(reboot_action)

data/lib/chef/resource/windows_auto_run.rb

@@ -21,7 +21,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class WindowsAutorun < Chef::Resource
-      resource_name :windows_auto_run
       provides(:windows_auto_run) { true }
 
       description "Use the windows_auto_run resource to set applications to run at login."

data/lib/chef/resource/windows_certificate.rb

@@ -26,7 +26,7 @@ require_relative "../dist"
 class Chef
   class Resource
     class WindowsCertificate < Chef::Resource
-      resource_name :windows_certificate
+      provides :windows_certificate
 
       description "Use the windows_certificate resource to install a certificate into the Windows certificate store from a file. The resource grants read-only access to the private key for designated accounts. Due to current limitations in WinRM, installing certificates remotely may not work if the operation requires a user profile. Operations on the local machine store should still work."
       introduced "14.7"

data/lib/chef/resource/windows_dfs_folder.rb

@@ -21,7 +21,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class WindowsDfsFolder < Chef::Resource
-      resource_name :windows_dfs_folder
       provides :windows_dfs_folder
 
       description "The windows_dfs_folder resources creates a folder within dfs as many levels deep as required."

data/lib/chef/resource/windows_dfs_namespace.rb

@@ -21,7 +21,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class WindowsDfsNamespace < Chef::Resource
-      resource_name :windows_dfs_namespace
       provides :windows_dfs_namespace
 
       description "Creates a share and DFS namespace on the local server."

data/lib/chef/resource/windows_dfs_server.rb

@@ -21,7 +21,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class WindowsDfsServer < Chef::Resource
-      resource_name :windows_dfs_server
       provides :windows_dfs_server
 
       description "The windows_dfs_server resource sets system-wide DFS settings."

data/lib/chef/resource/windows_dns_record.rb

@@ -21,7 +21,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class WindowsDnsRecord < Chef::Resource
-      resource_name :windows_dns_record
       provides :windows_dns_record
 
       description "The windows_dns_record resource creates a DNS record for the given domain."

data/lib/chef/resource/windows_dns_zone.rb

@@ -21,7 +21,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class WindowsDnsZone < Chef::Resource
-      resource_name :windows_dns_zone
       provides :windows_dns_zone
 
       description "The windows_dns_zone resource creates an Active Directory Integrated DNS Zone on the local server."

data/lib/chef/resource/windows_env.rb

@@ -22,7 +22,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class WindowsEnv < Chef::Resource
-      resource_name :windows_env
       provides :windows_env
       provides :env # backwards compat with the pre-Chef 14 resource name
 
@@ -33,11 +32,11 @@ class Chef
 
       property :key_name, String,
         description: "An optional property to set the name of the key that is to be created, deleted, or modified if it differs from the resource block's name.",
-        identity: true, name_property: true
+        name_property: true
 
       property :value, String,
         description: "The value of the environmental variable to set.",
-        required: true
+        required: %i{create modify}
 
       property :delim, [ String, nil, false ],
         description: "The delimiter that is used to separate multiple values for a single key.",

data/lib/chef/resource/windows_feature.rb

@@ -21,7 +21,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class WindowsFeature < Chef::Resource
-      resource_name :windows_feature
       provides(:windows_feature) { true }
 
       description "Use the windows_feature resource to add, remove or entirely delete Windows features and roles. This resource calls the 'windows_feature_dism' or 'windows_feature_powershell' resources depending on the specified installation method, and defaults to DISM, which is available on both Workstation and Server editions of Windows."
@@ -49,7 +48,8 @@ class Chef
 
       property :timeout, Integer,
         description: "Specifies a timeout (in seconds) for the feature installation.",
-        default: 600
+        default: 600,
+        desired_state: false
 
       action :install do
         description "Install a Windows role/feature"

data/lib/chef/resource/windows_feature_dism.rb

@@ -22,7 +22,6 @@ 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."
@@ -42,14 +41,13 @@ class Chef
 
       property :timeout, Integer,
         description: "Specifies a timeout (in seconds) for the feature installation.",
-        default: 600
+        default: 600,
+        desired_state: false
 
-      # @return [Array] lowercase the array unless we're on < Windows 2012
+      # @return [Array] lowercase the array
       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)
+        x.map(&:downcase)
       end
 
       action :install do
@@ -98,8 +96,6 @@ class Chef
       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
@@ -193,27 +189,18 @@ class Chef
           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
+        # 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?
+          # dism isn't case sensitive so it's best to compare lowercase lists so the
+          # user input doesn't need to be case sensitive
+          feature_details.downcase!
           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

data/lib/chef/resource/windows_feature_powershell.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require_relative "../mixin/powershell_out"
 require_relative "../json_compat"
 require_relative "../resource"
 require_relative "../platform/query_helpers"
@@ -24,7 +23,6 @@ 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 installation of the Remote Server Administration Tools on non-server releases of Windows."
@@ -44,26 +42,23 @@ class Chef
 
       property :timeout, Integer,
         description: "Specifies a timeout (in seconds) for the feature installation.",
-        default: 600
+        default: 600,
+        desired_state: false
 
       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+.
+      # Converts strings of features into an Array. Array objects are lowercased
       # @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)
+        # features aren't case sensitive so let's compare in lowercase
+        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
@@ -71,14 +66,10 @@ class Chef
         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
+            install_command = "Install-WindowsFeature #{features_to_install.join(",")}"
+            install_command << " -IncludeAllSubFeature" if new_resource.all
+            install_command << " -Source \"#{new_resource.source}\"" if new_resource.source
+            install_command << " -IncludeManagementTools" if new_resource.management_tools
 
             cmd = powershell_out!(install_command, timeout: new_resource.timeout)
             Chef::Log.info(cmd.stdout)
@@ -89,15 +80,13 @@ class Chef
       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)
+            cmd = powershell_out!("Uninstall-WindowsFeature #{features_to_remove.join(",")}", timeout: new_resource.timeout)
             Chef::Log.info(cmd.stdout)
 
             reload_cached_powershell_data # Reload cached powershell feature state
@@ -106,9 +95,6 @@ class Chef
       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
@@ -126,49 +112,10 @@ class Chef
       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/removed features are what needs installing
-          @features_to_install ||= begin
-            features = node["powershell_features_cache"]["disabled"]
-            features |= node["powershell_features_cache"]["removed"] if new_resource.source
-            new_resource.feature_name & features
-          end
+          # 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
@@ -228,13 +175,8 @@ class Chef
 
         # 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
+          # Grab raw feature information from WindowsFeature
+          raw_list_of_features = powershell_out!("Get-WindowsFeature | Select-Object -Property Name,InstallState | ConvertTo-Json -Compress", timeout: new_resource.timeout).stdout
 
           Chef::JSONCompat.from_json(raw_list_of_features)
         end
@@ -242,26 +184,19 @@ class Chef
         # 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)
+          # add the lowercase feature name to the mash so we can compare it lowercase later
+          node.override["powershell_features_cache"][feature_type] << 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
+          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
 
-          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