summaryrefslogtreecommitdiff
path: root/lib/chef_zero/server.rb
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2014-07-16 18:40:00 -0700
committerJohn Keiser <jkeiser@opscode.com>2014-07-23 19:21:23 -0600
commit2ced823a1f634e9afb5f20875ea35b741c66d075 (patch)
treedb34ebd48ca5104bca88a1508bd36525b63c3c48 /lib/chef_zero/server.rb
parent16dfd6a8016eed76834b24b5c0cb1d0926ebf109 (diff)
downloadchef-zero-2ced823a1f634e9afb5f20875ea35b741c66d075.tar.gz
Implement /organizations/ORG/users/... endpoints
Diffstat (limited to 'lib/chef_zero/server.rb')
-rw-r--r--lib/chef_zero/server.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb
index 1ae50c2..3ad4f94 100644
--- a/lib/chef_zero/server.rb
+++ b/lib/chef_zero/server.rb
@@ -59,6 +59,8 @@ require 'chef_zero/endpoints/environment_role_endpoint'
require 'chef_zero/endpoints/node_endpoint'
require 'chef_zero/endpoints/organizations_endpoint'
require 'chef_zero/endpoints/organization_endpoint'
+require 'chef_zero/endpoints/organization_users_endpoint'
+require 'chef_zero/endpoints/organization_user_endpoint'
require 'chef_zero/endpoints/organization_validator_key_endpoint'
require 'chef_zero/endpoints/organization_association_requests_endpoint'
require 'chef_zero/endpoints/organization_association_request_endpoint'
@@ -409,8 +411,8 @@ module ChefZero
else
[
# # EC-only
- # [ "/organizations/*/users", EcOrgUsersEndpoint.new(self) ],
- # [ "/organizations/*/users/*", EcOrgUserEndpoint.new(self) ],
+ [ "/organizations/*/users", OrganizationUsersEndpoint.new(self) ],
+ [ "/organizations/*/users/*", OrganizationUserEndpoint.new(self) ],
[ "/users", ActorsEndpoint.new(self) ],
[ "/users/*", ActorEndpoint.new(self) ],
[ "/users/_acl", AclsEndpoint.new(self) ],
@@ -426,7 +428,6 @@ module ChefZero
[ "/organizations", OrganizationsEndpoint.new(self) ],
[ "/organizations/*", OrganizationEndpoint.new(self) ],
[ "/organizations/*/_validator_key", OrganizationValidatorKeyEndpoint.new(self) ],
- # [ "/organizations/*/members", RestObjectEndpoint.new(self) ],
[ "/organizations/*/association_requests", OrganizationAssociationRequestsEndpoint.new(self) ],
[ "/organizations/*/association_requests/*", OrganizationAssociationRequestEndpoint.new(self) ],
[ "/users/*/association_requests", UserAssociationRequestsEndpoint.new(self) ],