[SB] Update Tests (#36469)

* update rg env name

* enable federated auth

* disable tests

* move to mi

* add in serv conn name

* fix async topic test

* use get_cred from devutils

* move mgmt tests

* fix errors

* move subscriptions tests

* move sessions over

* move client tests

* fix client tests

* fix sessions test

* move queues

* fix proxy tests

* change back rg value

* update async test and rg env var

* move samples to use dac

* fix mypy issues

* update readme

Author: kashifkhan

sdk/servicebus/azure-servicebus/README.md

@@ -119,12 +119,14 @@ This example sends single message and array of messages to a queue that is assum
 
 ```python
 from azure.servicebus import ServiceBusClient, ServiceBusMessage
+from azure.identity import DefaultAzureCredential
 
 import os
-connstr = os.environ['SERVICE_BUS_CONNECTION_STR']
+fully_qualified_namespace = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 queue_name = os.environ['SERVICE_BUS_QUEUE_NAME']
 
-with ServiceBusClient.from_connection_string(connstr) as client:
+credential = DefaultAzureCredential()
+with ServiceBusClient(fully_qualified_namespace, credential) as client:
     with client.get_queue_sender(queue_name) as sender:
         # Sending a single message
         single_message = ServiceBusMessage("Single message")
@@ -147,12 +149,14 @@ To receive from a queue, you can either perform an ad-hoc receive via `receiver.
 
 ```python
 from azure.servicebus import ServiceBusClient
+from azure.identity import DefaultAzureCredential
 
 import os
-connstr = os.environ['SERVICE_BUS_CONNECTION_STR']
+fully_qualified_namespace = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 queue_name = os.environ['SERVICE_BUS_QUEUE_NAME']
 
-with ServiceBusClient.from_connection_string(connstr) as client:
+credential = DefaultAzureCredential()
+with ServiceBusClient(fully_qualified_namespace, credential) as client:
     # max_wait_time specifies how long the receiver should wait with no incoming messages before stopping receipt.
     # Default is None; to receive forever.
     with client.get_queue_receiver(queue_name, max_wait_time=30) as receiver:
@@ -172,12 +176,14 @@ with ServiceBusClient.from_connection_string(connstr) as client:
 
 ```python
 from azure.servicebus import ServiceBusClient
+from azure.identity import DefaultAzureCredential
 
 import os
-connstr = os.environ['SERVICE_BUS_CONNECTION_STR']
+fully_qualified_namespace = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 queue_name = os.environ['SERVICE_BUS_QUEUE_NAME']
 
-with ServiceBusClient.from_connection_string(connstr) as client:
+credential = DefaultAzureCredential()
+with ServiceBusClient(fully_qualified_namespace, credential) as client:
     with client.get_queue_receiver(queue_name) as receiver:
         received_message_array = receiver.receive_messages(max_wait_time=10)  # try to receive a single message within 10 seconds
         if received_message_array:
@@ -201,13 +207,15 @@ Sessions provide first-in-first-out and single-receiver semantics on top of a qu
 
 ```python
 from azure.servicebus import ServiceBusClient, ServiceBusMessage
+from azure.identity import DefaultAzureCredential
 
 import os
-connstr = os.environ['SERVICE_BUS_CONNECTION_STR']
+fully_qualified_namespace = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 queue_name = os.environ['SERVICE_BUS_SESSION_QUEUE_NAME']
 session_id = os.environ['SERVICE_BUS_SESSION_ID']
 
-with ServiceBusClient.from_connection_string(connstr) as client:
+credential = DefaultAzureCredential()
+with ServiceBusClient(fully_qualified_namespace, credential) as client:
     with client.get_queue_sender(queue_name) as sender:
         sender.send_messages(ServiceBusMessage("Session Enabled Message", session_id=session_id))
 
@@ -229,13 +237,16 @@ and of how these differ from queues.
 
 ```python
 from azure.servicebus import ServiceBusClient, ServiceBusMessage
+from azure.identity import DefaultAzureCredential
+
 
 import os
-connstr = os.environ['SERVICE_BUS_CONNECTION_STR']
+fully_qualified_namespace = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 topic_name = os.environ['SERVICE_BUS_TOPIC_NAME']
 subscription_name = os.environ['SERVICE_BUS_SUBSCRIPTION_NAME']
 
-with ServiceBusClient.from_connection_string(connstr) as client:
+credential = DefaultAzureCredential()
+with ServiceBusClient(fully_qualified_namespace, credential) as client:
     with client.get_topic_sender(topic_name) as sender:
         sender.send_messages(ServiceBusMessage("Data"))
 
@@ -264,12 +275,15 @@ Declares the message processing to be successfully completed, removing the messa
 
 ```python
 from azure.servicebus import ServiceBusClient
+from azure.identity import DefaultAzureCredential
+
 
 import os
-connstr = os.environ['SERVICE_BUS_CONNECTION_STR']
+fully_qualified_namespace = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 queue_name = os.environ['SERVICE_BUS_QUEUE_NAME']
 
-with ServiceBusClient.from_connection_string(connstr) as client:
+credential = DefaultAzureCredential()
+with ServiceBusClient(fully_qualified_namespace, credential) as client:
     with client.get_queue_receiver(queue_name) as receiver:
         for msg in receiver:
             print(str(msg))
@@ -282,12 +296,15 @@ Abandon processing of the message for the time being, returning the message imme
 
 ```python
 from azure.servicebus import ServiceBusClient
+from azure.identity import DefaultAzureCredential
+
 
 import os
-connstr = os.environ['SERVICE_BUS_CONNECTION_STR']
+fully_qualified_namespace = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 queue_name = os.environ['SERVICE_BUS_QUEUE_NAME']
 
-with ServiceBusClient.from_connection_string(connstr) as client:
+credential = DefaultAzureCredential()
+with ServiceBusClient(fully_qualified_namespace, credential) as client:
     with client.get_queue_receiver(queue_name) as receiver:
         for msg in receiver:
             print(str(msg))
@@ -300,12 +317,15 @@ Transfer the message from the primary queue into a special "dead-letter sub-queu
 
 ```python
 from azure.servicebus import ServiceBusClient
+from azure.identity import DefaultAzureCredential
+
 
 import os
-connstr = os.environ['SERVICE_BUS_CONNECTION_STR']
+fully_qualified_namespace = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 queue_name = os.environ['SERVICE_BUS_QUEUE_NAME']
 
-with ServiceBusClient.from_connection_string(connstr) as client:
+credential = DefaultAzureCredential()
+with ServiceBusClient(fully_qualified_namespace, credential) as client:
     with client.get_queue_receiver(queue_name) as receiver:
         for msg in receiver:
             print(str(msg))
@@ -319,12 +339,15 @@ by setting it aside such that it must be received by sequence number in a call t
 
 ```python
 from azure.servicebus import ServiceBusClient
+from azure.identity import DefaultAzureCredential
+
 
 import os
-connstr = os.environ['SERVICE_BUS_CONNECTION_STR']
+fully_qualified_namespace = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 queue_name = os.environ['SERVICE_BUS_QUEUE_NAME']
 
-with ServiceBusClient.from_connection_string(connstr) as client:
+credential = DefaultAzureCredential()
+with ServiceBusClient(fully_qualified_namespace, credential) as client:
     with client.get_queue_receiver(queue_name) as receiver:
         for msg in receiver:
             print(str(msg))
@@ -342,14 +365,17 @@ It should be used as follows:
 
 ```python
 from azure.servicebus import ServiceBusClient, AutoLockRenewer
+from azure.identity import DefaultAzureCredential
+
 
 import os
-connstr = os.environ['SERVICE_BUS_CONNECTION_STR']
+fully_qualified_namespace = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 queue_name = os.environ['SERVICE_BUS_QUEUE_NAME']
 
 # Can also be called via "with AutoLockRenewer() as renewer" to automate closing.
 renewer = AutoLockRenewer()
-with ServiceBusClient.from_connection_string(connstr) as client:
+credential = DefaultAzureCredential()
+with ServiceBusClient(fully_qualified_namespace, credential) as client:
     with client.get_queue_receiver(queue_name) as receiver:
         for msg in receiver.receive_messages():
             renewer.register(receiver, msg, max_lock_renewal_duration=60)
@@ -362,15 +388,18 @@ renewer.close()
 
 ```python
 from azure.servicebus import ServiceBusClient, AutoLockRenewer
+from azure.identity import DefaultAzureCredential
+
 
 import os
-connstr = os.environ['SERVICE_BUS_CONNECTION_STR']
+fully_qualified_namespace = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 session_queue_name = os.environ['SERVICE_BUS_SESSION_QUEUE_NAME']
 session_id = os.environ['SERVICE_BUS_SESSION_ID']
 
 # Can also be called via "with AutoLockRenewer() as renewer" to automate closing.
 renewer = AutoLockRenewer()
-with ServiceBusClient.from_connection_string(connstr) as client:
+credential = DefaultAzureCredential()
+with ServiceBusClient(fully_qualified_namespace, credential) as client:
     with client.get_queue_receiver(session_queue_name, session_id=session_id) as receiver:
         renewer.register(receiver, receiver.session, max_lock_renewal_duration=300) # Duration for how long to maintain the lock for, in seconds.
 

sdk/servicebus/azure-servicebus/samples/async_samples/auto_lock_renew_async.py

@@ -21,14 +21,17 @@
 from azure.servicebus import ServiceBusMessage
 from azure.servicebus.aio import ServiceBusClient, AutoLockRenewer
 from azure.servicebus.exceptions import ServiceBusError
+from azure.identity.aio import DefaultAzureCredential
 
-CONNECTION_STR = os.environ['SERVICEBUS_CONNECTION_STR']
+FULLY_QUALIFIED_NAMESPACE = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 QUEUE_NAME = os.environ["SERVICEBUS_QUEUE_NAME"]
 SESSION_QUEUE_NAME = os.environ['SERVICEBUS_SESSION_QUEUE_NAME']
 
 
+
 async def renew_lock_on_message_received_from_non_sessionful_entity():
-    servicebus_client = ServiceBusClient.from_connection_string(conn_str=CONNECTION_STR)
+    credential = DefaultAzureCredential()
+    servicebus_client = ServiceBusClient(FULLY_QUALIFIED_NAMESPACE, credential)
 
     async with servicebus_client:
         async with servicebus_client.get_queue_sender(queue_name=QUEUE_NAME) as sender:
@@ -57,7 +60,8 @@ async def renew_lock_on_message_received_from_non_sessionful_entity():
 
 
 async def renew_lock_on_session_of_the_sessionful_entity():
-    servicebus_client = ServiceBusClient.from_connection_string(conn_str=CONNECTION_STR)
+    credential = DefaultAzureCredential()
+    servicebus_client = ServiceBusClient(FULLY_QUALIFIED_NAMESPACE, credential)
 
     async with servicebus_client:
 
@@ -86,7 +90,8 @@ async def renew_lock_on_session_of_the_sessionful_entity():
 
 
 async def renew_lock_with_lock_renewal_failure_callback():
-    servicebus_client = ServiceBusClient.from_connection_string(conn_str=CONNECTION_STR)
+    credential = DefaultAzureCredential()
+    servicebus_client = ServiceBusClient(FULLY_QUALIFIED_NAMESPACE, credential)
 
     async with servicebus_client:
         async with servicebus_client.get_queue_sender(queue_name=QUEUE_NAME) as sender:

sdk/servicebus/azure-servicebus/samples/async_samples/connection_to_custom_endpoint_address_async.py

@@ -13,9 +13,10 @@
 import asyncio
 from azure.servicebus import ServiceBusMessage
 from azure.servicebus.aio import ServiceBusClient
+from azure.identity.aio import DefaultAzureCredential
 
 
-CONNECTION_STR = os.environ['SERVICEBUS_CONNECTION_STR']
+FULLY_QUALIFIED_NAMESPACE = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 QUEUE_NAME = os.environ["SERVICEBUS_QUEUE_NAME"]
 # The custom endpoint address to use for establishing a connection to the Service Bus service,
 # allowing network requests to be routed through any application gateways
@@ -31,8 +32,10 @@ async def send_single_message(sender):
     await sender.send_messages(message)
 
 async def main():
-    servicebus_client = ServiceBusClient.from_connection_string(
-    conn_str=CONNECTION_STR, 
+    credential = DefaultAzureCredential()
+    servicebus_client = ServiceBusClient(
+    FULLY_QUALIFIED_NAMESPACE,
+    credential,
     custom_endpoint_address=CUSTOM_ENDPOINT_ADDRESS, 
     connection_verify=CUSTOM_CA_BUNDLE_PATH
     )

sdk/servicebus/azure-servicebus/samples/async_samples/deadletter_messages_and_correct_async.py

@@ -17,9 +17,10 @@
 import asyncio
 from azure.servicebus import ServiceBusMessage, ServiceBusSubQueue
 from azure.servicebus.aio import ServiceBusClient
+from azure.identity.aio import DefaultAzureCredential
 
 
-CONNECTION_STR = os.environ['SERVICEBUS_CONNECTION_STR']
+FULLY_QUALIFIED_NAMESPACE = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 QUEUE_NAME = os.environ["SERVICEBUS_QUEUE_NAME"]
 
 async def send_messages(servicebus_client, num_messages):
@@ -93,7 +94,8 @@ async def fix_deadletters(servicebus_client):
                 await receiver.complete_message(msg)
 
 async def main():
-    servicebus_client = ServiceBusClient.from_connection_string(conn_str=CONNECTION_STR)
+    credential = DefaultAzureCredential()
+    servicebus_client = ServiceBusClient(FULLY_QUALIFIED_NAMESPACE, credential)
     receiver = servicebus_client.get_queue_receiver(queue_name=QUEUE_NAME)
     dlq_receiver = servicebus_client.get_queue_receiver(queue_name=QUEUE_NAME, 
                                                         sub_queue=ServiceBusSubQueue.DEAD_LETTER)

sdk/servicebus/azure-servicebus/samples/async_samples/mgmt_queue_async.py

@@ -18,8 +18,9 @@
 import asyncio
 import uuid
 from azure.servicebus.aio.management import ServiceBusAdministrationClient
+from azure.identity.aio import DefaultAzureCredential
 
-CONNECTION_STR = os.environ['SERVICEBUS_CONNECTION_STR']
+FULLY_QUALIFIED_NAMESPACE = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 QUEUE_NAME = "sb_mgmt_queue" + str(uuid.uuid4())
 
 
@@ -79,7 +80,8 @@ async def get_queue_runtime_properties(servicebus_mgmt_client):
 
 
 async def main():
-    async with ServiceBusAdministrationClient.from_connection_string(CONNECTION_STR) as servicebus_mgmt_client:
+    credential = DefaultAzureCredential()
+    async with ServiceBusAdministrationClient(FULLY_QUALIFIED_NAMESPACE, credential) as servicebus_mgmt_client:
         await create_queue(servicebus_mgmt_client)
         await list_queues(servicebus_mgmt_client)
         await get_and_update_queue(servicebus_mgmt_client)

sdk/servicebus/azure-servicebus/samples/async_samples/mgmt_rule_async.py

@@ -20,8 +20,9 @@
 import uuid
 from azure.servicebus.management import SqlRuleFilter
 from azure.servicebus.aio.management import ServiceBusAdministrationClient
+from azure.identity.aio import DefaultAzureCredential
 
-CONNECTION_STR = os.environ['SERVICEBUS_CONNECTION_STR']
+FULLY_QUALIFIED_NAMESPACE = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 TOPIC_NAME = os.environ['SERVICEBUS_TOPIC_NAME']
 SUBSCRIPTION_NAME = os.environ['SERVICEBUS_SUBSCRIPTION_NAME']
 RULE_NAME = "sb_mgmt_rule" + str(uuid.uuid4())
@@ -97,7 +98,8 @@ async def get_and_update_rule(servicebus_mgmt_client):
 
 
 async def main():
-    async with ServiceBusAdministrationClient.from_connection_string(CONNECTION_STR) as servicebus_mgmt_client:
+    credential = DefaultAzureCredential()
+    async with ServiceBusAdministrationClient(FULLY_QUALIFIED_NAMESPACE, credential) as servicebus_mgmt_client:
         await create_rule(servicebus_mgmt_client)
         await list_rules(servicebus_mgmt_client)
         await get_and_update_rule(servicebus_mgmt_client)

sdk/servicebus/azure-servicebus/samples/async_samples/mgmt_subscription_async.py

@@ -18,8 +18,9 @@
 import asyncio
 import uuid
 from azure.servicebus.aio.management import ServiceBusAdministrationClient
+from azure.identity.aio import DefaultAzureCredential
 
-CONNECTION_STR = os.environ['SERVICEBUS_CONNECTION_STR']
+FULLY_QUALIFIED_NAMESPACE = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 TOPIC_NAME = os.environ['SERVICEBUS_TOPIC_NAME']
 SUBSCRIPTION_NAME = "sb_mgmt_sub" + str(uuid.uuid4())
 
@@ -68,7 +69,8 @@ async def get_subscription_runtime_properties(servicebus_mgmt_client):
     print("")
 
 async def main():
-    async with ServiceBusAdministrationClient.from_connection_string(CONNECTION_STR) as servicebus_mgmt_client:
+    credential = DefaultAzureCredential()
+    async with ServiceBusAdministrationClient(FULLY_QUALIFIED_NAMESPACE, credential) as servicebus_mgmt_client:
         await create_subscription(servicebus_mgmt_client)
         await list_subscriptions(servicebus_mgmt_client)
         await get_and_update_subscription(servicebus_mgmt_client)

sdk/servicebus/azure-servicebus/samples/async_samples/mgmt_topic_async.py

@@ -19,8 +19,9 @@
 import uuid
 import datetime
 from azure.servicebus.aio.management import ServiceBusAdministrationClient
+from azure.identity.aio import DefaultAzureCredential
 
-CONNECTION_STR = os.environ['SERVICEBUS_CONNECTION_STR']
+FULLY_QUALIFIED_NAMESPACE = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 TOPIC_NAME = "sb_mgmt_topic" + str(uuid.uuid4())
 
 
@@ -72,7 +73,8 @@ async def get_topic_runtime_properties(servicebus_mgmt_client):
 
 
 async def main():
-    async with ServiceBusAdministrationClient.from_connection_string(CONNECTION_STR) as servicebus_mgmt_client:
+    credential = DefaultAzureCredential()
+    async with ServiceBusAdministrationClient(FULLY_QUALIFIED_NAMESPACE, credential) as servicebus_mgmt_client:
         await create_topic(servicebus_mgmt_client)
         await list_topics(servicebus_mgmt_client)
         await get_and_update_topic(servicebus_mgmt_client)

sdk/servicebus/azure-servicebus/samples/async_samples/proxy_async.py

@@ -13,8 +13,9 @@
 import asyncio
 from azure.servicebus import ServiceBusMessage
 from azure.servicebus.aio import ServiceBusClient
+from azure.identity.aio import DefaultAzureCredential
 
-CONNECTION_STR = os.environ['SERVICEBUS_CONNECTION_STR']
+FULLY_QUALIFIED_NAMESPACE = os.environ['SERVICEBUS_FULLY_QUALIFIED_NAMESPACE']
 QUEUE_NAME = os.environ["SERVICEBUS_QUEUE_NAME"]
 
 
@@ -32,8 +33,10 @@ async def send_single_message(sender):
 
 
 async def main():
-    servicebus_client = ServiceBusClient.from_connection_string(
-        conn_str=CONNECTION_STR,
+    credential = DefaultAzureCredential()
+    servicebus_client = ServiceBusClient(
+        FULLY_QUALIFIED_NAMESPACE,
+        credential,
         http_proxy=HTTP_PROXY
     )