Merge pull request #19 from nitrictech/feature/more-pythonic

fix: return actual python dicts for headers and query_params

Author: tjholm

nitric/faas/trigger.py

@@ -103,10 +103,10 @@ def from_trigger_request(trigger_request: TriggerRequest):
         if trigger_request.http is not None:
             return TriggerContext(
                 context=HttpTriggerContext(
-                    headers=trigger_request.http.headers,
+                    headers=dict(trigger_request.http.headers),
                     path=trigger_request.http.path,
                     method=trigger_request.http.method,
-                    query_params=trigger_request.http.query_params,
+                    query_params=dict(trigger_request.http.query_params),
                 )
             )
         elif trigger_request.topic is not None:

tests/faas/test_start.py

@@ -21,7 +21,7 @@
 from nitric.faas import Response, ResponseContext, HttpResponseContext
 from nitric.faas import start
 from nitric.faas.faas import Handler
-from nitric.proto.faas.v1.faas_pb2 import TriggerResponse
+from nitric.proto.faas.v1.faas_pb2 import TriggerResponse, TriggerRequest
 from google.protobuf import json_format
 
 
@@ -50,7 +50,10 @@ def test_full_response(self):
 
         return_body = json_format.MessageToJson(mock_response.to_grpc_trigger_response_context())
 
-        with patch("nitric.faas.faas.construct_request", Mock()):
+        construct_request_mock = Mock()
+        construct_request_mock.return_value = TriggerRequest()
+
+        with patch("nitric.faas.faas.construct_request", construct_request_mock):
             handler = Handler(mock_func)
             response = handler()
 
@@ -62,7 +65,10 @@ def test_unhandled_exception(self):
         def error_func():
             raise Exception("mock error")
 
-        with patch("nitric.faas.faas.construct_request", Mock()):
+        construct_request_mock = Mock()
+        construct_request_mock.return_value = TriggerRequest()
+
+        with patch("nitric.faas.faas.construct_request", construct_request_mock):
             handler = Handler(error_func)
             response = handler()
 
@@ -78,7 +84,10 @@ def test_debug_unhandled_exception(self):
         def error_func():
             raise Exception("mock error")
 
-        with patch("nitric.faas.faas.construct_request", Mock()):
+        construct_request_mock = Mock()
+        construct_request_mock.return_value = TriggerRequest()
+
+        with patch("nitric.faas.faas.construct_request", construct_request_mock):
             handler = Handler(error_func)
             response = handler()
 
@@ -94,7 +103,10 @@ def test_str_response(self):
         mock_func = Mock()
         mock_func.return_value = "test"
 
-        with patch("nitric.faas.faas.construct_request", Mock()):
+        construct_request_mock = Mock()
+        construct_request_mock.return_value = TriggerRequest()
+
+        with patch("nitric.faas.faas.construct_request", construct_request_mock):
             handler = Handler(mock_func)
             response = handler()
 
@@ -109,7 +121,10 @@ def no_response(request):
             # do nothing
             mock = Mock()
 
-        with patch("nitric.faas.faas.construct_request", Mock()):
+        construct_request_mock = Mock()
+        construct_request_mock.return_value = TriggerRequest()
+
+        with patch("nitric.faas.faas.construct_request", construct_request_mock):
             handler = Handler(no_response)
             response = handler()