(MODULES-6860) Add dsc_lite feature for confines

lib/puppet/feature/dsc_lite.rb

@@ -0,0 +1,31 @@
+require 'puppet/util/feature'
+
+if Puppet.features.microsoft_windows?
+
+  DSC_LITE_MODULE_POWERSHELL_UPGRADE_MSG = <<-UPGRADE
+  The dsc_lite module requires PowerShell version %{required} - current version %{current}
+
+  The cmdlet Invoke-DscResource was introduced in v5.0, and is necessary for the
+  dsc_lite module to function. Further bug fixes, first made available in version
+  %{required} are also necessary for this module to function.
+
+  To enable this module, please install the latest version of WMF 5+ from Microsoft.
+  UPGRADE
+
+  required_version = Gem::Version.new('5.0.10586.117')
+  installed_version = Gem::Version.new(Facter.value(:powershell_version))
+
+  if (installed_version >= required_version)
+    Puppet.features.add(:dsc_lite)
+  else
+    Puppet.warn_once(
+      'dsc_lite_unavailable',
+      :dsc_lite_unavailable,
+      DSC_LITE_MODULE_POWERSHELL_UPGRADE_MSG %
+        { :required => required_version, :current => installed_version},
+      nil,
+      nil,
+      :err
+    )
+  end
+end

lib/puppet/provider/base_dsc_lite/powershell.rb

@@ -2,7 +2,6 @@
 require 'json'
 if Puppet::Util::Platform.windows?
   require_relative '../../../puppet_x/puppetlabs/dsc_lite/powershell_manager'
-  require_relative '../../../puppet_x/puppetlabs/dsc_lite/compatible_powershell_version'
   require_relative '../../../puppet_x/puppetlabs/dsc_lite/powershell_hash_formatter'
 end
 
@@ -35,18 +34,6 @@
   Puppet (including 3.x), or to a Puppet version newer than 3.x.
   UPGRADE
 
-  DSC_LITE_MODULE_POWERSHELL_UPGRADE_MSG = <<-UPGRADE
-  Currently, the dsc module has reduced functionality on this agent
-  due to one or more of the following conditions:
-  - A PowerShell less than 5.0
-    The dsc module requires PowerShell v5.0 or greater to function. THe cmdlet
-    Invoke-DscResource was introduced in v5.0, and is necessary for the dsc module
-    to work
-  To enable these improvements, it is suggested to upgrade to any x64 version of
-  Puppet (including 3.x), or to a Puppet version newer than 3.x and ensure you
-  have at least PowerShell v5.0 installed.
-  UPGRADE
-
   def self.upgrade_message
     Puppet.warning DSC_LITE_MODULE_PUPPET_UPGRADE_MSG if !@upgrade_warning_issued
     @upgrade_warning_issued = true
@@ -92,8 +79,6 @@ def exists?
     script_content = ps_script_content('test')
     Puppet.debug "\n" + script_content
 
-    fail DSC_LITE_MODULE_POWERSHELL_UPGRADE_MSG if !PuppetX::DscLite::PowerShellManager.compatible_version_of_powershell?
-
     if !PuppetX::DscLite::PowerShellManager.supported?
       self.class.upgrade_message
       output = powershell(self.class.powershell_args, script_content)
@@ -114,8 +99,6 @@ def create
     script_content = ps_script_content('set')
     Puppet.debug "\n" + script_content
 
-    fail DSC_LITE_MODULE_POWERSHELL_UPGRADE_MSG if !PuppetX::DscLite::PowerShellManager.compatible_version_of_powershell?
-
     if !PuppetX::DscLite::PowerShellManager.supported?
       self.class.upgrade_message
       output = powershell(self.class.powershell_args, script_content)
@@ -136,8 +119,6 @@ def destroy
     script_content = ps_script_content('set')
     Puppet.debug "\n" + script_content
 
-    fail DSC_LITE_MODULE_POWERSHELL_UPGRADE_MSG if !PuppetX::DscLite::PowerShellManager.compatible_version_of_powershell?
-
     if !PuppetX::DscLite::PowerShellManager.supported?
       self.class.upgrade_message
       output = powershell(self.class.powershell_args, script_content)

lib/puppet/type/dsc.rb

@@ -20,7 +20,7 @@
       fail("#{value} is not a valid #{self.name.to_s}") unless value =~ /^[a-zA-Z0-9\.\-\_\'\s]+$/
     end
   end
-  
+
   newparam(:dsc_resource_name) do
     desc "DSC Resource Name"
     isrequired
@@ -66,7 +66,7 @@
 end
 
 Puppet::Type.type(:dsc).provide :powershell, :parent => Puppet::Type.type(:base_dsc_lite).provider(:powershell) do
-  confine :true => (Gem::Version.new(Facter.value(:powershell_version)) >= Gem::Version.new('5.0.10586.117'))
+  confine :feature => :dsc_lite
   defaultfor :operatingsystem => :windows
 
   mk_resource_methods

lib/puppet_x/puppetlabs/dsc_lite/powershell_manager.rb

@@ -2,7 +2,7 @@
 require 'securerandom'
 require 'open3'
 require 'base64'
-require File.join(File.dirname(__FILE__), 'compatible_powershell_version')
+require 'puppet/feature/dsc_lite'
 
 module PuppetX
   module DscLite
@@ -29,7 +29,7 @@ def self.win32console_enabled?
       end
 
       def self.compatible_version_of_powershell?
-        @compatible_powershell_version ||= PuppetX::PuppetLabs::DscLite::CompatiblePowerShellVersion.compatible_version?
+        @compatible_powershell_version ||= Puppet.features.dsc_lite?
       end
 
       def self.supported?

spec/integration/puppet_x/puppetlabs/powershell_manager_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 require 'puppet/type'
 require 'puppet_x/puppetlabs/dsc_lite/powershell_manager'
-require 'puppet_x/puppetlabs/dsc_lite/compatible_powershell_version'
 
 module PuppetX
   module DscLite

tests/files/dsc_puppetfakeresource/dsc_puppetfakeresource.rb

@@ -126,7 +126,7 @@ def builddepends
 end
 
 Puppet::Type.type(:dsc_puppetfakeresource).provide :powershell, :parent => Puppet::Type.type(:base_dsc_lite).provider(:powershell) do
-  confine :true => (Gem::Version.new(Facter.value(:powershell_version)) >= Gem::Version.new('5.0.10240.16384'))
+  confine :feature => :dsc_lite
   defaultfor :operatingsystem => :windows
 
   mk_resource_methods