Limit required attributes to the actions that need them

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

diff --git a/cookbooks/postgresql/resources/database.rb b/cookbooks/postgresql/resources/database.rb
index 1e8f3972ce57a68893196267494b347c89125a5f..c73250464c99b35a865ed9f2da62b9d7ac6fe9a8 100644 (file)
--- a/cookbooks/postgresql/resources/database.rb
+++ b/cookbooks/postgresql/resources/database.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: postgresql
+# Cookbook:: postgresql

 # Resource:: postgresql_database
 #
 # Resource:: postgresql_database
 #

-# 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -19,11 +19,35 @@
 
 default_action :create
 
 
 default_action :create
 

-actions :create, :drop
+property :database, :kind_of => String, :name_property => true
+property :cluster, :kind_of => String, :required => true
+property :owner, :kind_of => String, :required => [:create]
+property :encoding, :kind_of => String, :default => "UTF8"
+property :collation, :kind_of => String, :default => "en_GB.UTF8"
+property :ctype, :kind_of => String, :default => "en_GB.UTF8"

 
 

-attribute :database, :kind_of => String, :name_attribute => true
-attribute :cluster, :kind_of => String, :required => true
-attribute :owner, :kind_of => String, :required => true
-attribute :encoding, :kind_of => String, :default => "UTF8"
-attribute :collation, :kind_of => String, :default => "en_GB.UTF8"
-attribute :ctype, :kind_of => String, :default => "en_GB.UTF8"
+action :create do
+  if !cluster.databases.include?(new_resource.database)
+    converge_by "create database #{new_resource.database}" do
+      cluster.execute(:command => "CREATE DATABASE \"#{new_resource.database}\" OWNER \"#{new_resource.owner}\" TEMPLATE template0 ENCODING '#{new_resource.encoding}' LC_COLLATE '#{new_resource.collation}' LC_CTYPE '#{new_resource.ctype}'")
+    end
+  elsif new_resource.owner != cluster.databases[new_resource.database][:owner]
+    converge_by "alter database #{new_resource.database}" do
+      cluster.execute(:command => "ALTER DATABASE \"#{new_resource.database}\" OWNER TO \"#{new_resource.owner}\"")
+    end
+  end
+end
+
+action :drop do
+  if cluster.databases.include?(new_resource.database)
+    converge_by "drop database #{new_resource.database}" do
+      cluster.execute(:command => "DROP DATABASE \"#{new_resource.database}\"")
+    end
+  end
+end
+
+action_class do
+  def cluster
+    @cluster ||= OpenStreetMap::PostgreSQL.new(new_resource.cluster)
+  end
+end