Code cleanup

Author: aavasthy

sdk/cosmos/azure-cosmos/azure/cosmos/_auth_policy.py

@@ -14,6 +14,7 @@
 from azure.core.exceptions import HttpResponseError
 
 from .http_constants import HttpHeaders
+from ._constants import _Constants as Constants
 
 HTTPRequestType = TypeVar("HTTPRequestType", HttpRequest, LegacyHttpRequest)
 
@@ -22,7 +23,7 @@
 # Composition was considered, but still required accessing protected members, so inheritance is retained
 # for seamless Azure SDK pipeline integration.
 class CosmosBearerTokenCredentialPolicy(BearerTokenCredentialPolicy):
-    AadDefaultScope = Constants._Constants.AAD_DEFAULT_SCOPE
+    AadDefaultScope = Constants.AAD_DEFAULT_SCOPE
 
     def __init__(self, credential, account_scope: str, override_scope: Optional[str] = None):
         self._account_scope = account_scope

sdk/cosmos/azure-cosmos/azure/cosmos/_cosmos_client_connection.py

@@ -118,7 +118,6 @@ def __init__( # pylint: disable=too-many-statements
         auth: CredentialDict,
         connection_policy: Optional[ConnectionPolicy] = None,
         consistency_level: Optional[str] = None,
-        audience: Optional[str] = None,
         **kwargs: Any
     ) -> None:
         """
@@ -133,8 +132,6 @@ def __init__( # pylint: disable=too-many-statements
             The connection policy for the client.
         :param documents.ConsistencyLevel consistency_level:
             The default consistency policy for client operations.
-        :param str audience:
-            The overridden scope value.
         """
         self.client_id = str(uuid.uuid4())
         self.url_connection = url_connection
@@ -206,7 +203,7 @@ def __init__( # pylint: disable=too-many-statements
 
         credentials_policy = None
         if self.aad_credentials:
-            scope_override = audience or os.environ.get(Constants.AAD_SCOPE_OVERRIDE, "")
+            scope_override = os.environ.get(Constants.AAD_SCOPE_OVERRIDE, "")
             account_scope = base.create_scope_from_url(self.url_connection)
             credentials_policy = CosmosBearerTokenCredentialPolicy(
                 self.aad_credentials,

sdk/cosmos/azure-cosmos/azure/cosmos/aio/_auth_policy_async.py

@@ -6,7 +6,6 @@
 
 from typing import Any, MutableMapping, TypeVar, cast, Optional
 
-from azure.cosmos import _constants as Constants
 from azure.core.pipeline.policies import AsyncBearerTokenCredentialPolicy
 from azure.core.pipeline import PipelineRequest
 from azure.core.pipeline.transport import HttpRequest as LegacyHttpRequest
@@ -15,6 +14,7 @@
 from azure.core.exceptions import HttpResponseError
 
 from ..http_constants import HttpHeaders
+from .._constants import _Constants as Constants
 
 HTTPRequestType = TypeVar("HTTPRequestType", HttpRequest, LegacyHttpRequest)
 
@@ -23,7 +23,7 @@
 # Composition was considered, but still required accessing protected members, so inheritance is retained
 # for seamless Azure SDK pipeline integration.
 class AsyncCosmosBearerTokenCredentialPolicy(AsyncBearerTokenCredentialPolicy):
-    AadDefaultScope = Constants._Constants.AAD_DEFAULT_SCOPE
+    AadDefaultScope = Constants.AAD_DEFAULT_SCOPE
 
     def __init__(self, credential, account_scope: str, override_scope: Optional[str] = None):
         self._account_scope = account_scope

sdk/cosmos/azure-cosmos/azure/cosmos/aio/_cosmos_client_connection_async.py

@@ -124,7 +124,6 @@ def __init__( # pylint: disable=too-many-statements
             auth: CredentialDict,
             connection_policy: Optional[ConnectionPolicy] = None,
             consistency_level: Optional[str] = None,
-            audience: Optional[str] = None,
             **kwargs: Any
     ) -> None:
         """
@@ -139,8 +138,6 @@ def __init__( # pylint: disable=too-many-statements
             The connection policy for the client.
         :param documents.ConsistencyLevel consistency_level:
             The default consistency policy for client operations.
-        :param str audience:
-            The overridden scope value.
         """
         self.client_id = str(uuid.uuid4())
         self.url_connection = url_connection
@@ -214,7 +211,7 @@ def __init__( # pylint: disable=too-many-statements
 
         credentials_policy = None
         if self.aad_credentials:
-            scope_override = audience or os.environ.get(Constants.AAD_SCOPE_OVERRIDE, "")
+            scope_override = os.environ.get(Constants.AAD_SCOPE_OVERRIDE, "")
             account_scope = base.create_scope_from_url(self.url_connection)
             credentials_policy = AsyncCosmosBearerTokenCredentialPolicy(
                 self.aad_credentials,