Limit required attributes to the actions that need them

[chef.git] / cookbooks / postgresql / resources / extension.rb

diff --git a/cookbooks/postgresql/resources/extension.rb b/cookbooks/postgresql/resources/extension.rb
index 8c876f4739aba8f986c3d5b824284543764716de..3adcfd62b26761df9eb16869abb7ce93927e4a34 100644 (file)
--- a/cookbooks/postgresql/resources/extension.rb
+++ b/cookbooks/postgresql/resources/extension.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: postgresql
+# Cookbook:: postgresql
 # Resource:: postgresql_extension
 #
-# Copyright 2012, OpenStreetMap Foundation
+# Copyright:: 2012, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,13 +17,30 @@
 # limitations under the License.
 #
 
-actions :create, :drop
+default_action :create
 
-attribute :extension, :kind_of => String, :name_attribute => true
-attribute :cluster, :kind_of => String, :required => true
-attribute :database, :kind_of => String, :required => true
+property :extension, :kind_of => String, :name_property => true
+property :cluster, :kind_of => String, :required => true
+property :database, :kind_of => String, :required => true
 
-def initialize(*args)
-  super
-  @action = :create
+action :create do
+  unless cluster.extensions(new_resource.database).include?(new_resource.extension)
+    converge_by "create extension #{new_resource.extension}" do
+      cluster.execute(:command => "CREATE EXTENSION #{new_resource.extension}", :database => new_resource.database)
+    end
+  end
+end
+
+action :drop do
+  if cluster.extensions(new_resource.database).include?(new_resource.extension)
+    converge_by "drop extension #{new_resource.extension}" do
+      cluster.execute(:command => "DROP EXTENSION #{new_resource.extension}", :database => new_resource.database)
+    end
+  end
+end
+
+action_class do
+  def cluster
+    @cluster ||= OpenStreetMap::PostgreSQL.new(new_resource.cluster)
+  end
 end