Skip to content

name validation delegation to service side validation and hsm uri property name fix #10872

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
fengzhou-msft merged 2 commits into from
Sep 22, 2020
Merged

name validation delegation to service side validation and hsm uri property name fix #10872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d240b95
Merge pull request #1 from Azure/master
riteshchitlangia1 Sep 21, 2020
da62b47
Fixing hsmUri property name and removing regex pattern for name valid…
riteshchitlangia1 Sep 21, 2020
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
2 changes: 1 addition & 1 deletion azure-rest-api-specs
Open in desktop
Submodule azure-rest-api-specs updated from 545a9a to f83281
4 changes: 2 additions & 2 deletions ...ger/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"enableSoftDelete": true,
"softDeleteRetentionInDays": 90,
"enablePurgeProtection": true,
"hsmPoolUri": null,
"hsmUri": null,
"provisioningState": "Provisioning",
"statusMessage": "Allocating hardware"
},
Expand Down Expand Up @@ -64,7 +64,7 @@
"enableSoftDelete": true,
"softDeleteRetentionInDays": 90,
"enablePurgeProtection": true,
"hsmPoolUri": "https://westus.hsm1.managedhsm.azure.net",
"hsmUri": "https://westus.hsm1.managedhsm.azure.net",
"provisioningState": "Succeeded",
"statusMessage": "ManagedHsm is functional."
},
Expand Down
2 changes: 1 addition & 1 deletion ...source-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"enableSoftDelete": true,
"softDeleteRetentionInDays": 90,
"enablePurgeProtection": true,
"hsmPoolUri": "https://westus.hsm1.managedhsm.azure.net",
"hsmUri": "https://westus.hsm1.managedhsm.azure.net",
"provisioningState": "Succeeded",
"statusMessage": "ManagedHsm is functional."
},
Expand Down
4 changes: 2 additions & 2 deletions ...icrosoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"enableSoftDelete": true,
"softDeleteRetentionInDays": 90,
"enablePurgeProtection": true,
"hsmPoolUri": "https://westus.hsm1.managedhsm.azure.net",
"hsmUri": "https://westus.hsm1.managedhsm.azure.net",
"provisioningState": "Succeeded",
"statusMessage": "ManagedHsm is functional."
},
Expand All @@ -43,7 +43,7 @@
"enableSoftDelete": true,
"softDeleteRetentionInDays": 90,
"enablePurgeProtection": true,
"hsmPoolUri": "https://westus.hsm2.managedhsm.azure.net",
"hsmUri": "https://westus.hsm2.managedhsm.azure.net",
"provisioningState": "Succeeded",
"statusMessage": "ManagedHsm is functional."
},
Expand Down
4 changes: 2 additions & 2 deletions ...Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_ListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"enableSoftDelete": true,
"softDeleteRetentionInDays": 90,
"enablePurgeProtection": true,
"hsmPoolUri": "https://westus.hsm1.managedhsm.azure.net",
"hsmUri": "https://westus.hsm1.managedhsm.azure.net",
"provisioningState": "Succeeded",
"statusMessage": "ManagedHsm is functional."
},
Expand All @@ -42,7 +42,7 @@
"enableSoftDelete": true,
"softDeleteRetentionInDays": 90,
"enablePurgeProtection": true,
"hsmPoolUri": "https://westus.hsm2.managedhsm.azure.net",
"hsmUri": "https://westus.hsm2.managedhsm.azure.net",
"provisioningState": "Succeeded",
"statusMessage": "ManagedHsm is functional."
},
Expand Down
4 changes: 2 additions & 2 deletions ...rce-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"enableSoftDelete": true,
"softDeleteRetentionInDays": 90,
"enablePurgeProtection": true,
"hsmPoolUri": "https://westus.hsm1.managedhsm.azure.net",
"hsmUri": "https://westus.hsm1.managedhsm.azure.net",
"provisioningState": "Succeeded",
"statusMessage": "ManagedHsm is functional."
},
Expand Down Expand Up @@ -52,7 +52,7 @@
"enableSoftDelete": true,
"softDeleteRetentionInDays": 90,
"enablePurgeProtection": true,
"hsmPoolUri": "https://westus.hsm1.managedhsm.azure.net",
"hsmUri": "https://westus.hsm1.managedhsm.azure.net",
"provisioningState": "Updating",
"statusMessage": "ManagedHsm is updating."
},
Expand Down
4 changes: 1 addition & 3 deletions ...n/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/managedHsm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
"in": "path",
"required": true,
"type": "string",
"pattern": "^[a-zA-Z0-9]{3,24}$",
"description": "Name of the managed HSM Pool"
},
{
Expand Down Expand Up @@ -112,7 +111,6 @@
"in": "path",
"required": true,
"type": "string",
"pattern": "^[a-zA-Z0-9]{3,24}$",
"description": "Name of the managed HSM Pool"
},
{
Expand Down Expand Up @@ -393,7 +391,7 @@
},
"description": "Array of initial administrators object ids for this managed hsm pool."
},
"hsmPoolUri": {
"hsmUri": {
"type": "string",
"description": "The URI of the managed hsm pool for performing operations on keys."
},
Expand Down