From d1115422bd9a563c18c9b7098fcea83049d9c14d Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Thu, 3 Sep 2020 01:24:55 -0700 Subject: [PATCH 01/14] initial commit --- .../azure/eventgrid/_consumer.py | 5 +- .../azure/eventgrid/_models.py | 75 ++++++++++++------- .../azure/eventgrid/_publisher_client.py | 4 + .../eventgrid/aio/_publisher_client_async.py | 4 + sdk/eventgrid/azure-eventgrid/test.py | 50 +++++++++++++ ...send_cloud_event_data_with_extensions.yaml | 40 ++++++++++ ...send_cloud_event_data_with_extensions.yaml | 30 ++++++++ .../tests/test_eg_publisher_client.py | 19 +++++ .../tests/test_eg_publisher_client_async.py | 20 +++++ 9 files changed, 218 insertions(+), 29 deletions(-) create mode 100644 sdk/eventgrid/azure-eventgrid/test.py create mode 100644 sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_with_extensions.yaml create mode 100644 sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_with_extensions.yaml diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_consumer.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_consumer.py index 8850bc0ab1e5..012b0c85bae9 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_consumer.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_consumer.py @@ -20,6 +20,7 @@ _LOGGER = logging.getLogger(__name__) +from ._generated.models import CloudEvent as InternalCloudEvent from ._models import CloudEvent, EventGridEvent class EventGridConsumer(object): @@ -38,7 +39,9 @@ def decode_cloud_event(self, cloud_event, **kwargs): encode = kwargs.pop('encoding', 'utf-8') try: cloud_event = CloudEvent._from_json(cloud_event, encode) - deserialized_event = CloudEvent.deserialize(cloud_event) + deserialized_event = CloudEvent._from_generated( + InternalCloudEvent.deserialize(cloud_event) + ) CloudEvent._deserialize_data(deserialized_event, deserialized_event.type) return deserialized_event except Exception as err: diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py index f894acff6da5..2f66292da86a 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py @@ -7,6 +7,7 @@ from msrest.serialization import UTC import datetime as dt import uuid +import base64 import json import six from ._generated import models @@ -50,7 +51,7 @@ def _from_json(event, encode): return event -class CloudEvent(InternalCloudEvent, EventMixin): #pylint:disable=too-many-instance-attributes +class CloudEvent(EventMixin): #pylint:disable=too-many-instance-attributes """Properties of an event published to an Event Grid topic using the CloudEvent 1.0 Schema. All required parameters must be populated in order to send to Azure. @@ -75,35 +76,53 @@ class CloudEvent(InternalCloudEvent, EventMixin): #pylint:disable=too-many-ins unique for each distinct event. :type id: Optional[str] """ - - _validation = { - 'source': {'required': True}, - 'type': {'required': True}, - } - - _attribute_map = { - 'additional_properties': {'key': '', 'type': '{object}'}, - 'id': {'key': 'id', 'type': 'str'}, - 'source': {'key': 'source', 'type': 'str'}, - 'data': {'key': 'data', 'type': 'object'}, - 'data_base64': {'key': 'data_base64', 'type': 'bytearray'}, - 'type': {'key': 'type', 'type': 'str'}, - 'time': {'key': 'time', 'type': 'iso-8601'}, - 'specversion': {'key': 'specversion', 'type': 'str'}, - 'dataschema': {'key': 'dataschema', 'type': 'str'}, - 'datacontenttype': {'key': 'datacontenttype', 'type': 'str'}, - 'subject': {'key': 'subject', 'type': 'str'}, - } - def __init__(self, source, type, **kwargs): # type: (str, str, Any) -> None - kwargs.setdefault('id', uuid.uuid4()) - kwargs.setdefault("source", source) - kwargs.setdefault("type", type) - kwargs.setdefault("time", dt.datetime.now(UTC()).isoformat()) - kwargs.setdefault("specversion", "1.0") - - super(CloudEvent, self).__init__(**kwargs) + self.source = source + self.type = type + self.specversion = kwargs.get("specversion", "1.0") + self.id = kwargs.get("id", str(uuid.uuid4())) + self.time = kwargs.get("time", dt.datetime.now(UTC()).isoformat()) + self.data = kwargs.get("data", None) + self.datacontenttype = kwargs.get("datacontenttype", None) + self.dataschema = kwargs.get("dataschema", None) + self.subject = kwargs.get("subject", None) + + for attr in kwargs: + setattr(self, attr, kwargs.get(attr)) + + @classmethod + def _from_generated(cls, generated, **kwargs): + if not generated: + return {} + return cls( + id=generated.id, + source=generated.source, + type=generated.type, + specversion=generated.specversion, + data=generated.data, + time=generated.time, + dataschema=generated.dataschema, + datacontenttype=generated.datacontenttype, + subject=generated.subject, + **kwargs + ) + + def _to_generated(self, **kwargs): + if isinstance(self.data, six.binary_type): + self.data = base64.b64encode(self.data) + return InternalCloudEvent( + id=self.id, + source=self.source, + type=self.type, + specversion=self.specversion, + data=self.data, + time=self.time, + dataschema=self.dataschema, + datacontenttype=self.datacontenttype, + subject=self.subject, + **kwargs + ) class EventGridEvent(InternalEventGridEvent, EventMixin): diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_publisher_client.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_publisher_client.py index 7e06364f4668..44b664ddc493 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_publisher_client.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_publisher_client.py @@ -62,6 +62,10 @@ def send(self, events, **kwargs): events = [events] if all(isinstance(e, CloudEvent) for e in events) or all(_is_cloud_event(e) for e in events): + try: + events = [e._to_generated(**kwargs) for e in events] + except AttributeError: + pass # means it's a dictionary kwargs.setdefault("content_type", "application/cloudevents-batch+json; charset=utf-8") self._client.publish_cloud_event_events(self._topic_hostname, events, **kwargs) elif all(isinstance(e, EventGridEvent) for e in events) or all(isinstance(e, dict) for e in events): diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_publisher_client_async.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_publisher_client_async.py index 48c5df022af8..0cfe1de4693f 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_publisher_client_async.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_publisher_client_async.py @@ -63,6 +63,10 @@ async def send(self, events, **kwargs): events = [events] if all(isinstance(e, CloudEvent) for e in events) or all(_is_cloud_event(e) for e in events): + try: + events = [e._to_generated(**kwargs) for e in events] + except AttributeError: + pass # means it's a dictionary kwargs.setdefault("content_type", "application/cloudevents-batch+json; charset=utf-8") await self._client.publish_cloud_event_events(self._topic_hostname, events, **kwargs) elif all(isinstance(e, EventGridEvent) for e in events) or all(isinstance(e, dict) for e in events): diff --git a/sdk/eventgrid/azure-eventgrid/test.py b/sdk/eventgrid/azure-eventgrid/test.py new file mode 100644 index 000000000000..644368dff5cf --- /dev/null +++ b/sdk/eventgrid/azure-eventgrid/test.py @@ -0,0 +1,50 @@ +from azure.eventgrid import CloudEvent, EventGridPublisherClient +from azure.eventgrid._generated.models import CloudEvent as ICL +# from cloudevents.http import from_http, to_binary, to_structured +from azure.core.credentials import AzureKeyCredential +import os +import json +# c = CloudEvent( +# {'source':'MyApp', +# 'type':'CreateStuff'}, +# 'asasa' +# ) # specversion is set by default to "1.0" + +# c = CloudEvent( +# id=12, +# source='MyApp', +# type='CreateStuff' +# ) + +# c ={ +# 'source':'sdsda', +# 'id':'asas', +# 'specversion':'1.0', +# 'type':'dsdsd' +# } + +key = "iT/OY/ZGqMi3d78DueblHkRgKVA0VLH8IGcdAYjHJAM=" +topic_hostname = "https://rakshith-cloud.westus2-1.eventgrid.azure.net" +credential = AzureKeyCredential(key) +client = EventGridPublisherClient(topic_hostname, credential) + + +c = CloudEvent( + source = "http://samplesource.dev", + data = "cloudevent", + type="Sample.Cloud.Event", + jaja="sadf", + reasonCode="asdf" + ) + +print(json.dumps(c.__dict__)) + +# class A(): +# def __init__(self, a, b, **kwargs): +# self.a = a +# self.b = b +# self.c = kwargs.get('c', None) + + +# a = A(1, 2, c=3, d=4) +# print(a.__dict__) \ No newline at end of file diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_with_extensions.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_with_extensions.yaml new file mode 100644 index 000000000000..278a52517132 --- /dev/null +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_with_extensions.yaml @@ -0,0 +1,40 @@ +interactions: +- request: + body: '[{"id": "9883be2c-2252-4c42-bb32-31317b72237f", "source": "http://samplesource.dev", + "data": "cloudevent", "type": "Sample.Cloud.Event", "time": "2020-09-03T08:23:07.846089Z", + "specversion": "1.0"}]' + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '198' + Content-Type: + - application/cloudevents-batch+json; charset=utf-8 + User-Agent: + - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) + aeg-sas-key: + - VLvBbcbjk3FZq9g7bBRruzw0Q4JHPzIYF4/yoCzl/5M= + method: POST + uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + response: + body: + string: '' + headers: + api-supported-versions: + - '2018-01-01' + content-length: + - '0' + date: + - Thu, 03 Sep 2020 08:23:06 GMT + server: + - Microsoft-HTTPAPI/2.0 + strict-transport-security: + - max-age=31536000; includeSubDomains + status: + code: 200 + message: OK +version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_with_extensions.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_with_extensions.yaml new file mode 100644 index 000000000000..fac36acd56ce --- /dev/null +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_with_extensions.yaml @@ -0,0 +1,30 @@ +interactions: +- request: + body: '[{"id": "d0a8c881-f84e-4f81-a3b8-217fc7a961cd", "source": "http://samplesource.dev", + "data": "cloudevent", "type": "Sample.Cloud.Event", "time": "2020-09-03T08:24:14.600013Z", + "specversion": "1.0"}]' + headers: + Content-Length: + - '198' + Content-Type: + - application/cloudevents-batch+json; charset=utf-8 + User-Agent: + - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) + aeg-sas-key: + - kO0HS7a7rxMJQhIYnq1je185aWTiqQBKmR1OykWaYzg= + method: POST + uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + response: + body: + string: '' + headers: + api-supported-versions: '2018-01-01' + content-length: '0' + date: Thu, 03 Sep 2020 08:24:13 GMT + server: Microsoft-HTTPAPI/2.0 + strict-transport-security: max-age=31536000; includeSubDomains + status: + code: 200 + message: OK + url: https://cloudeventgridtestuaw653.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 +version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py index 3c4a45a021a8..a8f07f0853d7 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py @@ -110,6 +110,25 @@ def test_send_cloud_event_data_as_list(self, resource_group, eventgrid_topic, ev ) client.send([cloud_event]) + @pytest.mark.liveTest + @CachedResourceGroupPreparer(name_prefix='eventgridtest') + @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') + def test_send_cloud_event_data_with_extensions(self, resource_group, eventgrid_topic, eventgrid_topic_primary_key, eventgrid_topic_endpoint): + akc_credential = AzureKeyCredential(eventgrid_topic_primary_key) + client = EventGridPublisherClient(eventgrid_topic_endpoint, akc_credential) + cloud_event = CloudEvent( + source = "http://samplesource.dev", + data = "cloudevent", + type="Sample.Cloud.Event", + reason_code=204, + extension="extension" + ) + client.send([cloud_event]) + assert 'reason_code' in cloud_event.__dict__ + assert 'extension' in cloud_event.__dict__ + assert cloud_event.reason_code == 204 + assert cloud_event.__dict__['reason_code'] == 204 + @pytest.mark.liveTest @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py index a93dc748dd4b..cb36b2b85a40 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py @@ -118,6 +118,26 @@ async def test_send_cloud_event_data_as_list(self, resource_group, eventgrid_top await client.send([cloud_event]) + @pytest.mark.liveTest + @CachedResourceGroupPreparer(name_prefix='eventgridtest') + @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') + async def test_send_cloud_event_data_with_extensions(self, resource_group, eventgrid_topic, eventgrid_topic_primary_key, eventgrid_topic_endpoint): + akc_credential = AzureKeyCredential(eventgrid_topic_primary_key) + client = EventGridPublisherClient(eventgrid_topic_endpoint, akc_credential) + cloud_event = CloudEvent( + source = "http://samplesource.dev", + data = "cloudevent", + type="Sample.Cloud.Event", + reason_code=204, + extension="extension" + ) + await client.send([cloud_event]) + assert 'reason_code' in cloud_event.__dict__ + assert 'extension' in cloud_event.__dict__ + assert cloud_event.reason_code == 204 + assert cloud_event.__dict__['reason_code'] == 204 + + @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') @pytest.mark.asyncio From a8a01f9328cd3405df18deee9c4887102967a38f Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Thu, 3 Sep 2020 01:27:48 -0700 Subject: [PATCH 02/14] oops --- sdk/eventgrid/azure-eventgrid/test.py | 50 --------------------------- 1 file changed, 50 deletions(-) delete mode 100644 sdk/eventgrid/azure-eventgrid/test.py diff --git a/sdk/eventgrid/azure-eventgrid/test.py b/sdk/eventgrid/azure-eventgrid/test.py deleted file mode 100644 index 644368dff5cf..000000000000 --- a/sdk/eventgrid/azure-eventgrid/test.py +++ /dev/null @@ -1,50 +0,0 @@ -from azure.eventgrid import CloudEvent, EventGridPublisherClient -from azure.eventgrid._generated.models import CloudEvent as ICL -# from cloudevents.http import from_http, to_binary, to_structured -from azure.core.credentials import AzureKeyCredential -import os -import json -# c = CloudEvent( -# {'source':'MyApp', -# 'type':'CreateStuff'}, -# 'asasa' -# ) # specversion is set by default to "1.0" - -# c = CloudEvent( -# id=12, -# source='MyApp', -# type='CreateStuff' -# ) - -# c ={ -# 'source':'sdsda', -# 'id':'asas', -# 'specversion':'1.0', -# 'type':'dsdsd' -# } - -key = "iT/OY/ZGqMi3d78DueblHkRgKVA0VLH8IGcdAYjHJAM=" -topic_hostname = "https://rakshith-cloud.westus2-1.eventgrid.azure.net" -credential = AzureKeyCredential(key) -client = EventGridPublisherClient(topic_hostname, credential) - - -c = CloudEvent( - source = "http://samplesource.dev", - data = "cloudevent", - type="Sample.Cloud.Event", - jaja="sadf", - reasonCode="asdf" - ) - -print(json.dumps(c.__dict__)) - -# class A(): -# def __init__(self, a, b, **kwargs): -# self.a = a -# self.b = b -# self.c = kwargs.get('c', None) - - -# a = A(1, 2, c=3, d=4) -# print(a.__dict__) \ No newline at end of file From 1b62b89eee792be8e3562711e7ae1b32ec33aaf9 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Thu, 3 Sep 2020 14:04:01 -0700 Subject: [PATCH 03/14] some changes --- .../azure/eventgrid/_models.py | 23 +++- ...send_cloud_event_data_with_extensions.yaml | 12 +- ...send_cloud_event_data_with_extensions.yaml | 14 +-- .../tests/test_eg_publisher_client.py | 8 +- .../tests/test_eg_publisher_client_async.py | 8 +- .../tests/test_serialization.py | 109 ++++++++++++++++++ 6 files changed, 147 insertions(+), 27 deletions(-) create mode 100644 sdk/eventgrid/azure-eventgrid/tests/test_serialization.py diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py index 2f66292da86a..94eb4cb04125 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py @@ -87,20 +87,25 @@ def __init__(self, source, type, **kwargs): self.datacontenttype = kwargs.get("datacontenttype", None) self.dataschema = kwargs.get("dataschema", None) self.subject = kwargs.get("subject", None) + self._extensions = {} + spec_attr = [ + 'source', 'type', 'specversion', 'id', 'time', + 'data', 'datacontenttype', 'dataschema', 'subject'] for attr in kwargs: - setattr(self, attr, kwargs.get(attr)) + if attr == 'extensions': + self._extensions.update({k:v for k, v in kwargs.get('extensions').items()}) + elif attr not in spec_attr: + self._extensions.update({attr: kwargs.get(attr)}) @classmethod def _from_generated(cls, generated, **kwargs): - if not generated: - return {} return cls( id=generated.id, source=generated.source, type=generated.type, specversion=generated.specversion, - data=generated.data, + data=generated.data or generated.data_base64, time=generated.time, dataschema=generated.dataschema, datacontenttype=generated.datacontenttype, @@ -110,17 +115,23 @@ def _from_generated(cls, generated, **kwargs): def _to_generated(self, **kwargs): if isinstance(self.data, six.binary_type): - self.data = base64.b64encode(self.data) + data_base64 = self.data + data = None + else: + data_base64 = None + data = self.data return InternalCloudEvent( id=self.id, source=self.source, type=self.type, specversion=self.specversion, - data=self.data, + data=data, + data_base64=data_base64, time=self.time, dataschema=self.dataschema, datacontenttype=self.datacontenttype, subject=self.subject, + additional_properties=self._extensions, **kwargs ) diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_with_extensions.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_with_extensions.yaml index 278a52517132..c7f8139541ac 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_with_extensions.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_with_extensions.yaml @@ -1,8 +1,8 @@ interactions: - request: - body: '[{"id": "9883be2c-2252-4c42-bb32-31317b72237f", "source": "http://samplesource.dev", - "data": "cloudevent", "type": "Sample.Cloud.Event", "time": "2020-09-03T08:23:07.846089Z", - "specversion": "1.0"}]' + body: '[{"reason_code": 204, "extension": "extension", "id": "20f0e28d-2f8b-4a6c-8db0-2bf2deb7b7a9", + "source": "http://samplesource.dev", "data": "cloudevent", "type": "Sample.Cloud.Event", + "time": "2020-09-03T20:53:53.682088Z", "specversion": "1.0"}]' headers: Accept: - '*/*' @@ -11,13 +11,13 @@ interactions: Connection: - keep-alive Content-Length: - - '198' + - '244' Content-Type: - application/cloudevents-batch+json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) aeg-sas-key: - - VLvBbcbjk3FZq9g7bBRruzw0Q4JHPzIYF4/yoCzl/5M= + - V2cEjWSHpLNxHUFGzsDcz5cM1uAluYb4GsvNL4HY3c8= method: POST uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -29,7 +29,7 @@ interactions: content-length: - '0' date: - - Thu, 03 Sep 2020 08:23:06 GMT + - Thu, 03 Sep 2020 20:53:52 GMT server: - Microsoft-HTTPAPI/2.0 strict-transport-security: diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_with_extensions.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_with_extensions.yaml index fac36acd56ce..8a6f5d95b4eb 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_with_extensions.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_with_extensions.yaml @@ -1,17 +1,17 @@ interactions: - request: - body: '[{"id": "d0a8c881-f84e-4f81-a3b8-217fc7a961cd", "source": "http://samplesource.dev", - "data": "cloudevent", "type": "Sample.Cloud.Event", "time": "2020-09-03T08:24:14.600013Z", - "specversion": "1.0"}]' + body: '[{"reason_code": 204, "extension": "extension", "id": "221e9357-ab98-40dc-8e39-d826781bdc20", + "source": "http://samplesource.dev", "data": "cloudevent", "type": "Sample.Cloud.Event", + "time": "2020-09-03T20:53:54.164825Z", "specversion": "1.0"}]' headers: Content-Length: - - '198' + - '244' Content-Type: - application/cloudevents-batch+json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) aeg-sas-key: - - kO0HS7a7rxMJQhIYnq1je185aWTiqQBKmR1OykWaYzg= + - V2cEjWSHpLNxHUFGzsDcz5cM1uAluYb4GsvNL4HY3c8= method: POST uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -20,11 +20,11 @@ interactions: headers: api-supported-versions: '2018-01-01' content-length: '0' - date: Thu, 03 Sep 2020 08:24:13 GMT + date: Thu, 03 Sep 2020 20:53:53 GMT server: Microsoft-HTTPAPI/2.0 strict-transport-security: max-age=31536000; includeSubDomains status: code: 200 message: OK - url: https://cloudeventgridtestuaw653.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + url: https://cloudeventgridtestrsa3iz.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py index a8f07f0853d7..3e33274e8188 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py @@ -124,10 +124,10 @@ def test_send_cloud_event_data_with_extensions(self, resource_group, eventgrid_t extension="extension" ) client.send([cloud_event]) - assert 'reason_code' in cloud_event.__dict__ - assert 'extension' in cloud_event.__dict__ - assert cloud_event.reason_code == 204 - assert cloud_event.__dict__['reason_code'] == 204 + internal = cloud_event._to_generated().serialize() + assert 'reason_code' in internal + assert 'extension' in internal + assert internal['reason_code'] == 204 @pytest.mark.liveTest @CachedResourceGroupPreparer(name_prefix='eventgridtest') diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py index cb36b2b85a40..9073b3dc2ccc 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py @@ -132,10 +132,10 @@ async def test_send_cloud_event_data_with_extensions(self, resource_group, event extension="extension" ) await client.send([cloud_event]) - assert 'reason_code' in cloud_event.__dict__ - assert 'extension' in cloud_event.__dict__ - assert cloud_event.reason_code == 204 - assert cloud_event.__dict__['reason_code'] == 204 + internal = cloud_event._to_generated().serialize() + assert 'reason_code' in internal + assert 'extension' in internal + assert internal['reason_code'] == 204 @CachedResourceGroupPreparer(name_prefix='eventgridtest') diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py new file mode 100644 index 000000000000..7d09de4a25f7 --- /dev/null +++ b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py @@ -0,0 +1,109 @@ +#------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +#-------------------------------------------------------------------------- + +import logging +import sys +import os +import pytest +import json +import base64 +import datetime as dt + +from devtools_testutils import AzureMgmtTestCase +from msrest.serialization import UTC +from azure.eventgrid import CloudEvent +from _mocks import ( + cloud_storage_dict, + cloud_storage_string, + cloud_storage_bytes, + ) + +class EventGridSerializationTests(AzureMgmtTestCase): + + def _assert_cloud_event_serialized(self, expected, actual): + assert expected['source'] == actual['source'] + assert expected['type'] == actual['type'] + assert actual['specversion'] == '1.0' + assert 'id' in actual + assert 'time' in actual + + if 'data' in expected: + assert expected['data'] == actual['data'] + else: + assert expected['data_base64'] == actual['data_base64'] + + + # Cloud Event tests + def test_cloud_event_serialization_extension_bytes(self, **kwargs): + data = b"cloudevent" + cloud_event = CloudEvent( + source="http://samplesource.dev", + data=data, + type="Sample.Cloud.Event", + reason_code=204, + foo="bar", + extensions={'e1':1, 'e2':2} + ) + + cloud_event.subject = "subject" # to test explicit setting of prop + encoded = base64.b64encode(data) + internal = cloud_event._to_generated() + + assert internal.additional_properties is not None + assert 'foo' in internal.additional_properties + assert 'e1' in internal.additional_properties + assert internal.additional_properties['reason_code'] == 204 + + json = internal.serialize() + + expected = { + 'source':'http://samplesource.dev', + 'data_base64': encoded, + 'type':'Sample.Cloud.Event', + 'reason_code':204, + 'foo':'bar', + 'e1':1, + 'e2':2 + } + + self._assert_cloud_event_serialized(expected, json) + + + def test_cloud_event_serialization_extension_string(self, **kwargs): + data = "cloudevent" + cloud_event = CloudEvent( + source="http://samplesource.dev", + data=data, + type="Sample.Cloud.Event", + reason_code=204, + foo="bar", + extensions={'e1':1, 'e2':2} + ) + + cloud_event.subject = "subject" # to test explicit setting of prop + internal = cloud_event._to_generated() + + assert internal.additional_properties is not None + assert 'foo' in internal.additional_properties + assert 'e1' in internal.additional_properties + assert internal.additional_properties['reason_code'] == 204 + + json = internal.serialize() + + expected = { + 'source':'http://samplesource.dev', + 'data': data, + 'type':'Sample.Cloud.Event', + 'reason_code':204, + 'foo':'bar', + 'e1':1, + 'e2':2 + } + + self._assert_cloud_event_serialized(expected, json) + + + \ No newline at end of file From 8022a0cd720c70280e8717593e22e1d4323576f9 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Thu, 3 Sep 2020 14:05:58 -0700 Subject: [PATCH 04/14] lint --- sdk/eventgrid/azure-eventgrid/tests/test_serialization.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py index 7d09de4a25f7..16835de19b98 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py @@ -104,6 +104,3 @@ def test_cloud_event_serialization_extension_string(self, **kwargs): } self._assert_cloud_event_serialized(expected, json) - - - \ No newline at end of file From f1e1cbed77371cb09e3992ca7dfe0d7adc386b53 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Thu, 3 Sep 2020 14:26:36 -0700 Subject: [PATCH 05/14] test fix --- sdk/eventgrid/azure-eventgrid/tests/test_serialization.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py index 16835de19b98..913830c73c32 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py @@ -49,7 +49,7 @@ def test_cloud_event_serialization_extension_bytes(self, **kwargs): ) cloud_event.subject = "subject" # to test explicit setting of prop - encoded = base64.b64encode(data) + encoded = base64.b64encode(data).decode('utf-8') internal = cloud_event._to_generated() assert internal.additional_properties is not None From db40e9c01db056f662c2c8d5b1e9954770b0ae48 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Thu, 3 Sep 2020 14:38:27 -0700 Subject: [PATCH 06/14] sas key --- ..._client.test_send_cloud_event_data_as_list.yaml | 8 +++----- ...her_client.test_send_cloud_event_data_dict.yaml | 8 +++----- ...sher_client.test_send_cloud_event_data_str.yaml | 8 +++----- ...test_send_cloud_event_data_with_extensions.yaml | 8 +++----- ...ublisher_client.test_send_cloud_event_dict.yaml | 4 +--- ...isher_client.test_send_custom_schema_event.yaml | 6 ++---- ...ient.test_send_custom_schema_event_as_list.yaml | 10 +++------- ...nt.test_send_event_grid_event_data_as_list.yaml | 14 ++++++-------- ...lient.test_send_event_grid_event_data_dict.yaml | 8 +++----- ...client.test_send_event_grid_event_data_str.yaml | 8 +++----- ...sher_client.test_send_signature_credential.yaml | 8 ++++---- ...t_async.test_send_cloud_event_data_as_list.yaml | 10 ++++------ ...ient_async.test_send_cloud_event_data_dict.yaml | 10 ++++------ ...lient_async.test_send_cloud_event_data_str.yaml | 10 ++++------ ...test_send_cloud_event_data_with_extensions.yaml | 10 ++++------ ...er_client_async.test_send_cloud_event_dict.yaml | 6 ++---- ...client_async.test_send_custom_schema_event.yaml | 8 +++----- ...sync.test_send_custom_schema_event_as_list.yaml | 10 ++++------ ...nc.test_send_event_grid_event_data_as_list.yaml | 14 ++++++-------- ...async.test_send_event_grid_event_data_dict.yaml | 12 +++++------- ..._async.test_send_event_grid_event_data_str.yaml | 10 ++++------ ...lient_async.test_send_signature_credential.yaml | 10 +++++----- .../tests/test_eg_publisher_client.py | 3 +++ .../tests/test_eg_publisher_client_async.py | 3 +++ 24 files changed, 85 insertions(+), 121 deletions(-) diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_as_list.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_as_list.yaml index 0cd77a94c75e..0622097e506c 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_as_list.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_as_list.yaml @@ -1,7 +1,7 @@ interactions: - request: - body: '[{"id": "3dc4b913-4bc2-41f8-be9b-bf1f67069806", "source": "http://samplesource.dev", - "data": "cloudevent", "type": "Sample.Cloud.Event", "time": "2020-08-19T03:36:41.947462Z", + body: '[{"id": "4e7a9df5-8e28-42c8-adca-4412c93e92d5", "source": "http://samplesource.dev", + "data": "cloudevent", "type": "Sample.Cloud.Event", "time": "2020-09-03T21:37:13.810619Z", "specversion": "1.0"}]' headers: Accept: @@ -16,8 +16,6 @@ interactions: - application/cloudevents-batch+json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - dHUaOOg5xRj+D7iH/AC92GyHweLx9ugrDuMDg4e5Xvw= method: POST uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -29,7 +27,7 @@ interactions: content-length: - '0' date: - - Wed, 19 Aug 2020 03:36:43 GMT + - Thu, 03 Sep 2020 21:37:12 GMT server: - Microsoft-HTTPAPI/2.0 strict-transport-security: diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_dict.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_dict.yaml index d0ffe1e0c37f..bf49c8a35b19 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_dict.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_dict.yaml @@ -1,7 +1,7 @@ interactions: - request: - body: '[{"id": "51c18497-2a25-45f1-b9ba-fdaf08c00263", "source": "http://samplesource.dev", - "data": {"sample": "cloudevent"}, "type": "Sample.Cloud.Event", "time": "2020-08-19T03:36:42.304479Z", + body: '[{"id": "51c747e0-7e8f-467c-80e4-920fdf1d95d2", "source": "http://samplesource.dev", + "data": {"sample": "cloudevent"}, "type": "Sample.Cloud.Event", "time": "2020-09-03T21:37:14.383108Z", "specversion": "1.0"}]' headers: Accept: @@ -16,8 +16,6 @@ interactions: - application/cloudevents-batch+json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - dHUaOOg5xRj+D7iH/AC92GyHweLx9ugrDuMDg4e5Xvw= method: POST uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -29,7 +27,7 @@ interactions: content-length: - '0' date: - - Wed, 19 Aug 2020 03:36:43 GMT + - Thu, 03 Sep 2020 21:37:12 GMT server: - Microsoft-HTTPAPI/2.0 strict-transport-security: diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_str.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_str.yaml index d5daebc0544c..2a45a2b2689f 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_str.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_str.yaml @@ -1,7 +1,7 @@ interactions: - request: - body: '[{"id": "6a315e93-a59c-4eca-b2f2-6bf3b8f27984", "source": "http://samplesource.dev", - "data": "cloudevent", "type": "Sample.Cloud.Event", "time": "2020-08-19T03:36:42.629467Z", + body: '[{"id": "eef0ee57-9833-44fd-9f52-d5f20b74267d", "source": "http://samplesource.dev", + "data": "cloudevent", "type": "Sample.Cloud.Event", "time": "2020-09-03T21:37:14.803665Z", "specversion": "1.0"}]' headers: Accept: @@ -16,8 +16,6 @@ interactions: - application/cloudevents-batch+json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - dHUaOOg5xRj+D7iH/AC92GyHweLx9ugrDuMDg4e5Xvw= method: POST uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -29,7 +27,7 @@ interactions: content-length: - '0' date: - - Wed, 19 Aug 2020 03:36:43 GMT + - Thu, 03 Sep 2020 21:37:13 GMT server: - Microsoft-HTTPAPI/2.0 strict-transport-security: diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_with_extensions.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_with_extensions.yaml index c7f8139541ac..85d4e49a1f12 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_with_extensions.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_with_extensions.yaml @@ -1,8 +1,8 @@ interactions: - request: - body: '[{"reason_code": 204, "extension": "extension", "id": "20f0e28d-2f8b-4a6c-8db0-2bf2deb7b7a9", + body: '[{"reason_code": 204, "extension": "extension", "id": "9da8e4ce-df2c-4480-b809-c7132fb3ee74", "source": "http://samplesource.dev", "data": "cloudevent", "type": "Sample.Cloud.Event", - "time": "2020-09-03T20:53:53.682088Z", "specversion": "1.0"}]' + "time": "2020-09-03T21:37:15.165652Z", "specversion": "1.0"}]' headers: Accept: - '*/*' @@ -16,8 +16,6 @@ interactions: - application/cloudevents-batch+json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - V2cEjWSHpLNxHUFGzsDcz5cM1uAluYb4GsvNL4HY3c8= method: POST uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -29,7 +27,7 @@ interactions: content-length: - '0' date: - - Thu, 03 Sep 2020 20:53:52 GMT + - Thu, 03 Sep 2020 21:37:13 GMT server: - Microsoft-HTTPAPI/2.0 strict-transport-security: diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_dict.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_dict.yaml index 58267d8b955e..1d2d4283ad33 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_dict.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_dict.yaml @@ -15,8 +15,6 @@ interactions: - application/cloudevents-batch+json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - dHUaOOg5xRj+D7iH/AC92GyHweLx9ugrDuMDg4e5Xvw= method: POST uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -28,7 +26,7 @@ interactions: content-length: - '0' date: - - Wed, 19 Aug 2020 03:36:44 GMT + - Thu, 03 Sep 2020 21:37:13 GMT server: - Microsoft-HTTPAPI/2.0 strict-transport-security: diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_custom_schema_event.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_custom_schema_event.yaml index 3c126ae700cf..57321b5fe648 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_custom_schema_event.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_custom_schema_event.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '[{"customSubject": "sample", "customEventType": "sample.event", "customDataVersion": - "2.0", "customId": "1234", "customEventTime": "2020-08-19T03:36:56.936961+00:00", + "2.0", "customId": "1234", "customEventTime": "2020-09-03T21:37:32.440554+00:00", "customData": "sample data"}]' headers: Accept: @@ -16,8 +16,6 @@ interactions: - application/json User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - uPQPJHQHsAhBxWOWtRXslz3sXf7TJ5lcqLZ6SC4QzJ4= method: POST uri: https://customeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -29,7 +27,7 @@ interactions: content-length: - '0' date: - - Wed, 19 Aug 2020 03:36:57 GMT + - Thu, 03 Sep 2020 21:37:31 GMT server: - Microsoft-HTTPAPI/2.0 strict-transport-security: diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_custom_schema_event_as_list.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_custom_schema_event_as_list.yaml index 6f84dc2cbe23..02f25b5538f9 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_custom_schema_event_as_list.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_custom_schema_event_as_list.yaml @@ -1,10 +1,10 @@ interactions: - request: body: '[{"customSubject": "sample", "customEventType": "sample.event", "customDataVersion": - "2.0", "customId": "1234", "customEventTime": "2020-08-19T03:36:57.422734+00:00", + "2.0", "customId": "1234", "customEventTime": "2020-09-03T21:37:32.857620+00:00", "customData": "sample data"}, {"customSubject": "sample2", "customEventType": "sample.event", "customDataVersion": "2.0", "customId": "12345", "customEventTime": - "2020-08-19T03:36:57.422734+00:00", "customData": "sample data 2"}]' + "2020-09-03T21:37:32.857620+00:00", "customData": "sample data 2"}]' headers: Accept: - '*/*' @@ -18,8 +18,6 @@ interactions: - application/json User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - uPQPJHQHsAhBxWOWtRXslz3sXf7TJ5lcqLZ6SC4QzJ4= method: POST uri: https://customeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -28,12 +26,10 @@ interactions: headers: api-supported-versions: - '2018-01-01' - connection: - - close content-length: - '0' date: - - Wed, 19 Aug 2020 03:36:58 GMT + - Thu, 03 Sep 2020 21:37:31 GMT server: - Microsoft-HTTPAPI/2.0 strict-transport-security: diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_as_list.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_as_list.yaml index d5cab7375376..b965b6a539dc 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_as_list.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_as_list.yaml @@ -1,10 +1,10 @@ interactions: - request: - body: '[{"id": "576f3e27-5433-47b3-8b4e-e31ea6a1bdde", "subject": "sample", "data": - "eventgridevent", "eventType": "Sample.EventGrid.Event", "eventTime": "2020-08-19T03:37:11.07064Z", - "dataVersion": "2.0"}, {"id": "6c359c8d-b1fe-4458-96c5-eaffcd864573", "subject": + body: '[{"id": "a3ad167e-302d-4d3d-b5ee-d9e989aa277a", "subject": "sample", "data": + "eventgridevent", "eventType": "Sample.EventGrid.Event", "eventTime": "2020-09-03T21:37:46.777197Z", + "dataVersion": "2.0"}, {"id": "e36112d1-2413-462b-ac5a-8046bd7add59", "subject": "sample2", "data": "eventgridevent2", "eventType": "Sample.EventGrid.Event", - "eventTime": "2020-08-19T03:37:11.071641Z", "dataVersion": "2.0"}]' + "eventTime": "2020-09-03T21:37:46.778197Z", "dataVersion": "2.0"}]' headers: Accept: - '*/*' @@ -13,13 +13,11 @@ interactions: Connection: - keep-alive Content-Length: - - '401' + - '402' Content-Type: - application/json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - dS38eoc9IPjofR5npZ1QXrsb3Gz/Kdt99ZdK9SJ+99w= method: POST uri: https://eventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -31,7 +29,7 @@ interactions: content-length: - '0' date: - - Wed, 19 Aug 2020 03:37:12 GMT + - Thu, 03 Sep 2020 21:37:45 GMT server: - Microsoft-HTTPAPI/2.0 strict-transport-security: diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_dict.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_dict.yaml index d20ed7f4c9c4..c5f808f36297 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_dict.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_dict.yaml @@ -1,8 +1,8 @@ interactions: - request: - body: '[{"id": "fbf293f1-d609-4fd8-8d3b-b0ed0e406795", "subject": "sample", "data": + body: '[{"id": "d686873c-334a-4456-b33a-f56c9103c084", "subject": "sample", "data": {"sample": "eventgridevent"}, "eventType": "Sample.EventGrid.Event", "eventTime": - "2020-08-19T03:37:11.563581Z", "dataVersion": "2.0"}]' + "2020-09-03T21:37:47.256176Z", "dataVersion": "2.0"}]' headers: Accept: - '*/*' @@ -16,8 +16,6 @@ interactions: - application/json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - dS38eoc9IPjofR5npZ1QXrsb3Gz/Kdt99ZdK9SJ+99w= method: POST uri: https://eventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -29,7 +27,7 @@ interactions: content-length: - '0' date: - - Wed, 19 Aug 2020 03:37:12 GMT + - Thu, 03 Sep 2020 21:37:45 GMT server: - Microsoft-HTTPAPI/2.0 strict-transport-security: diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_str.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_str.yaml index 22679778a2fc..1c02edf7725b 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_str.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_str.yaml @@ -1,7 +1,7 @@ interactions: - request: - body: '[{"id": "10994707-90e7-431e-88f0-2abae07cc806", "subject": "sample", "data": - "eventgridevent", "eventType": "Sample.EventGrid.Event", "eventTime": "2020-08-19T03:37:11.893631Z", + body: '[{"id": "be71503b-2316-4d36-ba30-db189bb742ac", "subject": "sample", "data": + "eventgridevent", "eventType": "Sample.EventGrid.Event", "eventTime": "2020-09-03T21:37:47.663176Z", "dataVersion": "2.0"}]' headers: Accept: @@ -16,8 +16,6 @@ interactions: - application/json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - dS38eoc9IPjofR5npZ1QXrsb3Gz/Kdt99ZdK9SJ+99w= method: POST uri: https://eventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -29,7 +27,7 @@ interactions: content-length: - '0' date: - - Wed, 19 Aug 2020 03:37:12 GMT + - Thu, 03 Sep 2020 21:37:45 GMT server: - Microsoft-HTTPAPI/2.0 strict-transport-security: diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_signature_credential.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_signature_credential.yaml index 35bc4e03ed5b..631c1977b5bc 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_signature_credential.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_signature_credential.yaml @@ -1,8 +1,8 @@ interactions: - request: - body: '[{"id": "18fe69c3-59bf-4e53-97e1-2e5310e4884f", "subject": "sample", "data": + body: '[{"id": "e8f4c1fb-ce80-470c-a6fb-997702c4cb12", "subject": "sample", "data": {"sample": "eventgridevent"}, "eventType": "Sample.EventGrid.Event", "eventTime": - "2020-08-19T03:37:12.238633Z", "dataVersion": "2.0"}]' + "2020-09-03T21:37:48.023188Z", "dataVersion": "2.0"}]' headers: Accept: - '*/*' @@ -17,7 +17,7 @@ interactions: User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) aeg-sas-token: - - r=https%3A%2F%2Feventgridtestpm22oyo2kyl.westus-1.eventgrid.azure.net%2Fapi%2Fevents%3FapiVersion%3D2018-01-01&e=2020-08-19%2004%3A37%3A12.237630%2B00%3A00&s=NiA404pCphKDcLVP9%2FjN%2FY0%2BnejDRolHVkrEnfrXk6c%3D + - r=https%3A%2F%2Feventgridtestqagvsp23jey.westus-1.eventgrid.azure.net%2Fapi%2Fevents%3FapiVersion%3D2018-01-01&e=2020-09-03%2022%3A37%3A48.021190%2B00%3A00&s=Ws1vSY7xBzFYccOy3jTJVqnI5iqNDl1qp5R1jj2MUTg%3D method: POST uri: https://eventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -29,7 +29,7 @@ interactions: content-length: - '0' date: - - Wed, 19 Aug 2020 03:37:12 GMT + - Thu, 03 Sep 2020 21:37:46 GMT server: - Microsoft-HTTPAPI/2.0 strict-transport-security: diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_as_list.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_as_list.yaml index b3c4782bd674..7fb1aa408395 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_as_list.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_as_list.yaml @@ -1,7 +1,7 @@ interactions: - request: - body: '[{"id": "a07023d9-c7ff-4f38-abe0-c3a8e555991b", "source": "http://samplesource.dev", - "data": "cloudevent", "type": "Sample.Cloud.Event", "time": "2020-08-26T08:36:53.957412Z", + body: '[{"id": "48538bd7-cfcc-4244-a06a-80787bb464c2", "source": "http://samplesource.dev", + "data": "cloudevent", "type": "Sample.Cloud.Event", "time": "2020-09-03T21:37:48.405133Z", "specversion": "1.0"}]' headers: Content-Length: @@ -10,8 +10,6 @@ interactions: - application/cloudevents-batch+json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - lWdojve+oWWftlsc/y8gop1eyam9FXonHf0jmkPpA6Q= method: POST uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -20,11 +18,11 @@ interactions: headers: api-supported-versions: '2018-01-01' content-length: '0' - date: Wed, 26 Aug 2020 08:36:53 GMT + date: Thu, 03 Sep 2020 21:37:46 GMT server: Microsoft-HTTPAPI/2.0 strict-transport-security: max-age=31536000; includeSubDomains status: code: 200 message: OK - url: https://cloudeventgridtestgz6mhk.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + url: https://cloudeventgridtestoc4o4l.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_dict.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_dict.yaml index 459913a84c1d..c420fc0b88e9 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_dict.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_dict.yaml @@ -1,7 +1,7 @@ interactions: - request: - body: '[{"id": "75b863c6-4344-47c5-a449-08ba3e68f912", "source": "http://samplesource.dev", - "data": {"sample": "cloudevent"}, "type": "Sample.Cloud.Event", "time": "2020-08-26T08:36:54.319455Z", + body: '[{"id": "f5255a4c-c870-451d-bb71-dae2f2a2287b", "source": "http://samplesource.dev", + "data": {"sample": "cloudevent"}, "type": "Sample.Cloud.Event", "time": "2020-09-03T21:37:48.640285Z", "specversion": "1.0"}]' headers: Content-Length: @@ -10,8 +10,6 @@ interactions: - application/cloudevents-batch+json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - lWdojve+oWWftlsc/y8gop1eyam9FXonHf0jmkPpA6Q= method: POST uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -20,11 +18,11 @@ interactions: headers: api-supported-versions: '2018-01-01' content-length: '0' - date: Wed, 26 Aug 2020 08:36:54 GMT + date: Thu, 03 Sep 2020 21:37:46 GMT server: Microsoft-HTTPAPI/2.0 strict-transport-security: max-age=31536000; includeSubDomains status: code: 200 message: OK - url: https://cloudeventgridtestgz6mhk.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + url: https://cloudeventgridtestoc4o4l.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_str.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_str.yaml index 0e83ae4d6684..c69eec9dec62 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_str.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_str.yaml @@ -1,7 +1,7 @@ interactions: - request: - body: '[{"id": "69cea73a-a033-4f12-ae17-0d2b21b4adbb", "source": "http://samplesource.dev", - "data": "cloudevent", "type": "Sample.Cloud.Event", "time": "2020-08-26T08:36:54.592725Z", + body: '[{"id": "7fa5bfc7-22e7-421a-8017-98e132d2270e", "source": "http://samplesource.dev", + "data": "cloudevent", "type": "Sample.Cloud.Event", "time": "2020-09-03T21:37:48.930286Z", "specversion": "1.0"}]' headers: Content-Length: @@ -10,8 +10,6 @@ interactions: - application/cloudevents-batch+json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - lWdojve+oWWftlsc/y8gop1eyam9FXonHf0jmkPpA6Q= method: POST uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -20,11 +18,11 @@ interactions: headers: api-supported-versions: '2018-01-01' content-length: '0' - date: Wed, 26 Aug 2020 08:36:53 GMT + date: Thu, 03 Sep 2020 21:37:47 GMT server: Microsoft-HTTPAPI/2.0 strict-transport-security: max-age=31536000; includeSubDomains status: code: 200 message: OK - url: https://cloudeventgridtestgz6mhk.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + url: https://cloudeventgridtestoc4o4l.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_with_extensions.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_with_extensions.yaml index 8a6f5d95b4eb..a63ec994b635 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_with_extensions.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_with_extensions.yaml @@ -1,8 +1,8 @@ interactions: - request: - body: '[{"reason_code": 204, "extension": "extension", "id": "221e9357-ab98-40dc-8e39-d826781bdc20", + body: '[{"reason_code": 204, "extension": "extension", "id": "70db4803-6202-4e85-8c0d-0d32243d864d", "source": "http://samplesource.dev", "data": "cloudevent", "type": "Sample.Cloud.Event", - "time": "2020-09-03T20:53:54.164825Z", "specversion": "1.0"}]' + "time": "2020-09-03T21:37:49.229285Z", "specversion": "1.0"}]' headers: Content-Length: - '244' @@ -10,8 +10,6 @@ interactions: - application/cloudevents-batch+json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - V2cEjWSHpLNxHUFGzsDcz5cM1uAluYb4GsvNL4HY3c8= method: POST uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -20,11 +18,11 @@ interactions: headers: api-supported-versions: '2018-01-01' content-length: '0' - date: Thu, 03 Sep 2020 20:53:53 GMT + date: Thu, 03 Sep 2020 21:37:47 GMT server: Microsoft-HTTPAPI/2.0 strict-transport-security: max-age=31536000; includeSubDomains status: code: 200 message: OK - url: https://cloudeventgridtestrsa3iz.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + url: https://cloudeventgridtestoc4o4l.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_dict.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_dict.yaml index 3c78a559a94b..c846a45e2101 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_dict.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_dict.yaml @@ -9,8 +9,6 @@ interactions: - application/cloudevents-batch+json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - lWdojve+oWWftlsc/y8gop1eyam9FXonHf0jmkPpA6Q= method: POST uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -19,11 +17,11 @@ interactions: headers: api-supported-versions: '2018-01-01' content-length: '0' - date: Wed, 26 Aug 2020 08:36:54 GMT + date: Thu, 03 Sep 2020 21:37:47 GMT server: Microsoft-HTTPAPI/2.0 strict-transport-security: max-age=31536000; includeSubDomains status: code: 200 message: OK - url: https://cloudeventgridtestgz6mhk.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + url: https://cloudeventgridtestoc4o4l.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_custom_schema_event.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_custom_schema_event.yaml index f62e83d46adf..6cc91a22b178 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_custom_schema_event.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_custom_schema_event.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '[{"customSubject": "sample", "customEventType": "sample.event", "customDataVersion": - "2.0", "customId": "1234", "customEventTime": "2020-08-26T08:37:08.332700+00:00", + "2.0", "customId": "1234", "customEventTime": "2020-09-03T21:37:49.762229+00:00", "customData": "sample data"}]' headers: Content-Length: @@ -10,8 +10,6 @@ interactions: - application/json User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - pWVPWql9F5Q5CqInHnpIWhyIWYW0gjMKy3N93kFcq8c= method: POST uri: https://customeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -20,11 +18,11 @@ interactions: headers: api-supported-versions: '2018-01-01' content-length: '0' - date: Wed, 26 Aug 2020 08:37:08 GMT + date: Thu, 03 Sep 2020 21:37:47 GMT server: Microsoft-HTTPAPI/2.0 strict-transport-security: max-age=31536000; includeSubDomains status: code: 200 message: OK - url: https://customeventgridtestj225p.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + url: https://customeventgridtestyjs7n.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_custom_schema_event_as_list.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_custom_schema_event_as_list.yaml index 8a6bd49d86e9..9ecb8d069b5f 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_custom_schema_event_as_list.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_custom_schema_event_as_list.yaml @@ -1,10 +1,10 @@ interactions: - request: body: '[{"customSubject": "sample", "customEventType": "sample.event", "customDataVersion": - "2.0", "customId": "1234", "customEventTime": "2020-08-26T08:37:08.710695+00:00", + "2.0", "customId": "1234", "customEventTime": "2020-09-03T21:37:50.025285+00:00", "customData": "sample data"}, {"customSubject": "sample2", "customEventType": "sample.event", "customDataVersion": "2.0", "customId": "12345", "customEventTime": - "2020-08-26T08:37:08.710695+00:00", "customData": "sample data 2"}]' + "2020-09-03T21:37:50.025285+00:00", "customData": "sample data 2"}]' headers: Content-Length: - '396' @@ -12,8 +12,6 @@ interactions: - application/json User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - pWVPWql9F5Q5CqInHnpIWhyIWYW0gjMKy3N93kFcq8c= method: POST uri: https://customeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -22,11 +20,11 @@ interactions: headers: api-supported-versions: '2018-01-01' content-length: '0' - date: Wed, 26 Aug 2020 08:37:08 GMT + date: Thu, 03 Sep 2020 21:37:48 GMT server: Microsoft-HTTPAPI/2.0 strict-transport-security: max-age=31536000; includeSubDomains status: code: 200 message: OK - url: https://customeventgridtestj225p.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + url: https://customeventgridtestyjs7n.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_as_list.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_as_list.yaml index ffab3ee0d911..8e8b991cef0c 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_as_list.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_as_list.yaml @@ -1,10 +1,10 @@ interactions: - request: - body: '[{"id": "d8217ffd-6e75-44e7-adbb-ed9869aa275b", "subject": "sample", "data": - "eventgridevent", "eventType": "Sample.EventGrid.Event", "eventTime": "2020-08-26T08:37:22.429524Z", - "dataVersion": "2.0"}, {"id": "8238c6eb-dd48-4404-bdb1-cc3fd06ceabd", "subject": + body: '[{"id": "3a5f4c79-11d8-440c-a050-6f0406220b28", "subject": "sample", "data": + "eventgridevent", "eventType": "Sample.EventGrid.Event", "eventTime": "2020-09-03T21:37:50.261291Z", + "dataVersion": "2.0"}, {"id": "70e96266-d9e5-47cb-bd2e-765048d2cea5", "subject": "sample2", "data": "eventgridevent2", "eventType": "Sample.EventGrid.Event", - "eventTime": "2020-08-26T08:37:22.429524Z", "dataVersion": "2.0"}]' + "eventTime": "2020-09-03T21:37:50.262227Z", "dataVersion": "2.0"}]' headers: Content-Length: - '402' @@ -12,8 +12,6 @@ interactions: - application/json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - NpNkZLDV1WROE17wLypJk8VTz8hmAcByPv3tsCmhlys= method: POST uri: https://eventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -22,11 +20,11 @@ interactions: headers: api-supported-versions: '2018-01-01' content-length: '0' - date: Wed, 26 Aug 2020 08:37:21 GMT + date: Thu, 03 Sep 2020 21:37:49 GMT server: Microsoft-HTTPAPI/2.0 strict-transport-security: max-age=31536000; includeSubDomains status: code: 200 message: OK - url: https://eventgridtesty45wuyer4g4.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + url: https://eventgridtestqagvsp23jey.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_dict.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_dict.yaml index f20a2a16b4d8..63ab59451837 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_dict.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_dict.yaml @@ -1,17 +1,15 @@ interactions: - request: - body: '[{"id": "3654b7c2-6219-45a6-a6e6-001770982469", "subject": "sample", "data": + body: '[{"id": "15dd698a-dfae-4b77-b74a-7ebbda98f3d5", "subject": "sample", "data": {"sample": "eventgridevent"}, "eventType": "Sample.EventGrid.Event", "eventTime": - "2020-08-26T08:37:22.81246Z", "dataVersion": "2.0"}]' + "2020-09-03T21:37:50.921288Z", "dataVersion": "2.0"}]' headers: Content-Length: - - '211' + - '212' Content-Type: - application/json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - NpNkZLDV1WROE17wLypJk8VTz8hmAcByPv3tsCmhlys= method: POST uri: https://eventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -20,11 +18,11 @@ interactions: headers: api-supported-versions: '2018-01-01' content-length: '0' - date: Wed, 26 Aug 2020 08:37:22 GMT + date: Thu, 03 Sep 2020 21:37:49 GMT server: Microsoft-HTTPAPI/2.0 strict-transport-security: max-age=31536000; includeSubDomains status: code: 200 message: OK - url: https://eventgridtesty45wuyer4g4.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + url: https://eventgridtestqagvsp23jey.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_str.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_str.yaml index 74bde4b6c0e9..56f3200ad437 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_str.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_str.yaml @@ -1,7 +1,7 @@ interactions: - request: - body: '[{"id": "5bd130e8-0001-488a-9cd6-807d6bb30270", "subject": "sample", "data": - "eventgridevent", "eventType": "Sample.EventGrid.Event", "eventTime": "2020-08-26T08:37:23.122484Z", + body: '[{"id": "45e66e3e-b349-4f9f-8aaf-c277ec452211", "subject": "sample", "data": + "eventgridevent", "eventType": "Sample.EventGrid.Event", "eventTime": "2020-09-03T21:37:51.163229Z", "dataVersion": "2.0"}]' headers: Content-Length: @@ -10,8 +10,6 @@ interactions: - application/json; charset=utf-8 User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - aeg-sas-key: - - NpNkZLDV1WROE17wLypJk8VTz8hmAcByPv3tsCmhlys= method: POST uri: https://eventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -20,11 +18,11 @@ interactions: headers: api-supported-versions: '2018-01-01' content-length: '0' - date: Wed, 26 Aug 2020 08:37:23 GMT + date: Thu, 03 Sep 2020 21:37:49 GMT server: Microsoft-HTTPAPI/2.0 strict-transport-security: max-age=31536000; includeSubDomains status: code: 200 message: OK - url: https://eventgridtesty45wuyer4g4.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + url: https://eventgridtestqagvsp23jey.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_signature_credential.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_signature_credential.yaml index 28c6113cb3a9..2cc7fa977214 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_signature_credential.yaml +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_signature_credential.yaml @@ -1,8 +1,8 @@ interactions: - request: - body: '[{"id": "711ffb3e-f134-45bd-b12c-b9d9463b2b95", "subject": "sample", "data": + body: '[{"id": "3c575436-60e6-49e1-be49-91e96207a69c", "subject": "sample", "data": {"sample": "eventgridevent"}, "eventType": "Sample.EventGrid.Event", "eventTime": - "2020-08-26T08:37:23.403459Z", "dataVersion": "2.0"}]' + "2020-09-03T21:37:51.447285Z", "dataVersion": "2.0"}]' headers: Content-Length: - '212' @@ -11,7 +11,7 @@ interactions: User-Agent: - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) aeg-sas-token: - - r=https%3A%2F%2Feventgridtesty45wuyer4g4.westus-1.eventgrid.azure.net%2Fapi%2Fevents%3FapiVersion%3D2018-01-01&e=2020-08-26%2009%3A37%3A23.402457%2B00%3A00&s=CCoSPjEt0vQovS3vOJXxswxV%2Frkxn9TCQPjtmE8xNeM%3D + - r=https%3A%2F%2Feventgridtestqagvsp23jey.westus-1.eventgrid.azure.net%2Fapi%2Fevents%3FapiVersion%3D2018-01-01&e=2020-09-03%2022%3A37%3A51.446284%2B00%3A00&s=MVgUMuibVdsa5f7YmaZDXPBQZPCUFR2paxC5lxJanAM%3D method: POST uri: https://eventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 response: @@ -20,11 +20,11 @@ interactions: headers: api-supported-versions: '2018-01-01' content-length: '0' - date: Wed, 26 Aug 2020 08:37:22 GMT + date: Thu, 03 Sep 2020 21:37:49 GMT server: Microsoft-HTTPAPI/2.0 strict-transport-security: max-age=31536000; includeSubDomains status: code: 200 message: OK - url: https://eventgridtesty45wuyer4g4.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + url: https://eventgridtestqagvsp23jey.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py index 3e33274e8188..c787fb7b9389 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py @@ -14,6 +14,7 @@ from devtools_testutils import AzureMgmtTestCase, CachedResourceGroupPreparer +from azure_devtools.scenario_tests import ReplayableTest from azure.core.credentials import AzureKeyCredential from azure.eventgrid import EventGridPublisherClient, CloudEvent, EventGridEvent, CustomEvent ,EventGridSharedAccessSignatureCredential, generate_shared_access_signature @@ -22,6 +23,8 @@ ) class EventGridPublisherClientTests(AzureMgmtTestCase): + FILTER_HEADERS = ReplayableTest.FILTER_HEADERS + ['aeg-sas-key'] + @pytest.mark.liveTest @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='eventgridtest') diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py index 9073b3dc2ccc..6bc512acc8b2 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py @@ -15,6 +15,7 @@ from devtools_testutils import AzureMgmtTestCase, CachedResourceGroupPreparer +from azure_devtools.scenario_tests import ReplayableTest from azure.core.credentials import AzureKeyCredential from azure.eventgrid import CloudEvent, EventGridEvent, CustomEvent ,EventGridSharedAccessSignatureCredential, generate_shared_access_signature from azure.eventgrid.aio import EventGridPublisherClient @@ -24,6 +25,8 @@ ) class EventGridPublisherClientTests(AzureMgmtTestCase): + FILTER_HEADERS = ReplayableTest.FILTER_HEADERS + ['aeg-sas-key'] + @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='eventgridtest') @pytest.mark.asyncio From a82a463c32793a3b29e132a4a4200343aaecd4be Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Thu, 3 Sep 2020 15:03:20 -0700 Subject: [PATCH 07/14] some more cahgnes --- .../azure-eventgrid/azure/eventgrid/_models.py | 9 +++++---- .../azure-eventgrid/tests/test_serialization.py | 11 +++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py index 94eb4cb04125..c61952e7c193 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py @@ -87,16 +87,16 @@ def __init__(self, source, type, **kwargs): self.datacontenttype = kwargs.get("datacontenttype", None) self.dataschema = kwargs.get("dataschema", None) self.subject = kwargs.get("subject", None) - self._extensions = {} + self.extensions = {} spec_attr = [ 'source', 'type', 'specversion', 'id', 'time', 'data', 'datacontenttype', 'dataschema', 'subject'] for attr in kwargs: if attr == 'extensions': - self._extensions.update({k:v for k, v in kwargs.get('extensions').items()}) + self.extensions.update({k:v for k, v in kwargs.get('extensions').items()}) elif attr not in spec_attr: - self._extensions.update({attr: kwargs.get(attr)}) + self.extensions.update({attr: kwargs.get(attr)}) @classmethod def _from_generated(cls, generated, **kwargs): @@ -110,6 +110,7 @@ def _from_generated(cls, generated, **kwargs): dataschema=generated.dataschema, datacontenttype=generated.datacontenttype, subject=generated.subject, + extensions=generated.additional_properties, **kwargs ) @@ -131,7 +132,7 @@ def _to_generated(self, **kwargs): dataschema=self.dataschema, datacontenttype=self.datacontenttype, subject=self.subject, - additional_properties=self._extensions, + additional_properties=self.extensions, **kwargs ) diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py index 913830c73c32..3d726198bedd 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py @@ -30,12 +30,6 @@ def _assert_cloud_event_serialized(self, expected, actual): assert 'id' in actual assert 'time' in actual - if 'data' in expected: - assert expected['data'] == actual['data'] - else: - assert expected['data_base64'] == actual['data_base64'] - - # Cloud Event tests def test_cloud_event_serialization_extension_bytes(self, **kwargs): data = b"cloudevent" @@ -70,6 +64,7 @@ def test_cloud_event_serialization_extension_bytes(self, **kwargs): } self._assert_cloud_event_serialized(expected, json) + assert expected['data_base64'] == json['data_base64'] def test_cloud_event_serialization_extension_string(self, **kwargs): @@ -104,3 +99,7 @@ def test_cloud_event_serialization_extension_string(self, **kwargs): } self._assert_cloud_event_serialized(expected, json) + if sys.version_info > (3, 5): + assert expected['data'] == actual['data'] + else: + assert expected['data_base64'] == actual['data_base64'] From 71ecc66dbd9e24716af3b9f6fad63f23ff481cd0 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Thu, 3 Sep 2020 15:42:46 -0700 Subject: [PATCH 08/14] test fix --- .../azure-eventgrid/azure/eventgrid/_models.py | 12 +++++++----- .../azure-eventgrid/tests/test_serialization.py | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py index c61952e7c193..7c46933d465e 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py @@ -87,19 +87,22 @@ def __init__(self, source, type, **kwargs): self.datacontenttype = kwargs.get("datacontenttype", None) self.dataschema = kwargs.get("dataschema", None) self.subject = kwargs.get("subject", None) - self.extensions = {} + self._extensions = {} spec_attr = [ 'source', 'type', 'specversion', 'id', 'time', 'data', 'datacontenttype', 'dataschema', 'subject'] for attr in kwargs: if attr == 'extensions': - self.extensions.update({k:v for k, v in kwargs.get('extensions').items()}) + self._extensions.update({k:v for k, v in kwargs.get('extensions').items()}) elif attr not in spec_attr: - self.extensions.update({attr: kwargs.get(attr)}) + self._extensions.update({attr: kwargs.get(attr)}) @classmethod def _from_generated(cls, generated, **kwargs): + if generated.additional_properties: + extensions = {k:v for k, v in generated.additional_properties.items()} + kwargs.setdefault('extensions', extensions) return cls( id=generated.id, source=generated.source, @@ -110,7 +113,6 @@ def _from_generated(cls, generated, **kwargs): dataschema=generated.dataschema, datacontenttype=generated.datacontenttype, subject=generated.subject, - extensions=generated.additional_properties, **kwargs ) @@ -132,7 +134,7 @@ def _to_generated(self, **kwargs): dataschema=self.dataschema, datacontenttype=self.datacontenttype, subject=self.subject, - additional_properties=self.extensions, + additional_properties=self._extensions, **kwargs ) diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py index 3d726198bedd..a134b44b5e1b 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py @@ -100,6 +100,6 @@ def test_cloud_event_serialization_extension_string(self, **kwargs): self._assert_cloud_event_serialized(expected, json) if sys.version_info > (3, 5): - assert expected['data'] == actual['data'] + assert expected['data'] == json['data'] else: - assert expected['data_base64'] == actual['data_base64'] + assert expected['data_base64'] == json['data_base64'] From d38c325002ead2c676cef5573b5b22f0917495f0 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Thu, 3 Sep 2020 15:56:16 -0700 Subject: [PATCH 09/14] 2.7 compat --- sdk/eventgrid/azure-eventgrid/tests/test_serialization.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py index a134b44b5e1b..e0d7635f3c49 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py @@ -102,4 +102,7 @@ def test_cloud_event_serialization_extension_string(self, **kwargs): if sys.version_info > (3, 5): assert expected['data'] == json['data'] else: + encoded = base64.b64encode(data).decode('utf-8') + expected['data_base64'] = encoded assert expected['data_base64'] == json['data_base64'] + assert 'data' not in json From 48394c9df93cd6d16b8823a5c4d98771f5483e10 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Thu, 3 Sep 2020 16:31:23 -0700 Subject: [PATCH 10/14] comments --- .../azure/eventgrid/_consumer.py | 5 +--- .../azure/eventgrid/_models.py | 26 ++++++++----------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_consumer.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_consumer.py index 012b0c85bae9..ae2d8a2aa9d9 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_consumer.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_consumer.py @@ -20,7 +20,6 @@ _LOGGER = logging.getLogger(__name__) -from ._generated.models import CloudEvent as InternalCloudEvent from ._models import CloudEvent, EventGridEvent class EventGridConsumer(object): @@ -39,9 +38,7 @@ def decode_cloud_event(self, cloud_event, **kwargs): encode = kwargs.pop('encoding', 'utf-8') try: cloud_event = CloudEvent._from_json(cloud_event, encode) - deserialized_event = CloudEvent._from_generated( - InternalCloudEvent.deserialize(cloud_event) - ) + deserialized_event = CloudEvent._from_generated(cloud_event) CloudEvent._deserialize_data(deserialized_event, deserialized_event.type) return deserialized_event except Exception as err: diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py index 7c46933d465e..435baf7495a4 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py @@ -80,26 +80,22 @@ def __init__(self, source, type, **kwargs): # type: (str, str, Any) -> None self.source = source self.type = type - self.specversion = kwargs.get("specversion", "1.0") - self.id = kwargs.get("id", str(uuid.uuid4())) - self.time = kwargs.get("time", dt.datetime.now(UTC()).isoformat()) - self.data = kwargs.get("data", None) - self.datacontenttype = kwargs.get("datacontenttype", None) - self.dataschema = kwargs.get("dataschema", None) - self.subject = kwargs.get("subject", None) + self.specversion = kwargs.pop("specversion", "1.0") + self.id = kwargs.pop("id", str(uuid.uuid4())) + self.time = kwargs.pop("time", dt.datetime.now(UTC()).isoformat()) + self.data = kwargs.pop("data", None) + self.datacontenttype = kwargs.pop("datacontenttype", None) + self.dataschema = kwargs.pop("dataschema", None) + self.subject = kwargs.pop("subject", None) self._extensions = {} + self._extensions.update({k:v for k, v in kwargs.pop('extensions', {}).items()}) - spec_attr = [ - 'source', 'type', 'specversion', 'id', 'time', - 'data', 'datacontenttype', 'dataschema', 'subject'] for attr in kwargs: - if attr == 'extensions': - self._extensions.update({k:v for k, v in kwargs.get('extensions').items()}) - elif attr not in spec_attr: - self._extensions.update({attr: kwargs.get(attr)}) + self._extensions.update({attr: kwargs.get(attr)}) @classmethod - def _from_generated(cls, generated, **kwargs): + def _from_generated(cls, cloud_event, **kwargs): + generated = InternalCloudEvent.deserialize(cloud_event) if generated.additional_properties: extensions = {k:v for k, v in generated.additional_properties.items()} kwargs.setdefault('extensions', extensions) From 1cd55e5561eb8ced791939a8dc507f6d8ad2bf39 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Thu, 3 Sep 2020 16:46:53 -0700 Subject: [PATCH 11/14] extensions --- .../azure-eventgrid/azure/eventgrid/_models.py | 3 --- .../azure-eventgrid/tests/test_eg_publisher_client.py | 6 ++++-- .../tests/test_eg_publisher_client_async.py | 6 ++++-- .../azure-eventgrid/tests/test_serialization.py | 10 ++-------- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py index 435baf7495a4..6594dc2ed534 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py @@ -90,9 +90,6 @@ def __init__(self, source, type, **kwargs): self._extensions = {} self._extensions.update({k:v for k, v in kwargs.pop('extensions', {}).items()}) - for attr in kwargs: - self._extensions.update({attr: kwargs.get(attr)}) - @classmethod def _from_generated(cls, cloud_event, **kwargs): generated = InternalCloudEvent.deserialize(cloud_event) diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py index c787fb7b9389..91791c711f6c 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py @@ -123,8 +123,10 @@ def test_send_cloud_event_data_with_extensions(self, resource_group, eventgrid_t source = "http://samplesource.dev", data = "cloudevent", type="Sample.Cloud.Event", - reason_code=204, - extension="extension" + extensions={ + 'reason_code':204, + 'extension':'hello' + } ) client.send([cloud_event]) internal = cloud_event._to_generated().serialize() diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py index 6bc512acc8b2..b86e2e088fcb 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py @@ -131,8 +131,10 @@ async def test_send_cloud_event_data_with_extensions(self, resource_group, event source = "http://samplesource.dev", data = "cloudevent", type="Sample.Cloud.Event", - reason_code=204, - extension="extension" + extensions={ + 'reason_code':204, + 'extension':'hello' + } ) await client.send([cloud_event]) internal = cloud_event._to_generated().serialize() diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py index e0d7635f3c49..6642d3b3813f 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py @@ -37,7 +37,6 @@ def test_cloud_event_serialization_extension_bytes(self, **kwargs): source="http://samplesource.dev", data=data, type="Sample.Cloud.Event", - reason_code=204, foo="bar", extensions={'e1':1, 'e2':2} ) @@ -47,9 +46,8 @@ def test_cloud_event_serialization_extension_bytes(self, **kwargs): internal = cloud_event._to_generated() assert internal.additional_properties is not None - assert 'foo' in internal.additional_properties + assert 'foo' not in internal.additional_properties assert 'e1' in internal.additional_properties - assert internal.additional_properties['reason_code'] == 204 json = internal.serialize() @@ -58,7 +56,6 @@ def test_cloud_event_serialization_extension_bytes(self, **kwargs): 'data_base64': encoded, 'type':'Sample.Cloud.Event', 'reason_code':204, - 'foo':'bar', 'e1':1, 'e2':2 } @@ -73,7 +70,6 @@ def test_cloud_event_serialization_extension_string(self, **kwargs): source="http://samplesource.dev", data=data, type="Sample.Cloud.Event", - reason_code=204, foo="bar", extensions={'e1':1, 'e2':2} ) @@ -82,9 +78,8 @@ def test_cloud_event_serialization_extension_string(self, **kwargs): internal = cloud_event._to_generated() assert internal.additional_properties is not None - assert 'foo' in internal.additional_properties + assert 'foo' not in internal.additional_properties assert 'e1' in internal.additional_properties - assert internal.additional_properties['reason_code'] == 204 json = internal.serialize() @@ -93,7 +88,6 @@ def test_cloud_event_serialization_extension_string(self, **kwargs): 'data': data, 'type':'Sample.Cloud.Event', 'reason_code':204, - 'foo':'bar', 'e1':1, 'e2':2 } From 6fb8283c0ece6d6bcf34ce182d81bf1cb7ec97b3 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Fri, 4 Sep 2020 10:13:41 -0700 Subject: [PATCH 12/14] changes --- .../azure/eventgrid/_models.py | 6 +-- ...ient.test_send_cloud_event_data_bytes.yaml | 38 +++++++++++++++++++ ...test_send_event_grid_event_data_bytes.yaml | 38 +++++++++++++++++++ ...sync.test_send_cloud_event_data_bytes.yaml | 28 ++++++++++++++ ...test_send_event_grid_event_data_bytes.yaml | 28 ++++++++++++++ .../tests/test_eg_publisher_client.py | 26 +++++++++++++ .../tests/test_eg_publisher_client_async.py | 28 +++++++++++++- 7 files changed, 187 insertions(+), 5 deletions(-) create mode 100644 sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_bytes.yaml create mode 100644 sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_bytes.yaml create mode 100644 sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_bytes.yaml create mode 100644 sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_bytes.yaml diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py index 6594dc2ed534..85918c9a28ed 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py @@ -87,8 +87,8 @@ def __init__(self, source, type, **kwargs): self.datacontenttype = kwargs.pop("datacontenttype", None) self.dataschema = kwargs.pop("dataschema", None) self.subject = kwargs.pop("subject", None) - self._extensions = {} - self._extensions.update({k:v for k, v in kwargs.pop('extensions', {}).items()}) + self.extensions = {} + self.extensions.update({k:v for k, v in kwargs.pop('extensions', {}).items()}) @classmethod def _from_generated(cls, cloud_event, **kwargs): @@ -127,7 +127,7 @@ def _to_generated(self, **kwargs): dataschema=self.dataschema, datacontenttype=self.datacontenttype, subject=self.subject, - additional_properties=self._extensions, + additional_properties=self.extensions, **kwargs ) diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_bytes.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_bytes.yaml new file mode 100644 index 000000000000..fd0dc457c7d5 --- /dev/null +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_cloud_event_data_bytes.yaml @@ -0,0 +1,38 @@ +interactions: +- request: + body: '[{"id": "a3f05c78-9a8d-44d8-a1a3-131b8da61192", "source": "http://samplesource.dev", + "data_base64": "Y2xvdWRldmVudA==", "type": "Sample.Cloud.Event", "time": "2020-09-04T17:06:31.601865Z", + "specversion": "1.0"}]' + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '211' + Content-Type: + - application/cloudevents-batch+json; charset=utf-8 + User-Agent: + - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) + method: POST + uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + response: + body: + string: '' + headers: + api-supported-versions: + - '2018-01-01' + content-length: + - '0' + date: + - Fri, 04 Sep 2020 17:06:29 GMT + server: + - Microsoft-HTTPAPI/2.0 + strict-transport-security: + - max-age=31536000; includeSubDomains + status: + code: 200 + message: OK +version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_bytes.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_bytes.yaml new file mode 100644 index 000000000000..7c31e4fc01cc --- /dev/null +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_bytes.yaml @@ -0,0 +1,38 @@ +interactions: +- request: + body: '[{"id": "c95a135b-fcf7-4532-9048-ec448309c46b", "subject": "sample", "data": + "b''eventgridevent''", "eventType": "Sample.EventGrid.Event", "eventTime": "2020-09-04T17:11:23.204584Z", + "dataVersion": "2.0"}]' + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '203' + Content-Type: + - application/json; charset=utf-8 + User-Agent: + - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) + method: POST + uri: https://eventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + response: + body: + string: '' + headers: + api-supported-versions: + - '2018-01-01' + content-length: + - '0' + date: + - Fri, 04 Sep 2020 17:11:20 GMT + server: + - Microsoft-HTTPAPI/2.0 + strict-transport-security: + - max-age=31536000; includeSubDomains + status: + code: 200 + message: OK +version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_bytes.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_bytes.yaml new file mode 100644 index 000000000000..ce1bc2d85c64 --- /dev/null +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_cloud_event_data_bytes.yaml @@ -0,0 +1,28 @@ +interactions: +- request: + body: '[{"id": "13ae3fbd-e54d-4e18-87d7-3a84e8b8927f", "source": "http://samplesource.dev", + "data_base64": "Y2xvdWRldmVudA==", "type": "Sample.Cloud.Event", "time": "2020-09-04T17:09:37.664287Z", + "specversion": "1.0"}]' + headers: + Content-Length: + - '211' + Content-Type: + - application/cloudevents-batch+json; charset=utf-8 + User-Agent: + - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) + method: POST + uri: https://cloudeventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + response: + body: + string: '' + headers: + api-supported-versions: '2018-01-01' + content-length: '0' + date: Fri, 04 Sep 2020 17:09:35 GMT + server: Microsoft-HTTPAPI/2.0 + strict-transport-security: max-age=31536000; includeSubDomains + status: + code: 200 + message: OK + url: https://cloudeventgridtestdfyfhi.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 +version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_bytes.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_bytes.yaml new file mode 100644 index 000000000000..c9e711d838b1 --- /dev/null +++ b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_bytes.yaml @@ -0,0 +1,28 @@ +interactions: +- request: + body: '[{"id": "1ffa21f1-300e-49df-9eaa-0879046fcf7c", "subject": "sample", "data": + "b''eventgridevent''", "eventType": "Sample.EventGrid.Event", "eventTime": "2020-09-04T17:12:57.778193Z", + "dataVersion": "2.0"}]' + headers: + Content-Length: + - '203' + Content-Type: + - application/json; charset=utf-8 + User-Agent: + - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) + method: POST + uri: https://eventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 + response: + body: + string: '' + headers: + api-supported-versions: '2018-01-01' + content-length: '0' + date: Fri, 04 Sep 2020 17:12:55 GMT + server: Microsoft-HTTPAPI/2.0 + strict-transport-security: max-age=31536000; includeSubDomains + status: + code: 200 + message: OK + url: https://eventgridtestanash6v6ehs.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 +version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py index 91791c711f6c..c2643c51ba3a 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py @@ -73,6 +73,20 @@ def test_send_event_grid_event_data_str(self, resource_group, eventgrid_topic, e ) client.send(eg_event) + @pytest.mark.liveTest + @CachedResourceGroupPreparer(name_prefix='eventgridtest') + @CachedEventGridTopicPreparer(name_prefix='eventgridtest') + def test_send_event_grid_event_data_bytes(self, resource_group, eventgrid_topic, eventgrid_topic_primary_key, eventgrid_topic_endpoint): + akc_credential = AzureKeyCredential(eventgrid_topic_primary_key) + client = EventGridPublisherClient(eventgrid_topic_endpoint, akc_credential) + eg_event = EventGridEvent( + subject="sample", + data=b"eventgridevent", + event_type="Sample.EventGrid.Event", + data_version="2.0" + ) + client.send(eg_event) + @pytest.mark.liveTest @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') @@ -99,6 +113,18 @@ def test_send_cloud_event_data_str(self, resource_group, eventgrid_topic, eventg ) client.send(cloud_event) + @pytest.mark.liveTest + @CachedResourceGroupPreparer(name_prefix='eventgridtest') + @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') + def test_send_cloud_event_data_bytes(self, resource_group, eventgrid_topic, eventgrid_topic_primary_key, eventgrid_topic_endpoint): + akc_credential = AzureKeyCredential(eventgrid_topic_primary_key) + client = EventGridPublisherClient(eventgrid_topic_endpoint, akc_credential) + cloud_event = CloudEvent( + source = "http://samplesource.dev", + data = b"cloudevent", + type="Sample.Cloud.Event" + ) + client.send(cloud_event) @pytest.mark.liveTest @CachedResourceGroupPreparer(name_prefix='eventgridtest') diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py index b86e2e088fcb..3eedce9c92fd 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py @@ -77,6 +77,19 @@ async def test_send_event_grid_event_data_str(self, resource_group, eventgrid_to ) await client.send(eg_event) + @CachedResourceGroupPreparer(name_prefix='eventgridtest') + @CachedEventGridTopicPreparer(name_prefix='eventgridtest') + @pytest.mark.asyncio + async def test_send_event_grid_event_data_bytes(self, resource_group, eventgrid_topic, eventgrid_topic_primary_key, eventgrid_topic_endpoint): + akc_credential = AzureKeyCredential(eventgrid_topic_primary_key) + client = EventGridPublisherClient(eventgrid_topic_endpoint, akc_credential) + eg_event = EventGridEvent( + subject="sample", + data=b"eventgridevent", + event_type="Sample.EventGrid.Event", + data_version="2.0" + ) + await client.send(eg_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') @@ -105,7 +118,18 @@ async def test_send_cloud_event_data_str(self, resource_group, eventgrid_topic, ) await client.send(cloud_event) - + @CachedResourceGroupPreparer(name_prefix='eventgridtest') + @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') + @pytest.mark.asyncio + async def test_send_cloud_event_data_bytes(self, resource_group, eventgrid_topic, eventgrid_topic_primary_key, eventgrid_topic_endpoint): + akc_credential = AzureKeyCredential(eventgrid_topic_primary_key) + client = EventGridPublisherClient(eventgrid_topic_endpoint, akc_credential) + cloud_event = CloudEvent( + source = "http://samplesource.dev", + data = b"cloudevent", + type="Sample.Cloud.Event" + ) + await client.send(cloud_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') @@ -121,9 +145,9 @@ async def test_send_cloud_event_data_as_list(self, resource_group, eventgrid_top await client.send([cloud_event]) - @pytest.mark.liveTest @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') + @pytest.mark.asyncio async def test_send_cloud_event_data_with_extensions(self, resource_group, eventgrid_topic, eventgrid_topic_primary_key, eventgrid_topic_endpoint): akc_credential = AzureKeyCredential(eventgrid_topic_primary_key) client = EventGridPublisherClient(eventgrid_topic_endpoint, akc_credential) From 38a76e6488c8f67623814a7691f7b05b4b1546e0 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Fri, 4 Sep 2020 11:10:36 -0700 Subject: [PATCH 13/14] Update sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py --- sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py index 85918c9a28ed..43d3624e672e 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_models.py @@ -7,7 +7,6 @@ from msrest.serialization import UTC import datetime as dt import uuid -import base64 import json import six from ._generated import models From 5a91d2253ee87f5ef2c18e98589b6c6927030083 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Fri, 4 Sep 2020 11:25:16 -0700 Subject: [PATCH 14/14] remove test --- ...test_send_event_grid_event_data_bytes.yaml | 38 ------------------- ...test_send_event_grid_event_data_bytes.yaml | 28 -------------- .../tests/test_eg_publisher_client.py | 14 ------- .../tests/test_eg_publisher_client_async.py | 14 ------- 4 files changed, 94 deletions(-) delete mode 100644 sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_bytes.yaml delete mode 100644 sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_bytes.yaml diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_bytes.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_bytes.yaml deleted file mode 100644 index 7c31e4fc01cc..000000000000 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client.test_send_event_grid_event_data_bytes.yaml +++ /dev/null @@ -1,38 +0,0 @@ -interactions: -- request: - body: '[{"id": "c95a135b-fcf7-4532-9048-ec448309c46b", "subject": "sample", "data": - "b''eventgridevent''", "eventType": "Sample.EventGrid.Event", "eventTime": "2020-09-04T17:11:23.204584Z", - "dataVersion": "2.0"}]' - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '203' - Content-Type: - - application/json; charset=utf-8 - User-Agent: - - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - method: POST - uri: https://eventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 - response: - body: - string: '' - headers: - api-supported-versions: - - '2018-01-01' - content-length: - - '0' - date: - - Fri, 04 Sep 2020 17:11:20 GMT - server: - - Microsoft-HTTPAPI/2.0 - strict-transport-security: - - max-age=31536000; includeSubDomains - status: - code: 200 - message: OK -version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_bytes.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_bytes.yaml deleted file mode 100644 index c9e711d838b1..000000000000 --- a/sdk/eventgrid/azure-eventgrid/tests/recordings/test_eg_publisher_client_async.test_send_event_grid_event_data_bytes.yaml +++ /dev/null @@ -1,28 +0,0 @@ -interactions: -- request: - body: '[{"id": "1ffa21f1-300e-49df-9eaa-0879046fcf7c", "subject": "sample", "data": - "b''eventgridevent''", "eventType": "Sample.EventGrid.Event", "eventTime": "2020-09-04T17:12:57.778193Z", - "dataVersion": "2.0"}]' - headers: - Content-Length: - - '203' - Content-Type: - - application/json; charset=utf-8 - User-Agent: - - azsdk-python-eventgridpublisherclient/unknown Python/3.7.3 (Windows-10-10.0.18362-SP0) - method: POST - uri: https://eventgridtestegtopic.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 - response: - body: - string: '' - headers: - api-supported-versions: '2018-01-01' - content-length: '0' - date: Fri, 04 Sep 2020 17:12:55 GMT - server: Microsoft-HTTPAPI/2.0 - strict-transport-security: max-age=31536000; includeSubDomains - status: - code: 200 - message: OK - url: https://eventgridtestanash6v6ehs.westus-1.eventgrid.azure.net/api/events?api-version=2018-01-01 -version: 1 diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py index c2643c51ba3a..69369c0334ad 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py @@ -73,20 +73,6 @@ def test_send_event_grid_event_data_str(self, resource_group, eventgrid_topic, e ) client.send(eg_event) - @pytest.mark.liveTest - @CachedResourceGroupPreparer(name_prefix='eventgridtest') - @CachedEventGridTopicPreparer(name_prefix='eventgridtest') - def test_send_event_grid_event_data_bytes(self, resource_group, eventgrid_topic, eventgrid_topic_primary_key, eventgrid_topic_endpoint): - akc_credential = AzureKeyCredential(eventgrid_topic_primary_key) - client = EventGridPublisherClient(eventgrid_topic_endpoint, akc_credential) - eg_event = EventGridEvent( - subject="sample", - data=b"eventgridevent", - event_type="Sample.EventGrid.Event", - data_version="2.0" - ) - client.send(eg_event) - @pytest.mark.liveTest @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py index 3eedce9c92fd..fb4aebcc18e0 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py @@ -77,20 +77,6 @@ async def test_send_event_grid_event_data_str(self, resource_group, eventgrid_to ) await client.send(eg_event) - @CachedResourceGroupPreparer(name_prefix='eventgridtest') - @CachedEventGridTopicPreparer(name_prefix='eventgridtest') - @pytest.mark.asyncio - async def test_send_event_grid_event_data_bytes(self, resource_group, eventgrid_topic, eventgrid_topic_primary_key, eventgrid_topic_endpoint): - akc_credential = AzureKeyCredential(eventgrid_topic_primary_key) - client = EventGridPublisherClient(eventgrid_topic_endpoint, akc_credential) - eg_event = EventGridEvent( - subject="sample", - data=b"eventgridevent", - event_type="Sample.EventGrid.Event", - data_version="2.0" - ) - await client.send(eg_event) - @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') @pytest.mark.asyncio