Skip to content

Certs Final PR #7076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iscai-msft merged 13 commits into from
Sep 6, 2019
Merged

Certs Final PR #7076

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4a1db9a
keyvault certificate implementation
iscai-msft Sep 5, 2019
5ff9a32
got rid of error mapping, README uses HttpResponseError instead
iscai-msft Sep 5, 2019
1e8ea7e
updated README to conform to Charles' new README standard
iscai-msft Sep 5, 2019
984891a
Merge branch 'master' of github.com:Azure/azure-sdk-for-python into c…
iscai-msft Sep 5, 2019
4b820f1
added samples for issuers and contacts
iscai-msft Sep 6, 2019
e01fef0
switched from PFX to PKCS12 for SecretContentType enum
iscai-msft Sep 6, 2019
edefc1b
fixed key vault overview
iscai-msft Sep 6, 2019
6e73f2e
got rid of adding RUN_IDENTIFIER to vault name
iscai-msft Sep 6, 2019
b54b39d
Merge branch 'certs_final' of github.com:iscai-msft/azure-sdk-for-pyt…
iscai-msft Sep 6, 2019
34662de
got rid of erroneous references to keys
iscai-msft Sep 6, 2019
7c9cfb2
Delete seed.txt
iscai-msft Sep 6, 2019
dc9f7c6
incorporated Charles' and Johan's comments
iscai-msft Sep 6, 2019
bdc7d8a
Merge branch 'certs_final' of github.com:iscai-msft/azure-sdk-for-pyt…
iscai-msft Sep 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
got rid of adding RUN_IDENTIFIER to vault name
  • Loading branch information
@iscai-msft
iscai-msft committed Sep 6, 2019
commit 6e73f2eef3c159ecd7b29f117baf03c70b343bfa
28 changes: 0 additions & 28 deletions sdk/keyvault/azure-keyvault-certificates/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,3 @@
collect_ignore_glob = []
if sys.version_info < (3, 5):
collect_ignore_glob.append("tests/*_async.py")

# get the run identifier for unique test runs
dirname = os.path.dirname(os.path.abspath(__file__))
seed_filename = os.path.abspath(os.path.join(dirname, "tests", "seed.txt"))

run_identifier_set = False

try:
with open(seed_filename, "r") as f:
if os.path.getsize(seed_filename):
os.environ['RUN_IDENTIFIER'] = f.readline().strip()
run_identifier_set = True

# if file exists but is empty
if not run_identifier_set:
if "RUN_IDENTIFIER" not in os.environ:
print("Please set your RUN_IDENTIFIER environment variable in seed.txt")
raise NameError
with open(seed_filename, "w") as f:
f.write(os.environ["RUN_IDENTIFIER"])

except FileNotFoundError:
# if file has not yet been created
if "RUN_IDENTIFIER" not in os.environ:
print("Please set your RUN_IDENTIFIER environment variable in seed.txt")
raise NameError
with open(seed_filename, "w") as f:
f.write(os.environ["RUN_IDENTIFIER"])
3 changes: 0 additions & 3 deletions sdk/keyvault/azure-keyvault-certificates/tests/certificates_preparer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ def __init__(
playback_fake_resource=None,
client_kwargs=None,
):
# incorporate a unicode integer representation of run identifier into key vault name for uniqueness
name_prefix += ''.join(str(ord(c)) for c in os.environ['RUN_IDENTIFIER'])[:10]

super(VaultClientPreparer, self).__init__(
name_prefix,
24,
Expand Down
124 changes: 77 additions & 47 deletions ...sts/recordings/test_certificates_client.test_async_request_cancellation_and_deletion.yaml
View file
Open in desktop

Large diffs are not rendered by default.

104 changes: 52 additions & 52 deletions ...-keyvault-certificates/tests/recordings/test_certificates_client.test_backup_restore.yaml
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions ...e-keyvault-certificates/tests/recordings/test_certificates_client.test_crud_contacts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ interactions:
Content-Type: [application/json; charset=utf-8]
User-Agent: [azsdk-python-keyvault-certificates/4.0.0b1 Python/3.6.6 (Windows-10-10.0.18362-SP0)]
method: PUT
uri: https://vault1051159997851e11ad.vault.azure.net/certificates/contacts?api-version=7.0
uri: https://vault851e11ad.vault.azure.net/certificates/contacts?api-version=7.0
response:
body: {string: '{"error":{"code":"Unauthorized","message":"Request is missing
a Bearer or PoP token."}}'}
headers:
cache-control: [no-cache]
content-length: ['87']
content-type: [application/json; charset=utf-8]
date: ['Wed, 04 Sep 2019 23:19:15 GMT']
date: ['Fri, 06 Sep 2019 18:03:30 GMT']
expires: ['-1']
pragma: [no-cache]
server: [Microsoft-IIS/10.0]
Expand All @@ -26,9 +26,9 @@ interactions:
resource="https://vault.azure.net"']
x-aspnet-version: [4.0.30319]
x-content-type-options: [nosniff]
x-ms-keyvault-network-info: [addr=131.107.160.72;act_addr_fam=InterNetwork;]
x-ms-keyvault-network-info: [addr=131.107.174.72;act_addr_fam=InterNetwork;]
x-ms-keyvault-region: [westus]
x-ms-keyvault-service-version: [1.1.0.876]
x-ms-keyvault-service-version: [1.1.0.878]
x-powered-by: [ASP.NET]
status: {code: 401, message: Unauthorized}
- request:
Expand All @@ -43,24 +43,24 @@ interactions:
Content-Type: [application/json; charset=utf-8]
User-Agent: [azsdk-python-keyvault-certificates/4.0.0b1 Python/3.6.6 (Windows-10-10.0.18362-SP0)]
method: PUT
uri: https://vault1051159997851e11ad.vault.azure.net/certificates/contacts?api-version=7.0
uri: https://vault851e11ad.vault.azure.net/certificates/contacts?api-version=7.0
response:
body: {string: '{"id":"https://vault1051159997851e11ad.vault.azure.net/certificates/contacts","contacts":[{"email":"[email protected]","name":"John
body: {string: '{"id":"https://vault851e11ad.vault.azure.net/certificates/contacts","contacts":[{"email":"[email protected]","name":"John
Doe","phone":"1111111111"},{"email":"[email protected]","name":"John Doe2","phone":"2222222222"}]}'}
headers:
cache-control: [no-cache]
content-length: ['231']
content-length: ['221']
content-type: [application/json; charset=utf-8]
date: ['Wed, 04 Sep 2019 23:19:16 GMT']
date: ['Fri, 06 Sep 2019 18:03:31 GMT']
expires: ['-1']
pragma: [no-cache]
server: [Microsoft-IIS/10.0]
strict-transport-security: [max-age=31536000;includeSubDomains]
x-aspnet-version: [4.0.30319]
x-content-type-options: [nosniff]
x-ms-keyvault-network-info: [addr=131.107.160.72;act_addr_fam=InterNetwork;]
x-ms-keyvault-network-info: [addr=131.107.174.72;act_addr_fam=InterNetwork;]
x-ms-keyvault-region: [westus]
x-ms-keyvault-service-version: [1.1.0.876]
x-ms-keyvault-service-version: [1.1.0.878]
x-powered-by: [ASP.NET]
status: {code: 200, message: OK}
- request:
Expand All @@ -71,24 +71,24 @@ interactions:
Connection: [keep-alive]
User-Agent: [azsdk-python-keyvault-certificates/4.0.0b1 Python/3.6.6 (Windows-10-10.0.18362-SP0)]
method: GET
uri: https://vault1051159997851e11ad.vault.azure.net/certificates/contacts?api-version=7.0
uri: https://vault851e11ad.vault.azure.net/certificates/contacts?api-version=7.0
response:
body: {string: '{"id":"https://vault1051159997851e11ad.vault.azure.net/certificates/contacts","contacts":[{"email":"[email protected]","name":"John
body: {string: '{"id":"https://vault851e11ad.vault.azure.net/certificates/contacts","contacts":[{"email":"[email protected]","name":"John
Doe","phone":"1111111111"},{"email":"[email protected]","name":"John Doe2","phone":"2222222222"}]}'}
headers:
cache-control: [no-cache]
content-length: ['231']
content-length: ['221']
content-type: [application/json; charset=utf-8]
date: ['Wed, 04 Sep 2019 23:19:16 GMT']
date: ['Fri, 06 Sep 2019 18:03:31 GMT']
expires: ['-1']
pragma: [no-cache]
server: [Microsoft-IIS/10.0]
strict-transport-security: [max-age=31536000;includeSubDomains]
x-aspnet-version: [4.0.30319]
x-content-type-options: [nosniff]
x-ms-keyvault-network-info: [addr=131.107.160.72;act_addr_fam=InterNetwork;]
x-ms-keyvault-network-info: [addr=131.107.174.72;act_addr_fam=InterNetwork;]
x-ms-keyvault-region: [westus]
x-ms-keyvault-service-version: [1.1.0.876]
x-ms-keyvault-service-version: [1.1.0.878]
x-powered-by: [ASP.NET]
status: {code: 200, message: OK}
- request:
Expand All @@ -100,24 +100,24 @@ interactions:
Content-Length: ['0']
User-Agent: [azsdk-python-keyvault-certificates/4.0.0b1 Python/3.6.6 (Windows-10-10.0.18362-SP0)]
method: DELETE
uri: https://vault1051159997851e11ad.vault.azure.net/certificates/contacts?api-version=7.0
uri: https://vault851e11ad.vault.azure.net/certificates/contacts?api-version=7.0
response:
body: {string: '{"id":"https://vault1051159997851e11ad.vault.azure.net/certificates/contacts","contacts":[{"email":"[email protected]","name":"John
body: {string: '{"id":"https://vault851e11ad.vault.azure.net/certificates/contacts","contacts":[{"email":"[email protected]","name":"John
Doe","phone":"1111111111"},{"email":"[email protected]","name":"John Doe2","phone":"2222222222"}]}'}
headers:
cache-control: [no-cache]
content-length: ['231']
content-length: ['221']
content-type: [application/json; charset=utf-8]
date: ['Wed, 04 Sep 2019 23:19:16 GMT']
date: ['Fri, 06 Sep 2019 18:03:31 GMT']
expires: ['-1']
pragma: [no-cache]
server: [Microsoft-IIS/10.0]
strict-transport-security: [max-age=31536000;includeSubDomains]
x-aspnet-version: [4.0.30319]
x-content-type-options: [nosniff]
x-ms-keyvault-network-info: [addr=131.107.160.72;act_addr_fam=InterNetwork;]
x-ms-keyvault-network-info: [addr=131.107.174.72;act_addr_fam=InterNetwork;]
x-ms-keyvault-region: [westus]
x-ms-keyvault-service-version: [1.1.0.876]
x-ms-keyvault-service-version: [1.1.0.878]
x-powered-by: [ASP.NET]
status: {code: 200, message: OK}
- request:
Expand All @@ -128,23 +128,23 @@ interactions:
Connection: [keep-alive]
User-Agent: [azsdk-python-keyvault-certificates/4.0.0b1 Python/3.6.6 (Windows-10-10.0.18362-SP0)]
method: GET
uri: https://vault1051159997851e11ad.vault.azure.net/certificates/contacts?api-version=7.0
uri: https://vault851e11ad.vault.azure.net/certificates/contacts?api-version=7.0
response:
body: {string: '{"error":{"code":"ContactsNotFound","message":"Contacts not found"}}'}
headers:
cache-control: [no-cache]
content-length: ['68']
content-type: [application/json; charset=utf-8]
date: ['Wed, 04 Sep 2019 23:19:16 GMT']
date: ['Fri, 06 Sep 2019 18:03:31 GMT']
expires: ['-1']
pragma: [no-cache]
server: [Microsoft-IIS/10.0]
strict-transport-security: [max-age=31536000;includeSubDomains]
x-aspnet-version: [4.0.30319]
x-content-type-options: [nosniff]
x-ms-keyvault-network-info: [addr=131.107.160.72;act_addr_fam=InterNetwork;]
x-ms-keyvault-network-info: [addr=131.107.174.72;act_addr_fam=InterNetwork;]
x-ms-keyvault-region: [westus]
x-ms-keyvault-service-version: [1.1.0.876]
x-ms-keyvault-service-version: [1.1.0.878]
x-powered-by: [ASP.NET]
status: {code: 404, message: Not Found}
version: 1
Loading