diff options
author | Thom May <thom@chef.io> | 2016-04-11 18:44:11 +0100 |
---|---|---|
committer | Thom May <thom@chef.io> | 2016-04-13 10:07:08 +0100 |
commit | e6c9c3a03d7b770bcf8f7786617b6644d24a6b8a (patch) | |
tree | 67b4bf62d6f040f93ab62eb641c123558c82cc0c /lib/chef/chef_fs/file_system/chef_server | |
parent | e7d602b1225041b5f2815dab235bba901dd8d341 (diff) | |
download | chef-e6c9c3a03d7b770bcf8f7786617b6644d24a6b8a.tar.gz |
Move all ChefFS exceptions into a single filetm/combined_chef_fs_exceptions
This leaves back compat requires to ensure nothing breaks.
Diffstat (limited to 'lib/chef/chef_fs/file_system/chef_server')
11 files changed, 11 insertions, 19 deletions
diff --git a/lib/chef/chef_fs/file_system/chef_server/acl_dir.rb b/lib/chef/chef_fs/file_system/chef_server/acl_dir.rb index 58a32d3860..9f4d13f5a9 100644 --- a/lib/chef/chef_fs/file_system/chef_server/acl_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/acl_dir.rb @@ -18,7 +18,7 @@ require "chef/chef_fs/file_system/base_fs_dir" require "chef/chef_fs/file_system/chef_server/acl_entry" -require "chef/chef_fs/file_system/operation_not_allowed_error" +require "chef/chef_fs/file_system/exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb b/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb index cf634256bb..68df3704bf 100644 --- a/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb @@ -17,9 +17,7 @@ # require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/file_system/not_found_error" -require "chef/chef_fs/file_system/operation_not_allowed_error" -require "chef/chef_fs/file_system/operation_failed_error" +require "chef/chef_fs/file_system/exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb index f7e5f058be..3fa5b49eb1 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb @@ -20,7 +20,7 @@ require "chef/chef_fs/command_line" require "chef/chef_fs/file_system/chef_server/rest_list_dir" require "chef/chef_fs/file_system/chef_server/cookbook_subdir" require "chef/chef_fs/file_system/chef_server/cookbook_file" -require "chef/chef_fs/file_system/not_found_error" +require "chef/chef_fs/file_system/exceptions" require "chef/cookbook_version" require "chef/cookbook_uploader" diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb index 72cefe44eb..631562d7ef 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb @@ -18,8 +18,7 @@ require "chef/chef_fs/file_system/chef_server/rest_list_dir" require "chef/chef_fs/file_system/chef_server/cookbook_dir" -require "chef/chef_fs/file_system/operation_failed_error" -require "chef/chef_fs/file_system/cookbook_frozen_error" +require "chef/chef_fs/file_system/exceptions" require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir" require "chef/mixin/file_class" diff --git a/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb b/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb index 6b06550a0a..5ad0063807 100644 --- a/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb @@ -17,8 +17,7 @@ # require "chef/chef_fs/file_system/chef_server/rest_list_dir" -require "chef/chef_fs/file_system/not_found_error" -require "chef/chef_fs/file_system/must_delete_recursively_error" +require "chef/chef_fs/file_system/exceptions" require "chef/chef_fs/data_handler/data_bag_item_data_handler" class Chef diff --git a/lib/chef/chef_fs/file_system/chef_server/environments_dir.rb b/lib/chef/chef_fs/file_system/chef_server/environments_dir.rb index 494036931f..81ae81ac0d 100644 --- a/lib/chef/chef_fs/file_system/chef_server/environments_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/environments_dir.rb @@ -18,8 +18,7 @@ require "chef/chef_fs/file_system/base_fs_dir" require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/file_system/not_found_error" -require "chef/chef_fs/file_system/default_environment_cannot_be_modified_error" +require "chef/chef_fs/file_system/exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb b/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb index 6ecc7f4336..4f83b89711 100644 --- a/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb @@ -18,7 +18,7 @@ require "chef/chef_fs/file_system/base_fs_dir" require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/file_system/not_found_error" +require "chef/chef_fs/file_system/exceptions" require "chef/chef_fs/data_handler/node_data_handler" class Chef diff --git a/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb b/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb index 98a0463069..b7413c44c5 100644 --- a/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb @@ -16,9 +16,7 @@ # limitations under the License. # -require "chef/chef_fs/file_system/already_exists_error" -require "chef/chef_fs/file_system/not_found_error" -require "chef/chef_fs/file_system/operation_failed_error" +require "chef/chef_fs/file_system/exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/policy_groups_dir.rb b/lib/chef/chef_fs/file_system/chef_server/policy_groups_dir.rb index 7243996cbb..0452fa4573 100644 --- a/lib/chef/chef_fs/file_system/chef_server/policy_groups_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/policy_groups_dir.rb @@ -18,7 +18,7 @@ require "chef/chef_fs/file_system/base_fs_dir" require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/file_system/not_found_error" +require "chef/chef_fs/file_system/exceptions" require "chef/chef_fs/file_system/chef_server/policy_group_entry" class Chef diff --git a/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb b/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb index b5b602a208..276f7760b5 100644 --- a/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb @@ -18,7 +18,7 @@ require "chef/chef_fs/file_system/base_fs_dir" require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/file_system/not_found_error" +require "chef/chef_fs/file_system/exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb b/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb index 5b9252ba03..9b16bd80de 100644 --- a/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb @@ -17,8 +17,7 @@ # require "chef/chef_fs/file_system/base_fs_object" -require "chef/chef_fs/file_system/not_found_error" -require "chef/chef_fs/file_system/operation_failed_error" +require "chef/chef_fs/file_system/exceptions" require "chef/role" require "chef/node" require "chef/json_compat" |