summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-12-03 15:16:20 -0800
committerGitHub <noreply@github.com>2020-12-03 15:16:20 -0800
commit4934d731087e0f410011a28a37da510e7706ceb0 (patch)
tree6c69b070d71ec361a405e19f26da599defcbb351
parente16c693a55d420ee7219cdd7a93791517d28bc15 (diff)
parent9f3e836914fcc00425b452502a8806381d685842 (diff)
downloadchef-4934d731087e0f410011a28a37da510e7706ceb0.tar.gz
Merge pull request #10708 from chef/no_32
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/chef/resource/dsc_script.rb9
-rw-r--r--spec/functional/resource/dsc_script_spec.rb2
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/chef/resource/dsc_script.rb b/lib/chef/resource/dsc_script.rb
index 42b12cac5a..3a14da15f0 100644
--- a/lib/chef/resource/dsc_script.rb
+++ b/lib/chef/resource/dsc_script.rb
@@ -29,7 +29,14 @@ class Chef
unified_mode true
provides :dsc_script
- description "Many DSC resources are comparable to built-in #{ChefUtils::Dist::Infra::PRODUCT} resources. For example, both DSC and #{ChefUtils::Dist::Infra::PRODUCT} have file, package, and service resources. The dsc_script resource is most useful for those DSC resources that do not have a direct comparison to a resource in #{ChefUtils::Dist::Infra::PRODUCT}, such as the Archive resource, a custom DSC resource, an existing DSC script that performs an important task, and so on. Use the dsc_script resource to embed the code that defines a DSC configuration directly within a #{ChefUtils::Dist::Infra::PRODUCT} recipe."
+ description <<~DESC
+ Many DSC resources are comparable to built-in #{ChefUtils::Dist::Infra::PRODUCT} resources. For example, both DSC and #{ChefUtils::Dist::Infra::PRODUCT}
+ have file, package, and service resources. The dsc_script resource is most useful for those DSC resources that do not have a direct comparison to a
+ resource in #{ChefUtils::Dist::Infra::PRODUCT}, such as the Archive resource, a custom DSC resource, an existing DSC script that performs an important
+ task, and so on. Use the dsc_script resource to embed the code that defines a DSC configuration directly within a #{ChefUtils::Dist::Infra::PRODUCT} recipe.
+
+ Warning: The **dsc_script** resource may not be used with the 32 bit Chef Infra client. It must be executed from a 64 bit Chef Infra client.
+ DESC
default_action :run
diff --git a/spec/functional/resource/dsc_script_spec.rb b/spec/functional/resource/dsc_script_spec.rb
index 87c624e85f..d0baeae7a9 100644
--- a/spec/functional/resource/dsc_script_spec.rb
+++ b/spec/functional/resource/dsc_script_spec.rb
@@ -21,7 +21,7 @@ require "chef/mixin/powershell_exec"
require "chef/mixin/windows_architecture_helper"
require "support/shared/integration/integration_helper"
-describe Chef::Resource::DscScript, :windows_powershell_dsc_only do
+describe Chef::Resource::DscScript, :windows_powershell_dsc_only, :windows64_only do
include Chef::Mixin::WindowsArchitectureHelper
include Chef::Mixin::PowershellExec
before(:all) do