Skip to content

test rbac #35953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
l0lawrence merged 3 commits into from
Jun 6, 2024
Merged

test rbac #35953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
460f15a
test rbac
l0lawrence Jun 6, 2024
2be63f7
update
l0lawrence Jun 6, 2024
218d215
update error msg
l0lawrence Jun 6, 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
4 changes: 2 additions & 2 deletions sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ def _http_response_error_handler(self, exception):
if exception.status_code == 404:
raise ResourceNotFoundError(
"Resource not found. "
"Please check that the tier you are using, corresponds to the correct "
"endpoint and/or topic name."
"For Event Grid Namespaces, please specify the namespace_topic name on the client. "
"For Event Grid Basic, do not specify the namespace_topic name."
) from exception
raise exception

Expand Down
4 changes: 2 additions & 2 deletions sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ def _http_response_error_handler(self, exception):
if exception.status_code == 404:
raise ResourceNotFoundError(
"Resource not found. "
"Please check that the tier you are using, corresponds to the correct "
"endpoint and/or topic name."
"For Event Grid Namespaces, please specify the namespace_topic name on the client. "
"For Event Grid Basic, do not specify the namespace_topic name."
) from exception
raise exception

Expand Down
47 changes: 11 additions & 36 deletions sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,8 @@ def test_receive_data(self, **kwargs):
eventgrid_key = kwargs["eventgrid_key"]
eventgrid_topic_name = kwargs["eventgrid_topic_name"]
eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
publisher = EventGridPublisherClient(
eventgrid_endpoint, AzureKeyCredential(eventgrid_key), namespace_topic=eventgrid_topic_name
)
consumer = EventGridConsumerClient(
eventgrid_endpoint,
AzureKeyCredential(eventgrid_key),
namespace_topic=eventgrid_topic_name,
subscription=eventgrid_event_subscription_name,
)
publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)
cloud_event = CloudEvent(
source="http://samplesource.dev",
data={"sample": "cloudevent"},
Expand All @@ -78,15 +71,9 @@ def test_receive_renew_data(self, **kwargs):
eventgrid_key = kwargs["eventgrid_key"]
eventgrid_topic_name = kwargs["eventgrid_topic_name"]
eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
publisher = EventGridPublisherClient(
eventgrid_endpoint, AzureKeyCredential(eventgrid_key), namespace_topic=eventgrid_topic_name
)
consumer = EventGridConsumerClient(
eventgrid_endpoint,
AzureKeyCredential(eventgrid_key),
namespace_topic=eventgrid_topic_name,
subscription=eventgrid_event_subscription_name,
)
publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)

cloud_event = CloudEvent(
source="http://samplesource.dev",
data={"sample": "cloudevent"},
Expand All @@ -109,15 +96,9 @@ def test_receive_release_data(self, **kwargs):
eventgrid_key = kwargs["eventgrid_key"]
eventgrid_topic_name = kwargs["eventgrid_topic_name"]
eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
publisher = EventGridPublisherClient(
eventgrid_endpoint, AzureKeyCredential(eventgrid_key), namespace_topic=eventgrid_topic_name
)
consumer = EventGridConsumerClient(
eventgrid_endpoint,
AzureKeyCredential(eventgrid_key),
namespace_topic=eventgrid_topic_name,
subscription=eventgrid_event_subscription_name,
)
publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)

cloud_event = CloudEvent(
source="http://samplesource.dev",
data={"sample": "cloudevent"},
Expand All @@ -139,15 +120,9 @@ def test_receive_reject_data(self, **kwargs):
eventgrid_key = kwargs["eventgrid_key"]
eventgrid_topic_name = kwargs["eventgrid_topic_name"]
eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
publisher = EventGridPublisherClient(
eventgrid_endpoint, AzureKeyCredential(eventgrid_key), namespace_topic=eventgrid_topic_name
)
consumer = EventGridConsumerClient(
eventgrid_endpoint,
AzureKeyCredential(eventgrid_key),
namespace_topic=eventgrid_topic_name,
subscription=eventgrid_event_subscription_name,
)
publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)

cloud_event = CloudEvent(
source="http://samplesource.dev",
data={"sample": "cloudevent"},
Expand Down
44 changes: 8 additions & 36 deletions sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer_client_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,8 @@ async def test_receive_data(self, **kwargs):
eventgrid_key = kwargs["eventgrid_key"]
eventgrid_topic_name = kwargs["eventgrid_topic_name"]
eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
publisher = EventGridPublisherClient(
eventgrid_endpoint, AzureKeyCredential(eventgrid_key), namespace_topic=eventgrid_topic_name
)
consumer = EventGridConsumerClient(
eventgrid_endpoint,
AzureKeyCredential(eventgrid_key),
namespace_topic=eventgrid_topic_name,
subscription=eventgrid_event_subscription_name,
)
publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)
cloud_event = CloudEvent(
source="http://samplesource.dev",
data={"sample": "cloudevent"},
Expand All @@ -81,15 +74,8 @@ async def test_receive_renew_data(self, **kwargs):
eventgrid_key = kwargs["eventgrid_key"]
eventgrid_topic_name = kwargs["eventgrid_topic_name"]
eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
publisher = EventGridPublisherClient(
eventgrid_endpoint, AzureKeyCredential(eventgrid_key), namespace_topic=eventgrid_topic_name
)
consumer = EventGridConsumerClient(
eventgrid_endpoint,
AzureKeyCredential(eventgrid_key),
namespace_topic=eventgrid_topic_name,
subscription=eventgrid_event_subscription_name,
)
publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)
cloud_event = CloudEvent(
source="http://samplesource.dev",
data={"sample": "cloudevent"},
Expand All @@ -113,15 +99,8 @@ async def test_receive_release_data(self, **kwargs):
eventgrid_key = kwargs["eventgrid_key"]
eventgrid_topic_name = kwargs["eventgrid_topic_name"]
eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
publisher = EventGridPublisherClient(
eventgrid_endpoint, AzureKeyCredential(eventgrid_key), namespace_topic=eventgrid_topic_name
)
consumer = EventGridConsumerClient(
eventgrid_endpoint,
AzureKeyCredential(eventgrid_key),
namespace_topic=eventgrid_topic_name,
subscription=eventgrid_event_subscription_name,
)
publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)
cloud_event = CloudEvent(
source="http://samplesource.dev",
data={"sample": "cloudevent"},
Expand All @@ -144,15 +123,8 @@ async def test_receive_reject_data(self, **kwargs):
eventgrid_key = kwargs["eventgrid_key"]
eventgrid_topic_name = kwargs["eventgrid_topic_name"]
eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
publisher = EventGridPublisherClient(
eventgrid_endpoint, AzureKeyCredential(eventgrid_key), namespace_topic=eventgrid_topic_name
)
consumer = EventGridConsumerClient(
eventgrid_endpoint,
AzureKeyCredential(eventgrid_key),
namespace_topic=eventgrid_topic_name,
subscription=eventgrid_event_subscription_name,
)
publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)
cloud_event = CloudEvent(
source="http://samplesource.dev",
data={"sample": "cloudevent"},
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def test_send_event_grid_event_dict_data_dict(self, eventgrid_topic_endpoint):
def test_send_event_grid_namespace(self, **kwargs):
eventgrid_endpoint = kwargs["eventgrid_endpoint"]
eventgrid_topic_name = kwargs["eventgrid_topic_name"]
client = EventGridPublisherClient(eventgrid_endpoint, AzureKeyCredential(kwargs["eventgrid_key"]), namespace_topic=eventgrid_topic_name)
client = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
eg_event = {
"subject": "sample",
"data": {"key1": "Sample.EventGrid.Event"},
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ async def test_send_event_grid_event_dict_data_bytes(self, eventgrid_topic_endpo
async def test_send_event_grid_namespace(self, **kwargs):
eventgrid_endpoint = kwargs["eventgrid_endpoint"]
eventgrid_topic_name = kwargs["eventgrid_topic_name"]
client = EventGridPublisherClient(eventgrid_endpoint, AzureKeyCredential(kwargs["eventgrid_key"]), namespace_topic=eventgrid_topic_name)
client = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
eg_event = {
"subject": "sample",
"data": {"key1": "Sample.EventGrid.Event"},
Expand Down
12 changes: 11 additions & 1 deletion sdk/eventgrid/test-resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"partnerChannelName": "[concat(parameters('baseName'), 'partner-channel')]",
"partnerTopicName": "[concat(parameters('baseName'), 'partner-topic')]",
"eventGridDataSenderRoleId": "d5a91429-5739-47e2-a06b-3470a27159e7",
"eventGridDataContributorRoleId": "1d8c3fe3-8864-474b-8749-01e3783e8157"
},
"resources": [
{
Expand Down Expand Up @@ -218,8 +219,17 @@
"principalId": "[parameters('testApplicationOid')]",
"scope": "[resourceGroup().id]"
}
},
{
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2019-04-01-preview",
"name": "[guid(resourceGroup().id, parameters('testApplicationOid'), variables('eventGridDataContributorRoleId'))]",
"properties": {
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', variables('eventGridDataContributorRoleId'))]",
"principalId": "[parameters('testApplicationOid')]",
"scope": "[resourceGroup().id]"
}
}

],
"outputs": {
"EVENTGRID_TOPIC_KEY": {
Expand Down