Skip to content

Commit 2be4054

Browse files
authored
[Key Vault] Test secrets library against a shared vault (Azure#16812)
1 parent b4021b3 commit 2be4054

File tree

35 files changed

+7166
-16592
lines changed

35 files changed

+7166
-16592
lines changed

sdk/keyvault/azure-keyvault-secrets/tests/_shared/test_case.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import time
66

77
from azure_devtools.scenario_tests.patches import patch_time_sleep_api
8-
from devtools_testutils import AzureMgmtTestCase
8+
from devtools_testutils import AzureTestCase
99

1010

11-
class KeyVaultTestCase(AzureMgmtTestCase):
11+
class KeyVaultTestCase(AzureTestCase):
1212
def __init__(self, *args, **kwargs):
1313
if "match_body" not in kwargs:
1414
kwargs["match_body"] = True
@@ -20,6 +20,10 @@ def setUp(self):
2020
self.list_test_size = 7
2121
super(KeyVaultTestCase, self).setUp()
2222

23+
def get_resource_name(self, name):
24+
"""helper to create resources with a consistent, test-indicative prefix"""
25+
return super(KeyVaultTestCase, self).get_resource_name("livekvtest{}".format(name))
26+
2327
def _poll_until_no_exception(self, fn, expected_exception, max_retries=20, retry_delay=3):
2428
"""polling helper for live tests because some operations take an unpredictable amount of time to complete"""
2529

sdk/keyvault/azure-keyvault-secrets/tests/_shared/test_case_async.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import asyncio
66

77
from azure_devtools.scenario_tests.patches import mock_in_unit_test
8-
from devtools_testutils import AzureMgmtTestCase
8+
from devtools_testutils import AzureTestCase
99

1010

1111
def skip_sleep(unit_test):
@@ -15,7 +15,7 @@ async def immediate_return(_):
1515
return mock_in_unit_test(unit_test, "asyncio.sleep", immediate_return)
1616

1717

18-
class KeyVaultTestCase(AzureMgmtTestCase):
18+
class KeyVaultTestCase(AzureTestCase):
1919
def __init__(self, *args, match_body=True, **kwargs):
2020
super().__init__(*args, match_body=match_body, **kwargs)
2121
self.replay_patches.append(skip_sleep)
@@ -24,6 +24,10 @@ def setUp(self):
2424
self.list_test_size = 7
2525
super(KeyVaultTestCase, self).setUp()
2626

27+
def get_resource_name(self, name):
28+
"""helper to create resources with a consistent, test-indicative prefix"""
29+
return super(KeyVaultTestCase, self).get_resource_name("livekvtest{}".format(name))
30+
2731
async def _poll_until_no_exception(self, fn, expected_exception, max_retries=20, retry_delay=3):
2832
"""polling helper for live tests because some operations take an unpredictable amount of time to complete"""
2933

sdk/keyvault/azure-keyvault-secrets/tests/recordings/test_parse_id.test_parse_secret_id_with_version.yaml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ interactions:
1515
User-Agent:
1616
- azsdk-python-keyvault-secrets/4.2.1 Python/3.5.3 (Windows-10-10.0.19041-SP0)
1717
method: PUT
18-
uri: https://vaultname.vault.azure.net/secrets/secretce671360?api-version=7.1
18+
uri: https://vaultname.vault.azure.net/secrets/livekvtestsecretce671360?api-version=7.1
1919
response:
2020
body:
2121
string: '{"error":{"code":"Unauthorized","message":"Request is missing a Bearer
@@ -28,7 +28,7 @@ interactions:
2828
content-type:
2929
- application/json; charset=utf-8
3030
date:
31-
- Fri, 06 Nov 2020 23:51:37 GMT
31+
- Thu, 18 Feb 2021 01:31:27 GMT
3232
expires:
3333
- '-1'
3434
pragma:
@@ -41,11 +41,11 @@ interactions:
4141
x-content-type-options:
4242
- nosniff
4343
x-ms-keyvault-network-info:
44-
- conn_type=Ipv4;addr=162.211.216.102;act_addr_fam=InterNetwork;
44+
- conn_type=Ipv4;addr=174.127.232.53;act_addr_fam=InterNetwork;
4545
x-ms-keyvault-region:
46-
- westus
46+
- westus2
4747
x-ms-keyvault-service-version:
48-
- 1.2.58.0
48+
- 1.2.164.2
4949
x-powered-by:
5050
- ASP.NET
5151
status:
@@ -67,19 +67,19 @@ interactions:
6767
User-Agent:
6868
- azsdk-python-keyvault-secrets/4.2.1 Python/3.5.3 (Windows-10-10.0.19041-SP0)
6969
method: PUT
70-
uri: https://vaultname.vault.azure.net/secrets/secretce671360?api-version=7.1
70+
uri: https://vaultname.vault.azure.net/secrets/livekvtestsecretce671360?api-version=7.1
7171
response:
7272
body:
73-
string: '{"value":"secret_value","id":"https://vaultname.vault.azure.net/secrets/secretce671360/0fb32b11fdbf47eb9973e04a064a5b3f","attributes":{"enabled":true,"created":1604706698,"updated":1604706698,"recoveryLevel":"Recoverable+Purgeable","recoverableDays":90}}'
73+
string: '{"value":"secret_value","id":"https://vaultname.vault.azure.net/secrets/livekvtestsecretce671360/122271ab5fff4bc3a7b735b0c0876328","attributes":{"enabled":true,"created":1613611887,"updated":1613611887,"recoveryLevel":"Recoverable+Purgeable","recoverableDays":90}}'
7474
headers:
7575
cache-control:
7676
- no-cache
7777
content-length:
78-
- '269'
78+
- '265'
7979
content-type:
8080
- application/json; charset=utf-8
8181
date:
82-
- Fri, 06 Nov 2020 23:51:38 GMT
82+
- Thu, 18 Feb 2021 01:31:27 GMT
8383
expires:
8484
- '-1'
8585
pragma:
@@ -89,11 +89,11 @@ interactions:
8989
x-content-type-options:
9090
- nosniff
9191
x-ms-keyvault-network-info:
92-
- conn_type=Ipv4;addr=162.211.216.102;act_addr_fam=InterNetwork;
92+
- conn_type=Ipv4;addr=174.127.232.53;act_addr_fam=InterNetwork;
9393
x-ms-keyvault-region:
94-
- westus
94+
- westus2
9595
x-ms-keyvault-service-version:
96-
- 1.2.58.0
96+
- 1.2.164.2
9797
x-powered-by:
9898
- ASP.NET
9999
status:
@@ -111,19 +111,19 @@ interactions:
111111
User-Agent:
112112
- azsdk-python-keyvault-secrets/4.2.1 Python/3.5.3 (Windows-10-10.0.19041-SP0)
113113
method: GET
114-
uri: https://vaultname.vault.azure.net/secrets/secretce671360/?api-version=7.1
114+
uri: https://vaultname.vault.azure.net/secrets/livekvtestsecretce671360/?api-version=7.1
115115
response:
116116
body:
117-
string: '{"value":"secret_value","id":"https://vaultname.vault.azure.net/secrets/secretce671360/0fb32b11fdbf47eb9973e04a064a5b3f","attributes":{"enabled":true,"created":1604706698,"updated":1604706698,"recoveryLevel":"Recoverable+Purgeable","recoverableDays":90}}'
117+
string: '{"value":"secret_value","id":"https://vaultname.vault.azure.net/secrets/livekvtestsecretce671360/122271ab5fff4bc3a7b735b0c0876328","attributes":{"enabled":true,"created":1613611887,"updated":1613611887,"recoveryLevel":"Recoverable+Purgeable","recoverableDays":90}}'
118118
headers:
119119
cache-control:
120120
- no-cache
121121
content-length:
122-
- '269'
122+
- '265'
123123
content-type:
124124
- application/json; charset=utf-8
125125
date:
126-
- Fri, 06 Nov 2020 23:51:38 GMT
126+
- Thu, 18 Feb 2021 01:31:27 GMT
127127
expires:
128128
- '-1'
129129
pragma:
@@ -133,11 +133,11 @@ interactions:
133133
x-content-type-options:
134134
- nosniff
135135
x-ms-keyvault-network-info:
136-
- conn_type=Ipv4;addr=162.211.216.102;act_addr_fam=InterNetwork;
136+
- conn_type=Ipv4;addr=174.127.232.53;act_addr_fam=InterNetwork;
137137
x-ms-keyvault-region:
138-
- westus
138+
- westus2
139139
x-ms-keyvault-service-version:
140-
- 1.2.58.0
140+
- 1.2.164.2
141141
x-powered-by:
142142
- ASP.NET
143143
status:

0 commit comments

Comments
 (0)