Merge pull request #1218 from jeremymv2/jeremymv2/node_http_head

support HEAD http request on named node endpoint

oc-chef-pedant/lib/pedant/request.rb

@@ -173,6 +173,10 @@ def get(url, requestor, opts={}, &validator)
       authenticated_request :GET, url, requestor, opts, &validator
     end
 
+    def head(url, requestor, opts={}, &validator)
+      authenticated_request :HEAD, url, requestor, opts, &validator
+    end
+
     def put(url, requestor, opts={}, &validator)
       authenticated_request :PUT, url, requestor, opts, &validator
     end

oc-chef-pedant/lib/pedant/rspec/node_util.rb

@@ -202,6 +202,12 @@ def validates_run_list
         }
       end
 
+      let(:head_success_response) do
+        {
+          :status => 200
+        }
+      end
+
       let(:fetch_node_list_empty_response) do
         {
           :status => 200,

oc-chef-pedant/spec/api/nodes/complete_endpoint_spec.rb

@@ -85,6 +85,25 @@
     end
   end # GET /nodes/<name>
 
+  context 'HEAD /nodes/<name>' do
+    let(:request_method) { :HEAD }
+    let(:request_url)    { api_url("/nodes/#{node_name}") }
+
+    context 'for a nonexistent node' do
+      let(:node_name){nonexistent_node_name}
+      it 'returns a 404', :smoke do
+        should look_like http_404_response
+      end
+    end
+
+    context 'for an existing node' do
+      include_context 'with temporary testing node'
+      it 'returns a 200', :smoke do
+        should look_like head_success_response
+      end
+    end
+  end # HEAD /nodes/<name>
+
   context 'GET /environments/<environment_name>/nodes' do
     let(:request_method) { :GET }
     let(:request_url)    { api_url("/environments/#{environment_name}/nodes") }

src/oc_erchef/apps/oc_chef_wm/src/chef_wm_named_node.erl

@@ -57,9 +57,10 @@ request_type() ->
   "nodes".
 
 allowed_methods(Req, State) ->
-    {['GET', 'PUT', 'DELETE'], Req, State}.
+    {['HEAD', 'GET', 'PUT', 'DELETE'], Req, State}.
 
 validate_request(Method, Req, State) when Method == 'GET';
+                                          Method == 'HEAD';
                                           Method == 'DELETE' ->
     {Req, State};
 validate_request('PUT', Req, #base_state{resource_state = NodeState} = State) ->
@@ -87,8 +88,13 @@ auth_info(Req, #base_state{chef_db_context = DbContext,
     end.
 
 to_json(Req, #base_state{resource_state = NodeState} = State) ->
-    #node_state{chef_node = Node} = NodeState,
-    {chef_db_compression:decompress(Node#chef_node.serialized_object), Req, State}.
+    case wrq:method(Req) of
+      'HEAD' ->
+        {<<>>, Req, State};
+      _ ->
+        #node_state{chef_node = Node} = NodeState,
+        {chef_db_compression:decompress(Node#chef_node.serialized_object), Req, State}
+    end.
 
 from_json(Req, #base_state{resource_state = #node_state{chef_node = Node,
                                                         node_data = NodeData}} = State) ->

src/oc_erchef/apps/oc_chef_wm/src/oc_chef_action.erl

@@ -73,6 +73,8 @@ log_action(Req, #base_state{resource_state = ResourceState,
     case wrq:method(Req) of
         'GET' ->
             ok;
+        'HEAD' ->
+            ok;
         _ElseMethod -> %% POST, PUT, DELETE
             case ResourceMod of
                 oc_chef_wm_authenticate_user ->  %% POST to authenticate_user should not be an action.

src/oc_erchef/apps/oc_chef_wm/src/oc_chef_wm_base.erl

@@ -539,6 +539,8 @@ http_method_to_authz_perm(#wm_reqdata{}=Req) ->
     http_method_to_authz_perm(wrq:method(Req));
 http_method_to_authz_perm('DELETE') ->
     delete;
+http_method_to_authz_perm('HEAD') ->
+    read;
 http_method_to_authz_perm('GET') ->
     read;
 http_method_to_authz_perm('POST') ->