From 77e51db5007c0aafa6d39404f5a0ce12d263a5c0 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Wed, 20 Jan 2021 10:25:40 -0800 Subject: [PATCH 1/3] Refactor send and system events --- sdk/eventgrid/azure-eventgrid/CHANGELOG.md | 2 ++ sdk/eventgrid/azure-eventgrid/README.md | 4 +-- .../azure/eventgrid/_publisher_client.py | 2 +- .../eventgrid/aio/_publisher_client_async.py | 2 +- .../{models => systemevents}/__init__.py | 0 .../azure-eventgrid/migration_guide.md | 2 +- .../cs1_publish_custom_events_to_a_topic.py | 2 +- ...custom_events_to_a_topic_with_signature.py | 2 +- ...publish_custom_events_to_a_domain_topic.py | 2 +- ...sh_events_using_cloud_events_1.0_schema.py | 2 +- ...ume_eg_storage_blob_created_data_sample.py | 2 +- ...ish_cloud_events_to_custom_topic_sample.py | 2 +- ...ish_cloud_events_to_domain_topic_sample.py | 2 +- ...sh_custom_schema_events_to_topic_sample.py | 2 +- ...vent_grid_events_to_custom_topic_sample.py | 2 +- ...ish_with_shared_access_signature_sample.py | 2 +- .../azure-eventgrid/tests/test_eg_consumer.py | 2 +- .../tests/test_eg_publisher_client.py | 28 +++++++++---------- .../tests/test_eg_publisher_client_async.py | 28 +++++++++---------- 19 files changed, 46 insertions(+), 44 deletions(-) rename sdk/eventgrid/azure-eventgrid/azure/eventgrid/{models => systemevents}/__init__.py (100%) diff --git a/sdk/eventgrid/azure-eventgrid/CHANGELOG.md b/sdk/eventgrid/azure-eventgrid/CHANGELOG.md index 857090e7b029..7db89c25d921 100644 --- a/sdk/eventgrid/azure-eventgrid/CHANGELOG.md +++ b/sdk/eventgrid/azure-eventgrid/CHANGELOG.md @@ -7,6 +7,8 @@ - `EventGridConsumer` is now renamed to `EventGridDeserializer`. - `decode_cloud_event` is renamed to `deserialize_cloud_events`. - `decode_eventgrid_event` is renamed to `deserialize_eventgrid_events`. + - The system events now exist in the `azure.eventgrid.systemevents` namespace instead of `azure.eventgrid.models` namespace. + - The `send` method in the `EventGridPubliserClient` is now replaced by the `send_events`. **Bug Fixes** - `EventGridEvent` has two additional required positional parameters namely, `data` and `data_version`. diff --git a/sdk/eventgrid/azure-eventgrid/README.md b/sdk/eventgrid/azure-eventgrid/README.md index f2282a0c59ca..07c440e7deb0 100644 --- a/sdk/eventgrid/azure-eventgrid/README.md +++ b/sdk/eventgrid/azure-eventgrid/README.md @@ -96,7 +96,7 @@ event = EventGridEvent( credential = AzureKeyCredential(key) client = EventGridPublisherClient(topic_hostname, credential) -client.send(event) +client.send_events(event) ``` ### Send a Cloud Event @@ -120,7 +120,7 @@ event = CloudEvent( credential = AzureKeyCredential(key) client = EventGridPublisherClient(topic_hostname, credential) -client.send(event) +client.send_events(event) ``` ### Consume an Event Grid Event diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_publisher_client.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_publisher_client.py index a6dd8f2d452a..5255b5645c19 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_publisher_client.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_publisher_client.py @@ -98,7 +98,7 @@ def _policies(credential, **kwargs): return policies @distributed_trace - def send(self, events, **kwargs): + def send_events(self, events, **kwargs): # type: (SendType, Any) -> None """Sends event data to topic hostname specified during client initialization. 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 40974812c365..df51577f8d9d 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 @@ -98,7 +98,7 @@ def _policies( return policies @distributed_trace_async - async def send( + async def send_events( self, events: SendType, **kwargs: Any) -> None: diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/__init__.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/systemevents/__init__.py similarity index 100% rename from sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/__init__.py rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/systemevents/__init__.py diff --git a/sdk/eventgrid/azure-eventgrid/migration_guide.md b/sdk/eventgrid/azure-eventgrid/migration_guide.md index 3bd43073b5df..e5a21685ecaf 100644 --- a/sdk/eventgrid/azure-eventgrid/migration_guide.md +++ b/sdk/eventgrid/azure-eventgrid/migration_guide.md @@ -79,7 +79,7 @@ The `publish_events` API is replaced with `send` in v2.0. Additionally, `send` A | In v1.3 | Equivalent in v2.0 | Sample | |---|---|---| -|`EventGridClient(credentials).publish_events(topic_hostname, events)`|`EventGridPublisherClient(topic_hostname, credential).send(events)`|[Sample for client construction](https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs5_publish_events_using_cloud_events_1.0_schema.py)| +|`EventGridClient(credentials).publish_events(topic_hostname, events)`|`EventGridPublisherClient(topic_hostname, credential).send_events(events)`|[Sample for client construction](https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs5_publish_events_using_cloud_events_1.0_schema.py)| ### Consuming Events diff --git a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs1_publish_custom_events_to_a_topic.py b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs1_publish_custom_events_to_a_topic.py index 77197390be85..d406da6a18c2 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs1_publish_custom_events_to_a_topic.py +++ b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs1_publish_custom_events_to_a_topic.py @@ -24,7 +24,7 @@ credential = AzureKeyCredential(topic_key) client = EventGridPublisherClient(topic_hostname, credential) -client.send([ +client.send_events([ EventGridEvent( event_type="Contoso.Items.ItemReceived", data={ diff --git a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs1b_publish_custom_events_to_a_topic_with_signature.py b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs1b_publish_custom_events_to_a_topic_with_signature.py index 2b9844b0e82f..3023f5dfb78f 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs1b_publish_custom_events_to_a_topic_with_signature.py +++ b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs1b_publish_custom_events_to_a_topic_with_signature.py @@ -27,7 +27,7 @@ credential = AzureSasCredential(signature) client = EventGridPublisherClient(topic_hostname, credential) -client.send([ +client.send_events([ EventGridEvent( event_type="Contoso.Items.ItemReceived", data={ diff --git a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs2_publish_custom_events_to_a_domain_topic.py b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs2_publish_custom_events_to_a_domain_topic.py index 81ca6f8bb06a..f992a37c12fc 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs2_publish_custom_events_to_a_domain_topic.py +++ b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs2_publish_custom_events_to_a_domain_topic.py @@ -24,7 +24,7 @@ credential = AzureKeyCredential(domain_key) client = EventGridPublisherClient(domain_hostname, credential) -client.send([ +client.send_events([ EventGridEvent( topic="MyCustomDomainTopic1", event_type="Contoso.Items.ItemReceived", diff --git a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs5_publish_events_using_cloud_events_1.0_schema.py b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs5_publish_events_using_cloud_events_1.0_schema.py index d8f9f05d663f..d21e8fa16ab8 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs5_publish_events_using_cloud_events_1.0_schema.py +++ b/sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs5_publish_events_using_cloud_events_1.0_schema.py @@ -24,7 +24,7 @@ credential = AzureKeyCredential(topic_key) client = EventGridPublisherClient(topic_hostname, credential) -client.send([ +client.send_events([ CloudEvent( type="Contoso.Items.ItemReceived", source="/contoso/items", diff --git a/sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_eg_storage_blob_created_data_sample.py b/sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_eg_storage_blob_created_data_sample.py index 057a296bd47b..dc5ba23f5646 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_eg_storage_blob_created_data_sample.py +++ b/sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_eg_storage_blob_created_data_sample.py @@ -13,7 +13,7 @@ """ import json from azure.eventgrid import EventGridDeserializer, EventGridEvent -from azure.eventgrid.models import StorageBlobCreatedEventData +from azure.eventgrid.systemevents import StorageBlobCreatedEventData # all types of EventGridEvents below produce same DeserializedEvent eg_storage_dict = { diff --git a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_custom_topic_sample.py b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_custom_topic_sample.py index 6f6fda72a458..cb40d5290b76 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_custom_topic_sample.py +++ b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_custom_topic_sample.py @@ -47,7 +47,7 @@ def publish_event(): event_list.append(event) # publish list of events - client.send(event_list) + client.send_events(event_list) print("Batch of size {} published".format(len(event_list))) time.sleep(randint(1, 5)) diff --git a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_domain_topic_sample.py b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_domain_topic_sample.py index 1466e6d797d1..ccacbe5e7005 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_domain_topic_sample.py +++ b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_cloud_events_to_domain_topic_sample.py @@ -51,7 +51,7 @@ def publish_event(): event_list.append(event) # publish list of events - client.send(event_list) + client.send_events(event_list) print("Batch of size {} published".format(len(event_list))) time.sleep(randint(1, 5)) diff --git a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_custom_schema_events_to_topic_sample.py b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_custom_schema_events_to_topic_sample.py index 09b859093f0f..e481f70b023c 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_custom_schema_events_to_topic_sample.py +++ b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_custom_schema_events_to_topic_sample.py @@ -51,7 +51,7 @@ def publish_event(): event_list.append(event) # publish list of events - client.send(event_list) + client.send_events(event_list) print("Batch of size {} published".format(len(event_list))) time.sleep(randint(1, 5)) diff --git a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_event_grid_events_to_custom_topic_sample.py b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_event_grid_events_to_custom_topic_sample.py index 744f4c064eb0..4b306c15aa96 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_event_grid_events_to_custom_topic_sample.py +++ b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_event_grid_events_to_custom_topic_sample.py @@ -48,7 +48,7 @@ def publish_event(): event_list.append(event) # publish list of events - client.send(event_list) + client.send_events(event_list) print("Batch of size {} published".format(len(event_list))) time.sleep(randint(1, 5)) diff --git a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_with_shared_access_signature_sample.py b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_with_shared_access_signature_sample.py index 7e5ef234dfb1..d62bbed433f4 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_with_shared_access_signature_sample.py +++ b/sdk/eventgrid/azure-eventgrid/samples/publish_samples/publish_with_shared_access_signature_sample.py @@ -51,7 +51,7 @@ def publish_event(): event_list.append(event) # publish list of events - client.send(event_list) + client.send_events(event_list) print("Batch of size {} published".format(len(event_list))) time.sleep(randint(1, 5)) diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer.py index 9332ed4a4f49..33e44b3c2087 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer.py @@ -14,7 +14,7 @@ from devtools_testutils import AzureMgmtTestCase from msrest.serialization import UTC from azure.eventgrid import EventGridDeserializer, CloudEvent, EventGridEvent -from azure.eventgrid.models import StorageBlobCreatedEventData +from azure.eventgrid.systemevents import StorageBlobCreatedEventData from _mocks import ( cloud_storage_dict, cloud_storage_string, 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 a34b54ad8c77..180d740abb83 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py @@ -36,7 +36,7 @@ def test_send_event_grid_event_data_dict(self, resource_group, eventgrid_topic, event_type="Sample.EventGrid.Event", data_version="2.0" ) - client.send(eg_event) + client.send_events(eg_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='eventgridtest') @@ -55,7 +55,7 @@ def test_send_event_grid_event_data_as_list(self, resource_group, eventgrid_topi event_type="Sample.EventGrid.Event", data_version="2.0" ) - client.send([eg_event1, eg_event2]) + client.send_events([eg_event1, eg_event2]) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='eventgridtest') @@ -68,7 +68,7 @@ def test_send_event_grid_event_data_str(self, resource_group, eventgrid_topic, e event_type="Sample.EventGrid.Event", data_version="2.0" ) - client.send(eg_event) + client.send_events(eg_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='eventgridtest') @@ -82,7 +82,7 @@ def test_send_event_grid_event_data_bytes(self, resource_group, eventgrid_topic, data_version="2.0" ) with pytest.raises(TypeError, match="Data in EventGridEvent cannot be bytes*"): - client.send(eg_event) + client.send_events(eg_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='eventgridtest') @@ -96,7 +96,7 @@ def test_send_event_grid_event_dict_data_bytes(self, resource_group, eventgrid_t "data_version":"2.0" } with pytest.raises(TypeError, match="Data in EventGridEvent cannot be bytes*"): - client.send(eg_event) + client.send_events(eg_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') @@ -108,7 +108,7 @@ def test_send_cloud_event_data_dict(self, resource_group, eventgrid_topic, event data = {"sample": "cloudevent"}, type="Sample.Cloud.Event" ) - client.send(cloud_event) + client.send_events(cloud_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') @@ -120,7 +120,7 @@ def test_send_cloud_event_data_str(self, resource_group, eventgrid_topic, eventg data = "cloudevent", type="Sample.Cloud.Event" ) - client.send(cloud_event) + client.send_events(cloud_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') @@ -132,7 +132,7 @@ def test_send_cloud_event_data_bytes(self, resource_group, eventgrid_topic, even data = b"cloudevent", type="Sample.Cloud.Event" ) - client.send(cloud_event) + client.send_events(cloud_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') @@ -144,7 +144,7 @@ def test_send_cloud_event_data_as_list(self, resource_group, eventgrid_topic, ev data = "cloudevent", type="Sample.Cloud.Event" ) - client.send([cloud_event]) + client.send_events([cloud_event]) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') @@ -160,7 +160,7 @@ def test_send_cloud_event_data_with_extensions(self, resource_group, eventgrid_t 'extension':'hello' } ) - client.send([cloud_event]) + client.send_events([cloud_event]) internal = cloud_event._to_generated().serialize() assert 'reason_code' in internal assert 'extension' in internal @@ -178,7 +178,7 @@ def test_send_cloud_event_dict(self, resource_group, eventgrid_topic, eventgrid_ "data": "cloudevent", "type": "Sample.Cloud.Event" } - client.send(cloud_event1) + client.send_events(cloud_event1) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='eventgridtest') @@ -193,7 +193,7 @@ def test_send_signature_credential(self, resource_group, eventgrid_topic, eventg event_type="Sample.EventGrid.Event", data_version="2.0" ) - client.send(eg_event) + client.send_events(eg_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='customeventgridtest') @@ -210,7 +210,7 @@ def test_send_custom_schema_event(self, resource_group, eventgrid_topic, eventgr "customData": "sample data" } ) - client.send(custom_event) + client.send_events(custom_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='customeventgridtest') @@ -237,7 +237,7 @@ def test_send_custom_schema_event_as_list(self, resource_group, eventgrid_topic, "customData": "sample data 2" } ) - client.send([custom_event1, custom_event2]) + client.send_events([custom_event1, custom_event2]) def test_send_throws_with_bad_credential(self): bad_credential = "I am a bad credential" 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 3e482f1ad5e0..128058d35f61 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 @@ -39,7 +39,7 @@ async def test_send_event_grid_event_data_dict(self, resource_group, eventgrid_t event_type="Sample.EventGrid.Event", data_version="2.0" ) - await client.send(eg_event) + await client.send_events(eg_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @@ -60,7 +60,7 @@ async def test_send_event_grid_event_data_as_list(self, resource_group, eventgri event_type="Sample.EventGrid.Event", data_version="2.0" ) - await client.send([eg_event1, eg_event2]) + await client.send_events([eg_event1, eg_event2]) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @@ -75,7 +75,7 @@ async def test_send_event_grid_event_data_str(self, resource_group, eventgrid_to event_type="Sample.EventGrid.Event", data_version="2.0" ) - await client.send(eg_event) + await client.send_events(eg_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='eventgridtest') @@ -90,7 +90,7 @@ async def test_send_event_grid_event_data_bytes(self, resource_group, eventgrid_ data_version="2.0" ) with pytest.raises(TypeError, match="Data in EventGridEvent cannot be bytes*"): - await client.send(eg_event) + await client.send_events(eg_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='eventgridtest') @@ -105,7 +105,7 @@ async def test_send_event_grid_event_dict_data_bytes(self, resource_group, event "data_version":"2.0" } with pytest.raises(TypeError, match="Data in EventGridEvent cannot be bytes*"): - await client.send(eg_event) + await client.send_events(eg_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') @@ -118,7 +118,7 @@ async def test_send_cloud_event_data_dict(self, resource_group, eventgrid_topic, data = {"sample": "cloudevent"}, type="Sample.Cloud.Event" ) - await client.send(cloud_event) + await client.send_events(cloud_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @@ -132,7 +132,7 @@ async def test_send_cloud_event_data_str(self, resource_group, eventgrid_topic, data = "cloudevent", type="Sample.Cloud.Event" ) - await client.send(cloud_event) + await client.send_events(cloud_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') @@ -145,7 +145,7 @@ async def test_send_cloud_event_data_bytes(self, resource_group, eventgrid_topic data = b"cloudevent", type="Sample.Cloud.Event" ) - await client.send(cloud_event) + await client.send_events(cloud_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @CachedEventGridTopicPreparer(name_prefix='cloudeventgridtest') @@ -158,7 +158,7 @@ async def test_send_cloud_event_data_as_list(self, resource_group, eventgrid_top data = "cloudevent", type="Sample.Cloud.Event" ) - await client.send([cloud_event]) + await client.send_events([cloud_event]) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @@ -176,7 +176,7 @@ async def test_send_cloud_event_data_with_extensions(self, resource_group, event 'extension':'hello' } ) - await client.send([cloud_event]) + await client.send_events([cloud_event]) internal = cloud_event._to_generated().serialize() assert 'reason_code' in internal assert 'extension' in internal @@ -196,7 +196,7 @@ async def test_send_cloud_event_dict(self, resource_group, eventgrid_topic, even "data": "cloudevent", "type": "Sample.Cloud.Event" } - await client.send(cloud_event1) + await client.send_events(cloud_event1) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @@ -213,7 +213,7 @@ async def test_send_signature_credential(self, resource_group, eventgrid_topic, event_type="Sample.EventGrid.Event", data_version="2.0" ) - await client.send(eg_event) + await client.send_events(eg_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @@ -232,7 +232,7 @@ async def test_send_custom_schema_event(self, resource_group, eventgrid_topic, e "customData": "sample data" } ) - await client.send(custom_event) + await client.send_events(custom_event) @CachedResourceGroupPreparer(name_prefix='eventgridtest') @@ -261,4 +261,4 @@ async def test_send_custom_schema_event_as_list(self, resource_group, eventgrid_ "customData": "sample data 2" } ) - await client.send([custom_event1, custom_event2]) + await client.send_events([custom_event1, custom_event2]) From 456ff1621d6486a6a906bad1712142dc563e94a9 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Wed, 20 Jan 2021 10:34:42 -0800 Subject: [PATCH 2/3] refac --- 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 173ff3f7e61b..622edd3c0094 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py @@ -15,7 +15,7 @@ from devtools_testutils import AzureMgmtTestCase from msrest.serialization import UTC from azure.eventgrid import CloudEvent, EventGridEvent -from azure.eventgrid import models +from azure.eventgrid import systemevents from azure.eventgrid._generated import models as internal_models from _mocks import ( cloud_storage_dict, From 0a58fd7f1fba78ad57f43ab9abb5f35ac17e9406 Mon Sep 17 00:00:00 2001 From: Rakshith Bhyravabhotla Date: Wed, 20 Jan 2021 10:46:03 -0800 Subject: [PATCH 3/3] fix test --- 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 622edd3c0094..2a72ab2747cd 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_serialization.py @@ -104,7 +104,7 @@ def test_cloud_event_serialization_extension_string(self, **kwargs): assert 'data' not in json def test_models_exist_in_namespace(self): - exposed = dir(models) + exposed = dir(systemevents) generated = dir(internal_models) diff = {m for m in list(set(generated) - set(exposed)) if not m.startswith('_')}