Merge pull request #554 from rtdip/develop

v0.8.7

Author: GBBBAS

src/sdk/python/rtdip_sdk/pipelines/utilities/azure/autoloader_resources.py

@@ -28,6 +28,7 @@
 )
 from azure.mgmt.storage import StorageManagementClient
 from azure.mgmt.storage.models import StorageQueue
+from azure.core.exceptions import ResourceNotFoundError
 
 
 class AzureAutoloaderResourcesUtility(UtilitiesInterface):
@@ -43,7 +44,6 @@ class AzureAutoloaderResourcesUtility(UtilitiesInterface):
         credential (TokenCredential): Credentials to authenticate with Storage Account
         event_subscription_name (str): Name of the Event Subscription
         queue_name (str): Name of the queue that will be used for the Endpoint of the Messages
-        system_topic_name (optional, str): The system topic name. Defaults to the storage account name if not provided.
     """
 
     subscription_id: str
@@ -54,7 +54,6 @@ class AzureAutoloaderResourcesUtility(UtilitiesInterface):
     credential: TokenCredential
     event_subscription_name: str
     queue_name: str
-    system_topic_name: str
 
     def __init__(
         self,
@@ -66,7 +65,6 @@ def __init__(
         credential: TokenCredential,
         event_subscription_name: str,
         queue_name: str,
-        system_topic_name: str = None,
     ) -> None:
         self.subscription_id = subscription_id
         self.resource_group_name = resource_group_name
@@ -76,9 +74,6 @@ def __init__(
         self.credential = credential
         self.event_subscription_name = event_subscription_name
         self.queue_name = queue_name
-        self.system_topic_name = (
-            storage_account if system_topic_name is None else system_topic_name
-        )
 
     @staticmethod
     def system_type():
@@ -104,21 +99,16 @@ def execute(self) -> bool:
             credential=self.credential, subscription_id=self.subscription_id
         )
 
-        account_properties = storage_mgmt_client.storage_accounts.get_properties(
-            resource_group_name=self.resource_group_name,
-            account_name=self.storage_account,
-        )
-
-        queue_response = storage_mgmt_client.queue.list(
-            resource_group_name=self.resource_group_name,
-            account_name=self.storage_account,
-        )
-
-        queue_list = [
-            queue for queue in queue_response if queue.name == self.queue_name
-        ]
+        try:
+            queue_response = storage_mgmt_client.queue.get(
+                resource_group_name=self.resource_group_name,
+                account_name=self.storage_account,
+                queue_name=self.queue_name,
+            )
+        except ResourceNotFoundError:
+            queue_response = None
 
-        if queue_list == []:
+        if queue_response == None:
             storage_mgmt_client.queue.create(
                 resource_group_name=self.resource_group_name,
                 account_name=self.storage_account,
@@ -130,47 +120,18 @@ def execute(self) -> bool:
             credential=self.credential, subscription_id=self.subscription_id
         )
 
-        system_topic_response = eventgrid_client.system_topics.list_by_resource_group(
-            resource_group_name=self.resource_group_name,
-            filter="name eq '{}'".format(self.system_topic_name),
-        )
-
         source = "/subscriptions/{}/resourceGroups/{}/providers/Microsoft.Storage/StorageAccounts/{}".format(
             self.subscription_id, self.resource_group_name, self.storage_account
         )
 
-        system_topic_list = [
-            system_topic
-            for system_topic in system_topic_response
-            if system_topic.source == source
-        ]
-
-        if system_topic_list == []:
-            eventgrid_client.system_topics.begin_create_or_update(
-                resource_group_name=self.resource_group_name,
-                system_topic_name=self.system_topic_name,
-                system_topic_info=SystemTopic(
-                    location=account_properties.location,
-                    source=source,
-                    topic_type="Microsoft.Storage.StorageAccounts",
-                ),
-            ).result()
-
-        system_topic_event_subscription_response = (
-            eventgrid_client.system_topic_event_subscriptions.list_by_system_topic(
-                resource_group_name=self.resource_group_name,
-                system_topic_name=self.system_topic_name,
-                filter="name eq '{}'".format(self.event_subscription_name),
+        try:
+            event_subscription_response = eventgrid_client.event_subscriptions.get(
+                scope=source, event_subscription_name=self.event_subscription_name
             )
-        )
-
-        system_topic_event_subscription_list = [
-            system_topic_event_subscription
-            for system_topic_event_subscription in system_topic_event_subscription_response
-            if system_topic_event_subscription.source == source
-        ]
+        except ResourceNotFoundError:
+            event_subscription_response = None
 
-        if system_topic_event_subscription_list == []:
+        if event_subscription_response == None:
             event_subscription_destination = StorageQueueEventSubscriptionDestination(
                 resource_id=source,
                 queue_name=self.queue_name,
@@ -210,10 +171,10 @@ def execute(self) -> bool:
                 retry_policy=retry_policy,
             )
 
-            eventgrid_client.system_topic_event_subscriptions.begin_create_or_update(
-                resource_group_name=self.resource_group_name,
-                system_topic_name=self.system_topic_name,
+            eventgrid_client.event_subscriptions.begin_create_or_update(
+                scope=source,
                 event_subscription_name=self.event_subscription_name,
                 event_subscription_info=event_subscription_info,
             ).result()
+
             return True

tests/sdk/python/rtdip_sdk/pipelines/utilities/azure/test_autoloader_resources.py

@@ -40,6 +40,9 @@ class MockEventSubscription:
     def __init__(self) -> None:  # NOSONAR
         pass
 
+    def get(self, **kwargs):
+        return None
+
     def list_by_system_topic(self, **kwargs):
         return []
 
@@ -65,6 +68,9 @@ def __init__(self) -> None:  # NOSONAR
     def create(self, **kwargs):  # NOSONAR
         pass
 
+    def get(self, **kwargs):
+        return None
+
     def list(self, **kwargs):
         return []
 
@@ -87,6 +93,7 @@ def __init__(self) -> None:  # NOSONAR
 class MockEventGridClient:
     system_topics = MockSystemTopics()
     system_topic_event_subscriptions = MockEventSubscription()
+    event_subscriptions = MockEventSubscription()
 
     def __init__(self) -> None:  # NOSONAR
         pass