diff options
| author | Tyler Cloke <tylercloke@gmail.com> | 2016-03-16 15:33:05 -0700 |
|---|---|---|
| committer | Tyler Cloke <tylercloke@gmail.com> | 2016-03-16 15:33:05 -0700 |
| commit | 6715eb0f0e95b8d330d4028cf54a2c0af18e413e (patch) | |
| tree | dbcb0885c687a3bac8519453989bb05f64f3fe25 /lib/chef_zero/server.rb | |
| parent | 601cfb2079ec394aa25cd9f75073dbadc1b67259 (diff) | |
| parent | 0b425910236c9082745a01d155f8b7b3067892bf (diff) | |
| download | chef-zero-6715eb0f0e95b8d330d4028cf54a2c0af18e413e.tar.gz | |
Merge pull request #205 from chef/tc/org-scoped-user-keys-get
Implemented GET /orgs/ORG/users/USER/keys(/key) endpoint recently added to server.
Diffstat (limited to 'lib/chef_zero/server.rb')
| -rw-r--r-- | lib/chef_zero/server.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb index 7d508ca..9378afb 100644 --- a/lib/chef_zero/server.rb +++ b/lib/chef_zero/server.rb @@ -43,6 +43,9 @@ require 'chef_zero/endpoints/acl_endpoint' require 'chef_zero/endpoints/actor_endpoint' require 'chef_zero/endpoints/actors_endpoint' require 'chef_zero/endpoints/actor_key_endpoint' +require 'chef_zero/endpoints/organization_user_key_endpoint' +require 'chef_zero/endpoints/organization_user_default_key_endpoint' +require 'chef_zero/endpoints/organization_user_keys_endpoint' require 'chef_zero/endpoints/actor_default_key_endpoint' require 'chef_zero/endpoints/actor_keys_endpoint' require 'chef_zero/endpoints/cookbooks_endpoint' @@ -526,7 +529,7 @@ module ChefZero [ [ "/organizations/*/users", ActorsEndpoint.new(self) ], [ "/organizations/*/users/*", ActorEndpoint.new(self) ], - [ "/organizations/*/authenticate_user", OrganizationAuthenticateUserEndpoint.new(self) ], + [ "/organizations/*/authenticate_user", OrganizationAuthenticateUserEndpoint.new(self) ] ] else # EC-only @@ -547,7 +550,6 @@ module ChefZero [ "/authenticate_user", AuthenticateUserEndpoint.new(self) ], [ "/system_recovery", SystemRecoveryEndpoint.new(self) ], [ "/license", LicenseEndpoint.new(self) ], - [ "/organizations", OrganizationsEndpoint.new(self) ], [ "/organizations/*", OrganizationEndpoint.new(self) ], [ "/organizations/*/_validator_key", OrganizationValidatorKeyEndpoint.new(self) ], @@ -573,6 +575,9 @@ module ChefZero [ "/organizations/*/clients/*/keys", ActorKeysEndpoint.new(self) ], [ "/organizations/*/clients/*/keys/default", ActorDefaultKeyEndpoint.new(self) ], [ "/organizations/*/clients/*/keys/*", ActorKeyEndpoint.new(self) ], + [ "/organizations/*/users/*/keys", OrganizationUserKeysEndpoint.new(self) ], + [ "/organizations/*/users/*/keys/default", OrganizationUserDefaultKeyEndpoint.new(self) ], + [ "/organizations/*/users/*/keys/*", OrganizationUserKeyEndpoint.new(self) ], [ "/organizations/*/controls", ControlsEndpoint.new(self) ], [ "/organizations/*/cookbooks", CookbooksEndpoint.new(self) ], [ "/organizations/*/cookbooks/*", CookbookEndpoint.new(self) ], |