Skip to content

Commit 4e77a91

Browse files
committed
Update condition to DAC check
Signed-off-by: Paul Van Eck <paulvaneck@microsoft.com>
1 parent 61112af commit 4e77a91

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

sdk/identity/azure-identity/azure/identity/_credentials/default.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def __init__(self, **kwargs: Any) -> None: # pylint: disable=too-many-statement
146146

147147
credentials: List["TokenCredential"] = []
148148
if not exclude_environment_credential:
149-
credentials.append(EnvironmentCredential(authority=authority, **kwargs))
149+
credentials.append(EnvironmentCredential(authority=authority, _within_dac=True, **kwargs))
150150
if not exclude_workload_identity_credential:
151151
if all(os.environ.get(var) for var in EnvironmentVariables.WORKLOAD_IDENTITY_VARS):
152152
client_id = workload_identity_client_id

sdk/identity/azure-identity/azure/identity/_credentials/environment.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ def __init__(self, **kwargs: Any) -> None:
101101
set_variables = [v for v in expected_variables if v in os.environ]
102102
if set_variables:
103103
_LOGGER.log(
104-
logging.INFO if set_variables == [EnvironmentVariables.AZURE_CLIENT_ID] else logging.WARNING,
105-
"Incomplete environment configuration. These variables are set: %s",
104+
logging.INFO if kwargs.get("_within_dac") else logging.WARNING,
105+
"Incomplete environment configuration for EnvironmentCredential. These variables are set: %s",
106106
", ".join(set_variables),
107107
)
108108
else:

sdk/identity/azure-identity/azure/identity/aio/_credentials/default.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def __init__(self, **kwargs: Any) -> None:
136136

137137
credentials = [] # type: List[AsyncTokenCredential]
138138
if not exclude_environment_credential:
139-
credentials.append(EnvironmentCredential(authority=authority, **kwargs))
139+
credentials.append(EnvironmentCredential(authority=authority, _within_dac=True, **kwargs))
140140
if not exclude_workload_identity_credential:
141141
if all(os.environ.get(var) for var in EnvironmentVariables.WORKLOAD_IDENTITY_VARS):
142142
client_id = workload_identity_client_id

sdk/identity/azure-identity/azure/identity/aio/_credentials/environment.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ def __init__(self, **kwargs: Any) -> None:
7676
set_variables = [v for v in expected_variables if v in os.environ]
7777
if set_variables:
7878
_LOGGER.log(
79-
logging.INFO if set_variables == [EnvironmentVariables.AZURE_CLIENT_ID] else logging.WARNING,
80-
"Incomplete environment configuration. These variables are set: %s",
79+
logging.INFO if kwargs.get("_within_dac") else logging.WARNING,
80+
"Incomplete environment configuration for EnvironmentCredential. These variables are set: %s",
8181
", ".join(set_variables),
8282
)
8383
else:

0 commit comments

Comments
 (0)