Skip to content

Commit 80c3b8e

Browse files
authored
[Key Vault] Test certificates library against a shared vault (#16792)
1 parent b9fe720 commit 80c3b8e

File tree

60 files changed

+9474
-20623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+9474
-20623
lines changed

sdk/keyvault/azure-keyvault-certificates/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-certificates/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-certificates/tests/recordings/test_certificates_client.test_2016_10_01_models.yaml

Lines changed: 61 additions & 123 deletions
Large diffs are not rendered by default.

sdk/keyvault/azure-keyvault-certificates/tests/recordings/test_certificates_client.test_async_request_cancellation_and_deletion.yaml

Lines changed: 125 additions & 437 deletions
Large diffs are not rendered by default.

sdk/keyvault/azure-keyvault-certificates/tests/recordings/test_certificates_client.test_backup_restore.yaml

Lines changed: 278 additions & 119 deletions
Large diffs are not rendered by default.

sdk/keyvault/azure-keyvault-certificates/tests/recordings/test_certificates_client.test_crud_contacts.yaml

Lines changed: 31 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ interactions:
1313
Content-Type:
1414
- application/json
1515
User-Agent:
16-
- azsdk-python-keyvault-certificates/4.2.0b2 Python/3.7.7 (Darwin-17.7.0-x86_64-i386-64bit)
16+
- azsdk-python-keyvault-certificates/4.2.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
1717
method: PUT
1818
uri: https://vaultname.vault.azure.net/certificates/contacts?api-version=7.1
1919
response:
@@ -28,7 +28,7 @@ interactions:
2828
content-type:
2929
- application/json; charset=utf-8
3030
date:
31-
- Wed, 29 Jul 2020 17:51:52 GMT
31+
- Wed, 17 Feb 2021 01:33:34 GMT
3232
expires:
3333
- '-1'
3434
pragma:
@@ -38,25 +38,23 @@ interactions:
3838
www-authenticate:
3939
- Bearer authorization="https://login.windows.net/72f988bf-86f1-41af-91ab-2d7cd011db47",
4040
resource="https://vault.azure.net"
41-
x-aspnet-version:
42-
- 4.0.30319
4341
x-content-type-options:
4442
- nosniff
4543
x-ms-keyvault-network-info:
46-
- conn_type=Ipv4;addr=73.135.72.237;act_addr_fam=InterNetwork;
44+
- conn_type=Ipv4;addr=174.127.232.53;act_addr_fam=InterNetwork;
4745
x-ms-keyvault-region:
48-
- westus
46+
- westus2
4947
x-ms-keyvault-service-version:
50-
- 1.1.10.0
48+
- 1.2.164.2
5149
x-powered-by:
5250
- ASP.NET
5351
status:
5452
code: 401
5553
message: Unauthorized
5654
- request:
57-
body: '{"contacts": [{"email": "[email protected]", "name": "John Doe", "phone":
58-
"1111111111"}, {"email": "[email protected]", "name": "John Doe2", "phone":
59-
"2222222222"}]}'
55+
body: '{"contacts": [{"phone": "1111111111", "email": "[email protected]", "name":
56+
"John Doe"}, {"phone": "2222222222", "email": "[email protected]", "name":
57+
"John Doe2"}]}'
6058
headers:
6159
Accept:
6260
- application/json
@@ -69,7 +67,7 @@ interactions:
6967
Content-Type:
7068
- application/json
7169
User-Agent:
72-
- azsdk-python-keyvault-certificates/4.2.0b2 Python/3.7.7 (Darwin-17.7.0-x86_64-i386-64bit)
70+
- azsdk-python-keyvault-certificates/4.2.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
7371
method: PUT
7472
uri: https://vaultname.vault.azure.net/certificates/contacts?api-version=7.1
7573
response:
@@ -80,27 +78,25 @@ interactions:
8078
cache-control:
8179
- no-cache
8280
content-length:
83-
- '232'
81+
- '218'
8482
content-type:
8583
- application/json; charset=utf-8
8684
date:
87-
- Wed, 29 Jul 2020 17:51:52 GMT
85+
- Wed, 17 Feb 2021 01:33:34 GMT
8886
expires:
8987
- '-1'
9088
pragma:
9189
- no-cache
9290
strict-transport-security:
9391
- max-age=31536000;includeSubDomains
94-
x-aspnet-version:
95-
- 4.0.30319
9692
x-content-type-options:
9793
- nosniff
9894
x-ms-keyvault-network-info:
99-
- conn_type=Ipv4;addr=73.135.72.237;act_addr_fam=InterNetwork;
95+
- conn_type=Ipv4;addr=174.127.232.53;act_addr_fam=InterNetwork;
10096
x-ms-keyvault-region:
101-
- westus
97+
- westus2
10298
x-ms-keyvault-service-version:
103-
- 1.1.10.0
99+
- 1.2.164.2
104100
x-powered-by:
105101
- ASP.NET
106102
status:
@@ -116,7 +112,7 @@ interactions:
116112
Connection:
117113
- keep-alive
118114
User-Agent:
119-
- azsdk-python-keyvault-certificates/4.2.0b2 Python/3.7.7 (Darwin-17.7.0-x86_64-i386-64bit)
115+
- azsdk-python-keyvault-certificates/4.2.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
120116
method: GET
121117
uri: https://vaultname.vault.azure.net/certificates/contacts?api-version=7.1
122118
response:
@@ -127,27 +123,25 @@ interactions:
127123
cache-control:
128124
- no-cache
129125
content-length:
130-
- '232'
126+
- '218'
131127
content-type:
132128
- application/json; charset=utf-8
133129
date:
134-
- Wed, 29 Jul 2020 17:51:52 GMT
130+
- Wed, 17 Feb 2021 01:33:34 GMT
135131
expires:
136132
- '-1'
137133
pragma:
138134
- no-cache
139135
strict-transport-security:
140136
- max-age=31536000;includeSubDomains
141-
x-aspnet-version:
142-
- 4.0.30319
143137
x-content-type-options:
144138
- nosniff
145139
x-ms-keyvault-network-info:
146-
- conn_type=Ipv4;addr=73.135.72.237;act_addr_fam=InterNetwork;
140+
- conn_type=Ipv4;addr=174.127.232.53;act_addr_fam=InterNetwork;
147141
x-ms-keyvault-region:
148-
- westus
142+
- westus2
149143
x-ms-keyvault-service-version:
150-
- 1.1.10.0
144+
- 1.2.164.2
151145
x-powered-by:
152146
- ASP.NET
153147
status:
@@ -165,7 +159,7 @@ interactions:
165159
Content-Length:
166160
- '0'
167161
User-Agent:
168-
- azsdk-python-keyvault-certificates/4.2.0b2 Python/3.7.7 (Darwin-17.7.0-x86_64-i386-64bit)
162+
- azsdk-python-keyvault-certificates/4.2.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
169163
method: DELETE
170164
uri: https://vaultname.vault.azure.net/certificates/contacts?api-version=7.1
171165
response:
@@ -176,27 +170,25 @@ interactions:
176170
cache-control:
177171
- no-cache
178172
content-length:
179-
- '232'
173+
- '218'
180174
content-type:
181175
- application/json; charset=utf-8
182176
date:
183-
- Wed, 29 Jul 2020 17:51:52 GMT
177+
- Wed, 17 Feb 2021 01:33:34 GMT
184178
expires:
185179
- '-1'
186180
pragma:
187181
- no-cache
188182
strict-transport-security:
189183
- max-age=31536000;includeSubDomains
190-
x-aspnet-version:
191-
- 4.0.30319
192184
x-content-type-options:
193185
- nosniff
194186
x-ms-keyvault-network-info:
195-
- conn_type=Ipv4;addr=73.135.72.237;act_addr_fam=InterNetwork;
187+
- conn_type=Ipv4;addr=174.127.232.53;act_addr_fam=InterNetwork;
196188
x-ms-keyvault-region:
197-
- westus
189+
- westus2
198190
x-ms-keyvault-service-version:
199-
- 1.1.10.0
191+
- 1.2.164.2
200192
x-powered-by:
201193
- ASP.NET
202194
status:
@@ -212,7 +204,7 @@ interactions:
212204
Connection:
213205
- keep-alive
214206
User-Agent:
215-
- azsdk-python-keyvault-certificates/4.2.0b2 Python/3.7.7 (Darwin-17.7.0-x86_64-i386-64bit)
207+
- azsdk-python-keyvault-certificates/4.2.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
216208
method: GET
217209
uri: https://vaultname.vault.azure.net/certificates/contacts?api-version=7.1
218210
response:
@@ -226,23 +218,21 @@ interactions:
226218
content-type:
227219
- application/json; charset=utf-8
228220
date:
229-
- Wed, 29 Jul 2020 17:51:52 GMT
221+
- Wed, 17 Feb 2021 01:33:34 GMT
230222
expires:
231223
- '-1'
232224
pragma:
233225
- no-cache
234226
strict-transport-security:
235227
- max-age=31536000;includeSubDomains
236-
x-aspnet-version:
237-
- 4.0.30319
238228
x-content-type-options:
239229
- nosniff
240230
x-ms-keyvault-network-info:
241-
- conn_type=Ipv4;addr=73.135.72.237;act_addr_fam=InterNetwork;
231+
- conn_type=Ipv4;addr=174.127.232.53;act_addr_fam=InterNetwork;
242232
x-ms-keyvault-region:
243-
- westus
233+
- westus2
244234
x-ms-keyvault-service-version:
245-
- 1.1.10.0
235+
- 1.2.164.2
246236
x-powered-by:
247237
- ASP.NET
248238
status:

0 commit comments

Comments
 (0)