summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Cline <acline@us.ibm.com>2013-05-03 15:47:27 -0400
committerAlex Cline <acline@us.ibm.com>2013-05-03 15:47:27 -0400
commite08734af5a38cb9ad4bc2323104a1a8a76019bb8 (patch)
tree56c8ac9c38e052a56498bf22680e462aa8617b3d
parent0c68ff6d66960424567f15711cb20b674fc60054 (diff)
(#20548) Allow an array of resource titles to be passed into the ensure_resource function
This patch allows an array of resource titles to be passed into the ensure_resource function. Each item in the array will be checked for existence and will be created if it doesn't already exist.
-rw-r--r--README.markdown5
-rw-r--r--lib/puppet/parser/functions/ensure_resource.rb22
-rw-r--r--spec/functions/ensure_resource_spec.rb35
3 files changed, 56 insertions, 6 deletions
diff --git a/README.markdown b/README.markdown
index 84cd08e..7b45b17 100644
--- a/README.markdown
+++ b/README.markdown
@@ -243,6 +243,11 @@ If the resource already exists but does not match the specified parameters,
this function will attempt to recreate the resource leading to a duplicate
resource definition error.
+An array of resources can also be passed in and each will be created with
+the type and parameters specified if it doesn't already exist.
+
+ ensure_resource('user', ['dan','alex'], {'ensure' => 'present'})
+
- *Type*: statement
diff --git a/lib/puppet/parser/functions/ensure_resource.rb b/lib/puppet/parser/functions/ensure_resource.rb
index fba2035..8ede967 100644
--- a/lib/puppet/parser/functions/ensure_resource.rb
+++ b/lib/puppet/parser/functions/ensure_resource.rb
@@ -19,17 +19,27 @@ If the resource already exists but does not match the specified parameters,
this function will attempt to recreate the resource leading to a duplicate
resource definition error.
+An array of resources can also be passed in and each will be created with
+the type and parameters specified if it doesn't already exist.
+
+ ensure_resource('user', ['dan','alex'], {'ensure' => 'present'})
+
ENDOFDOC
) do |vals|
type, title, params = vals
raise(ArgumentError, 'Must specify a type') unless type
raise(ArgumentError, 'Must specify a title') unless title
params ||= {}
- Puppet::Parser::Functions.function(:defined_with_params)
- if function_defined_with_params(["#{type}[#{title}]", params])
- Puppet.debug("Resource #{type}[#{title}] not created b/c it already exists")
- else
- Puppet::Parser::Functions.function(:create_resources)
- function_create_resources([type.capitalize, { title => params }])
+
+ items = title.kind_of?(Array) ? title : [].push(title)
+
+ items.each do |item|
+ Puppet::Parser::Functions.function(:defined_with_params)
+ if function_defined_with_params(["#{type}[#{item}]", params])
+ Puppet.debug("Resource #{type}[#{item}] not created b/c it already exists")
+ else
+ Puppet::Parser::Functions.function(:create_resources)
+ function_create_resources([type.capitalize, { item => params }])
+ end
end
end
diff --git a/spec/functions/ensure_resource_spec.rb b/spec/functions/ensure_resource_spec.rb
index 611666e..abd8719 100644
--- a/spec/functions/ensure_resource_spec.rb
+++ b/spec/functions/ensure_resource_spec.rb
@@ -37,4 +37,39 @@ describe 'ensure_resource' do
).and_raise_error(Puppet::Error)
end
end
+
+ describe 'when an array of new resources are passed in' do
+ it do
+ should run.with_params('User', ['dan', 'alex'], {})
+ compiler.catalog.resource('User[dan]').to_s.should == 'User[dan]'
+ compiler.catalog.resource('User[alex]').to_s.should == 'User[alex]'
+ end
+ end
+
+ describe 'when an array of existing resources is compared against existing resources' do
+ let :pre_condition do
+ 'user { "dan": ensure => present; "alex": ensure => present }'
+ end
+ it do
+ should run.with_params('User', ['dan', 'alex'], {})
+ compiler.catalog.resource('User[dan]').to_s.should == 'User[dan]'
+ compiler.catalog.resource('User[alex]').to_s.should == 'User[alex]'
+ end
+ end
+
+ describe 'when compared against existing resources with attributes' do
+ let :pre_condition do
+ 'user { "dan": ensure => present; "alex": ensure => present }'
+ end
+ it do
+ # These should not fail
+ should run.with_params('User', ['dan', 'alex'], {})
+ should run.with_params('User', ['dan', 'alex'], '')
+ should run.with_params('User', ['dan', 'alex'], {'ensure' => 'present'})
+ # This should fail
+ should run.with_params('User', ['dan', 'alex'],
+ {'ensure' => 'absent'}
+ ).and_raise_error(Puppet::Error)
+ end
+ end
end