Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
c8b92f5
[EG] dont hardcode api_version on request (#34965)
l0lawrence Mar 27, 2024
d5c7f31
add sync side patches
l0lawrence Mar 27, 2024
b33f24e
aio patches
l0lawrence Mar 29, 2024
10275c3
update readme samples
l0lawrence Mar 29, 2024
4b972fb
all samples use EGClient
l0lawrence Mar 29, 2024
6afe650
update readme samples
l0lawrence Mar 29, 2024
c2da0d2
fix imports
l0lawrence Mar 29, 2024
6e30992
import issue
l0lawrence Mar 29, 2024
3a3dfd5
missing pathc
l0lawrence Mar 29, 2024
1d2e3fb
allow sas cred
l0lawrence Mar 29, 2024
36156ee
typo
l0lawrence Mar 29, 2024
1ffe29c
updates
l0lawrence Mar 29, 2024
d31a9ad
sas
l0lawrence Mar 29, 2024
eddc282
client
l0lawrence Mar 29, 2024
9195ef8
self serialize cloudevent
l0lawrence Apr 1, 2024
5e4face
add bakc in
l0lawrence Apr 1, 2024
dc9dfb1
updates
l0lawrence Apr 1, 2024
18e30ab
update ptach
l0lawrence Apr 1, 2024
9e0ab3d
update
l0lawrence Apr 1, 2024
da460d5
update exception logic
l0lawrence Apr 1, 2024
f445558
async w client
l0lawrence Apr 1, 2024
b1568d3
aio [atch
l0lawrence Apr 1, 2024
e5666bc
typo
l0lawrence Apr 1, 2024
8ce9377
import
l0lawrence Apr 1, 2024
a55861b
update links
l0lawrence Apr 1, 2024
3e9231a
tests
l0lawrence Apr 1, 2024
cce33cc
raise error
l0lawrence Apr 1, 2024
8e68c4c
content type
l0lawrence Apr 1, 2024
009d24b
use more fake url
l0lawrence Apr 1, 2024
a0e055f
remove content type
l0lawrence Apr 1, 2024
9a5fb89
mypy
l0lawrence Apr 1, 2024
4f42263
update apiversion
l0lawrence Apr 1, 2024
2737e9e
content type
l0lawrence Apr 1, 2024
a3a78ac
unitttests
l0lawrence Apr 2, 2024
ef4b2eb
update auth
l0lawrence Apr 2, 2024
37e7839
updates
l0lawrence Apr 2, 2024
de8f2bd
add level
l0lawrence Apr 2, 2024
241cdc2
update readme
l0lawrence Apr 2, 2024
d744e99
update
l0lawrence Apr 2, 2024
4dfa335
binary mode
l0lawrence Apr 2, 2024
cb9354d
args, kwargs
l0lawrence Apr 2, 2024
240e959
remove auth
l0lawrence Apr 2, 2024
339a9d6
add sample comments
l0lawrence Apr 2, 2024
0938e4b
testing
l0lawrence Apr 2, 2024
7c4934b
move around readme
l0lawrence Apr 2, 2024
ccd5c85
content type
l0lawrence Apr 3, 2024
307668a
update tests
l0lawrence Apr 3, 2024
55ace2e
docstring
l0lawrence Apr 3, 2024
e078283
cncf event
l0lawrence Apr 3, 2024
38007d7
add more tests
l0lawrence Apr 3, 2024
fe2d551
update doc
l0lawrence Apr 3, 2024
0769169
update inits to prevent typing errors
l0lawrence Apr 3, 2024
3afea29
ran blakc
l0lawrence Apr 3, 2024
5a6f41a
fix pylint patch
l0lawrence Apr 3, 2024
03ff6b3
changes
l0lawrence Apr 3, 2024
51737b4
add all kwargs
l0lawrence Apr 3, 2024
0f4ab57
indent
l0lawrence Apr 3, 2024
fd8adfc
reviews
l0lawrence Apr 3, 2024
bf35f7b
nit
l0lawrence Apr 3, 2024
bd4ea4e
name changes
l0lawrence Apr 3, 2024
fe0623a
options
l0lawrence Apr 3, 2024
6d37422
options/result rename
l0lawrence Apr 3, 2024
291e88c
Revert "options"
l0lawrence Apr 4, 2024
93fb64b
Revert "options/result rename"
l0lawrence Apr 4, 2024
61e81c0
fix tests
l0lawrence Apr 4, 2024
475ed6a
remove or None
l0lawrence Apr 4, 2024
bf94364
remove EGPubClient
l0lawrence Apr 4, 2024
7d4e712
remove options naming
l0lawrence Apr 4, 2024
e5c92a6
Merge branch 'llawrence/eg/oneclient' of https://github.com/l0lawrenc…
l0lawrence Apr 4, 2024
788a3e3
Revert "remove EGPubClient"
l0lawrence Apr 4, 2024
92543d8
typeerror
l0lawrence Apr 4, 2024
6c293ac
update readme
l0lawrence Apr 4, 2024
bb514b7
readme nit
l0lawrence Apr 4, 2024
f4fc072
readme updates
l0lawrence Apr 4, 2024
31a200a
add send operation samples
l0lawrence Apr 4, 2024
1a5b355
add datacontenttpye
l0lawrence Apr 4, 2024
1abb59f
typo
l0lawrence Apr 5, 2024
c906efa
make Options bag models kwargs
l0lawrence Apr 5, 2024
484cea4
remove models
l0lawrence Apr 5, 2024
67b5ba3
import
l0lawrence Apr 5, 2024
bb45754
exception
l0lawrence Apr 5, 2024
19ca9e0
update changelog
l0lawrence Apr 5, 2024
cd37161
shorten operation names
l0lawrence Apr 5, 2024
e793e38
nit
l0lawrence Apr 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
shorten operation names
  • Loading branch information
l0lawrence committed Apr 5, 2024
commit cd37161b28e56bfa805c8a00615a7e5cac073ab0
12 changes: 6 additions & 6 deletions sdk/eventgrid/azure-eventgrid/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Azure Event Grid is a fully-managed intelligent event routing service that allow

## _Disclaimer_

This is a beta release of Azure EventGrid's `EventGridClient`. `EventGridClient` supports `send`, `receive_cloud_events`, `acknowledge_cloud_events` , `release_cloud_events`, `reject_cloud_events`, and `renew_cloud_event_locks` operations. Please refer to the [samples](https://github.com/Azure/azure-sdk-for-python/tree/feature/eventgrid/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples) for further information.
This is a beta release of Azure EventGrid's `EventGridClient`. `EventGridClient` supports `send`, `receive`, `acknowledge` , `release`, `reject`, and `renew_locks` operations. Please refer to the [samples](https://github.com/Azure/azure-sdk-for-python/tree/feature/eventgrid/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples) for further information.

## Getting started

Expand Down Expand Up @@ -316,32 +316,32 @@ sub_name = os.environ["EVENTGRID_EVENT_SUBSCRIPTION_NAME"]
credential = AzureKeyCredential(key)
client = EventGridClient(endpoint, credential, level=ClientLevel.STANDARD)

events = client.receive_cloud_events(topic_name, sub_name, max_events=4)
events = client.receive(topic_name, sub_name, max_events=4)

for e in events:
renew_tokens = e.broker_properties.lock_token
renew_result = client.renew_cloud_events_lock(
renew_result = client.renew_locks(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=renew_tokens,
)

release_tokens = events[0].broker_properties.lock_token
release_result = client.release_cloud_events(
release_result = client.release(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=release_tokens,
)

ack_tokens = events[1].broker_properties.lock_token
ack_result = client.acknowledge_cloud_events(
ack_result = client.acknowledge(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=ack_tokens,
)

reject_tokens = events[2].broker_properties.lock_token
reject_result = client.reject_cloud_events(
reject_result = client.reject(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=reject_tokens,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ def _publish(

@use_standard_only
@distributed_trace
def receive_cloud_events(
def receive(
self,
topic_name: str,
subscription_name: str,
Expand Down Expand Up @@ -468,7 +468,7 @@ def receive_cloud_events(

@use_standard_only
@distributed_trace
def acknowledge_cloud_events(
def acknowledge(
self,
topic_name: str,
subscription_name: str,
Expand Down Expand Up @@ -504,7 +504,7 @@ def acknowledge_cloud_events(
@api_version_validation(
params_added_on={"2023-10-01-preview": ["release_delay_in_seconds"]},
)
def release_cloud_events(
def release(
self,
topic_name: str,
subscription_name: str,
Expand Down Expand Up @@ -541,7 +541,7 @@ def release_cloud_events(

@use_standard_only
@distributed_trace
def reject_cloud_events(
def reject(
self,
topic_name: str,
subscription_name: str,
Expand Down Expand Up @@ -576,7 +576,7 @@ def reject_cloud_events(
@api_version_validation(
method_added_on="2023-10-01-preview",
)
def renew_cloud_event_locks(
def renew_locks(
self,
topic_name: str,
subscription_name: str,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def _http_response_error_handler(self, exception, level):

@use_standard_only
@distributed_trace_async
async def receive_cloud_events(
async def receive(
self,
topic_name: str,
subscription_name: str,
Expand Down Expand Up @@ -299,7 +299,7 @@ async def receive_cloud_events(

@use_standard_only
@distributed_trace_async
async def acknowledge_cloud_events(
async def acknowledge(
self,
topic_name: str,
subscription_name: str,
Expand Down Expand Up @@ -332,7 +332,7 @@ async def acknowledge_cloud_events(
@api_version_validation(
params_added_on={"2023-10-01-preview": ["release_delay_in_seconds"]},
)
async def release_cloud_events(
async def release(
self,
topic_name: str,
subscription_name: str,
Expand Down Expand Up @@ -369,7 +369,7 @@ async def release_cloud_events(

@use_standard_only
@distributed_trace_async
async def reject_cloud_events(
async def reject(
self,
topic_name: str,
subscription_name: str,
Expand Down Expand Up @@ -401,7 +401,7 @@ async def reject_cloud_events(
@api_version_validation(
method_added_on="2023-10-01-preview",
)
async def renew_cloud_event_locks(
async def renew_locks(
self,
topic_name: str,
subscription_name: str,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ async def run():
try:
async with client:
lock_tokens = ["token"]
ack_events = await client.acknowledge_cloud_events(
ack_events = await client.acknowledge(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=lock_tokens,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ async def run():

# Receive Published Cloud Events
try:
receive_results = await client.receive_cloud_events(
receive_results = await client.receive(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
max_events=10,
Expand Down Expand Up @@ -95,7 +95,7 @@ async def run():

if len(release_events) > 0:
try:
release_result = await client.release_cloud_events(
release_result = await client.release(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=release_events,
Expand All @@ -108,7 +108,7 @@ async def run():

if len(acknowledge_events) > 0:
try:
ack_result = await client.acknowledge_cloud_events(
ack_result = await client.acknowledge(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=acknowledge_events,
Expand All @@ -121,7 +121,7 @@ async def run():

if len(reject_events) > 0:
try:
reject_result = await client.reject_cloud_events(
reject_result = await client.reject(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=reject_events,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ async def run():
cloud_event = CloudEvent(data=json.dumps({"hello":"data"}).encode("utf-8"), source="https://example.com", type="example", datacontenttype="application/json")
await client.send(topic_name=TOPIC_NAME, events=cloud_event, binary_mode=True)

receive_result = await client.receive_cloud_events(
receive_result = await client.receive(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
max_events=10,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ async def run():
await client.send(topic_name=TOPIC_NAME, events=cloud_event)

# Receive CloudEvents and parse out lock tokens
receive_result = await client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=10, max_wait_time=10)
receive_result = await client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=10, max_wait_time=10)
lock_tokens_to_release = []
for item in receive_result.value:
lock_tokens_to_release.append(item.broker_properties.lock_token)

# Renew lock tokens
renew_events = await client.renew_cloud_event_locks(
renew_events = await client.renew_locks(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=lock_tokens_to_release,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ async def run():
await client.send(topic_name=TOPIC_NAME, events=cloud_event)

# Receive CloudEvents and parse out lock tokens
receive_result = await client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15)
receive_result = await client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15)
lock_tokens_to_release = []
for item in receive_result.value:
lock_tokens_to_release.append(item.broker_properties.lock_token)

print("Received events:", receive_result.value)

# Release a LockToken
release_events = await client.release_cloud_events(
release_events = await client.release(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
release_delay_in_seconds=60,
Expand All @@ -59,11 +59,11 @@ async def run():
print("Released Event:", release_events)

# Receive CloudEvents again
receive_result = await client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15)
receive_result = await client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15)
print("Received events after release:", receive_result.value)

# Acknowledge a LockToken that was released
acknowledge_events = await client.acknowledge_cloud_events(
acknowledge_events = await client.acknowledge(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=lock_tokens_to_release,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ async def run():
# Receive CloudEvents
try:
async with client:
receive_result = await client.receive_cloud_events(
receive_result = await client.receive(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
max_events=10,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ async def run():
try:
async with client:
tokens = ["token"]
reject_events = await client.reject_cloud_events(
reject_events = await client.reject(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=tokens,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ async def run():
try:
async with client:
tokens = ["token"]
release_events = await client.release_cloud_events(
release_events = await client.release(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
release_delay_in_seconds=10,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ async def run():
# Renew a lockToken
try:
lock_tokens = ["token"]
release_events = await client.renew_cloud_event_locks(
release_events = await client.renew_locks(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=lock_tokens,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# Acknowledge a CloudEvent
try:
lock_tokens = ["token"]
ack_events = client.acknowledge_cloud_events(
ack_events = client.acknowledge(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=lock_tokens,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

# Receive Published Cloud Events
try:
receive_results = client.receive_cloud_events(
receive_results = client.receive(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
max_events=10,
Expand Down Expand Up @@ -88,7 +88,7 @@

if len(release_events) > 0:
try:
release_result = client.release_cloud_events(
release_result = client.release(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=release_events,
Expand All @@ -101,7 +101,7 @@

if len(acknowledge_events) > 0:
try:
ack_result = client.acknowledge_cloud_events(
ack_result = client.acknowledge(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=acknowledge_events,
Expand All @@ -114,7 +114,7 @@

if len(reject_events) > 0:
try:
reject_result = client.reject_cloud_events(
reject_result = client.reject(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=reject_events,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
client.send(topic_name=TOPIC_NAME, events=cloud_event, binary_mode=True)

# Receive a CloudEvent
receive_result = client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=100)
receive_result = client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=100)
for receive_details in receive_result.value:
cloud_event_received = receive_details.event
print("CloudEvent: ", cloud_event_received)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
client.send(topic_name=TOPIC_NAME, events=cloud_event)

# Receive CloudEvents and parse out lock tokens
receive_result = client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=10, max_wait_time=10)
receive_result = client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=10, max_wait_time=10)
lock_tokens_to_renew = []
for item in receive_result.value:
lock_tokens_to_renew.append(item.broker_properties.lock_token)

# Renew a lock token
renew_events = client.renew_cloud_event_locks(
renew_events = client.renew_locks(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=lock_tokens_to_renew,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
client.send(topic_name=TOPIC_NAME, events=cloud_event)

# Receive CloudEvents and parse out lock tokens
receive_result = client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15)
receive_result = client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15)
lock_tokens_to_release = []
for item in receive_result.value:
lock_tokens_to_release.append(item.broker_properties.lock_token)

print("Received events:", receive_result.value)

# Release a LockToken
release_events = client.release_cloud_events(
release_events = client.release(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
release_delay_in_seconds=60,
Expand All @@ -56,11 +56,11 @@
print("Released Event:", release_events)

# Receive CloudEvents again
receive_result = client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15)
receive_result = client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15)
print("Received events after release:", receive_result.value)

# Acknowledge a LockToken that was released
acknowledge_events = client.acknowledge_cloud_events(
acknowledge_events = client.acknowledge(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=lock_tokens_to_release,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

# Receive CloudEvents
try:
receive_result = client.receive_cloud_events(
receive_result = client.receive(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
max_events=10,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
# Release a LockToken
try:
lock_tokens = ["token"]
reject_events = client.reject_cloud_events(
reject_events = client.reject(
topic_name=TOPIC_NAME,
subscription_name=EVENT_SUBSCRIPTION_NAME,
lock_tokens=lock_tokens,
Expand Down
Loading