From 1e0983362464e8f2832239b09cdbc9175a51e6ec Mon Sep 17 00:00:00 2001
From: Jeff McCune <jeff@puppetlabs.com>
Date: Tue, 14 Aug 2012 18:26:17 -0700
Subject: Revert "Merge pull request #86 from bodepd/ensure_resource"

This reverts commit 42ddd7fe54f37b84e34b4a005de2249e53f07469, reversing
changes made to 53243605b28fc31618d079155c86b37b4e88a6ca.
---
 lib/puppet/parser/functions/defined_with_params.rb | 35 ----------------------
 lib/puppet/parser/functions/ensure_resource.rb     | 33 --------------------
 2 files changed, 68 deletions(-)
 delete mode 100644 lib/puppet/parser/functions/defined_with_params.rb
 delete mode 100644 lib/puppet/parser/functions/ensure_resource.rb

(limited to 'lib/puppet/parser/functions')

diff --git a/lib/puppet/parser/functions/defined_with_params.rb b/lib/puppet/parser/functions/defined_with_params.rb
deleted file mode 100644
index d7df306..0000000
--- a/lib/puppet/parser/functions/defined_with_params.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# Test whether a given class or definition is defined
-require 'puppet/parser/functions'
-
-Puppet::Parser::Functions.newfunction(:defined_with_params,
-                                      :type => :rvalue,
-                                      :doc => <<-'ENDOFDOC'
-Takes a resource reference and an optional hash of attributes.
-
-Returns true if a resource with the specified attributes has already been added
-to the catalog, and false otherwise.
-
-    user { 'dan':
-      ensure => present,
-    }
-
-    if ! defined_with_params(User[dan], {'ensure' => 'present' }) {
-      user { 'dan': ensure => present, }
-    }
-ENDOFDOC
-) do |vals|
-  reference, params = vals
-  raise(ArgumentError, 'Must specify a reference') unless reference
-  if (! params) || params == ''
-    params = {}
-  end
-  ret = false
-  if resource = findresource(reference.to_s)
-    matches = params.collect do |key, value|
-      resource[key] == value
-    end
-    ret = params.empty? || !matches.include?(false)
-  end
-  Puppet.debug("Resource #{reference} was not determined to be defined")
-  ret
-end
diff --git a/lib/puppet/parser/functions/ensure_resource.rb b/lib/puppet/parser/functions/ensure_resource.rb
deleted file mode 100644
index 6a9e2ed..0000000
--- a/lib/puppet/parser/functions/ensure_resource.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# Test whether a given class or definition is defined
-require 'puppet/parser/functions'
-
-Puppet::Parser::Functions.newfunction(:ensure_resource,
-                                      :type => :statement,
-                                      :doc => <<-'ENDOFDOC'
-Takes a resource type, title, and a list of attributes that describe a
-resource.
-
-    user { 'dan':
-      ensure => present,
-    }
-
-This example only creates the resource if it does not already exist:
-
-    ensure_resource('user, 'dan', {'ensure' => 'present' })
-
-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.
-
-ENDOFDOC
-) do |vals|
-  type, title, params = vals
-  raise(ArgumentError, 'Must specify a type') unless type
-  raise(ArgumentError, 'Must specify a title') unless title
-  params ||= {}
-  if function_defined_with_params(["#{type}[#{title}]", params])
-    Puppet.debug("Resource #{type}[#{title}] not created b/c it already exists")
-  else
-    function_create_resources([type.capitalize, { title => params }])
-  end
-end
-- 
cgit v1.2.3