Merge pull request #152 from AlexCline/feature/master/allow_arrays_in_ensure_resource

(#20548) Allow an array of resource titles to be passed into the ensure_...

3 files changed, 63 insertions, 24 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..a9a1733 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].flatten
+
+  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 because 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..2e8aefc 100644
--- a/spec/functions/ensure_resource_spec.rb
+++ b/spec/functions/ensure_resource_spec.rb
@@ -4,17 +4,16 @@ require 'spec_helper'
 require 'rspec-puppet'
 describe 'ensure_resource' do
   describe 'when a type or title is not specified' do
-    it do
-      should run.with_params().and_raise_error(ArgumentError)
-      should run.with_params(['type']).and_raise_error(ArgumentError)
-    end
+    it { should run.with_params().and_raise_error(ArgumentError) }
+    it { should run.with_params(['type']).and_raise_error(ArgumentError) }
   end
+
   describe 'when compared against a resource with no attributes' do
     let :pre_condition do
       'user { "dan": }'
     end
-    it do
-      should run.with_params('user', 'dan', {})
+    it "should contain the the ensured resources" do
+      subject.should run.with_params('user', 'dan', {})
       compiler.catalog.resource('User[dan]').to_s.should == 'User[dan]'
     end
   end
@@ -23,18 +22,43 @@ describe 'ensure_resource' do
     let :pre_condition do
       'user { "dan": ensure => present, shell => "/bin/csh", managehome => false}'
     end
-    it do
-      # these first three should not fail
-      should run.with_params('User', 'dan', {})
-      should run.with_params('User', 'dan', '')
-      should run.with_params('User', 'dan', {'ensure' => 'present'})
-      should run.with_params('User', 'dan',
-                             {'ensure' => 'present', 'managehome' => false}
-                            )
-      #  test that this fails
-      should run.with_params('User', 'dan',
-                             {'ensure' => 'absent', 'managehome' => false}
-                            ).and_raise_error(Puppet::Error)
+    # these first three should not fail
+    it { should run.with_params('User', 'dan', {}) }
+    it { should run.with_params('User', 'dan', '') }
+    it { should run.with_params('User', 'dan', {'ensure' => 'present'}) }
+    it { should run.with_params('User', 'dan', {'ensure' => 'present', 'managehome' => false}) }
+    #  test that this fails
+    it { should run.with_params('User', 'dan', {'ensure' => 'absent', 'managehome' => false}).and_raise_error(Puppet::Error) }
+  end
+
+  describe 'when an array of new resources are passed in' do
+    it "should contain the ensured resources" do
+      subject.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 "should return the existing resources" do
+      subject.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
+    # These should not fail
+    it { should run.with_params('User', ['dan', 'alex'], {}) }
+    it { should run.with_params('User', ['dan', 'alex'], '') }
+    it { should run.with_params('User', ['dan', 'alex'], {'ensure' => 'present'}) }
+    # This should fail
+    it { should run.with_params('User', ['dan', 'alex'], {'ensure' => 'absent'}).and_raise_error(Puppet::Error) }
   end
 end