Skip to content

Commit 93c72bd

Browse files
authored
disable_instance_discovery (Azure#28816)
1 parent 340d2ff commit 93c72bd

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

sdk/identity/azure-identity/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
### Features Added
66

7+
- Changed parameter from `instance_discovery` to `disable_instance_discovery` to make it more explicit.
8+
79
### Breaking Changes
810

911
### Bugs Fixed

sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ def __init__(
2424
additionally_allowed_tenants: Optional[List[str]] = None,
2525
allow_broker: Optional[bool] = None,
2626
authority: Optional[str] = None,
27-
instance_discovery: Optional[bool] = None,
27+
disable_instance_discovery: Optional[bool] = None,
2828
tenant_id: Optional[str] = None,
2929
**kwargs
3030
) -> None:
31-
self._instance_discovery = instance_discovery
31+
self._instance_discovery = None if disable_instance_discovery is None else not disable_instance_discovery
3232
self._authority = normalize_authority(authority) if authority else get_default_authority()
3333
self._regional_authority = os.environ.get(EnvironmentVariables.AZURE_REGIONAL_AUTHORITY_NAME)
3434
if self._regional_authority and self._regional_authority.lower() in ["tryautodetect", "true"]:

sdk/identity/azure-identity/tests/test_device_code_credential.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def test_device_code_credential():
203203

204204
callback = Mock()
205205
credential = DeviceCodeCredential(
206-
client_id=client_id, prompt_callback=callback, transport=transport, instance_discovery=False,
206+
client_id=client_id, prompt_callback=callback, transport=transport, disable_instance_discovery=True,
207207
)
208208

209209
now = datetime.datetime.utcnow()
@@ -259,7 +259,7 @@ def test_tenant_id():
259259

260260
callback = Mock()
261261
credential = DeviceCodeCredential(
262-
client_id=client_id, prompt_callback=callback, transport=transport, instance_discovery=False, additionally_allowed_tenants=['*']
262+
client_id=client_id, prompt_callback=callback, transport=transport, disable_instance_discovery=True, additionally_allowed_tenants=['*']
263263
)
264264

265265
now = datetime.datetime.utcnow()
@@ -274,7 +274,7 @@ def test_timeout():
274274
msal_app.initiate_device_flow.return_value = flow
275275
msal_app.acquire_token_by_device_flow.return_value = {"error": "authorization_pending"}
276276

277-
credential = DeviceCodeCredential(client_id="_", timeout=1, instance_discovery=False)
277+
credential = DeviceCodeCredential(client_id="_", timeout=1, disable_instance_discovery=True)
278278
with pytest.raises(ClientAuthenticationError) as ex:
279279
credential.get_token("scope")
280280
assert "timed out" in ex.value.message.lower()

sdk/identity/azure-identity/tests/test_instance_discovery.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
def test_instance_discovery():
99
credential = MsalCredential(
1010
client_id="CLIENT_ID",
11-
instance_discovery=False,
11+
disable_instance_discovery=True,
1212
)
1313
app = credential._get_app()
1414
assert not app._instance_discovery
1515

1616
credential = MsalCredential(
1717
client_id="CLIENT_ID",
18-
instance_discovery=True,
18+
disable_instance_discovery=False,
1919
)
2020
app = credential._get_app()
2121
assert app._instance_discovery

sdk/identity/azure-identity/tests/test_username_password_credential.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def test_username_password_credential():
111111
username="user@azure",
112112
password="secret_password",
113113
transport=transport,
114-
instance_discovery=False, # kwargs are passed to MSAL; this one prevents an AAD verification request
114+
disable_instance_discovery=True, # kwargs are passed to MSAL; this one prevents an AAD verification request
115115
)
116116

117117
token = credential.get_token("scope")

0 commit comments

Comments
 (0)