Skip to content

Added deletedmanagedhsm object to examples and managedhsm.json #13591

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
kim-soohwan merged 3 commits into from
Mar 24, 2021
Merged

Added deletedmanagedhsm object to examples and managedhsm.json #13591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16e43f6
Added deletedmanagedhsm object to examples and managedhsm.json
Mar 24, 2021
c6834a0
Fixing error in references to correct values
Mar 24, 2021
be8eab3
Changed vaultId to mhsmId in exmaples
Mar 24, 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
35 changes: 12 additions & 23 deletions ...manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/DeletedManagedHsm_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
}
Expand Down
70 changes: 24 additions & 46 deletions ...anager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/DeletedManagedHsm_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
],
Expand Down
83 changes: 81 additions & 2 deletions ...n/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/managedHsm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@
"200": {
"description": "Retrieved information about all managed HSMs in the specified subscription.",
"schema": {
"$ref": "#/definitions/ManagedHsmListResult"
"$ref": "#/definitions/DeletedManagedHsmListResult"
}
},
"default": {
Expand Down Expand Up @@ -421,7 +421,7 @@
"200": {
"description": "Retrieved information about the specified deleted managed HSM.",
"schema": {
"$ref": "#/definitions/ManagedHsm"
"$ref": "#/definitions/DeletedManagedHsm"
}
},
"default": {
Expand Down Expand Up @@ -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": {
Expand Down