From b75d861b4fcc1cbe8ea939b4ff8bc69a196c391c Mon Sep 17 00:00:00 2001 From: Stephan Schultchen Date: Thu, 21 Nov 2024 17:15:52 +0100 Subject: [PATCH 1/2] do not pass dsc_timeout as timeout parameter to DSC resource params (cherry picked from commit a1c61c0c866835e03f7b7d1fe0a6a11c4b284e43) --- lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb b/lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb index cd977738..a62cdc25 100644 --- a/lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb +++ b/lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb @@ -917,6 +917,9 @@ def invoke_params(resource) params[:ModuleName] = resource[:dscmeta_module_name] end resource[:parameters].each do |property_name, property_hash| + # ignore dsc_timeout, since it is only used to specify the powershell command timeout + # and timeout itself is not a parameter to the DSC resource + next if property_name == :dsc_timeout # strip dsc_ from the beginning of the property name declaration name = property_name.to_s.gsub(/^dsc_/, '').to_sym params[:Property][name] = case property_hash[:mof_type] From 87fc0e29cb3d0a37ad4a2b0804c4c0cd7b9ea761 Mon Sep 17 00:00:00 2001 From: jordanbreen28 Date: Fri, 14 Feb 2025 12:15:11 +0000 Subject: [PATCH 2/2] (maint) - Fix Layout/EmptyLineAfterGuardClause & Metrics/MethodLength --- lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb b/lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb index a62cdc25..e96c68d1 100644 --- a/lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb +++ b/lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb @@ -899,7 +899,7 @@ def format_ciminstance(variable_name, class_name, property_hash) # # @param resource [Hash] a hash with the information needed to run `Invoke-DscResource` # @return [String] A string representing the PowerShell definition of the InvokeParams hash - def invoke_params(resource) + def invoke_params(resource) # rubocop:disable Metrics/MethodLength params = { Name: resource[:dscmeta_resource_friendly_name], Method: resource[:dsc_invoke_method], @@ -920,6 +920,7 @@ def invoke_params(resource) # ignore dsc_timeout, since it is only used to specify the powershell command timeout # and timeout itself is not a parameter to the DSC resource next if property_name == :dsc_timeout + # strip dsc_ from the beginning of the property name declaration name = property_name.to_s.gsub(/^dsc_/, '').to_sym params[:Property][name] = case property_hash[:mof_type]