Merge pull request #3815 from chef/jdm/powershell-validation-fix

Fix powershell_script validation 

2 files changed, 20 insertions, 1 deletions

diff --git a/lib/chef/provider/powershell_script.rb b/lib/chef/provider/powershell_script.rb
index 004b182769..b876b6d8ee 100644
--- a/lib/chef/provider/powershell_script.rb
+++ b/lib/chef/provider/powershell_script.rb
@@ -99,7 +99,10 @@ EOH
           # Therefore, the only return value for a syntactically valid
           # script is 0. If an exception is raised by shellout, this
           # means a non-zero return and thus a syntactically invalid script.
-          shell_out!(validation_command, {returns: [0]})
+
+          with_os_architecture(node, architecture: new_resource.architecture) do
+            shell_out!(validation_command, {returns: [0]})
+          end
         end
       end
 
diff --git a/spec/functional/resource/powershell_script_spec.rb b/spec/functional/resource/powershell_script_spec.rb
index 2e8abedac5..be744e748b 100644
--- a/spec/functional/resource/powershell_script_spec.rb
+++ b/spec/functional/resource/powershell_script_spec.rb
@@ -227,6 +227,22 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
       expect { resource.should_skip?(:run) }.to raise_error(ArgumentError, /guard_interpreter does not support blocks/)
     end
 
+    context "when dsc is supported", :windows_powershell_dsc_only do
+      it "can execute LCM configuration code" do
+        resource.code <<-EOF
+configuration LCM
+{
+  param ($thumbprint)
+  localconfigurationmanager
+  {
+    RebootNodeIfNeeded = $false
+    ConfigurationMode = 'ApplyOnly'
+  }
+}
+        EOF
+        expect { resource.run_action(:run) }.not_to raise_error
+      end
+    end
   end
 
   context "when running on a 32-bit version of Ruby", :ruby32_only do