summaryrefslogtreecommitdiff
path: root/lib/chef/chef_fs
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2014-08-27 14:27:59 -0700
committerJohn Keiser <jkeiser@opscode.com>2014-08-27 14:27:59 -0700
commita2c8256a6d699f254b24de61e2a7e1a20bbb2c3d (patch)
tree4d48a76d67192d793b64077f3dacbf0e9a4874ca /lib/chef/chef_fs
parent847365e6198056a82fbad48d835e8fed92282e14 (diff)
downloadchef-a2c8256a6d699f254b24de61e2a7e1a20bbb2c3d.tar.gz
Clean up acl data handler, add username to user handler for cheffishjk/data_handler_cleanup
Diffstat (limited to 'lib/chef/chef_fs')
-rw-r--r--lib/chef/chef_fs/data_handler/acl_data_handler.rb4
-rw-r--r--lib/chef/chef_fs/data_handler/user_data_handler.rb1
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef/chef_fs/data_handler/acl_data_handler.rb b/lib/chef/chef_fs/data_handler/acl_data_handler.rb
index 5ce4e335f4..8def8a543d 100644
--- a/lib/chef/chef_fs/data_handler/acl_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/acl_data_handler.rb
@@ -4,9 +4,9 @@ class Chef
module ChefFS
module DataHandler
class AclDataHandler < DataHandlerBase
- def normalize(node, entry)
+ def normalize(acl, entry)
# Normalize the order of the keys for easier reading
- result = normalize_hash(node, {
+ result = normalize_hash(acl, {
'create' => {},
'read' => {},
'update' => {},
diff --git a/lib/chef/chef_fs/data_handler/user_data_handler.rb b/lib/chef/chef_fs/data_handler/user_data_handler.rb
index 66a780690a..99a247f2db 100644
--- a/lib/chef/chef_fs/data_handler/user_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/user_data_handler.rb
@@ -7,6 +7,7 @@ class Chef
def normalize(user, entry)
normalize_hash(user, {
'name' => remove_dot_json(entry.name),
+ 'username' => remove_dot_json(entry.name),
'admin' => false,
'json_class' => 'Chef::WebUIUser',
'chef_type' => 'webui_user',