diff --git a/azure-rest-api-specs b/azure-rest-api-specs index 545a9ad7563f..f83281b2fed8 160000 --- a/azure-rest-api-specs +++ b/azure-rest-api-specs @@ -1 +1 @@ -Subproject commit 545a9ad7563fe2858d08aba9ee5b8444375d47a9 +Subproject commit f83281b2fed8011962c4e91b7b0270f6391a0832 diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_CreateOrUpdate.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_CreateOrUpdate.json index 73da0e381c22..16c3ad45709d 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_CreateOrUpdate.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_CreateOrUpdate.json @@ -36,7 +36,7 @@ "enableSoftDelete": true, "softDeleteRetentionInDays": 90, "enablePurgeProtection": true, - "hsmPoolUri": null, + "hsmUri": null, "provisioningState": "Provisioning", "statusMessage": "Allocating hardware" }, @@ -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." }, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Get.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Get.json index 09952f621ce4..9dd9972f3fac 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Get.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Get.json @@ -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." }, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_ListByResourceGroup.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_ListByResourceGroup.json index 52723b08d547..7a3fe9cb1ee9 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_ListByResourceGroup.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_ListByResourceGroup.json @@ -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." }, @@ -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." }, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_ListBySubscription.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_ListBySubscription.json index e792f31cecef..63ae1da82161 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_ListBySubscription.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_ListBySubscription.json @@ -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." }, @@ -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." }, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Update.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Update.json index eaea40a4cefe..ebedabe4e003 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Update.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Update.json @@ -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." }, @@ -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." }, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/managedHsm.json index 7c8276ac052f..34462f6b4514 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/managedHsm.json @@ -51,7 +51,6 @@ "in": "path", "required": true, "type": "string", - "pattern": "^[a-zA-Z0-9]{3,24}$", "description": "Name of the managed HSM Pool" }, { @@ -112,7 +111,6 @@ "in": "path", "required": true, "type": "string", - "pattern": "^[a-zA-Z0-9]{3,24}$", "description": "Name of the managed HSM Pool" }, { @@ -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." },