diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/DeletedManagedHsm_Get.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/DeletedManagedHsm_Get.json index 609a2b290154..23864badaaa4 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/DeletedManagedHsm_Get.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/DeletedManagedHsm_Get.json @@ -8,30 +8,19 @@ "responses": { "200": { "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.KeyVault/locations/westus/deletedManagedHSMs/hsm1", + "name": "vault-agile-drawer-6404", + "type": "Microsoft.KeyVault/deletedManagedHSMs", "properties": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "initialAdminObjectIds": [ - "00000000-0000-0000-0000-000000000000" - ], - "enableSoftDelete": true, - "softDeleteRetentionInDays": 90, - "enablePurgeProtection": true, - "hsmUri": "https://westus.hsm1.managedhsm.azure.net", - "provisioningState": "Succeeded", - "statusMessage": "ManagedHsm is functional.", - "scheduledPurgeDate": "2021-04-01T00:00:59Z" - }, - "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" + "mhsmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1", + "location": "westus", + "deletionDate": "2021-04-01T00:00:59Z", + "scheduledPurgeDate": "2021-04-01T00:00:59Z", + "purgeProtectionEnabled": true, + "tags": { + "Dept": "hsm", + "Environment": "production" + } } } } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/DeletedManagedHsm_List.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/DeletedManagedHsm_List.json index 66fb2ed37e3e..3eb8ad51f8fe 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/DeletedManagedHsm_List.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/DeletedManagedHsm_List.json @@ -8,57 +8,35 @@ "body": { "value": [ { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.KeyVault/locations/westus/deletedManagedHSMs/hsm1", + "name": "vault-agile-drawer-6404", + "type": "Microsoft.KeyVault/deletedManagedHSMs", "properties": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "initialAdminObjectIds": [ - "00000000-0000-0000-0000-000000000000" - ], - "enableSoftDelete": true, - "softDeleteRetentionInDays": 90, - "enablePurgeProtection": true, - "hsmUri": "https://westus.hsm1.managedhsm.azure.net", - "provisioningState": "Succeeded", - "statusMessage": "ManagedHsm is functional.", - "scheduledPurgeDate": "2021-04-01T00:00:59Z" - }, - "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" + "mhsmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1", + "location": "westus", + "deletionDate": "2021-04-01T00:00:59Z", + "scheduledPurgeDate": "2021-04-01T00:00:59Z", + "purgeProtectionEnabled": true, + "tags": { + "Dept": "hsm", + "Environment": "production" + } } }, { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.KeyVault/locations/westus/deletedManagedHSMs/hsm2", + "name": "vault-agile-drawer-6404", + "type": "Microsoft.KeyVault/deletedManagedHSMs", "properties": { - "tenantId": "00000000-0000-0000-0000-000000000000", - "initialAdminObjectIds": [ - "00000000-0000-0000-0000-000000000000" - ], - "enableSoftDelete": true, - "softDeleteRetentionInDays": 90, - "enablePurgeProtection": true, - "hsmUri": "https://westus.hsm2.managedhsm.azure.net", - "provisioningState": "Succeeded", - "statusMessage": "ManagedHsm is functional.", - "scheduledPurgeDate": "2021-04-01T00:00:59Z" - }, - "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" + "mhsmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm2", + "location": "westus", + "deletionDate": "2021-04-01T00:00:59Z", + "scheduledPurgeDate": "2021-04-01T00:00:59Z", + "purgeProtectionEnabled": true, + "tags": { + "Dept": "hsm", + "Environment": "production" + } } } ], diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/managedHsm.json index 4c8d6b20393f..10c84594d258 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/managedHsm.json @@ -368,7 +368,7 @@ "200": { "description": "Retrieved information about all managed HSMs in the specified subscription.", "schema": { - "$ref": "#/definitions/ManagedHsmListResult" + "$ref": "#/definitions/DeletedManagedHsmListResult" } }, "default": { @@ -421,7 +421,7 @@ "200": { "description": "Retrieved information about the specified deleted managed HSM.", "schema": { - "$ref": "#/definitions/ManagedHsm" + "$ref": "#/definitions/DeletedManagedHsm" } }, "default": { @@ -1015,6 +1015,85 @@ }, "description": "The server error." }, + "DeletedManagedHsm": { + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "The Azure Resource Manager resource ID for the deleted managed HSM Pool." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the managed HSM Pool." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The resource type of the managed HSM Pool." + }, + "properties": { + "$ref": "#/definitions/DeletedManagedHsmProperties", + "description": "Properties of the deleted managed HSM" + } + } + }, + "DeletedManagedHsmProperties": { + "properties": { + "mhsmId": { + "readOnly": true, + "type": "string", + "description": "The resource id of the original managed HSM." + }, + "location": { + "readOnly": true, + "type": "string", + "description": "The location of the original managed HSM." + }, + "deletionDate": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "The deleted date." + }, + "scheduledPurgeDate": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "The scheduled purged date." + }, + "purgeProtectionEnabled": { + "readOnly": true, + "type": "boolean", + "description": "Purge protection status of the original managed HSM." + }, + "tags": { + "readOnly": true, + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Tags of the original managed HSM." + } + }, + "description": "Properties of the deleted managed HSM." + }, + "DeletedManagedHsmListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/DeletedManagedHsm" + }, + "description": "The list of deleted managed HSM Pools." + }, + "nextLink": { + "type": "string", + "description": "The URL to get the next set of deleted managed HSM Pools." + } + }, + "description": "List of deleted managed HSM Pools" + }, "MHSMNetworkRuleSet": { "properties": { "bypass": {