From 0ebedbdec2af95f1ae0b7f8fb93181dfb9685732 Mon Sep 17 00:00:00 2001 From: Neeraja Akula Date: Fri, 8 Jul 2022 11:02:44 -0700 Subject: [PATCH 1/3] Updated the managed hsm resource manager spec to include two additional properties for private endpoint connection item --- .../preview/2021-04-01-preview/managedHsm.json | 8 ++++++++ .../preview/2021-06-01-preview/managedHsm.json | 8 ++++++++ .../preview/2021-11-01-preview/managedHsm.json | 8 ++++++++ .../Microsoft.KeyVault/stable/2021-10-01/managedHsm.json | 8 ++++++++ 4 files changed, 32 insertions(+) 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 c8cf0caf2c0b..e53d97fd7742 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 @@ -1228,6 +1228,14 @@ }, "MHSMPrivateEndpointConnectionItem": { "properties": { + "id": { + "type": "string", + "description": "Id of private endpoint connection." + }, + "etag": { + "type": "string", + "description": "Modified whenever there is a change in the state of private endpoint connection." + }, "properties": { "$ref": "#/definitions/MHSMPrivateEndpointConnectionProperties", "x-ms-client-flatten": true, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/managedHsm.json index 5db534b75d8e..09f383f02470 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/managedHsm.json @@ -1228,6 +1228,14 @@ }, "MHSMPrivateEndpointConnectionItem": { "properties": { + "id": { + "type": "string", + "description": "Id of private endpoint connection." + }, + "etag": { + "type": "string", + "description": "Modified whenever there is a change in the state of private endpoint connection." + }, "properties": { "$ref": "#/definitions/MHSMPrivateEndpointConnectionProperties", "x-ms-client-flatten": true, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/managedHsm.json index 40ddc151e623..a13fa19a58f2 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/managedHsm.json @@ -1228,6 +1228,14 @@ }, "MHSMPrivateEndpointConnectionItem": { "properties": { + "id": { + "type": "string", + "description": "Id of private endpoint connection." + }, + "etag": { + "type": "string", + "description": "Modified whenever there is a change in the state of private endpoint connection." + }, "properties": { "$ref": "#/definitions/MHSMPrivateEndpointConnectionProperties", "x-ms-client-flatten": true, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/managedHsm.json index 75a2e3615302..f58e5fd5efc4 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/managedHsm.json @@ -1241,6 +1241,14 @@ }, "MHSMPrivateEndpointConnectionItem": { "properties": { + "id": { + "type": "string", + "description": "Id of private endpoint connection." + }, + "etag": { + "type": "string", + "description": "Modified whenever there is a change in the state of private endpoint connection." + }, "properties": { "$ref": "#/definitions/MHSMPrivateEndpointConnectionProperties", "x-ms-client-flatten": true, From 2de584f84db60aaba9b828cc93fb2212f2b40f20 Mon Sep 17 00:00:00 2001 From: Neeraja Akula Date: Wed, 13 Jul 2022 16:44:11 -0700 Subject: [PATCH 2/3] Update managed hsm private endpoint connection item in mhsm spec for latest api version --- .../Microsoft.KeyVault/stable/2022-07-01/managedHsm.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-07-01/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-07-01/managedHsm.json index fba96cd7e871..15939c75c66f 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-07-01/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-07-01/managedHsm.json @@ -1305,6 +1305,14 @@ }, "MHSMPrivateEndpointConnectionItem": { "properties": { + "id": { + "type": "string", + "description": "Id of private endpoint connection." + }, + "etag": { + "type": "string", + "description": "Modified whenever there is a change in the state of private endpoint connection." + }, "properties": { "$ref": "#/definitions/MHSMPrivateEndpointConnectionProperties", "x-ms-client-flatten": true, From 59771d3124ba508e680667ac179274ebe89adcd0 Mon Sep 17 00:00:00 2001 From: Neeraja Akula Date: Fri, 15 Jul 2022 08:26:45 -0700 Subject: [PATCH 3/3] Address LRO_RESPONSE_HEADER violation for managed hsm Long running operations that are annotated with x-ms-long-running-operation:true must return location header or azure-AsyncOperation in response. Added the missing location header for managed hsm update command as well as to the corresponding examples. --- .../2021-04-01-preview/examples/ManagedHsm_Update.json | 3 +++ .../preview/2021-04-01-preview/managedHsm.json | 6 ++++++ .../preview/2021-06-01-preview/managedHsm.json | 6 ++++++ .../2021-11-01-preview/examples/ManagedHsm_Update.json | 3 +++ .../preview/2021-11-01-preview/managedHsm.json | 6 ++++++ .../stable/2021-10-01/examples/ManagedHsm_Update.json | 3 +++ .../Microsoft.KeyVault/stable/2021-10-01/managedHsm.json | 6 ++++++ 7 files changed, 33 insertions(+) diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/ManagedHsm_Update.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/ManagedHsm_Update.json index defc35777707..2b8ced382814 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/ManagedHsm_Update.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/ManagedHsm_Update.json @@ -43,6 +43,9 @@ } }, "202": { + "headers": { + "Location": "https://some.endpoint.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1?api-version=2022-07-01&kv-operation=abJjb2RkIjoiAGVsZXRlTWFuYWdlZEhzbUFzeW5jYm9" + }, "body": { "properties": { "tenantId": "00000000-0000-0000-0000-000000000000", 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 e53d97fd7742..7bf3581a7e20 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 @@ -132,6 +132,12 @@ "responses": { "202": { "description": "Accepted and the operation will complete asynchronously.", + "headers": { + "Location": { + "description": "The URI to poll for completion status.", + "type": "string" + } + }, "schema": { "$ref": "#/definitions/ManagedHsm" } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/managedHsm.json index 09f383f02470..51040a1c1d23 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/managedHsm.json @@ -132,6 +132,12 @@ "responses": { "202": { "description": "Accepted and the operation will complete asynchronously.", + "headers": { + "Location": { + "description": "The URI to poll for completion status.", + "type": "string" + } + }, "schema": { "$ref": "#/definitions/ManagedHsm" } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/examples/ManagedHsm_Update.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/examples/ManagedHsm_Update.json index d4ff90e16fa6..e77297107813 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/examples/ManagedHsm_Update.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/examples/ManagedHsm_Update.json @@ -43,6 +43,9 @@ } }, "202": { + "headers": { + "Location": "https://some.endpoint.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1?api-version=2022-07-01&kv-operation=abJjb2RkIjoiAGVsZXRlTWFuYWdlZEhzbUFzeW5jYm9" + }, "body": { "properties": { "tenantId": "00000000-0000-0000-0000-000000000000", diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/managedHsm.json index a13fa19a58f2..1c82fed4abde 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/managedHsm.json @@ -132,6 +132,12 @@ "responses": { "202": { "description": "Accepted and the operation will complete asynchronously.", + "headers": { + "Location": { + "description": "The URI to poll for completion status.", + "type": "string" + } + }, "schema": { "$ref": "#/definitions/ManagedHsm" } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/examples/ManagedHsm_Update.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/examples/ManagedHsm_Update.json index ebc6fbe3c3d4..d1f1bb5a3517 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/examples/ManagedHsm_Update.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/examples/ManagedHsm_Update.json @@ -43,6 +43,9 @@ } }, "202": { + "headers": { + "Location": "https://some.endpoint.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1?api-version=2022-07-01&kv-operation=abJjb2RkIjoiAGVsZXRlTWFuYWdlZEhzbUFzeW5jYm9" + }, "body": { "properties": { "tenantId": "00000000-0000-0000-0000-000000000000", diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/managedHsm.json index f58e5fd5efc4..12a347590ecd 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/managedHsm.json @@ -132,6 +132,12 @@ "responses": { "202": { "description": "Accepted and the operation will complete asynchronously.", + "headers": { + "Location": { + "description": "The URI to poll for completion status.", + "type": "string" + } + }, "schema": { "$ref": "#/definitions/ManagedHsm" }