Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add /organizations/NAME/nodes/NAME/_identifiers endpoint #152

Merged
merged 2 commits into from
Aug 12, 2015
Merged

Add /organizations/NAME/nodes/NAME/_identifiers endpoint #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae7634c
Disable CS12 pedant flags
Aug 12, 2015
3197fc4
Preliminary support for _identifiers API
Aug 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions lib/chef_zero/endpoints/node_identifiers_endpoint.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
require 'ffi_yajl'
require 'chef_zero/rest_base'
require 'uuidtools'

module ChefZero
module Endpoints
# /organizations/NAME/nodes/NAME/_identifiers
class NodeIdentifiersEndpoint < RestBase
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the documentation on how this endpoint is supposed to work? Did you just look at the server code?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at the server code and the pedant test cases. This endpoint is implemented in https://github.com/chef/chef-server/blob/master/src/oc_erchef/apps/oc_chef_wm/src/chef_wm_object_identifiers.erl.

FWIW, I'm not super happy with this implementation, it was meant as a stub so that tests pass. I would prefer that someone with more experience with Chef Server code could review and/or update to ensure it is correct.

def get(request)
if get_data(request, request.rest_path[0..3])
result = {
:id => UUIDTools::UUID.parse_raw(request.rest_path[0..4].to_s).to_s.gsub('-',''),
:authz_id => '0'*32,
:org_id => UUIDTools::UUID.parse_raw(request.rest_path[0..1].to_s).to_s.gsub('-','') }
json_response(200, result)
else
raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
end
end
end
end
end
2 changes: 2 additions & 0 deletions lib/chef_zero/server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
require 'chef_zero/endpoints/environment_role_endpoint'
require 'chef_zero/endpoints/license_endpoint'
require 'chef_zero/endpoints/node_endpoint'
require 'chef_zero/endpoints/node_identifiers_endpoint'
require 'chef_zero/endpoints/organizations_endpoint'
require 'chef_zero/endpoints/organization_endpoint'
require 'chef_zero/endpoints/organization_association_requests_endpoint'
Expand Down Expand Up @@ -540,6 +541,7 @@ def open_source_endpoints
[ "/organizations/*/environments/*/roles/*", EnvironmentRoleEndpoint.new(self) ],
[ "/organizations/*/nodes", RestListEndpoint.new(self) ],
[ "/organizations/*/nodes/*", NodeEndpoint.new(self) ],
[ "/organizations/*/nodes/*/_identifiers", NodeIdentifiersEndpoint.new(self) ],
[ "/organizations/*/policies/*/*", PoliciesEndpoint.new(self) ],
[ "/organizations/*/principals/*", PrincipalEndpoint.new(self) ],
[ "/organizations/*/roles", RestListEndpoint.new(self) ],
Expand Down
10 changes: 9 additions & 1 deletion spec/run_oc_pedant.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,15 @@
'--skip-omnibus',
'--skip-usags',
'--exclude-internal-orgs',
'--skip-headers'
'--skip-headers',

# Chef 12 features not yet 100% supported by Chef Zero
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're going to accept this commit we definitely need to file another bug to go back and make these work so we get feature parity. I don't know about api-v1 but all the other features are new and just require adding. Before we put out the next minor release I would like to make sure that chef-zero supports these.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @tyler-ball, I've filed #153 to track this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed - api-v1 is actually pretty critical as well and the implied API versioning support I've opened that as #154

'--skip-policies',
'--skip-server-api-version',
'--skip-cookbook-artifacts',
'--skip-containers',
'--skip-api-v1'

])

result = RSpec::Core::Runner.run(Pedant.config.rspec_args)
Expand Down