summaryrefslogtreecommitdiff
path: root/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb')
-rw-r--r--lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb6
1 files changed, 2 insertions, 4 deletions
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..4ad3dfe5b8 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
@@ -38,10 +38,8 @@ class Chef
end
def api_child_name
- if name.length < 5 || name[-5, 5] != ".json"
- raise "Invalid name #{path}: must end in .json"
- end
- name[0, name.length - 5]
+ raise "Invalid name #{path}" unless is_ruby_or_json_file?(path)
+ File.basename(path, ".*")
end
def api_path