cleanup

Author: LukasAud

lib/puppet/provider/base_dsc_lite/powershell.rb

@@ -2,11 +2,6 @@
 
 require 'pathname'
 require 'json'
-require 'erb' # ensure ERB is available
-require 'puppet'
-require 'puppet/node'
-require 'puppet/parser/script_compiler'
-require 'puppet/pops/evaluator/deferred_resolver'
 require_relative '../../../puppet_x/puppetlabs/dsc_lite/powershell_hash_formatter'
 
 Puppet::Type.type(:base_dsc_lite).provide(:powershell) do
@@ -36,10 +31,6 @@
   Puppet (including 3.x), or to a Puppet version newer than 3.x.
   UPGRADE
 
-  # ---------------------------
-  # Class helpers
-  # ---------------------------
-
   def self.upgrade_message
     Puppet.warning DSC_LITE_MODULE_PUPPET_UPGRADE_MSG unless @upgrade_warning_issued
     @upgrade_warning_issued = true
@@ -157,92 +148,6 @@ def contains_deferred_values?(value)
     end
   end
 
-  # ---------------------------
-  # Legacy deferred resolution methods (keeping for reference but not using)
-  # ---------------------------
-
-  # 1) Catalog-wide resolve: replace all Deferreds/futures in the catalog
-  def force_resolve_catalog_deferred!
-    cat = resource&.catalog
-    return unless cat
-
-    facts = Puppet.lookup(:facts) { nil }
-    env   = if cat.respond_to?(:environment_instance)
-              cat.environment_instance
-            else
-              Puppet.lookup(:current_environment) { nil }
-            end
-
-    begin
-      Puppet::Pops::Evaluator::DeferredResolver.resolve_and_replace(facts, cat, env, true)
-      Puppet.notice('DSC PROVIDER SENTINEL → resolve_and_replace invoked')
-    rescue => e
-      Puppet.notice("DSC PROVIDER resolve_and_replace error: #{e.class}: #{e.message}")
-    end
-  end
-
-  # Build a compiler on the agent for local resolution
-  def build_agent_compiler(env)
-    node_name = Puppet[:node_name_value]
-    node      = Puppet::Node.new(node_name, environment: env)
-
-    # Attaching facts improves function behavior during resolve (best-effort)
-    begin
-      facts = Puppet.lookup(:facts) { nil }
-      node.add_facts(facts) if facts
-    rescue => e
-      Puppet.debug("DSC_lite: could not attach facts to node for local resolve: #{e.class}: #{e.message}")
-    end
-
-    if defined?(Puppet::Parser::ScriptCompiler)
-      Puppet::Parser::ScriptCompiler.new(node, env)
-    else
-      Puppet::Parser::Compiler.new(node)
-    end
-  end
-
-  # 2) Targeted resolve: explicitly resolve the :properties value using a resolver that
-  #    handles both Deferred and evaluator futures, then write it back to the resource.
-  def force_resolve_properties!
-    return unless resource.parameters.key?(:properties)
-
-    cat = resource&.catalog
-    env = if cat&.respond_to?(:environment_instance)
-            cat.environment_instance
-          else
-            Puppet.lookup(:current_environment) { nil }
-          end
-
-    begin
-      compiler = build_agent_compiler(env) if env
-      return unless compiler # without a compiler, local resolve can't proceed
-
-      facts = Puppet.lookup(:facts) { nil }
-
-      resolver = Puppet::Pops::Evaluator::DeferredResolver.new(compiler, true)
-      resolver.set_facts_variable(facts) if facts
-
-      # Read current value, resolve deeply, then write back into the parameter
-      current  = resource.parameters[:properties].value
-      resolved = resolver.resolve(current)
-      resource.parameters[:properties].value = resolved
-
-      # Post-check: what class is properties['Contents'] now?
-      cls = if resolved.is_a?(Hash) && resolved.key?('Contents')
-              resolved['Contents'].class
-            else
-              resolved.class
-            end
-      Puppet.notice("DSC PROVIDER SENTINEL → post-resolve properties.Contents: #{cls}")
-    rescue => e
-      Puppet.debug("DSC_lite: explicit properties resolve failed: #{e.class}: #{e.message}")
-    end
-  end
-
-  # ---------------------------
-  # Existing provider helpers
-  # ---------------------------
-
   def dsc_parameters
     resource.parameters_with_value.select do |p|
       p.name.to_s.include? 'dsc_'
@@ -269,13 +174,7 @@ def format_for_ps(value)
     self.class.format_dsc_lite(value)
   end
 
-  # ---------------------------
-  # Provider operations
-  # ---------------------------
-
   def exists?
-    Puppet.notice("DSC PROVIDER SENTINEL → #{__FILE__}")
-
     # Resolve deferred values right before we start processing
     resolve_deferred_values!
 
@@ -308,8 +207,6 @@ def exists?
   end
 
   def create
-    Puppet.notice("DSC PROVIDER SENTINEL → #{__FILE__}")
-
     # Resolve deferred values right before we start processing
     resolve_deferred_values!
 

lib/puppet/type/dsc.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'pathname'
-require 'puppet/pops/evaluator/deferred_resolver' # ← add: resolver API
 
 Puppet::Type.newtype(:dsc) do
   desc <<-DOC
@@ -107,11 +106,6 @@ def change_to_s(currentvalue, newvalue)
     end
 
     munge do |value|
-      # Don't try to resolve deferred values during munge - they should be resolved
-      # on the agent during catalog application, not during catalog compilation.
-      # Just pass them through to the provider for proper resolution timing.
-      Puppet.notice("DSC TYPE SENTINEL → #{__FILE__} - letting deferred values pass through")
-
       PuppetX::DscLite::TypeHelpers.munge_sensitive_hash(value)
     end
   end