diff options
author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-02-12 16:02:57 -0600 |
---|---|---|
committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-02-12 16:02:57 -0600 |
commit | 0df0e36f82e24cfb7cb22eaef0c8d99002a177b8 (patch) | |
tree | 2e629b5a0b4a1a315e3c08aeda33bf7201684f1a /lib/chef/util/dsc | |
parent | ab6aeedae48d37bca177a983232f35b518557d2f (diff) | |
parent | 0f794c42243138b1b0cdcfa572ed805274562c68 (diff) | |
download | chef-0df0e36f82e24cfb7cb22eaef0c8d99002a177b8.tar.gz |
Merge pull request #2779 from chef/jdm/dsc_script_imports
Allow dsc_script to import dsc resources
Diffstat (limited to 'lib/chef/util/dsc')
-rw-r--r-- | lib/chef/util/dsc/configuration_generator.rb | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/lib/chef/util/dsc/configuration_generator.rb b/lib/chef/util/dsc/configuration_generator.rb index 12cd5dc3a2..0d7296eae9 100644 --- a/lib/chef/util/dsc/configuration_generator.rb +++ b/lib/chef/util/dsc/configuration_generator.rb @@ -25,9 +25,9 @@ class Chef::Util::DSC @config_directory = config_directory end - def configuration_document_from_script_code(code, configuration_flags, shellout_flags) + def configuration_document_from_script_code(code, configuration_flags, imports, shellout_flags) Chef::Log.debug("DSC: DSC code:\n '#{code}'") - generated_script_path = write_document_generation_script(code, 'chef_dsc') + generated_script_path = write_document_generation_script(code, 'chef_dsc', imports) begin configuration_document_from_script_path(generated_script_path, 'chef_dsc', configuration_flags, shellout_flags) ensure @@ -80,18 +80,42 @@ class Chef::Util::DSC merged_configuration_flags end - def configuration_code(code, configuration_name) - "$ProgressPreference = 'SilentlyContinue';Configuration '#{configuration_name}'\n{\n\tnode 'localhost'\n{\n\t#{code}\n}}\n" + def configuration_code(code, configuration_name, imports) + <<-EOF +$ProgressPreference = 'SilentlyContinue'; +Configuration '#{configuration_name}' +{ + #{generate_import_resource_statements(imports).join(" \n")} + node 'localhost' + { + #{code} + } +} + EOF + end + + def generate_import_resource_statements(imports) + if imports + imports.map do |resource_module, resources| + if resources.length == 0 || resources.include?('*') + "Import-DscResource -ModuleName #{resource_module}" + else + "Import-DscResource -ModuleName #{resource_module} -Name #{resources.join(',')}" + end + end + else + [] + end end def configuration_document_generation_code(configuration_script, configuration_name) ". '#{configuration_script}';#{configuration_name}" end - def write_document_generation_script(code, configuration_name) + def write_document_generation_script(code, configuration_name, imports) script_path = "#{@config_directory}/chef_dsc_config.ps1" ::File.open(script_path, 'wt') do | script | - script.write(configuration_code(code, configuration_name)) + script.write(configuration_code(code, configuration_name, imports)) end script_path end |