Skip to content

Commit 4b50745

Browse files
authored
[Key Vault] Update tests to work with missing SP credentials (#36679)
1 parent 92bf9ab commit 4b50745

File tree

14 files changed

+26
-20
lines changed

14 files changed

+26
-20
lines changed

sdk/keyvault/azure-keyvault-administration/tests/_async_test_case.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ def _skip_if_not_configured(self, api_version, **kwargs):
4848

4949
def _set_mgmt_settings_real_values(self):
5050
if self.is_live:
51-
os.environ["AZURE_TENANT_ID"] = os.environ["KEYVAULT_TENANT_ID"]
52-
os.environ["AZURE_CLIENT_ID"] = os.environ["KEYVAULT_CLIENT_ID"]
53-
os.environ["AZURE_CLIENT_SECRET"] = os.environ["KEYVAULT_CLIENT_SECRET"]
51+
os.environ["AZURE_TENANT_ID"] = os.getenv("KEYVAULT_TENANT_ID", "") # empty in pipelines
52+
os.environ["AZURE_CLIENT_ID"] = os.getenv("KEYVAULT_CLIENT_ID", "") # empty in pipelines
53+
os.environ["AZURE_CLIENT_SECRET"] = os.getenv("KEYVAULT_CLIENT_SECRET", "") # empty for user-based auth
5454

5555

5656
class KeyVaultBackupClientPreparer(BaseClientPreparer):

sdk/keyvault/azure-keyvault-administration/tests/_test_case.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ def _skip_if_not_configured(self, api_version, **kwargs):
4949

5050
def _set_mgmt_settings_real_values(self):
5151
if self.is_live:
52-
os.environ["AZURE_TENANT_ID"] = os.environ["KEYVAULT_TENANT_ID"]
53-
os.environ["AZURE_CLIENT_ID"] = os.environ["KEYVAULT_CLIENT_ID"]
54-
os.environ["AZURE_CLIENT_SECRET"] = os.environ["KEYVAULT_CLIENT_SECRET"]
52+
os.environ["AZURE_TENANT_ID"] = os.getenv("KEYVAULT_TENANT_ID", "") # empty in pipelines
53+
os.environ["AZURE_CLIENT_ID"] = os.getenv("KEYVAULT_CLIENT_ID", "") # empty in pipelines
54+
os.environ["AZURE_CLIENT_SECRET"] = os.getenv("KEYVAULT_CLIENT_SECRET", "") # empty for user-based auth
5555

5656

5757
class KeyVaultBackupClientPreparer(BaseClientPreparer):

sdk/keyvault/azure-keyvault-certificates/tests/_async_test_case.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ def __init__(self, **kwargs) -> None:
2828
self.is_logging_enabled = kwargs.pop("logging_enable", True)
2929

3030
if is_live():
31-
os.environ["AZURE_TENANT_ID"] = os.environ["KEYVAULT_TENANT_ID"]
32-
os.environ["AZURE_CLIENT_ID"] = os.environ["KEYVAULT_CLIENT_ID"]
31+
os.environ["AZURE_TENANT_ID"] = os.getenv("KEYVAULT_TENANT_ID", "") # empty in pipelines
32+
os.environ["AZURE_CLIENT_ID"] = os.getenv("KEYVAULT_CLIENT_ID", "") # empty in pipelines
3333
os.environ["AZURE_CLIENT_SECRET"] = os.getenv("KEYVAULT_CLIENT_SECRET", "") # empty for user-based auth
3434

3535
def __call__(self, fn):

sdk/keyvault/azure-keyvault-certificates/tests/_test_case.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ def __init__(self, **kwargs) -> None:
2626

2727
if is_live():
2828
self.azure_keyvault_url = os.environ["AZURE_KEYVAULT_URL"]
29-
os.environ["AZURE_TENANT_ID"] = os.environ["KEYVAULT_TENANT_ID"]
30-
os.environ["AZURE_CLIENT_ID"] = os.environ["KEYVAULT_CLIENT_ID"]
29+
os.environ["AZURE_TENANT_ID"] = os.getenv("KEYVAULT_TENANT_ID", "") # empty in pipelines
30+
os.environ["AZURE_CLIENT_ID"] = os.getenv("KEYVAULT_CLIENT_ID", "") # empty in pipelines
3131
os.environ["AZURE_CLIENT_SECRET"] = os.getenv("KEYVAULT_CLIENT_SECRET", "") # empty for user-based auth
3232

3333
def __call__(self, fn):

sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def print(*args):
2121
assert all(arg is not None for arg in args)
2222

2323

24+
@pytest.mark.playback_test_only("Can't run in live pipelines, and there's no reason to.")
2425
def test_create_certificate_client():
2526
vault_url = "vault_url"
2627
# pylint:disable=unused-variable

sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates_async.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def print(*args):
2121

2222

2323
@pytest.mark.asyncio
24+
@pytest.mark.playback_test_only("Can't run in live pipelines, and there's no reason to.")
2425
async def test_create_certificate():
2526
vault_url = "vault_url"
2627
# pylint:disable=unused-variable

sdk/keyvault/azure-keyvault-keys/tests/_async_test_case.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ def create_key_client(self, vault_uri, **kwargs):
9595

9696
def _set_mgmt_settings_real_values(self):
9797
if self.is_live:
98-
os.environ["AZURE_TENANT_ID"] = os.environ["KEYVAULT_TENANT_ID"]
99-
os.environ["AZURE_CLIENT_ID"] = os.environ["KEYVAULT_CLIENT_ID"]
100-
os.environ["AZURE_CLIENT_SECRET"] = os.environ.get("KEYVAULT_CLIENT_SECRET", "") # Empty for user auth
98+
os.environ["AZURE_TENANT_ID"] = os.getenv("KEYVAULT_TENANT_ID", "") # empty in pipelines
99+
os.environ["AZURE_CLIENT_ID"] = os.getenv("KEYVAULT_CLIENT_ID", "") # empty in pipelines
100+
os.environ["AZURE_CLIENT_SECRET"] = os.getenv("KEYVAULT_CLIENT_SECRET", "") # empty for user-based auth
101101

102102
def _skip_if_not_configured(self, is_hsm):
103103
if self.is_live and is_hsm and self.managed_hsm_url is None:

sdk/keyvault/azure-keyvault-keys/tests/_test_case.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ def create_key_client(self, vault_uri, **kwargs):
100100

101101
def _set_mgmt_settings_real_values(self):
102102
if self.is_live:
103-
os.environ["AZURE_TENANT_ID"] = os.environ["KEYVAULT_TENANT_ID"]
104-
os.environ["AZURE_CLIENT_ID"] = os.environ["KEYVAULT_CLIENT_ID"]
105-
os.environ["AZURE_CLIENT_SECRET"] = os.environ.get("KEYVAULT_CLIENT_SECRET", "") # Empty for user auth
103+
os.environ["AZURE_TENANT_ID"] = os.getenv("KEYVAULT_TENANT_ID", "") # empty in pipelines
104+
os.environ["AZURE_CLIENT_ID"] = os.getenv("KEYVAULT_CLIENT_ID", "") # empty in pipelines
105+
os.environ["AZURE_CLIENT_SECRET"] = os.getenv("KEYVAULT_CLIENT_SECRET", "") # empty for user-based auth
106106

107107
def _skip_if_not_configured(self, is_hsm):
108108
if self.is_live and is_hsm and self.managed_hsm_url is None:

sdk/keyvault/azure-keyvault-keys/tests/test_samples_keys.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ def print(*args):
2323
assert all(arg is not None for arg in args)
2424

2525

26+
@pytest.mark.playback_test_only("Can't run in live pipelines, and there's no reason to.")
2627
def test_create_key_client():
2728
vault_url = "vault_url"
2829
# pylint:disable=unused-variable

sdk/keyvault/azure-keyvault-keys/tests/test_samples_keys_async.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def print(*args):
2121

2222

2323
@pytest.mark.asyncio
24+
@pytest.mark.playback_test_only("Can't run in live pipelines, and there's no reason to.")
2425
async def test_create_key_client():
2526
vault_url = "vault_url"
2627
# pylint:disable=unused-variable

0 commit comments

Comments
 (0)