From a0cb8cdee42125c7acd64f17af603a2fa9375863 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Tue, 7 Aug 2012 20:48:54 -0700 Subject: Add function ensure_resource and defined_with_params This commit adds 2 new functions with unit tests. defined_with_params works similarily to puppet's defined function, except it allows you to also specify a hash of params. defined_with_params will return true if a resource also exists that matches the specified type/title (just like with defined) as well as all of the specified params. ensure_resource is a function that basically combines defined_with_params with create_resources to conditionally create resources only if the specified resource (title, type, params) does not already exist. These functions are created to serve as an alternative to using defined as follows: if ! defined(Package['some_package']) { package { 'some_package': ensure => present, } The issue with this usage is that there is no guarentee about what parameters were set in the previous definition of the package that made its way into the catalog. ensure_resource could be used instead, as: ensure_resource('package', 'some_package', { 'ensure' => 'present' }) This will creat the package resources only if another resource does not exist with the specified parameters. --- spec/functions/defined_with_params_spec.rb | 31 ++++++++++++++++++++++++++ spec/functions/ensure_resource_spec.rb | 35 ++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 spec/functions/defined_with_params_spec.rb create mode 100644 spec/functions/ensure_resource_spec.rb (limited to 'spec') diff --git a/spec/functions/defined_with_params_spec.rb b/spec/functions/defined_with_params_spec.rb new file mode 100644 index 0000000..21c08a0 --- /dev/null +++ b/spec/functions/defined_with_params_spec.rb @@ -0,0 +1,31 @@ +#! /usr/bin/env ruby -S rspec +require 'spec_helper' + +require 'rspec-puppet' +describe 'defined_with_params' do + describe 'when a resource is not specified' do + it { should run.with_params().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]', {}).and_return(true) + should run.with_params('User[bob]', {}).and_return(false) + should run.with_params('User[dan]', {'foo' => 'bar'}).and_return(false) + end + end + + describe 'when comparted against a resource with attributes' do + let :pre_condition do + 'user { "dan": ensure => present, shell => "/bin/csh", managehome => false}' + end + it do + should run.with_params('User[dan]', {}).and_return(true) + should run.with_params('User[dan]', {'ensure' => 'present'}).and_return(true) + should run.with_params('User[dan]', {'ensure' => 'present', 'managehome' => false}).and_return(true) + should run.with_params('User[dan]', {'ensure' => 'absent', 'managehome' => false}).and_return(false) + end + end +end diff --git a/spec/functions/ensure_resource_spec.rb b/spec/functions/ensure_resource_spec.rb new file mode 100644 index 0000000..e45a6d0 --- /dev/null +++ b/spec/functions/ensure_resource_spec.rb @@ -0,0 +1,35 @@ +#! /usr/bin/env ruby -S rspec +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 + 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', {}) + compiler.catalog.resource('User[dan]').to_s.should == 'User[dan]' + end + end + + describe 'when comparted against a resource with attributes' 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', {'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) + end + end +end -- cgit v1.2.3 From 4f8b133917255451b1f28128e26b36305c23d254 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Mon, 13 Aug 2012 18:52:00 -0700 Subject: Handle undef for parameter argument This commit adds better handling of the case where undef is passed as the parameter value. This works by converting '' into [] --- spec/functions/defined_with_params_spec.rb | 1 + spec/functions/ensure_resource_spec.rb | 1 + 2 files changed, 2 insertions(+) (limited to 'spec') diff --git a/spec/functions/defined_with_params_spec.rb b/spec/functions/defined_with_params_spec.rb index 21c08a0..f995b67 100644 --- a/spec/functions/defined_with_params_spec.rb +++ b/spec/functions/defined_with_params_spec.rb @@ -26,6 +26,7 @@ describe 'defined_with_params' do should run.with_params('User[dan]', {'ensure' => 'present'}).and_return(true) should run.with_params('User[dan]', {'ensure' => 'present', 'managehome' => false}).and_return(true) should run.with_params('User[dan]', {'ensure' => 'absent', 'managehome' => false}).and_return(false) + should run.with_params('User[dan]', '').and_return(true) end end end diff --git a/spec/functions/ensure_resource_spec.rb b/spec/functions/ensure_resource_spec.rb index e45a6d0..e03efda 100644 --- a/spec/functions/ensure_resource_spec.rb +++ b/spec/functions/ensure_resource_spec.rb @@ -26,6 +26,7 @@ describe 'ensure_resource' do 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 -- cgit v1.2.3 From 444393bf6b1e21da4e31f9037d17ea417b9b473b Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Mon, 13 Aug 2012 18:53:47 -0700 Subject: re-formatting This commit refactors to ensure 80 character lines. --- spec/functions/defined_with_params_spec.rb | 13 +++++++++---- spec/functions/ensure_resource_spec.rb | 10 +++++++--- 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'spec') diff --git a/spec/functions/defined_with_params_spec.rb b/spec/functions/defined_with_params_spec.rb index f995b67..28dbab3 100644 --- a/spec/functions/defined_with_params_spec.rb +++ b/spec/functions/defined_with_params_spec.rb @@ -17,16 +17,21 @@ describe 'defined_with_params' do end end - describe 'when comparted against a resource with attributes' do + describe 'when compared against a resource with attributes' do let :pre_condition do 'user { "dan": ensure => present, shell => "/bin/csh", managehome => false}' end it do should run.with_params('User[dan]', {}).and_return(true) - should run.with_params('User[dan]', {'ensure' => 'present'}).and_return(true) - should run.with_params('User[dan]', {'ensure' => 'present', 'managehome' => false}).and_return(true) - should run.with_params('User[dan]', {'ensure' => 'absent', 'managehome' => false}).and_return(false) should run.with_params('User[dan]', '').and_return(true) + should run.with_params('User[dan]', {'ensure' => 'present'} + ).and_return(true) + should run.with_params('User[dan]', + {'ensure' => 'present', 'managehome' => false} + ).and_return(true) + should run.with_params('User[dan]', + {'ensure' => 'absent', 'managehome' => false} + ).and_return(false) end end end diff --git a/spec/functions/ensure_resource_spec.rb b/spec/functions/ensure_resource_spec.rb index e03efda..611666e 100644 --- a/spec/functions/ensure_resource_spec.rb +++ b/spec/functions/ensure_resource_spec.rb @@ -19,7 +19,7 @@ describe 'ensure_resource' do end end - describe 'when comparted against a resource with attributes' do + describe 'when compared against a resource with attributes' do let :pre_condition do 'user { "dan": ensure => present, shell => "/bin/csh", managehome => false}' end @@ -28,9 +28,13 @@ describe 'ensure_resource' do 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}) + 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) + should run.with_params('User', 'dan', + {'ensure' => 'absent', 'managehome' => false} + ).and_raise_error(Puppet::Error) end end end -- cgit v1.2.3