Skip to content
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

[Key Vault] Implement 7.3-preview with secure key release #18055

Merged
merged 11 commits into from
Apr 16, 2021
Merged

[Key Vault] Implement 7.3-preview with secure key release #18055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
da3d383
Generate code
mccoyp Apr 6, 2021
f701f3c
Bump package version
mccoyp Apr 14, 2021
32199ca
Implement export_key and release_key
mccoyp Apr 7, 2021
45f71ff
Add test placeholders
mccoyp Apr 9, 2021
d75b5d3
Update recordings
mccoyp Apr 14, 2021
e187113
Regenerate w/ swagger tweaks
mccoyp Apr 15, 2021
80d767d
Address feedback/swagger changes
mccoyp Apr 15, 2021
ad07d37
Update admin test recordings
mccoyp Apr 15, 2021
c4b53c2
Backwards-compatible exportable property
mccoyp Apr 15, 2021
3a04e22
Update changelog to pass CI
mccoyp Apr 16, 2021
e7795ac
pylint
mccoyp Apr 16, 2021
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
10 changes: 5 additions & 5 deletions ...yvault-administration/tests/recordings/test_backup_client.test_selective_key_restore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ interactions:
User-Agent:
- azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
method: POST
uri: https://managedhsm/keys/selective-restore-test-keya85a1290/create?api-version=7.2-preview
uri: https://managedhsm/keys/selective-restore-test-keya85a1290/create?api-version=7.3-preview
response:
body:
string: ''
Expand Down Expand Up @@ -58,7 +58,7 @@ interactions:
User-Agent:
- azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
method: POST
uri: https://managedhsm/keys/selective-restore-test-keya85a1290/create?api-version=7.2-preview
uri: https://managedhsm/keys/selective-restore-test-keya85a1290/create?api-version=7.3-preview
response:
body:
string: '{"attributes":{"created":1612826772,"enabled":true,"exportable":false,"recoverableDays":90,"recoveryLevel":"Recoverable+Purgeable","updated":1612826772},"key":{"e":"AQAB","key_ops":["wrapKey","decrypt","encrypt","unwrapKey","sign","verify"],"kid":"https://managedhsm/keys/selective-restore-test-keya85a1290/2baac872a79e4f4d37d2fd1d360b7b38","kty":"RSA-HSM","n":"op5WXDgzSfohX67cJmBplGev8zwrI_gy7qTLCTjgw-Hb7B4AvS8q0QXoytAZic2QLfb9eaoaCClHbck0OlHjQykQdthxTX6usMXOqVfcwQ12nfQ8pJjnAZg08kyVs5hZDWjlbdInNIUwBdwwmyrEBckTh6UlolxIIsOJiUbrihv3wdv_4JnSRQm7f7lV69tNs7meqdOI-fjiOYwP8eH1hau265uRb6en9aoov0p59IWvZ-HVocak5eYjv3-8XnGL4Fr2FvwT5HTlSUmkiAGOiK2PBkyzgZLXImgZ06i1bEqPDMlUufYsKIBf3jHUpdkiorB0s7ZoXHc1PNh-AkygAw"}}'
Expand Down Expand Up @@ -570,7 +570,7 @@ interactions:
User-Agent:
- azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
method: DELETE
uri: https://managedhsm/keys/selective-restore-test-keya85a1290?api-version=7.2-preview
uri: https://managedhsm/keys/selective-restore-test-keya85a1290?api-version=7.3-preview
response:
body:
string: '{"attributes":{"created":1612826772,"enabled":true,"exportable":false,"recoverableDays":90,"recoveryLevel":"Recoverable+Purgeable","updated":1612826772},"deletedDate":1612826814,"key":{"e":"AQAB","key_ops":["wrapKey","encrypt","decrypt","unwrapKey","sign","verify"],"kid":"https://managedhsm/keys/selective-restore-test-keya85a1290/2baac872a79e4f4d37d2fd1d360b7b38","kty":"RSA-HSM","n":"op5WXDgzSfohX67cJmBplGev8zwrI_gy7qTLCTjgw-Hb7B4AvS8q0QXoytAZic2QLfb9eaoaCClHbck0OlHjQykQdthxTX6usMXOqVfcwQ12nfQ8pJjnAZg08kyVs5hZDWjlbdInNIUwBdwwmyrEBckTh6UlolxIIsOJiUbrihv3wdv_4JnSRQm7f7lV69tNs7meqdOI-fjiOYwP8eH1hau265uRb6en9aoov0p59IWvZ-HVocak5eYjv3-8XnGL4Fr2FvwT5HTlSUmkiAGOiK2PBkyzgZLXImgZ06i1bEqPDMlUufYsKIBf3jHUpdkiorB0s7ZoXHc1PNh-AkygAw"},"recoveryId":"https://managedhsm/deletedkeys/selective-restore-test-keya85a1290","scheduledPurgeDate":1620602814}'
Expand Down Expand Up @@ -610,7 +610,7 @@ interactions:
User-Agent:
- azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
method: GET
uri: https://managedhsm/deletedkeys/selective-restore-test-keya85a1290?api-version=7.2-preview
uri: https://managedhsm/deletedkeys/selective-restore-test-keya85a1290?api-version=7.3-preview
response:
body:
string: '{"attributes":{"created":1612826772,"enabled":true,"exportable":false,"recoverableDays":90,"recoveryLevel":"Recoverable+Purgeable","updated":1612826772},"deletedDate":1612826814,"key":{"e":"AQAB","key_ops":["verify","sign","unwrapKey","encrypt","decrypt","wrapKey"],"kid":"https://managedhsm/keys/selective-restore-test-keya85a1290/2baac872a79e4f4d37d2fd1d360b7b38","kty":"RSA-HSM","n":"op5WXDgzSfohX67cJmBplGev8zwrI_gy7qTLCTjgw-Hb7B4AvS8q0QXoytAZic2QLfb9eaoaCClHbck0OlHjQykQdthxTX6usMXOqVfcwQ12nfQ8pJjnAZg08kyVs5hZDWjlbdInNIUwBdwwmyrEBckTh6UlolxIIsOJiUbrihv3wdv_4JnSRQm7f7lV69tNs7meqdOI-fjiOYwP8eH1hau265uRb6en9aoov0p59IWvZ-HVocak5eYjv3-8XnGL4Fr2FvwT5HTlSUmkiAGOiK2PBkyzgZLXImgZ06i1bEqPDMlUufYsKIBf3jHUpdkiorB0s7ZoXHc1PNh-AkygAw"},"recoveryId":"https://managedhsm/deletedkeys/selective-restore-test-keya85a1290","scheduledPurgeDate":1620602814}'
Expand Down Expand Up @@ -654,7 +654,7 @@ interactions:
User-Agent:
- azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
method: DELETE
uri: https://managedhsm/deletedkeys/selective-restore-test-keya85a1290?api-version=7.2-preview
uri: https://managedhsm/deletedkeys/selective-restore-test-keya85a1290?api-version=7.3-preview
response:
body:
string: ''
Expand Down
20 changes: 10 additions & 10 deletions ...-administration/tests/recordings/test_backup_client_async.test_selective_key_restore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ interactions:
User-Agent:
- azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
method: POST
uri: https://managedhsm/keys/selective-restore-test-key20e5150d/create?api-version=7.2-preview
uri: https://managedhsm/keys/selective-restore-test-key20e5150d/create?api-version=7.3-preview
response:
body:
string: ''
Expand All @@ -29,7 +29,7 @@ interactions:
status:
code: 401
message: Unauthorized
url: https://mcpatinotesthsm.managedhsm.azure.net/keys/selective-restore-test-key20e5150d/create?api-version=7.2-preview
url: https://mcpatinotesthsm.managedhsm.azure.net/keys/selective-restore-test-key20e5150d/create?api-version=7.3-preview
- request:
body: '{"kty": "RSA"}'
headers:
Expand All @@ -42,7 +42,7 @@ interactions:
User-Agent:
- azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
method: POST
uri: https://managedhsm/keys/selective-restore-test-key20e5150d/create?api-version=7.2-preview
uri: https://managedhsm/keys/selective-restore-test-key20e5150d/create?api-version=7.3-preview
response:
body:
string: '{"attributes":{"created":1612829541,"enabled":true,"exportable":false,"recoverableDays":90,"recoveryLevel":"Recoverable+Purgeable","updated":1612829541},"key":{"e":"AQAB","key_ops":["wrapKey","decrypt","encrypt","unwrapKey","sign","verify"],"kid":"https://managedhsm/keys/selective-restore-test-key20e5150d/a649e5b2c7e646ba062f308cc4736f3c","kty":"RSA-HSM","n":"oHCH2OW-TG9B0pSwDQzO-ZgNZ1mKw_pWTkXt7CdEv_VOb9qJSfaczurdEgen9wKLM8oQPdOEhZzgHZHoQW7zXVISjgTm2JADHH29aYxzu_h8EKvA6kO4eWzN_KphSr3TIn2NqtTo7QeCeTKx4bGbZejGElVmPJhq8srqq53XhuX7xZVb6-Du5Pjm1J-mlpfZR1C2r1hx049BUdz1bPBjwcVhCqXIqUwxbPex80Von26ULxHJk3TVzogSwjTreKG2NqmJBoDzAA51id4C0JxrC7bu2tHCC1OuhWcE-JN67bBtd9Vn2O1ePda2eGsdyM3_6D_aBYtAVEK-7ksEiYyFYQ"}}'
Expand All @@ -60,7 +60,7 @@ interactions:
status:
code: 200
message: OK
url: https://mcpatinotesthsm.managedhsm.azure.net/keys/selective-restore-test-key20e5150d/create?api-version=7.2-preview
url: https://mcpatinotesthsm.managedhsm.azure.net/keys/selective-restore-test-key20e5150d/create?api-version=7.3-preview
- request:
body: null
headers:
Expand Down Expand Up @@ -377,7 +377,7 @@ interactions:
User-Agent:
- azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
method: DELETE
uri: https://managedhsm/keys/selective-restore-test-key20e5150d?api-version=7.2-preview
uri: https://managedhsm/keys/selective-restore-test-key20e5150d?api-version=7.3-preview
response:
body:
string: '{"attributes":{"created":1612829541,"enabled":true,"exportable":false,"recoverableDays":90,"recoveryLevel":"Recoverable+Purgeable","updated":1612829541},"deletedDate":1612829584,"key":{"e":"AQAB","key_ops":["wrapKey","encrypt","decrypt","unwrapKey","sign","verify"],"kid":"https://managedhsm/keys/selective-restore-test-key20e5150d/a649e5b2c7e646ba062f308cc4736f3c","kty":"RSA-HSM","n":"oHCH2OW-TG9B0pSwDQzO-ZgNZ1mKw_pWTkXt7CdEv_VOb9qJSfaczurdEgen9wKLM8oQPdOEhZzgHZHoQW7zXVISjgTm2JADHH29aYxzu_h8EKvA6kO4eWzN_KphSr3TIn2NqtTo7QeCeTKx4bGbZejGElVmPJhq8srqq53XhuX7xZVb6-Du5Pjm1J-mlpfZR1C2r1hx049BUdz1bPBjwcVhCqXIqUwxbPex80Von26ULxHJk3TVzogSwjTreKG2NqmJBoDzAA51id4C0JxrC7bu2tHCC1OuhWcE-JN67bBtd9Vn2O1ePda2eGsdyM3_6D_aBYtAVEK-7ksEiYyFYQ"},"recoveryId":"https://managedhsm/deletedkeys/selective-restore-test-key20e5150d","scheduledPurgeDate":1620605584}'
Expand All @@ -395,7 +395,7 @@ interactions:
status:
code: 200
message: OK
url: https://mcpatinotesthsm.managedhsm.azure.net/keys/selective-restore-test-key20e5150d?api-version=7.2-preview
url: https://mcpatinotesthsm.managedhsm.azure.net/keys/selective-restore-test-key20e5150d?api-version=7.3-preview
- request:
body: null
headers:
Expand All @@ -404,7 +404,7 @@ interactions:
User-Agent:
- azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
method: GET
uri: https://managedhsm/deletedkeys/selective-restore-test-key20e5150d?api-version=7.2-preview
uri: https://managedhsm/deletedkeys/selective-restore-test-key20e5150d?api-version=7.3-preview
response:
body:
string: '{"attributes":{"created":1612829541,"enabled":true,"exportable":false,"recoverableDays":90,"recoveryLevel":"Recoverable+Purgeable","updated":1612829541},"deletedDate":1612829584,"key":{"e":"AQAB","key_ops":["verify","sign","unwrapKey","encrypt","decrypt","wrapKey"],"kid":"https://managedhsm/keys/selective-restore-test-key20e5150d/a649e5b2c7e646ba062f308cc4736f3c","kty":"RSA-HSM","n":"oHCH2OW-TG9B0pSwDQzO-ZgNZ1mKw_pWTkXt7CdEv_VOb9qJSfaczurdEgen9wKLM8oQPdOEhZzgHZHoQW7zXVISjgTm2JADHH29aYxzu_h8EKvA6kO4eWzN_KphSr3TIn2NqtTo7QeCeTKx4bGbZejGElVmPJhq8srqq53XhuX7xZVb6-Du5Pjm1J-mlpfZR1C2r1hx049BUdz1bPBjwcVhCqXIqUwxbPex80Von26ULxHJk3TVzogSwjTreKG2NqmJBoDzAA51id4C0JxrC7bu2tHCC1OuhWcE-JN67bBtd9Vn2O1ePda2eGsdyM3_6D_aBYtAVEK-7ksEiYyFYQ"},"recoveryId":"https://managedhsm/deletedkeys/selective-restore-test-key20e5150d","scheduledPurgeDate":1620605584}'
Expand All @@ -423,7 +423,7 @@ interactions:
status:
code: 200
message: OK
url: https://mcpatinotesthsm.managedhsm.azure.net/deletedkeys/selective-restore-test-key20e5150d?api-version=7.2-preview
url: https://mcpatinotesthsm.managedhsm.azure.net/deletedkeys/selective-restore-test-key20e5150d?api-version=7.3-preview
- request:
body: null
headers:
Expand All @@ -432,7 +432,7 @@ interactions:
User-Agent:
- azsdk-python-keyvault-keys/4.3.2 Python/3.5.3 (Windows-10-10.0.19041-SP0)
method: DELETE
uri: https://managedhsm/deletedkeys/selective-restore-test-key20e5150d?api-version=7.2-preview
uri: https://managedhsm/deletedkeys/selective-restore-test-key20e5150d?api-version=7.3-preview
response:
body:
string: ''
Expand All @@ -450,5 +450,5 @@ interactions:
status:
code: 204
message: ''
url: https://mcpatinotesthsm.managedhsm.azure.net/deletedkeys/selective-restore-test-key20e5150d?api-version=7.2-preview
url: https://mcpatinotesthsm.managedhsm.azure.net/deletedkeys/selective-restore-test-key20e5150d?api-version=7.3-preview
version: 1
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-keyvault-keys/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release History

## 4.4.0b5 (Unreleased)
## 4.5.0b1 (Unreleased)


## 4.4.0b4 (2021-04-06)
Expand Down
11 changes: 10 additions & 1 deletion sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@
from ._parse_id import parse_key_vault_key_id
from ._shared.client_base import ApiVersion
from ._shared import KeyVaultResourceId
from ._models import DeletedKey, JsonWebKey, KeyProperties, KeyVaultKey
from ._models import (
DeletedKey,
JsonWebKey,
KeyProperties,
KeyReleasePolicy,
KeyReleaseResult,
KeyVaultKey,
)
from ._client import KeyClient

__all__ = [
Expand All @@ -19,6 +26,8 @@
"KeyType",
"DeletedKey",
"KeyProperties",
"KeyReleasePolicy",
"KeyReleaseResult",
"parse_key_vault_key_id",
"KeyVaultResourceId"
]
Expand Down
Loading