Revert "Add Cloud Events support for #55 (#56) (#64)"

This reverts commit 8f3fe35.

Author: di

README.md

@@ -129,57 +129,27 @@ You can configure the Functions Framework using command-line flags or environmen
 | `--host`           | `HOST`                    | The host on which the Functions Framework listens for requests. Default: `0.0.0.0`                                                                                                               |
 | `--port`           | `PORT`                    | The port on which the Functions Framework listens for requests. Default: `8080`                                                                                                                  |
 | `--target`         | `FUNCTION_TARGET`         | The name of the exported function to be invoked in response to requests. Default: `function`                                                                                                     |
-| `--signature-type` | `FUNCTION_SIGNATURE_TYPE` | The signature used when writing your function. Controls unmarshalling rules and determines which arguments are used to invoke your function. Default: `http`; accepted values: `http` or `event` or `cloudevent` |
+| `--signature-type` | `FUNCTION_SIGNATURE_TYPE` | The signature used when writing your function. Controls unmarshalling rules and determines which arguments are used to invoke your function. Default: `http`; accepted values: `http` or `event` |
 | `--source`         | `FUNCTION_SOURCE`         | The path to the file containing your function. Default: `main.py` (in the current working directory)                                                                                             |
 | `--debug`          | `DEBUG`                   | A flag that allows to run functions-framework to run in debug mode, including live reloading. Default: `False`                                                                                   |
 
+# Enable CloudEvents
 
-# Enable Google Cloud Functions Events
-
-The Functions Framework can unmarshall incoming
-Google Cloud Functions [event](https://cloud.google.com/functions/docs/concepts/events-triggers#events) payloads to `data` and `context` objects.
-These will be passed as arguments to your function when it receives a request.
-Note that your function must use the `event`-style function signature:
-
+The Functions Framework can unmarshall incoming [CloudEvents](http://cloudevents.io) payloads to `data` and `context` objects.  These will be passed as arguments to your function when it receives a request.  Note that your function must use the event-style function signature:
 
 ```python
 def hello(data, context):
     print(data)
     print(context)
 ```
 
-To enable automatic unmarshalling, set the function signature type to `event`
-using a command-line flag or an environment variable. By default, the HTTP
-signature will be used and automatic event unmarshalling will be disabled.
-
-For more details on this signature type, check out the Google Cloud Functions
-documentation on
-[background functions](https://cloud.google.com/functions/docs/writing/background#cloud_pubsub_example).
-
-See the [running example](examples/cloud_run_event).
-
-# Enable CloudEvents
-
-The Functions Framework can unmarshall incoming
-[CloudEvent](http://cloudevents.io) payloads to a `cloudevent` object.
-It will be passed as an argument to your function when it receives a request.
-Note that your function must use the `cloudevent`-style function signature
-
-
-```python
-def hello(cloudevent):
-    print("Received event with ID: %s" % cloudevent.EventID())
-    return 200
-```
-
-To enable automatic unmarshalling, set the function signature type to `cloudevent` using the `--signature-type` command-line flag or the `FUNCTION_SIGNATURE_TYPE` environment variable. By default, the HTTP signature type will be used and automatic event unmarshalling will be disabled.
+To enable automatic unmarshalling, set the function signature type to `event` using the `--signature-type` command-line flag or the `FUNCTION_SIGNATURE_TYPE` environment variable. By default, the HTTP signature type will be used and automatic event unmarshalling will be disabled.
 
-See the [running example](examples/cloud_run_cloudevents).
+For more details on this signature type, check out the Google Cloud Functions documentation on [background functions](https://cloud.google.com/functions/docs/writing/background#cloud_pubsub_example).
 
 # Advanced Examples
 
-More advanced guides can be found in the [`examples/`](./examples/) directory. You can also find examples
-on using the CloudEvent Python SDK [here](https://github.com/cloudevents/sdk-python).
+More advanced guides can be found in the [`examples/`](./examples/) directory.
 
 # Contributing
 

examples/README.md

@@ -1,5 +1,4 @@
 # Python Functions Frameworks Examples
 
 * [`cloud_run_http`](./cloud_run_http/) - Deploying an HTTP function to [Cloud Run](http://cloud.google.com/run) with the Functions Framework
-* [`cloud_run_event`](./cloud_run_event/) - Deploying a [Google Cloud Functions Event](https://cloud.google.com/functions/docs/concepts/events-triggers#events) function to [Cloud Run](http://cloud.google.com/run) with the Functions Framework
-* [`cloud_run_cloudevents`](./cloud_run_cloudevents/) - Deploying a [CloudEvent](https://github.com/cloudevents/sdk-python) function to [Cloud Run](http://cloud.google.com/run) with the Functions Framework
+* [`cloud_run_event`](./cloud_run_event/) - Deploying a CloudEvent function to [Cloud Run](http://cloud.google.com/run) with the Functions Framework

examples/cloud_run_cloudevents/Dockerfile

@@ -12,4 +12,4 @@ RUN pip install gunicorn functions-framework
 RUN pip install -r requirements.txt
 
 # Run the web service on container startup.
-CMD exec functions-framework --target=hello --signature_type=event
+CMD exec functions-framework --target=hello --signature-type=event

examples/cloud_run_cloudevents/README.md

@@ -52,7 +52,6 @@
         "click>=7.0,<8.0",
         "watchdog>=0.10.0",
         "gunicorn>=19.2.0,<21.0; platform_system!='Windows'",
-        "cloudevents<1.0",
     ],
     entry_points={
         "console_scripts": [

examples/cloud_run_cloudevents/main.py

@@ -12,19 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import enum
+import functools
 import importlib.util
-import io
-import json
 import os.path
 import pathlib
 import sys
 import types
 
-import cloudevents.sdk
-import cloudevents.sdk.event
-import cloudevents.sdk.event.v1
-import cloudevents.sdk.marshaller
 import flask
 import werkzeug
 
@@ -42,12 +36,6 @@
 MAX_CONTENT_LENGTH = 10 * 1024 * 1024
 
 
-class _EventType(enum.Enum):
-    LEGACY = 1
-    CLOUDEVENT_BINARY = 2
-    CLOUDEVENT_STRUCTURED = 3
-
-
 class _Event(object):
     """Event passed to background functions."""
 
@@ -80,83 +68,38 @@ def view_func(path):
     return view_func
 
 
-def _get_cloudevent_version():
-    return cloudevents.sdk.event.v1.Event()
-
-
-def _run_legacy_event(function, request):
-    event_data = request.get_json()
-    if not event_data:
-        flask.abort(400)
-    event_object = _Event(**event_data)
-    data = event_object.data
-    context = Context(**event_object.context)
-    function(data, context)
-
-
-def _run_binary_cloudevent(function, request, cloudevent_def):
-    data = io.BytesIO(request.get_data())
-    http_marshaller = cloudevents.sdk.marshaller.NewDefaultHTTPMarshaller()
-    event = http_marshaller.FromRequest(
-        cloudevent_def, request.headers, data, json.load
-    )
-
-    function(event)
-
-
-def _run_structured_cloudevent(function, request, cloudevent_def):
-    data = io.StringIO(request.get_data(as_text=True))
-    m = cloudevents.sdk.marshaller.NewDefaultHTTPMarshaller()
-    event = m.FromRequest(cloudevent_def, request.headers, data, json.loads)
-    function(event)
-
-
-def _get_event_type(request):
-    if (
+def _is_binary_cloud_event(request):
+    return (
         request.headers.get("ce-type")
         and request.headers.get("ce-specversion")
         and request.headers.get("ce-source")
         and request.headers.get("ce-id")
-    ):
-        return _EventType.CLOUDEVENT_BINARY
-    elif request.headers.get("Content-Type") == "application/cloudevents+json":
-        return _EventType.CLOUDEVENT_STRUCTURED
-    else:
-        return _EventType.LEGACY
+    )
 
 
 def _event_view_func_wrapper(function, request):
     def view_func(path):
-        if _get_event_type(request) == _EventType.LEGACY:
-            _run_legacy_event(function, request)
-        else:
-            # here for defensive backwards compatibility in case we make a mistake in rollout.
-            flask.abort(
-                400,
-                description="The FUNCTION_SIGNATURE_TYPE for this function is set to event "
-                "but no Google Cloud Functions Event was given. If you are using CloudEvents set "
-                "FUNCTION_SIGNATURE_TYPE=cloudevent",
+        if _is_binary_cloud_event(request):
+            # Support CloudEvents in binary content mode, with data being the
+            # whole request body and context attributes retrieved from request
+            # headers.
+            data = request.get_data()
+            context = Context(
+                eventId=request.headers.get("ce-eventId"),
+                timestamp=request.headers.get("ce-timestamp"),
+                eventType=request.headers.get("ce-eventType"),
+                resource=request.headers.get("ce-resource"),
             )
-
-        return "OK"
-
-    return view_func
-
-
-def _cloudevent_view_func_wrapper(function, request):
-    def view_func(path):
-        cloudevent_def = _get_cloudevent_version()
-        event_type = _get_event_type(request)
-        if event_type == _EventType.CLOUDEVENT_STRUCTURED:
-            _run_structured_cloudevent(function, request, cloudevent_def)
-        elif event_type == _EventType.CLOUDEVENT_BINARY:
-            _run_binary_cloudevent(function, request, cloudevent_def)
+            function(data, context)
         else:
-            flask.abort(
-                400,
-                description="Function was defined with FUNCTION_SIGNATURE_TYPE=cloudevent "
-                " but it did not receive a cloudevent as a request.",
-            )
+            # This is a regular CloudEvent
+            event_data = request.get_json()
+            if not event_data:
+                flask.abort(400)
+            event_object = _Event(**event_data)
+            data = event_object.data
+            context = Context(**event_object.context)
+            function(data, context)
 
         return "OK"
 
@@ -263,27 +206,19 @@ def create_app(target=None, source=None, signature_type=None):
         app.view_functions["run"] = _http_view_func_wrapper(function, flask.request)
         app.view_functions["error"] = lambda: flask.abort(404, description="Not Found")
         app.after_request(read_request)
-    elif signature_type == "event" or signature_type == "cloudevent":
+    elif signature_type == "event":
         app.url_map.add(
             werkzeug.routing.Rule(
-                "/", defaults={"path": ""}, endpoint=signature_type, methods=["POST"]
+                "/", defaults={"path": ""}, endpoint="run", methods=["POST"]
             )
         )
         app.url_map.add(
-            werkzeug.routing.Rule(
-                "/<path:path>", endpoint=signature_type, methods=["POST"]
-            )
+            werkzeug.routing.Rule("/<path:path>", endpoint="run", methods=["POST"])
         )
-
+        app.view_functions["run"] = _event_view_func_wrapper(function, flask.request)
         # Add a dummy endpoint for GET /
         app.url_map.add(werkzeug.routing.Rule("/", endpoint="get", methods=["GET"]))
         app.view_functions["get"] = lambda: ""
-
-        # Add the view functions
-        app.view_functions["event"] = _event_view_func_wrapper(function, flask.request)
-        app.view_functions["cloudevent"] = _cloudevent_view_func_wrapper(
-            function, flask.request
-        )
     else:
         raise FunctionsFrameworkException(
             "Invalid signature type: {signature_type}".format(

examples/cloud_run_cloudevents/requirements.txt

@@ -26,7 +26,7 @@
 @click.option(
     "--signature-type",
     envvar="FUNCTION_SIGNATURE_TYPE",
-    type=click.Choice(["http", "event", "cloudevent"]),
+    type=click.Choice(["http", "event"]),
     default="http",
 )
 @click.option("--host", envvar="HOST", type=click.STRING, default="0.0.0.0")