diff options
Diffstat (limited to 'lib/chef/chef_fs/data_handler')
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/chef/chef_fs/data_handler/container_data_handler.rb b/lib/chef/chef_fs/data_handler/container_data_handler.rb index 6e578e53d6..27bb9dc736 100644 --- a/lib/chef/chef_fs/data_handler/container_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/container_data_handler.rb @@ -15,7 +15,7 @@ class Chef return key == "containername" end - def verify_integrity(object, entry, &on_error) + def verify_integrity(object, entry) base_name = remove_dot_json(entry.name) if object["containername"] != base_name yield("Name in #{entry.path_for_printing} must be '#{base_name}' (is '#{object['name']}')") diff --git a/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb b/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb index 3b609fad4e..89087e159f 100644 --- a/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb @@ -42,7 +42,7 @@ class Chef Chef::DataBagItem end - def verify_integrity(object, entry, &on_error) + def verify_integrity(object, entry) base_name = remove_dot_json(entry.name) if object["raw_data"]["id"] != base_name yield("ID in #{entry.path_for_printing} must be '#{base_name}' (is '#{object['raw_data']['id']}')") diff --git a/lib/chef/chef_fs/data_handler/data_handler_base.rb b/lib/chef/chef_fs/data_handler/data_handler_base.rb index 93d54e3bee..f487218f31 100644 --- a/lib/chef/chef_fs/data_handler/data_handler_base.rb +++ b/lib/chef/chef_fs/data_handler/data_handler_base.rb @@ -189,7 +189,7 @@ class Chef # Verify that the JSON hash for this type has a key that matches its name. # Calls the on_error block with the error, if there is one. # - def verify_integrity(object, entry, &on_error) + def verify_integrity(object, entry) base_name = remove_dot_json(entry.name) if object["name"] != base_name yield("Name must be '#{base_name}' (is '#{object['name']}')") diff --git a/lib/chef/chef_fs/data_handler/organization_data_handler.rb b/lib/chef/chef_fs/data_handler/organization_data_handler.rb index d61e4f454a..4afde75d40 100644 --- a/lib/chef/chef_fs/data_handler/organization_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/organization_data_handler.rb @@ -19,7 +19,7 @@ class Chef return key == "name" end - def verify_integrity(object, entry, &on_error) + def verify_integrity(object, entry) if entry.org != object["name"] yield("Name must be '#{entry.org}' (is '#{object['name']}')") end diff --git a/lib/chef/chef_fs/data_handler/policy_data_handler.rb b/lib/chef/chef_fs/data_handler/policy_data_handler.rb index 47f534bfc9..f88b41401f 100644 --- a/lib/chef/chef_fs/data_handler/policy_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/policy_data_handler.rb @@ -26,7 +26,7 @@ class Chef normalize_hash(policy, defaults) end - def verify_integrity(object_data, entry, &on_error) + def verify_integrity(object_data, entry) name, revision = name_and_revision(entry.name) if object_data["name"] != name yield("Object name '#{object_data['name']}' doesn't match entry '#{entry.name}'.") diff --git a/lib/chef/chef_fs/data_handler/policy_group_data_handler.rb b/lib/chef/chef_fs/data_handler/policy_group_data_handler.rb index d3bdd81e25..e20676a791 100644 --- a/lib/chef/chef_fs/data_handler/policy_group_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/policy_group_data_handler.rb @@ -15,7 +15,7 @@ class Chef result end - def verify_integrity(object_data, entry, &on_error) + def verify_integrity(object_data, entry) if object_data["policies"].empty? yield("Policy group #{object_data["name"]} does not have any policies in it.") end |