summaryrefslogtreecommitdiff
path: root/lib/chef_zero/server.rb
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2014-07-16 15:52:10 -0700
committerJohn Keiser <jkeiser@opscode.com>2014-07-23 19:21:23 -0600
commitfa62b97a687a37df2fdcca317eeca91ebd7949cb (patch)
treec455b7ca54125adc7c8a0baed4f0f0d9f4489ff1 /lib/chef_zero/server.rb
parentb52e96e28b46fd549dede51055205ea2b329f4ad (diff)
downloadchef-zero-fa62b97a687a37df2fdcca317eeca91ebd7949cb.tar.gz
Add /organizations/ORG/association_requests/... endpoints
Diffstat (limited to 'lib/chef_zero/server.rb')
-rw-r--r--lib/chef_zero/server.rb17
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb
index db8cb36..a9adbff 100644
--- a/lib/chef_zero/server.rb
+++ b/lib/chef_zero/server.rb
@@ -60,6 +60,8 @@ require 'chef_zero/endpoints/node_endpoint'
require 'chef_zero/endpoints/organizations_endpoint'
require 'chef_zero/endpoints/organization_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'
require 'chef_zero/endpoints/principal_endpoint'
require 'chef_zero/endpoints/role_endpoint'
require 'chef_zero/endpoints/role_environments_endpoint'
@@ -404,8 +406,8 @@ module ChefZero
else
[
# # EC-only
- # [ "/organizations/*/users", EcUsersEndpoint.new(self) ],
- # [ "/organizations/*/users/*", EcUserEndpoint.new(self) ],
+ # [ "/organizations/*/users", EcOrgUsersEndpoint.new(self) ],
+ # [ "/organizations/*/users/*", EcOrgUserEndpoint.new(self) ],
[ "/users", ActorsEndpoint.new(self) ],
[ "/users/*", ActorEndpoint.new(self) ],
[ "/users/_acl", AclsEndpoint.new(self) ],
@@ -422,16 +424,17 @@ module ChefZero
[ "/organizations/*", OrganizationEndpoint.new(self) ],
[ "/organizations/*/_validator_key", OrganizationValidatorKeyEndpoint.new(self) ],
# [ "/organizations/*/members", RestObjectEndpoint.new(self) ],
- # [ "/organizations/*/association_requests", AssociationRequestsEndpoint.new(self) ],
- # [ "/organizations/*/association_requests/count", AssociationRequestsCountEndpoint.new(self) ],
- # [ "/organizations/*/association_requests/*", AssociationRequestEndpoint.new(self) ],
+ [ "/organizations/*/association_requests", OrganizationAssociationRequestsEndpoint.new(self) ],
+ [ "/organizations/*/association_requests/*", OrganizationAssociationRequestEndpoint.new(self) ],
+ # [ "/users/*/association_requests", UserAssocationRequestsEndpoint.new(self) ],
+ # [ "/users/*/association_requests/count", UserAssocationRequestsCountEndpoint.new(self) ],
+ # [ "/users/*/association_requests/*", UserAssociationRequestEndpoint.new(self) ],
+
[ "/organizations/*/containers", ContainersEndpoint.new(self) ],
[ "/organizations/*/containers/*", ContainerEndpoint.new(self) ],
[ "/organizations/*/groups", GroupsEndpoint.new(self) ],
[ "/organizations/*/groups/*", GroupEndpoint.new(self) ],
# [ "/users/*/organizations", UserOrganizationsEndpoint.new(self) ],
- # [ "/users/*/association_requests", UserAssocationRequestsEndpoint.new(self) ],
- # [ "/users/*/association_requests/*", UserAssociationRequestEndpoint.new(self) ],
[ "/organizations/*/organization/_acl", AclsEndpoint.new(self) ],
[ "/organizations/*/*/*/_acl", AclsEndpoint.new(self) ],
[ "/organizations/*/organization/_acl/*", AclEndpoint.new(self) ],