Skip to content

Commit 989edaf

Browse files
author
Rakshith Bhyravabhotla
authored
Naming feedback - part 1 (Azure#16208)
* EventGridConsumer * decodes
1 parent b3960b1 commit 989edaf

15 files changed

+80
-77
lines changed

sdk/eventgrid/azure-eventgrid/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
**Breaking Changes**
66
- `EventGridSharedAccessSignatureCredential` is deprecated in favor of `AzureSasCredential`.
7+
- `EventGridConsumer` is now renamed to `EventGridDeserializer`.
8+
- `decode_cloud_event` is renamed to `deserialize_cloud_events`.
9+
- `decode_eventgrid_event` is renamed to `deserialize_eventgrid_events`.
710

811
**Bug Fixes**
912
- `EventGridEvent` has two additional required positional parameters namely, `data` and `data_version`.

sdk/eventgrid/azure-eventgrid/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ Information about the key concepts on Event Grid, see [Concepts in Azure Event G
6262
`EventGridPublisherClient` provides operations to send event data to topic hostname specified during client initialization.
6363
Either a list or a single instance of CloudEvent/EventGridEvent/CustomEvent can be sent.
6464

65-
### EventGridConsumer
66-
`EventGridConsumer` is used to desrialize an event received.
65+
### EventGridDeserializer
66+
`EventGridDeserializer` is used to desrialize an event received.
6767

6868
## Examples
6969

@@ -129,9 +129,9 @@ This example demonstrates consuming and deserializing an eventgrid event.
129129

130130
```Python
131131
import os
132-
from azure.eventgrid import EventGridConsumer
132+
from azure.eventgrid import EventGridDeserializer
133133

134-
consumer = EventGridConsumer()
134+
consumer = EventGridDeserializer()
135135

136136
eg_storage_dict = {
137137
"id":"bbab625-dc56-4b22-abeb-afcc72e5290c",
@@ -146,7 +146,7 @@ eg_storage_dict = {
146146
"topic":"/subscriptions/{subscription-id}/resourceGroups/{resource-group}/providers/Microsoft.EventGrid/topics/eventgridegsub"
147147
}
148148

149-
deserialized_event = consumer.decode_eventgrid_event(eg_storage_dict)
149+
deserialized_event = consumer.deserialize_eventgrid_events(eg_storage_dict)
150150

151151
# both allow access to raw properties as strings
152152
time_string = deserialized_event.event_time
@@ -158,9 +158,9 @@ This example demonstrates consuming and deserializing a cloud event.
158158

159159
```Python
160160
import os
161-
from azure.eventgrid import EventGridConsumer
161+
from azure.eventgrid import EventGridDeserializer
162162

163-
consumer = EventGridConsumer()
163+
consumer = EventGridDeserializer()
164164

165165
cloud_storage_dict = {
166166
"id":"a0517898-9fa4-4e70-b4a3-afda1dd68672",
@@ -173,7 +173,7 @@ cloud_storage_dict = {
173173
"specversion":"1.0"
174174
}
175175

176-
deserialized_event = consumer.decode_cloud_event(cloud_storage_dict)
176+
deserialized_event = consumer.deserialize_cloud_events(cloud_storage_dict)
177177

178178
# both allow access to raw properties as strings
179179
time_string = deserialized_event.time

sdk/eventgrid/azure-eventgrid/azure/eventgrid/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
# --------------------------------------------------------------------------
66

77
from ._publisher_client import EventGridPublisherClient
8-
from ._consumer import EventGridConsumer
8+
from ._consumer import EventGridDeserializer
99
from ._helpers import generate_shared_access_signature
1010
from ._models import CloudEvent, CustomEvent, EventGridEvent
1111
from ._version import VERSION
1212

13-
__all__ = ['EventGridPublisherClient', 'EventGridConsumer',
13+
__all__ = ['EventGridPublisherClient', 'EventGridDeserializer',
1414
'CloudEvent', 'CustomEvent', 'EventGridEvent', 'generate_shared_access_signature'
1515
]
1616
__version__ = VERSION

sdk/eventgrid/azure-eventgrid/azure/eventgrid/_consumer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
_LOGGER = logging.getLogger(__name__)
1818

19-
class EventGridConsumer(object):
19+
class EventGridDeserializer(object):
2020
"""
2121
A consumer responsible for deserializing event handler messages, to allow for
2222
access to strongly typed Event objects.
2323
"""
24-
def decode_cloud_event(self, cloud_event, **kwargs): # pylint: disable=no-self-use
24+
def deserialize_cloud_events(self, cloud_event, **kwargs): # pylint: disable=no-self-use
2525
# type: (Union[str, dict, bytes], Any) -> CloudEvent
2626
"""Single event following CloudEvent schema will be parsed and returned as Deserialized Event.
2727
:param cloud_event: The event to be deserialized.
@@ -44,7 +44,7 @@ def decode_cloud_event(self, cloud_event, **kwargs): # pylint: disable=no-self-u
4444
raise ValueError('Error: cannot deserialize event. Event does not have a valid format. \
4545
Event must be a string, dict, or bytes following the CloudEvent schema.')
4646

47-
def decode_eventgrid_event(self, eventgrid_event, **kwargs): # pylint: disable=no-self-use
47+
def deserialize_eventgrid_events(self, eventgrid_event, **kwargs): # pylint: disable=no-self-use
4848
# type: (Union[str, dict, bytes], Any) -> EventGridEvent
4949
"""Single event following EventGridEvent schema will be parsed and returned as Deserialized Event.
5050
:param eventgrid_event: The event to be deserialized.

sdk/eventgrid/azure-eventgrid/migration_guide.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ cloud_event = {
6565
|---|---|---|
6666
|`EventGridClient(credentials)`|`EventGridPublisherClient(topic_hostname, credential)`|[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)|
6767

68-
* Additionally, we now have an `EventGridConsumer` that should be used to deserialize the events. This class is used only to decode data into a `CloudEvent` or an `EventGridEvent`. Hence, there are no credentials required to construct this as shown below.
68+
* Additionally, we now have an `EventGridDeserializer` that should be used to deserialize the events. This class is used only to decode data into a `CloudEvent` or an `EventGridEvent`. Hence, there are no credentials required to construct this as shown below.
6969

7070
```Python
71-
from azure.eventgrid import EventGridConsumer
71+
from azure.eventgrid import EventGridDeserializer
7272

73-
eg_consumer = EventGridConsumer()
73+
eg_consumer = EventGridDeserializer()
7474
```
7575

7676
### Publishing Events
@@ -83,12 +83,12 @@ The `publish_events` API is replaced with `send` in v2.0. Additionally, `send` A
8383

8484
### Consuming Events
8585

86-
In v2.0, `EventGridConsumer` can be used to decode both Cloud Events and EventGrid Events. Please find the samples [here](https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/eventgrid/azure-eventgrid/samples/consume_samples) to see detailed examples of the consumer.
86+
In v2.0, `EventGridDeserializer` can be used to decode both Cloud Events and EventGrid Events. Please find the samples [here](https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/eventgrid/azure-eventgrid/samples/consume_samples) to see detailed examples of the consumer.
8787

8888
```Python
89-
EventGridConsumer().decode_cloud_event(cloud_event_dict)
89+
EventGridDeserializer().deserialize_cloud_events(cloud_event_dict)
9090

91-
EventGridConsumer().decode_eventgrid_event(eventgrid_event_dict)
91+
EventGridDeserializer().deserialize_eventgrid_events(eventgrid_event_dict)
9292
```
9393

9494
## Additional samples

sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs3_consume_system_events.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
"""
1313
import os
1414
import json
15-
from azure.eventgrid import EventGridConsumer
15+
from azure.eventgrid import EventGridDeserializer
1616

17-
consumer = EventGridConsumer()
17+
consumer = EventGridDeserializer()
1818
path = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "./cs3_system_event.json"))
1919

2020
with open(path, 'r') as f:
2121
eg_event_received_message = json.loads(f.read())
2222
# returns List[DeserializedEvent]
23-
event = consumer.decode_eventgrid_event(eg_event_received_message)
23+
event = consumer.deserialize_eventgrid_events(eg_event_received_message)
2424

2525
datetime_object = event.event_time
2626
print(datetime_object)

sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs4_consume_custom_events.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
"""
1313
import os
1414
import json
15-
from azure.eventgrid import EventGridConsumer
15+
from azure.eventgrid import EventGridDeserializer
1616

17-
consumer = EventGridConsumer()
17+
consumer = EventGridDeserializer()
1818
path = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "./cs4_event_grid_event_custom_event.json"))
1919

2020
with open(path, 'r') as f:
2121
eg_event_received_message = json.loads(f.read())
2222

2323
# returns List[DeserializedEvent]
24-
event = consumer.decode_eventgrid_event(eg_event_received_message)
24+
event = consumer.deserialize_eventgrid_events(eg_event_received_message)
2525

2626
# returns { "itemSku": "Contoso Item SKU #1" }
2727
data_dict = event.data

sdk/eventgrid/azure-eventgrid/samples/champion_scenarios/cs6_consume_events_using_cloud_events_1.0_schema.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
"""
1313
import os
1414
import json
15-
from azure.eventgrid import EventGridConsumer
15+
from azure.eventgrid import EventGridDeserializer
1616

17-
consumer = EventGridConsumer()
17+
consumer = EventGridDeserializer()
1818
path = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "./cs6_cloud_event_system_event.json"))
1919

2020
with open(path, 'r') as f:
2121
cloud_event_received_message = json.loads(f.read())
2222

2323
# returns List[DeserializedEvent]
24-
event = consumer.decode_cloud_event(cloud_event_received_message)
24+
event = consumer.deserialize_cloud_events(cloud_event_received_message)
2525

2626
datetime_object = event.time
2727
print(datetime_object)

sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_cloud_custom_data_sample.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Set the environment variables with your own values before running the sample:
1313
"""
1414
import json
15-
from azure.eventgrid import EventGridConsumer, CloudEvent
15+
from azure.eventgrid import EventGridDeserializer, CloudEvent
1616

1717
# all types of CloudEvents below produce same DeserializedEvent
1818
cloud_custom_dict = {
@@ -26,12 +26,12 @@
2626
cloud_custom_string = json.dumps(cloud_custom_dict)
2727
cloud_custom_bytes = str(cloud_custom_string).encode("utf-8")
2828

29-
client = EventGridConsumer()
30-
deserialized_dict_event = client.decode_cloud_event(cloud_custom_dict)
29+
client = EventGridDeserializer()
30+
deserialized_dict_event = client.deserialize_cloud_events(cloud_custom_dict)
3131
print(deserialized_dict_event)
3232

33-
deserialized_str_event = client.decode_cloud_event(cloud_custom_string)
33+
deserialized_str_event = client.deserialize_cloud_events(cloud_custom_string)
3434
print(deserialized_str_event)
3535

36-
deserialized_bytes_event = client.decode_cloud_event(cloud_custom_bytes)
36+
deserialized_bytes_event = client.deserialize_cloud_events(cloud_custom_bytes)
3737
print(deserialized_bytes_event)

sdk/eventgrid/azure-eventgrid/samples/consume_samples/consume_eg_storage_blob_created_data_sample.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Set the environment variables with your own values before running the sample:
1313
"""
1414
import json
15-
from azure.eventgrid import EventGridConsumer, EventGridEvent
15+
from azure.eventgrid import EventGridDeserializer, EventGridEvent
1616
from azure.eventgrid.models import StorageBlobCreatedEventData
1717

1818
# all types of EventGridEvents below produce same DeserializedEvent
@@ -41,12 +41,12 @@
4141
eg_storage_string = json.dumps(eg_storage_dict)
4242
eg_storage_bytes = str(eg_storage_string).encode("utf-8")
4343

44-
client = EventGridConsumer()
45-
deserialized_dict_event = client.decode_eventgrid_event(eg_storage_dict)
44+
client = EventGridDeserializer()
45+
deserialized_dict_event = client.deserialize_eventgrid_events(eg_storage_dict)
4646
print(deserialized_dict_event)
4747

48-
deserialized_str_event = client.decode_eventgrid_event(eg_storage_string)
48+
deserialized_str_event = client.deserialize_eventgrid_events(eg_storage_string)
4949
print(deserialized_str_event)
5050

51-
deserialized_bytes_event = client.decode_eventgrid_event(eg_storage_bytes)
51+
deserialized_bytes_event = client.deserialize_eventgrid_events(eg_storage_bytes)
5252
print(deserialized_bytes_event)

0 commit comments

Comments
 (0)