Limit required attributes to the actions that need them

diff --git a/cookbooks/apache/resources/conf.rb b/cookbooks/apache/resources/conf.rb
index a163b449697d1403552ef1f34715a8c0c207b9cf..12daf87ab48ef39d5bf0e1c84b09da69a07c0f9f 100644 (file)
--- a/cookbooks/apache/resources/conf.rb
+++ b/cookbooks/apache/resources/conf.rb
@@ -21,7 +21,7 @@ default_action [:create, :enable]
 
 property :conf, :kind_of => String, :name_property => true
 property :cookbook, :kind_of => String
 
 property :conf, :kind_of => String, :name_property => true
 property :cookbook, :kind_of => String

-property :template, :kind_of => String, :required => true
+property :template, :kind_of => String, :required => [:create]

 property :variables, :kind_of => Hash, :default => {}
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 property :variables, :kind_of => Hash, :default => {}
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 

diff --git a/cookbooks/apache/resources/site.rb b/cookbooks/apache/resources/site.rb
index 96cf872f47ae282650cb966f21ae70d192fc6b85..e039e3ac529e93a67a88d04676678205573fd0b8 100644 (file)
--- a/cookbooks/apache/resources/site.rb
+++ b/cookbooks/apache/resources/site.rb
@@ -22,7 +22,7 @@ default_action [:create, :enable]
 property :site, :kind_of => String, :name_property => true
 property :directory, :kind_of => String
 property :cookbook, :kind_of => String
 property :site, :kind_of => String, :name_property => true
 property :directory, :kind_of => String
 property :cookbook, :kind_of => String

-property :template, :kind_of => String, :required => true
+property :template, :kind_of => String, :required => [:create]

 property :variables, :kind_of => Hash, :default => {}
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 property :variables, :kind_of => Hash, :default => {}
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 05a0452eeddd7775e4ed8b367f3a2248a3f3e24e..2cc90df563a6d9ba64ea8e2059eeb8471452e134 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -23,7 +23,7 @@ default_action :create
 
 property :layer, String, :name_property => true
 property :site, String, :required => true
 
 property :layer, String, :name_property => true
 property :site, String, :required => true

-property :source, String, :required => true
+property :source, String, :required => [:create]

 property :root_layer, [true, false], :default => false
 property :title, String
 property :copyright, String, :default => "Copyright"
 property :root_layer, [true, false], :default => false
 property :title, String
 property :copyright, String, :default => "Copyright"

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 711ae3e504b6227649207a0529106fde5e7e67de..50bfd24b8fd2dcc914f05d73ed3af0145ef3b3ee 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -22,9 +22,9 @@ require "yaml"
 default_action :create
 
 property :site, String, :name_property => true
 default_action :create
 
 property :site, String, :name_property => true

-property :title, String, :required => true
+property :title, String, :required => [:create]

 property :aliases, [String, Array], :default => []
 property :aliases, [String, Array], :default => []

-property :bbox, Array, :required => true
+property :bbox, Array, :required => [:create]

 
 action :create do
   directory "/srv/#{new_resource.site}" do
 
 action :create do
   directory "/srv/#{new_resource.site}" do

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index a7cb8cf4091047e0b31cb3e6ee3007dce86b604c..472e8c3d8ba176c0caa18f2fbecfda47701e35ed 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -24,8 +24,8 @@ property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String
 property :version, :kind_of => String, :default => "1.33"
 property :database_name, :kind_of => String, :required => true
 property :directory, :kind_of => String
 property :version, :kind_of => String, :default => "1.33"
 property :database_name, :kind_of => String, :required => true

-property :database_user, :kind_of => String, :required => true
-property :database_password, :kind_of => String, :required => true
+property :database_user, :kind_of => String, :required => [:create, :update]
+property :database_password, :kind_of => String, :required => [:create, :update]

 property :sitename, :kind_of => String, :default => "OpenStreetMap Wiki"
 property :metanamespace, :kind_of => String, :default => "OpenStreetMap"
 property :logo, :kind_of => String, :default => "$wgStylePath/common/images/wiki.png"
 property :sitename, :kind_of => String, :default => "OpenStreetMap Wiki"
 property :metanamespace, :kind_of => String, :default => "OpenStreetMap"
 property :logo, :kind_of => String, :default => "$wgStylePath/common/images/wiki.png"


@@ -37,7 +37,7 @@ property :skin, :kind_of => String, :default => "vector"
 property :site_notice, :kind_of => [String, TrueClass, FalseClass], :default => false
 property :site_readonly, :kind_of => [String, TrueClass, FalseClass], :default => false
 property :admin_user, :kind_of => String, :default => "Admin"
 property :site_notice, :kind_of => [String, TrueClass, FalseClass], :default => false
 property :site_readonly, :kind_of => [String, TrueClass, FalseClass], :default => false
 property :admin_user, :kind_of => String, :default => "Admin"

-property :admin_password, :kind_of => String, :required => true
+property :admin_password, :kind_of => String, :required => [:create]

 property :private_accounts, :kind_of => [TrueClass, FalseClass], :default => false
 property :private_site, :kind_of => [TrueClass, FalseClass], :default => false
 property :recaptcha_public_key, :kind_of => String
 property :private_accounts, :kind_of => [TrueClass, FalseClass], :default => false
 property :private_site, :kind_of => [TrueClass, FalseClass], :default => false
 property :recaptcha_public_key, :kind_of => String

diff --git a/cookbooks/munin/resources/plugin_conf.rb b/cookbooks/munin/resources/plugin_conf.rb
index e58a42889aa84b01541a3ea8c92b59e5e1860063..6105f0d2b94b4e7bc6f11f1724148b6e177cd5c8 100644 (file)
--- a/cookbooks/munin/resources/plugin_conf.rb
+++ b/cookbooks/munin/resources/plugin_conf.rb
@@ -21,7 +21,7 @@ default_action :create
 
 property :plugin_conf, :kind_of => String, :name_property => true
 property :cookbook, :kind_of => [String, nil]
 
 property :plugin_conf, :kind_of => String, :name_property => true
 property :cookbook, :kind_of => [String, nil]

-property :template, :kind_of => String, :required => true
+property :template, :kind_of => String, :required => [:create]

 property :variables, :kind_of => Hash, :default => {}
 property :restart_munin, :kind_of => [TrueClass, FalseClass], :default => true
 
 property :variables, :kind_of => Hash, :default => {}
 property :restart_munin, :kind_of => [TrueClass, FalseClass], :default => true
 

diff --git a/cookbooks/nginx/resources/site.rb b/cookbooks/nginx/resources/site.rb
index 25066f459a8c324325f8045bb4174611e375f428..45422434a9274b66d0b69a501361cc8c153a8f93 100644 (file)
--- a/cookbooks/nginx/resources/site.rb
+++ b/cookbooks/nginx/resources/site.rb
@@ -22,7 +22,7 @@ default_action :create
 property :site, :kind_of => String, :name_property => true
 property :directory, :kind_of => String
 property :cookbook, :kind_of => String
 property :site, :kind_of => String, :name_property => true
 property :directory, :kind_of => String
 property :cookbook, :kind_of => String

-property :template, :kind_of => String, :required => true
+property :template, :kind_of => String, :required => [:create]

 property :variables, :kind_of => Hash, :default => {}
 
 action :create do
 property :variables, :kind_of => Hash, :default => {}
 
 action :create do

diff --git a/cookbooks/ohai/resources/plugin.rb b/cookbooks/ohai/resources/plugin.rb
index 580d4912f56ef70686a598b17fcde2d665b4b8be..5d550371faf7997fa3d8396ab03fa60cf4a2b55d 100644 (file)
--- a/cookbooks/ohai/resources/plugin.rb
+++ b/cookbooks/ohai/resources/plugin.rb
@@ -20,7 +20,7 @@
 default_action :create
 
 property :plugin, :kind_of => String, :name_property => true
 default_action :create
 
 property :plugin, :kind_of => String, :name_property => true

-property :template, :kind_of => String, :required => true
+property :template, :kind_of => String, :required => [:create]

 
 action :create do
   ohai new_resource.plugin do
 
 action :create do
   ohai new_resource.plugin do

diff --git a/cookbooks/postgresql/resources/database.rb b/cookbooks/postgresql/resources/database.rb
index c0e7e0de4b97d685afcea0966232c2c5cba7135c..c73250464c99b35a865ed9f2da62b9d7ac6fe9a8 100644 (file)
--- a/cookbooks/postgresql/resources/database.rb
+++ b/cookbooks/postgresql/resources/database.rb
@@ -21,7 +21,7 @@ default_action :create
 
 property :database, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 
 property :database, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true

-property :owner, :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"
 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"

diff --git a/cookbooks/postgresql/resources/table.rb b/cookbooks/postgresql/resources/table.rb
index 4bb2431eee68ce3452e06b02ac9bcdaf13033672..ed26559326cfbda1db84e665df8f2ddd76ababdf 100644 (file)
--- a/cookbooks/postgresql/resources/table.rb
+++ b/cookbooks/postgresql/resources/table.rb
@@ -23,7 +23,7 @@ property :table, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 property :database, :kind_of => String, :required => true
 property :schema, :kind_of => String, :default => "public"
 property :cluster, :kind_of => String, :required => true
 property :database, :kind_of => String, :required => true
 property :schema, :kind_of => String, :default => "public"

-property :owner, :kind_of => String, :required => true
+property :owner, :kind_of => String, :required => [:create]

 property :permissions, :kind_of => Hash, :default => {}
 
 action :create do
 property :permissions, :kind_of => Hash, :default => {}
 
 action :create do

diff --git a/cookbooks/postgresql/resources/tablespace.rb b/cookbooks/postgresql/resources/tablespace.rb
index 82e901228e861f9c994723f4fc0952f83ec5dc1c..69e0ce2b0c508e68dbf2106f28e1f1ea0ca17b2f 100644 (file)
--- a/cookbooks/postgresql/resources/tablespace.rb
+++ b/cookbooks/postgresql/resources/tablespace.rb
@@ -21,7 +21,7 @@ default_action :create
 
 property :tablespace, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true
 
 property :tablespace, :kind_of => String, :name_property => true
 property :cluster, :kind_of => String, :required => true

-property :location, :kind_of => String, :required => true
+property :location, :kind_of => String, :required => [:create]

 
 action :create do
   unless cluster.tablespaces.include?(new_resource.tablespace)
 
 action :create do
   unless cluster.tablespaces.include?(new_resource.tablespace)

diff --git a/cookbooks/squid/resources/fragment.rb b/cookbooks/squid/resources/fragment.rb
index 22c31ba47fbddc7b454c0c0f17a6d94b39779d9f..f4099ad7bd9fb4b62b0a753bee8f56d50342382d 100644 (file)
--- a/cookbooks/squid/resources/fragment.rb
+++ b/cookbooks/squid/resources/fragment.rb
@@ -20,7 +20,7 @@
 default_action :create
 
 property :fragment, :kind_of => String, :name_property => true
 default_action :create
 
 property :fragment, :kind_of => String, :name_property => true

-property :template, :kind_of => String, :required => true
+property :template, :kind_of => String, :required => [:create]

 property :variables, :kind_of => Hash, :default => {}
 
 action :create do
 property :variables, :kind_of => Hash, :default => {}
 
 action :create do

diff --git a/cookbooks/ssl/resources/certificate.rb b/cookbooks/ssl/resources/certificate.rb
index fd1bff0e4c13dc73d09e34280b8711e4529bd2bf..116c2bd4da0266a940bb02cd0b4f16dc375b0e5b 100644 (file)
--- a/cookbooks/ssl/resources/certificate.rb
+++ b/cookbooks/ssl/resources/certificate.rb
@@ -20,7 +20,7 @@
 default_action :create
 
 property :certificate, String, :name_property => true
 default_action :create
 
 property :certificate, String, :name_property => true

-property :domains, [String, Array], :required => true
+property :domains, [String, Array], :required => [:create]

 
 action :create do
   node.default[:letsencrypt][:certificates][new_resource.certificate] = {
 
 action :create do
   node.default[:letsencrypt][:certificates][new_resource.certificate] = {

diff --git a/cookbooks/systemd/resources/path.rb b/cookbooks/systemd/resources/path.rb
index 918e5f80193f90140c22f9ba15bc94032378ac82..29bbfa51c1782a664e8d809cddf76812871df5a2 100644 (file)
--- a/cookbooks/systemd/resources/path.rb
+++ b/cookbooks/systemd/resources/path.rb
@@ -20,7 +20,7 @@
 default_action :create
 
 property :path, String, :name_property => true
 default_action :create
 
 property :path, String, :name_property => true

-property :description, String, :required => true
+property :description, String, :required => [:create]

 property :after, [String, Array]
 property :wants, [String, Array]
 property :path_exists, [String, Array]
 property :after, [String, Array]
 property :wants, [String, Array]
 property :path_exists, [String, Array]

diff --git a/cookbooks/systemd/resources/timer.rb b/cookbooks/systemd/resources/timer.rb
index c18db64c8882db757480aef22562db48016cb8d0..7dc4cab6544a69b8be0dbd93c660e0d39166a9cf 100644 (file)
--- a/cookbooks/systemd/resources/timer.rb
+++ b/cookbooks/systemd/resources/timer.rb
@@ -20,7 +20,7 @@
 default_action :create
 
 property :timer, String, :name_property => true
 default_action :create
 
 property :timer, String, :name_property => true

-property :description, String, :required => true
+property :description, String, :required => [:create]

 property :after, [String, Array]
 property :wants, [String, Array]
 property :on_active_sec, [Integer, String]
 property :after, [String, Array]
 property :wants, [String, Array]
 property :on_active_sec, [Integer, String]

diff --git a/cookbooks/systemd/resources/tmpfile.rb b/cookbooks/systemd/resources/tmpfile.rb
index 2c294b5ba3a23559aad8ca120d14bd3b391aa64b..8eaf47316372e7b22ee3003462c2f617c927c1b2 100644 (file)
--- a/cookbooks/systemd/resources/tmpfile.rb
+++ b/cookbooks/systemd/resources/tmpfile.rb
@@ -19,7 +19,7 @@
 
 default_action :create
 
 
 default_action :create
 

-property :type, String, :required => true
+property :type, String, :required => [:create]

 property :path, String, :name_property => true
 property :mode, String, :default => "-"
 property :owner, String, :default => "-"
 property :path, String, :name_property => true
 property :mode, String, :default => "-"
 property :owner, String, :default => "-"

diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index c86705d5df02832725697960ed6a366358195a5f..1771c2a1bbb7f84b4c6e3ba5eff9c81a945afde5 100644 (file)
--- a/cookbooks/wordpress/resources/site.rb
+++ b/cookbooks/wordpress/resources/site.rb
@@ -25,8 +25,8 @@ property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String
 property :version, :kind_of => String
 property :database_name, :kind_of => String, :required => true
 property :directory, :kind_of => String
 property :version, :kind_of => String
 property :database_name, :kind_of => String, :required => true

-property :database_user, :kind_of => String, :required => true
-property :database_password, :kind_of => String, :required => true
+property :database_user, :kind_of => String, :required => [:create]
+property :database_password, :kind_of => String, :required => [:create]

 property :database_prefix, :kind_of => String, :default => "wp_"
 property :urls, :kind_of => Hash, :default => {}
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 property :database_prefix, :kind_of => String, :default => "wp_"
 property :urls, :kind_of => Hash, :default => {}
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true