-
Notifications
You must be signed in to change notification settings - Fork 5.2k
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.
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
[Hub Generated] Review request for Microsoft.KeyVault to add version preview/2020-04-01-preview #8996
Merged
fengzhou-msft
merged 17 commits into
Azure:master
from
riteshchitlangia1:dev-keyvault-Microsoft.KeyVault-2020-04-01-preview
Aug 22, 2020
Merged
[Hub Generated] Review request for Microsoft.KeyVault to add version preview/2020-04-01-preview #8996
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
e2a5827
Adds base for updating Microsoft.KeyVault from version stable/2019-09…
riteshchitlangia1 b248411
Updates readme
riteshchitlangia1 1cb55e2
Updates API version in new specs and examples
riteshchitlangia1 2e04fb6
Adding managed HSM support
riteshchitlangia1 3c0f1b7
Addressing PR Comment : removing json files from all versions section
riteshchitlangia1 cd4ffe1
fixing Linter tool error
riteshchitlangia1 9a4a1c4
Fixing Prettier Check errors
riteshchitlangia1 e1fc443
Fixing spell check errors
riteshchitlangia1 5b66a3a
Incorporating PR comments to add more properties to resource
riteshchitlangia1 05639a8
Fixing error
riteshchitlangia1 6b09dd5
Fixing error
riteshchitlangia1 7a6997b
Fixing prettier check errors
riteshchitlangia1 fa29334
Incorporating PR feedback
riteshchitlangia1 e5aec28
Addresing PR feedback
riteshchitlangia1 81f8c93
fixes
riteshchitlangia1 def4ada
Removing security domain id from spec.
riteshchitlangia1 0d0268b
Merge branch 'master' into dev-keyvault-Microsoft.KeyVault-2020-04-01…
riteshchitlangia1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1037,6 +1037,7 @@ overprovision | |
| overprovisioned | ||
| overprovisioning | ||
| overridable | ||
| overriden | ||
| OWASP | ||
| oxxm | ||
| pageable | ||
|
|
||
88 changes: 88 additions & 0 deletions
88
...ger/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_CreateOrUpdate.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| { | ||
| "parameters": { | ||
| "resourceGroupName": "hsm-group", | ||
| "name": "hsm1", | ||
| "subscriptionId": "00000000-0000-0000-0000-000000000000", | ||
| "api-version": "2020-04-01-preview", | ||
| "parameters": { | ||
| "properties": { | ||
| "tenantId": "00000000-0000-0000-0000-000000000000", | ||
| "initialAdminObjectIds": [ | ||
| "00000000-0000-0000-0000-000000000000" | ||
| ], | ||
| "enableSoftDelete": true, | ||
| "softDeleteRetentionInDays": 90, | ||
| "enablePurgeProtection": true | ||
| }, | ||
riteshchitlangia1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "location": "westus", | ||
| "sku": { | ||
| "family": "B", | ||
| "name": "Standard_B1" | ||
| }, | ||
| "tags": { | ||
| "Dept": "hsm", | ||
| "Environment": "dogfood" | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "202": { | ||
| "body": { | ||
| "properties": { | ||
| "tenantId": "00000000-0000-0000-0000-000000000000", | ||
| "initialAdminObjectIds": [ | ||
| "00000000-0000-0000-0000-000000000000" | ||
| ], | ||
| "securityDomainId": null, | ||
| "enableSoftDelete": true, | ||
| "softDeleteRetentionInDays": 90, | ||
| "enablePurgeProtection": true, | ||
| "hsmPoolUri": null, | ||
| "provisioningState": "Provisioning", | ||
| "statusMessage": "Allocating hardware" | ||
| }, | ||
| "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1", | ||
| "name": "hsm1", | ||
| "type": "Microsoft.KeyVault/managedHSMs", | ||
| "location": "westus", | ||
| "sku": { | ||
| "family": "B", | ||
| "name": "Standard_B1" | ||
| }, | ||
| "tags": { | ||
| "Dept": "hsm", | ||
| "Environment": "dogfood" | ||
| } | ||
| } | ||
| }, | ||
| "200": { | ||
| "body": { | ||
| "properties": { | ||
| "tenantId": "00000000-0000-0000-0000-000000000000", | ||
| "initialAdminObjectIds": [ | ||
| "00000000-0000-0000-0000-000000000000" | ||
| ], | ||
| "securityDomainId": "00000000-0000-0000-0000-000000000000", | ||
| "enableSoftDelete": true, | ||
| "softDeleteRetentionInDays": 90, | ||
| "enablePurgeProtection": true, | ||
| "hsmPoolUri": "https://westus.hsm1.managedhsm.azure.net", | ||
| "provisioningState": "Succeeded", | ||
| "statusMessage": "ManagedHsm is functional." | ||
| }, | ||
| "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1", | ||
| "name": "hsm1", | ||
| "type": "Microsoft.KeyVault/managedHSMs", | ||
| "location": "westus", | ||
| "sku": { | ||
| "family": "B", | ||
| "name": "Standard_B1" | ||
| }, | ||
| "tags": { | ||
| "Dept": "hsm", | ||
| "Environment": "dogfood" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
13 changes: 13 additions & 0 deletions
13
...rce-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Delete.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| { | ||
| "parameters": { | ||
| "resourceGroupName": "hsm-group", | ||
| "name": "hsm1", | ||
| "subscriptionId": "00000000-0000-0000-0000-000000000000", | ||
| "api-version": "2020-04-01-preview" | ||
| }, | ||
| "responses": { | ||
| "200": {}, | ||
| "202": {}, | ||
| "204": {} | ||
| } | ||
| } |
39 changes: 39 additions & 0 deletions
39
...source-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Get.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| { | ||
| "parameters": { | ||
| "resourceGroupName": "hsm-group", | ||
| "name": "hsm1", | ||
| "subscriptionId": "00000000-0000-0000-0000-000000000000", | ||
| "api-version": "2020-04-01-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "properties": { | ||
| "tenantId": "00000000-0000-0000-0000-000000000000", | ||
| "initialAdminObjectIds": [ | ||
| "00000000-0000-0000-0000-000000000000" | ||
| ], | ||
| "securityDomainId": "00000000-0000-0000-0000-000000000000", | ||
| "enableSoftDelete": true, | ||
| "softDeleteRetentionInDays": 90, | ||
| "enablePurgeProtection": true, | ||
| "hsmPoolUri": "https://westus.hsm1.managedhsm.azure.net", | ||
| "provisioningState": "Succeeded", | ||
| "statusMessage": "ManagedHsm is functional." | ||
| }, | ||
| "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1", | ||
| "name": "hsm1", | ||
| "type": "Microsoft.KeyVault/managedHSMs", | ||
| "location": "westus", | ||
| "sku": { | ||
| "family": "B", | ||
| "name": "Standard_B1" | ||
| }, | ||
| "tags": { | ||
| "Dept": "hsm", | ||
| "Environment": "dogfood" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
70 changes: 70 additions & 0 deletions
70
...icrosoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_ListByResourceGroup.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| { | ||
| "parameters": { | ||
| "resourceGroupName": "hsm-group", | ||
| "subscriptionId": "00000000-0000-0000-0000-000000000000", | ||
| "api-version": "2020-04-01-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "value": [ | ||
| { | ||
| "properties": { | ||
| "tenantId": "00000000-0000-0000-0000-000000000000", | ||
| "initialAdminObjectIds": [ | ||
| "00000000-0000-0000-0000-000000000000" | ||
| ], | ||
| "securityDomainId": "00000000-0000-0000-0000-000000000000", | ||
| "enableSoftDelete": true, | ||
| "softDeleteRetentionInDays": 90, | ||
| "enablePurgeProtection": true, | ||
| "hsmPoolUri": "https://westus.hsm1.managedhsm.azure.net", | ||
| "provisioningState": "Succeeded", | ||
| "statusMessage": "ManagedHsm is functional." | ||
| }, | ||
| "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1", | ||
| "name": "hsm1", | ||
| "type": "Microsoft.KeyVault/managedHSMs", | ||
| "location": "westus", | ||
| "sku": { | ||
| "family": "B", | ||
| "name": "Standard_B1" | ||
| }, | ||
| "tags": { | ||
| "Dept": "hsm", | ||
| "Environment": "dogfood" | ||
| } | ||
| }, | ||
| { | ||
| "properties": { | ||
| "tenantId": "00000000-0000-0000-0000-000000000000", | ||
| "initialAdminObjectIds": [ | ||
| "00000000-0000-0000-0000-000000000000" | ||
| ], | ||
| "securityDomainId": "00000000-0000-0000-0000-000000000000", | ||
| "enableSoftDelete": true, | ||
| "softDeleteRetentionInDays": 90, | ||
| "enablePurgeProtection": true, | ||
| "hsmPoolUri": "https://westus.hsm2.managedhsm.azure.net", | ||
| "provisioningState": "Succeeded", | ||
| "statusMessage": "ManagedHsm is functional." | ||
| }, | ||
| "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm2", | ||
| "name": "hsm2", | ||
| "type": "Microsoft.KeyVault/managedHSMs", | ||
| "location": "westus", | ||
| "sku": { | ||
| "family": "B", | ||
| "name": "Standard_B1" | ||
| }, | ||
| "tags": { | ||
| "Dept": "hsm", | ||
| "Environment": "production" | ||
| } | ||
| } | ||
| ], | ||
| "nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs?api-version=2020-04-01-preview&$skiptoken=dmF1bHQtcGVza3ktanVyeS03MzA3Ng==" | ||
| } | ||
| } | ||
| } | ||
| } |
69 changes: 69 additions & 0 deletions
69
...Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_ListBySubscription.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "00000000-0000-0000-0000-000000000000", | ||
| "api-version": "2020-04-01-preview" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "value": [ | ||
| { | ||
| "properties": { | ||
| "tenantId": "00000000-0000-0000-0000-000000000000", | ||
| "initialAdminObjectIds": [ | ||
| "00000000-0000-0000-0000-000000000000" | ||
| ], | ||
| "securityDomainId": "00000000-0000-0000-0000-000000000000", | ||
| "enableSoftDelete": true, | ||
| "softDeleteRetentionInDays": 90, | ||
| "enablePurgeProtection": true, | ||
| "hsmPoolUri": "https://westus.hsm1.managedhsm.azure.net", | ||
| "provisioningState": "Succeeded", | ||
| "statusMessage": "ManagedHsm is functional." | ||
| }, | ||
| "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1", | ||
| "name": "hsm1", | ||
| "type": "Microsoft.KeyVault/managedHSMs", | ||
| "location": "westus", | ||
| "sku": { | ||
| "family": "B", | ||
| "name": "Standard_B1" | ||
| }, | ||
| "tags": { | ||
| "Dept": "hsm", | ||
| "Environment": "dogfood" | ||
| } | ||
| }, | ||
| { | ||
| "properties": { | ||
| "tenantId": "00000000-0000-0000-0000-000000000000", | ||
| "initialAdminObjectIds": [ | ||
| "00000000-0000-0000-0000-000000000000" | ||
| ], | ||
| "securityDomainId": "00000000-0000-0000-0000-000000000000", | ||
| "enableSoftDelete": true, | ||
| "softDeleteRetentionInDays": 90, | ||
| "enablePurgeProtection": true, | ||
| "hsmPoolUri": "https://westus.hsm2.managedhsm.azure.net", | ||
| "provisioningState": "Succeeded", | ||
| "statusMessage": "ManagedHsm is functional." | ||
| }, | ||
| "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm2", | ||
| "name": "hsm2", | ||
| "type": "Microsoft.KeyVault/managedHSMs", | ||
| "location": "westus", | ||
| "sku": { | ||
| "family": "B", | ||
| "name": "Standard_B1" | ||
| }, | ||
| "tags": { | ||
| "Dept": "hsm", | ||
| "Environment": "production" | ||
| } | ||
| } | ||
| ], | ||
| "nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.KeyVault/managedHSMs?api-version=2020-04-01-preview&$skiptoken=dmF1bHQtcGVza3ktanVyeS03MzA3Ng==" | ||
| } | ||
| } | ||
| } | ||
| } |
77 changes: 77 additions & 0 deletions
77
...rce-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Update.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| { | ||
| "parameters": { | ||
| "resourceGroupName": "hsm-group", | ||
| "name": "hsm1", | ||
| "subscriptionId": "00000000-0000-0000-0000-000000000000", | ||
| "api-version": "2020-04-01-preview", | ||
| "parameters": { | ||
| "tags": { | ||
| "Dept": "hsm", | ||
| "Environment": "dogfood", | ||
| "Slice": "A" | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "properties": { | ||
| "tenantId": "00000000-0000-0000-0000-000000000000", | ||
| "initialAdminObjectIds": [ | ||
| "00000000-0000-0000-0000-000000000000" | ||
| ], | ||
| "securityDomainId": "00000000-0000-0000-0000-000000000000", | ||
| "enableSoftDelete": true, | ||
| "softDeleteRetentionInDays": 90, | ||
| "enablePurgeProtection": true, | ||
| "hsmPoolUri": "https://westus.hsm1.managedhsm.azure.net", | ||
| "provisioningState": "Succeeded", | ||
| "statusMessage": "ManagedHsm is functional." | ||
| }, | ||
| "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1", | ||
| "name": "hsm1", | ||
| "type": "Microsoft.KeyVault/managedHSMs", | ||
| "location": "westus", | ||
| "sku": { | ||
| "family": "B", | ||
| "name": "Standard_B1" | ||
| }, | ||
| "tags": { | ||
| "Dept": "hsm", | ||
| "Environment": "dogfood", | ||
| "Slice": "A" | ||
| } | ||
| } | ||
| }, | ||
| "202": { | ||
| "body": { | ||
| "properties": { | ||
| "tenantId": "00000000-0000-0000-0000-000000000000", | ||
| "initialAdminObjectIds": [ | ||
| "00000000-0000-0000-0000-000000000000" | ||
| ], | ||
| "securityDomainId": "00000000-0000-0000-0000-000000000000", | ||
| "enableSoftDelete": true, | ||
| "softDeleteRetentionInDays": 90, | ||
| "enablePurgeProtection": true, | ||
| "hsmPoolUri": "https://westus.hsm1.managedhsm.azure.net", | ||
| "provisioningState": "Updating", | ||
riteshchitlangia1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "statusMessage": "ManagedHsm is updating." | ||
| }, | ||
| "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1", | ||
| "name": "hsm1", | ||
| "type": "Microsoft.KeyVault/managedHSMs", | ||
| "location": "westus", | ||
| "sku": { | ||
| "family": "B", | ||
| "name": "Standard_B1" | ||
| }, | ||
| "tags": { | ||
| "Dept": "hsm", | ||
| "Environment": "dogfood", | ||
| "Slice": "A" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
17 changes: 17 additions & 0 deletions
17
...er/Microsoft.KeyVault/preview/2020-04-01-preview/examples/checkVaultNameAvailability.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "00000000-0000-0000-0000-000000000000", | ||
| "api-version": "2020-04-01-preview", | ||
| "vaultName": { | ||
| "name": "sample-vault", | ||
| "type": "Microsoft.KeyVault/vaults" | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "nameAvailable": true | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we remove "enableSoftDelete" from this example? We will either not support disabling this or only support for whitelisted subscriptions. So to avoid confusion we should probably remove from the CreateOrUpdate properties in this example right?