chore: update http-json-cloudevents examples to use cloudevents v2

Author: xSAVIKx

samples/http-json-cloudevents/README.md

@@ -3,20 +3,20 @@
 Install dependencies:
 
 ```sh
-pip3 install -r requirements.txt
+pip install -r requirements.txt
 ```
 
 Start server:
 
 ```sh
-python3 json_sample_server.py
+python json_sample_server.py
 ```
 
 In a new shell, run the client code which sends a structured and binary
 cloudevent to your local server:
 
 ```sh
-python3 client.py http://localhost:3000/
+python client.py http://localhost:3000/
 ```
 
 ## Test

samples/http-json-cloudevents/client.py

@@ -15,47 +15,55 @@
 import sys
 
 import requests
-from cloudevents_v1.conversion import to_binary, to_structured
-from cloudevents_v1.http import CloudEvent
+
+from cloudevents.core.bindings.http import (
+    CloudEvent,
+    to_binary_event,
+    to_structured_event,
+)
 
 
 def send_binary_cloud_event(url):
     # This data defines a binary cloudevent
     attributes = {
+        "id": "123",
+        "specversion": "1.0",
         "type": "com.example.sampletype1",
         "source": "https://example.com/event-producer",
     }
     data = {"message": "Hello World!"}
 
     event = CloudEvent(attributes, data)
-    headers, body = to_binary(event)
+    http_message = to_binary_event(event)
 
     # send and print event
-    requests.post(url, headers=headers, data=body)
-    print(f"Sent {event['id']} from {event['source']} with {event.data}")
+    requests.post(url, headers=http_message.headers, data=http_message.body)
+    print(f"Sent {event.get_id()} from {event.get_source()} with {event.get_data()}")
 
 
 def send_structured_cloud_event(url):
-    # This data defines a binary cloudevent
+    # This data defines a structured cloudevent
     attributes = {
+        "id": "123",
+        "specversion": "1.0",
         "type": "com.example.sampletype2",
         "source": "https://example.com/event-producer",
     }
     data = {"message": "Hello World!"}
 
     event = CloudEvent(attributes, data)
-    headers, body = to_structured(event)
+    http_message = to_structured_event(event)
 
     # send and print event
-    requests.post(url, headers=headers, data=body)
-    print(f"Sent {event['id']} from {event['source']} with {event.data}")
+    requests.post(url, headers=http_message.headers, data=http_message.body)
+    print(f"Sent {event.get_id()} from {event.get_source()} with {event.get_data()}")
 
 
 if __name__ == "__main__":
     # expects a url from command line.
-    # e.g. python3 client.py http://localhost:3000/
+    # e.g. python client.py http://localhost:3000/
     if len(sys.argv) < 2:
-        sys.exit("Usage: python with_requests.py <CloudEvents controller URL>")
+        sys.exit("Usage: python client.py <CloudEvents controller URL>")
 
     url = sys.argv[1]
     send_binary_cloud_event(url)

samples/http-json-cloudevents/json_sample_server.py

@@ -12,22 +12,23 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cloudevents_v1.http import from_http
 from flask import Flask, request
 
+from cloudevents.core.bindings.http import HTTPMessage, from_http_event
+
 app = Flask(__name__)
 
 
-# create an endpoint at http://localhost:/3000/
+# create an endpoint at http://localhost:3000/
 @app.route("/", methods=["POST"])
 def home():
     # create a CloudEvent
-    event = from_http(request.headers, request.get_data())
+    event = from_http_event(HTTPMessage(dict(request.headers), request.get_data()))
 
     # you can access cloudevent fields as seen below
     print(
-        f"Found {event['id']} from {event['source']} with type "
-        f"{event['type']} and specversion {event['specversion']}"
+        f"Found {event.get_id()} from {event.get_source()} with type "
+        f"{event.get_type()} and specversion {event.get_specversion()}"
     )
 
     return "", 204

samples/http-json-cloudevents/json_sample_test.py

@@ -13,10 +13,14 @@
 #    under the License.
 
 import pytest
-from cloudevents_v1.conversion import to_binary, to_structured
-from cloudevents_v1.http import CloudEvent
 from json_sample_server import app
 
+from cloudevents.core.bindings.http import (
+    CloudEvent,
+    to_binary_event,
+    to_structured_event,
+)
+
 
 @pytest.fixture
 def client():
@@ -27,28 +31,32 @@ def client():
 def test_binary_request(client):
     # This data defines a binary cloudevent
     attributes = {
+        "id": "123",
+        "specversion": "1.0",
         "type": "com.example.sampletype1",
         "source": "https://example.com/event-producer",
     }
     data = {"message": "Hello World!"}
 
     event = CloudEvent(attributes, data)
-    headers, body = to_binary(event)
+    http_message = to_binary_event(event)
 
-    r = client.post("/", headers=headers, data=body)
+    r = client.post("/", headers=http_message.headers, data=http_message.body)
     assert r.status_code == 204
 
 
 def test_structured_request(client):
-    # This data defines a binary cloudevent
+    # This data defines a structured cloudevent
     attributes = {
+        "id": "123",
+        "specversion": "1.0",
         "type": "com.example.sampletype2",
         "source": "https://example.com/event-producer",
     }
     data = {"message": "Hello World!"}
 
     event = CloudEvent(attributes, data)
-    headers, body = to_structured(event)
+    http_message = to_structured_event(event)
 
-    r = client.post("/", headers=headers, data=body)
+    r = client.post("/", headers=http_message.headers, data=http_message.body)
     assert r.status_code == 204

samples/http-json-cloudevents/requirements.txt

@@ -1,4 +1,4 @@
 flask
 requests
 pytest
-cloudevents
+cloudevents==2.0.0a1