Skip to content
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

Dev keyvault microsoft.key vault 2021 04 01 preview #13585

Merged
merged 17 commits into from
Apr 8, 2021
Merged

Dev keyvault microsoft.key vault 2021 04 01 preview #13585

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0b58e73
Adds base for updating Microsoft.KeyVault from version preview/2020-0…
jiacheng-L Feb 5, 2021
986da95
Updates readme
jiacheng-L Feb 5, 2021
fa35def
Updates API version in new specs and examples
jiacheng-L Feb 5, 2021
ab9e37d
Open API change for Managed Hsm private endpoints feature (#12938)
riteshchitlangia1 Feb 17, 2021
4913df4
GET responses following a successful DELETE should be returning 404. …
riteshchitlangia1 Feb 23, 2021
1f87e26
Added new routes for Deleted ManagedHsm for Soft Delete Feature (#13282)
kim-soohwan Mar 9, 2021
78d9d1a
Addressing Comments for PR 13585 (#13586)
kim-soohwan Mar 23, 2021
eaa0bea
Added deletedmanagedhsm object to examples and managedhsm.json (#13591)
kim-soohwan Mar 24, 2021
f3bd899
Try to use the common type for SystemData (#13723)
jiacheng-L Mar 31, 2021
1cba1b7
04012021 fix schema (#13749)
kim-soohwan Mar 31, 2021
5323325
Merge branch 'master' into dev-keyvault-Microsoft.KeyVault-2021-04-01…
akning-ms Apr 1, 2021
76effcc
Merge branch 'master' into dev-keyvault-Microsoft.KeyVault-2021-04-01…
akning-ms Apr 1, 2021
32e8a70
Add missing default error response (#13762)
jiacheng-L Apr 1, 2021
6a34453
Fix Lint error (#13765)
jiacheng-L Apr 6, 2021
8688527
Added python tag for 2021 preview (#13805)
kim-soohwan Apr 7, 2021
4903fe5
Fixing linting errors for MHSM R4036 - ImplementPrivateEndpointAPIs (…
riteshchitlangia1 Apr 7, 2021
981c898
Add suppression for SystemData (#13835)
jiacheng-L Apr 8, 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
48 changes: 48 additions & 0 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
@@ -0,0 +1,48 @@
{
"parameters": {
"name": "hsm1",
"location": "westus",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"api-version": "2021-04-01-preview"
},
"responses": {
"200": {
"body": {
"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"
}
}
},
"404": {
"headers": {},
"body": {
"error": {
"code": "",
"message": ""
}
}
}
}
}
69 changes: 69 additions & 0 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
@@ -0,0 +1,69 @@
{
"parameters": {
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"api-version": "2021-04-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"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"
}
},
{
"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"
}
}
],
"nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.KeyVault/deletedManagedHSMs?api-version=2021-04-01-preview&$skiptoken=dmF1bHQtcGVza3ktanVyeS03MzA3Ng=="
}
}
}
}
20 changes: 20 additions & 0 deletions ...nager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/DeletedManagedHsm_Purge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"parameters": {
"name": "hsm1",
"location": "westus",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"api-version": "2021-04-01-preview"
},
"responses": {
"202": {},
"404": {
"headers": {},
"body": {
"error": {
"code": "",
"message": ""
}
}
}
}
}
157 changes: 157 additions & 0 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 @@ -349,6 +349,157 @@
}
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.KeyVault/deletedManagedHSMs": {
"get": {
"tags": [
"ManagedHsms"
],
"operationId": "ManagedHsms_ListDeleted",
"description": "The List operation gets information about the deleted managed HSMs associated with the subscription.",
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "Retrieved information about all managed HSMs in the specified subscription.",
"schema": {
"$ref": "#/definitions/ManagedHsmListResult"
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ManagedHsmError"
}
}
},
"x-ms-pageable": {
"nextLinkName": "nextLink"
},
"x-ms-examples": {
"List deleted managed HSMs in the specified subscription": {
"$ref": "./examples/DeletedManagedHsm_List.json"
}
}
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.KeyVault/locations/{location}/deletedManagedHSMs/{name}": {
"get": {
"tags": [
"ManagedHsms"
],
"operationId": "ManagedHsms_GetDeleted",
"description": "Gets the specified deleted managed HSM.",
"parameters": [
{
"name": "name",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the deleted managed HSM."
},
{
"name": "location",
"in": "path",
"required": true,
"type": "string",
"description": "The location of the deleted managed HSM."
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "Retrieved information about the specified deleted managed HSM.",
"schema": {
"$ref": "#/definitions/ManagedHsm"
kim-soohwan marked this conversation as resolved.
Show resolved Hide resolved
}
},
"404": {
kim-soohwan marked this conversation as resolved.
Show resolved Hide resolved
"description": "The specified resource does not exist.",
"schema": {
"$ref": "common.json#/definitions/CloudError"
},
"x-ms-error-response": true
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ManagedHsmError"
}
}
},
"x-ms-examples": {
"Retrieve a deleted managed HSM": {
"$ref": "./examples/DeletedManagedHsm_Get.json"
}
}
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.KeyVault/locations/{location}/deletedManagedHSMs/{name}/purge": {
"post": {
"tags": [
"ManagedHsms"
],
"operationId": "ManagedHsms_PurgeDeleted",
"description": "Permanently deletes the specified managed HSM.",
"parameters": [
{
"name": "name",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the soft-deleted managed HSM."
},
{
"name": "location",
"in": "path",
"required": true,
"type": "string",
"description": "The location of the soft-deleted managed HSM."
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"404": {
kim-soohwan marked this conversation as resolved.
Show resolved Hide resolved
"description": "The specified resource does not exist.",
"schema": {
"$ref": "common.json#/definitions/CloudError"
},
"x-ms-error-response": true
},
"202": {
"description": "Accepted and the operation will complete asynchronously."
},
"default": {
"description": "The error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ManagedHsmError"
}
}
},
"x-ms-examples": {
"Purge a managed HSM Pool": {
"$ref": "./examples/DeletedManagedHsm_Purge.json"
}
},
"x-ms-long-running-operation": true
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/managedHSMs/{name}/privateEndpointConnections/{privateEndpointConnectionName}": {
"get": {
"tags": [
Expand Down Expand Up @@ -764,6 +915,12 @@
"name": "PublicNetworkAccess",
"modelAsString": true
}
},
"scheduledPurgeDate": {
"readOnly": true,
"type": "string",
"format": "date-time",
"description": "The scheduled purge date in UTC."
}
},
"description": "Properties of the managed HSM Pool"
Expand Down