From 338f38a684783fd986ee3645744a0eaf43d9357d Mon Sep 17 00:00:00 2001 From: Neeraja Akula Date: Mon, 3 Apr 2023 15:48:51 -0700 Subject: [PATCH 1/6] Update description for managed HSM properties in resource manager for following properties: enableSoftDelete, softDeleteRetentionDays, enablePurgeProtection and publicNetworkAccess --- .../preview/2020-04-01-preview/managedHsm.json | 6 +++--- .../preview/2021-04-01-preview/managedHsm.json | 8 ++++---- .../preview/2021-06-01-preview/managedHsm.json | 8 ++++---- .../preview/2021-11-01-preview/managedHsm.json | 8 ++++---- .../preview/2022-02-01-preview/managedHsm.json | 8 ++++---- .../Microsoft.KeyVault/stable/2021-10-01/managedHsm.json | 8 ++++---- .../Microsoft.KeyVault/stable/2022-07-01/managedHsm.json | 8 ++++---- .../Microsoft.KeyVault/stable/2022-11-01/managedHsm.json | 8 ++++---- .../Microsoft.KeyVault/stable/2023-02-01/managedHsm.json | 8 ++++---- 9 files changed, 35 insertions(+), 35 deletions(-) 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 012e91502b76..46d76ecc17a8 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 @@ -406,18 +406,18 @@ "enableSoftDelete": { "type": "boolean", "default": true, - "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. If it's not set to any value(true or false) when creating new managed HSM pool, it will be set to true by default. Once set to true, it cannot be reverted to false." + "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. Soft delete is enabled by default for all managed HSMs and is immutable." }, "softDeleteRetentionInDays": { "type": "integer", "format": "int32", "default": 90, - "description": "softDelete data retention days. It accepts >=7 and <=90." + "description": "Soft deleted data retention days. When you delete an HSM or a key, it will remain recoverable for the configured retention period or for a default period of 90 days. It accepts values between 7 and 90." }, "enablePurgeProtection": { "type": "boolean", "default": true, - "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. The setting is effective only if soft delete is also enabled. Enabling this functionality is irreversible." + "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. Enabling this functionality is irreversible." }, "createMode": { "type": "string", 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 e822e4e16cff..f6e19459bcbf 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 @@ -852,18 +852,18 @@ "enableSoftDelete": { "type": "boolean", "default": true, - "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. If it's not set to any value(true or false) when creating new managed HSM pool, it will be set to true by default. Once set to true, it cannot be reverted to false." + "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. Soft delete is enabled by default for all managed HSMs and is immutable." }, "softDeleteRetentionInDays": { "type": "integer", "format": "int32", "default": 90, - "description": "softDelete data retention days. It accepts >=7 and <=90." + "description": "Soft deleted data retention days. When you delete an HSM or a key, it will remain recoverable for the configured retention period or for a default period of 90 days. It accepts values between 7 and 90." }, "enablePurgeProtection": { "type": "boolean", "default": true, - "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. The setting is effective only if soft delete is also enabled. Enabling this functionality is irreversible." + "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. Enabling this functionality is irreversible." }, "createMode": { "type": "string", @@ -962,7 +962,7 @@ "description": "List of private endpoint connections associated with the managed hsm pool." }, "publicNetworkAccess": { - "description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.", + "description": "Control permission to the managed HSM from public networks.", "enum": [ "Enabled", "Disabled" 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 0bbc65e4968d..0d2ea65d36e2 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 @@ -852,18 +852,18 @@ "enableSoftDelete": { "type": "boolean", "default": true, - "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. If it's not set to any value(true or false) when creating new managed HSM pool, it will be set to true by default. Once set to true, it cannot be reverted to false." + "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. Soft delete is enabled by default for all managed HSMs and is immutable." }, "softDeleteRetentionInDays": { "type": "integer", "format": "int32", "default": 90, - "description": "softDelete data retention days. It accepts >=7 and <=90." + "description": "Soft deleted data retention days. When you delete an HSM or a key, it will remain recoverable for the configured retention period or for a default period of 90 days. It accepts values between 7 and 90." }, "enablePurgeProtection": { "type": "boolean", "default": true, - "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. The setting is effective only if soft delete is also enabled. Enabling this functionality is irreversible." + "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. Enabling this functionality is irreversible." }, "createMode": { "type": "string", @@ -962,7 +962,7 @@ "description": "List of private endpoint connections associated with the managed hsm pool." }, "publicNetworkAccess": { - "description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.", + "description": "Control permission to the managed HSM from public networks.", "enum": [ "Enabled", "Disabled" 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 0744dade1dde..225944ad1faa 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 @@ -852,18 +852,18 @@ "enableSoftDelete": { "type": "boolean", "default": true, - "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. If it's not set to any value(true or false) when creating new managed HSM pool, it will be set to true by default. Once set to true, it cannot be reverted to false." + "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. Soft delete is enabled by default for all managed HSMs and is immutable." }, "softDeleteRetentionInDays": { "type": "integer", "format": "int32", "default": 90, - "description": "softDelete data retention days. It accepts >=7 and <=90." + "description": "Soft deleted data retention days. When you delete an HSM or a key, it will remain recoverable for the configured retention period or for a default period of 90 days. It accepts values between 7 and 90." }, "enablePurgeProtection": { "type": "boolean", "default": true, - "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. The setting is effective only if soft delete is also enabled. Enabling this functionality is irreversible." + "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. Enabling this functionality is irreversible." }, "createMode": { "type": "string", @@ -962,7 +962,7 @@ "description": "List of private endpoint connections associated with the managed hsm pool." }, "publicNetworkAccess": { - "description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.", + "description": "Control permission to the managed HSM from public networks.", "enum": [ "Enabled", "Disabled" diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json index 5afd3a2c7874..d880ebf0c898 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json @@ -899,18 +899,18 @@ "enableSoftDelete": { "type": "boolean", "default": true, - "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. If it's not set to any value(true or false) when creating new managed HSM pool, it will be set to true by default. Once set to true, it cannot be reverted to false." + "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. Soft delete is enabled by default for all managed HSMs and is immutable." }, "softDeleteRetentionInDays": { "type": "integer", "format": "int32", "default": 90, - "description": "softDelete data retention days. It accepts >=7 and <=90." + "description": "Soft deleted data retention days. When you delete an HSM or a key, it will remain recoverable for the configured retention period or for a default period of 90 days. It accepts values between 7 and 90." }, "enablePurgeProtection": { "type": "boolean", "default": true, - "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. The setting is effective only if soft delete is also enabled. Enabling this functionality is irreversible." + "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. Enabling this functionality is irreversible." }, "createMode": { "type": "string", @@ -1009,7 +1009,7 @@ "description": "List of private endpoint connections associated with the managed hsm pool." }, "publicNetworkAccess": { - "description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.", + "description": "Control permission to the managed HSM from public networks.", "enum": [ "Enabled", "Disabled" 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 dbd0ead843cd..ccd9dd74d759 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 @@ -853,18 +853,18 @@ "enableSoftDelete": { "type": "boolean", "default": true, - "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. If it's not set to any value(true or false) when creating new managed HSM pool, it will be set to true by default. Once set to true, it cannot be reverted to false." + "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. Soft delete is enabled by default for all managed HSMs and is immutable." }, "softDeleteRetentionInDays": { "type": "integer", "format": "int32", "default": 90, - "description": "softDelete data retention days. It accepts >=7 and <=90." + "description": "Soft deleted data retention days. When you delete an HSM or a key, it will remain recoverable for the configured retention period or for a default period of 90 days. It accepts values between 7 and 90." }, "enablePurgeProtection": { "type": "boolean", "default": true, - "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. The setting is effective only if soft delete is also enabled. Enabling this functionality is irreversible." + "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. Enabling this functionality is irreversible." }, "createMode": { "type": "string", @@ -963,7 +963,7 @@ "description": "List of private endpoint connections associated with the managed hsm pool." }, "publicNetworkAccess": { - "description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.", + "description": "Control permission to the managed HSM from public networks.", "enum": [ "Enabled", "Disabled" 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 e325666fa24e..e792d2e35552 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 @@ -899,18 +899,18 @@ "enableSoftDelete": { "type": "boolean", "default": true, - "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. If it's not set to any value(true or false) when creating new managed HSM pool, it will be set to true by default. Once set to true, it cannot be reverted to false." + "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. Soft delete is enabled by default for all managed HSMs and is immutable." }, "softDeleteRetentionInDays": { "type": "integer", "format": "int32", "default": 90, - "description": "softDelete data retention days. It accepts >=7 and <=90." + "description": "Soft deleted data retention days. When you delete an HSM or a key, it will remain recoverable for the configured retention period or for a default period of 90 days. It accepts values between 7 and 90." }, "enablePurgeProtection": { "type": "boolean", "default": true, - "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. The setting is effective only if soft delete is also enabled. Enabling this functionality is irreversible." + "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. Enabling this functionality is irreversible." }, "createMode": { "type": "string", @@ -1009,7 +1009,7 @@ "description": "List of private endpoint connections associated with the managed hsm pool." }, "publicNetworkAccess": { - "description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.", + "description": "Control permission to the managed HSM from public networks.", "enum": [ "Enabled", "Disabled" diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/managedHsm.json index 61643ae82556..159438f2ff2c 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/managedHsm.json @@ -899,18 +899,18 @@ "enableSoftDelete": { "type": "boolean", "default": true, - "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. If it's not set to any value(true or false) when creating new managed HSM pool, it will be set to true by default. Once set to true, it cannot be reverted to false." + "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. Soft delete is enabled by default for all managed HSMs and is immutable." }, "softDeleteRetentionInDays": { "type": "integer", "format": "int32", "default": 90, - "description": "softDelete data retention days. It accepts >=7 and <=90." + "description": "Soft deleted data retention days. When you delete an HSM or a key, it will remain recoverable for the configured retention period or for a default period of 90 days. It accepts values between 7 and 90." }, "enablePurgeProtection": { "type": "boolean", "default": true, - "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. The setting is effective only if soft delete is also enabled. Enabling this functionality is irreversible." + "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. Enabling this functionality is irreversible." }, "createMode": { "type": "string", @@ -1009,7 +1009,7 @@ "description": "List of private endpoint connections associated with the managed hsm pool." }, "publicNetworkAccess": { - "description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.", + "description": "Control permission to the managed HSM from public networks.", "enum": [ "Enabled", "Disabled" diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/managedHsm.json index d0c7875fb6e4..dd73c7f61cff 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/managedHsm.json @@ -948,18 +948,18 @@ "enableSoftDelete": { "type": "boolean", "default": true, - "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. If it's not set to any value(true or false) when creating new managed HSM pool, it will be set to true by default. Once set to true, it cannot be reverted to false." + "description": "Property to specify whether the 'soft delete' functionality is enabled for this managed HSM pool. Soft delete is enabled by default for all managed HSMs and is immutable." }, "softDeleteRetentionInDays": { "type": "integer", "format": "int32", "default": 90, - "description": "softDelete data retention days. It accepts >=7 and <=90." + "description": "Soft deleted data retention days. When you delete an HSM or a key, it will remain recoverable for the configured retention period or for a default period of 90 days. It accepts values between 7 and 90." }, "enablePurgeProtection": { "type": "boolean", "default": true, - "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. The setting is effective only if soft delete is also enabled. Enabling this functionality is irreversible." + "description": "Property specifying whether protection against purge is enabled for this managed HSM pool. Setting this property to true activates protection against purge for this managed HSM pool and its content - only the Managed HSM service may initiate a hard, irrecoverable deletion. Enabling this functionality is irreversible." }, "createMode": { "type": "string", @@ -1068,7 +1068,7 @@ "description": "List of private endpoint connections associated with the managed hsm pool." }, "publicNetworkAccess": { - "description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.", + "description": "Control permission to the managed HSM from public networks.", "enum": [ "Enabled", "Disabled" From be562b2587f056ecb887e27ac1a64094f0ec406a Mon Sep 17 00:00:00 2001 From: Neeraja Akula Date: Tue, 4 Apr 2023 09:23:24 -0700 Subject: [PATCH 2/6] Fix model validation failures for LRO_Response_Header rule in managed HSM resource manager version 2020-04-01-preview --- .../2020-04-01-preview/examples/ManagedHsm_Update.json | 3 +++ .../preview/2020-04-01-preview/managedHsm.json | 6 ++++++ 2 files changed, 9 insertions(+) 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 ebedabe4e003..a299bf3f31d4 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 @@ -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/2020-04-01-preview/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/managedHsm.json index 46d76ecc17a8..3bf3bcfbd199 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 @@ -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" } From 95533ed72cbab330a3b4e65f083e50640badeb11 Mon Sep 17 00:00:00 2001 From: Neeraja Akula Date: Tue, 4 Apr 2023 10:51:08 -0700 Subject: [PATCH 3/6] Fix model validation failures for LRO_Response_Header rule in managed HSM resource manager version 2020-04-01-preview for delete operation --- .../2020-04-01-preview/examples/ManagedHsm_Delete.json | 6 +++++- .../preview/2020-04-01-preview/managedHsm.json | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Delete.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Delete.json index a8cca6244440..cb835be37b7e 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Delete.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Delete.json @@ -7,7 +7,11 @@ }, "responses": { "200": {}, - "202": {}, + "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" + } + }, "204": {} } } 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 3bf3bcfbd199..092b5f9d4168 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 @@ -190,7 +190,13 @@ "description": "Request successful. Resource does not exist." }, "202": { - "description": "Accepted and the operation will complete asynchronously." + "description": "Accepted and the operation will complete asynchronously.", + "headers": { + "Location": { + "description": "The URI to poll for completion status.", + "type": "string" + } + } }, "200": { "description": "Delete successful." From 92214f3cb12155c49052f0bcd45781741683fda5 Mon Sep 17 00:00:00 2001 From: Neeraja Akula Date: Tue, 4 Apr 2023 14:33:34 -0700 Subject: [PATCH 4/6] Revert change of location header to delete in managed HSM resource manager --- .../2020-04-01-preview/examples/ManagedHsm_Delete.json | 6 +----- .../preview/2020-04-01-preview/managedHsm.json | 8 +------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Delete.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Delete.json index cb835be37b7e..a8cca6244440 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Delete.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Delete.json @@ -7,11 +7,7 @@ }, "responses": { "200": {}, - "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" - } - }, + "202": {}, "204": {} } } 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 092b5f9d4168..3bf3bcfbd199 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 @@ -190,13 +190,7 @@ "description": "Request successful. Resource does not exist." }, "202": { - "description": "Accepted and the operation will complete asynchronously.", - "headers": { - "Location": { - "description": "The URI to poll for completion status.", - "type": "string" - } - } + "description": "Accepted and the operation will complete asynchronously." }, "200": { "description": "Delete successful." From d65aa96881c183c582ad2b5eb31a4605cd9a5984 Mon Sep 17 00:00:00 2001 From: Neeraja Akula Date: Wed, 5 Apr 2023 08:41:15 -0700 Subject: [PATCH 5/6] Fix S360 issue with additional property being returned for managed HSM RP public network access. Added default value. --- .../preview/2021-04-01-preview/managedHsm.json | 1 + .../preview/2021-06-01-preview/managedHsm.json | 1 + .../preview/2021-11-01-preview/managedHsm.json | 1 + .../preview/2022-02-01-preview/managedHsm.json | 1 + .../Microsoft.KeyVault/stable/2021-10-01/managedHsm.json | 1 + .../Microsoft.KeyVault/stable/2022-07-01/managedHsm.json | 1 + .../Microsoft.KeyVault/stable/2022-11-01/managedHsm.json | 1 + .../Microsoft.KeyVault/stable/2023-02-01/managedHsm.json | 1 + 8 files changed, 8 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 f6e19459bcbf..bdf1669311e1 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 @@ -967,6 +967,7 @@ "Enabled", "Disabled" ], + "default": "Enabled", "type": "string", "x-ms-enum": { "name": "PublicNetworkAccess", 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 0d2ea65d36e2..1687320c9316 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 @@ -967,6 +967,7 @@ "Enabled", "Disabled" ], + "default": "Enabled", "type": "string", "x-ms-enum": { "name": "PublicNetworkAccess", 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 225944ad1faa..64094cd7d52d 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 @@ -967,6 +967,7 @@ "Enabled", "Disabled" ], + "default": "Enabled", "type": "string", "x-ms-enum": { "name": "PublicNetworkAccess", diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json index d880ebf0c898..c49138d566d5 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json @@ -1014,6 +1014,7 @@ "Enabled", "Disabled" ], + "default": "Enabled", "type": "string", "x-ms-enum": { "name": "PublicNetworkAccess", 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 ccd9dd74d759..4686a11d57be 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 @@ -968,6 +968,7 @@ "Enabled", "Disabled" ], + "default": "Enabled", "type": "string", "x-ms-enum": { "name": "PublicNetworkAccess", 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 e792d2e35552..87e6727f2015 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 @@ -1014,6 +1014,7 @@ "Enabled", "Disabled" ], + "default": "Enabled", "type": "string", "x-ms-enum": { "name": "PublicNetworkAccess", diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/managedHsm.json index 159438f2ff2c..ac0c79485bbf 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/managedHsm.json @@ -1014,6 +1014,7 @@ "Enabled", "Disabled" ], + "default": "Enabled", "type": "string", "x-ms-enum": { "name": "PublicNetworkAccess", diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/managedHsm.json index dd73c7f61cff..c9ee2bfce67b 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/managedHsm.json @@ -1073,6 +1073,7 @@ "Enabled", "Disabled" ], + "default": "Enabled", "type": "string", "x-ms-enum": { "name": "PublicNetworkAccess", From abe4d3c15ec2bb77a4d05df3c750fbcd035169c4 Mon Sep 17 00:00:00 2001 From: Neeraja Akula Date: Fri, 7 Apr 2023 12:05:19 -0700 Subject: [PATCH 6/6] Fix S360 alert for enum mismatch in Managed HSM resource manager for SKU property --- .../preview/2021-04-01-preview/managedHsm.json | 3 ++- .../preview/2021-06-01-preview/managedHsm.json | 3 ++- .../preview/2021-11-01-preview/managedHsm.json | 3 ++- .../preview/2022-02-01-preview/managedHsm.json | 3 ++- .../Microsoft.KeyVault/stable/2021-10-01/managedHsm.json | 3 ++- .../Microsoft.KeyVault/stable/2022-07-01/managedHsm.json | 3 ++- .../Microsoft.KeyVault/stable/2022-11-01/managedHsm.json | 3 ++- .../Microsoft.KeyVault/stable/2023-02-01/managedHsm.json | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) 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 bdf1669311e1..168ec1a89f07 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 @@ -816,7 +816,8 @@ "description": "SKU of the managed HSM Pool", "enum": [ "Standard_B1", - "Custom_B32" + "Custom_B32", + "Custom_B6" ], "x-ms-enum": { "name": "ManagedHsmSkuName", 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 1687320c9316..a6dfd3cec93a 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 @@ -816,7 +816,8 @@ "description": "SKU of the managed HSM Pool", "enum": [ "Standard_B1", - "Custom_B32" + "Custom_B32", + "Custom_B6" ], "x-ms-enum": { "name": "ManagedHsmSkuName", 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 64094cd7d52d..39f66ef4dbd5 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 @@ -816,7 +816,8 @@ "description": "SKU of the managed HSM Pool", "enum": [ "Standard_B1", - "Custom_B32" + "Custom_B32", + "Custom_B6" ], "x-ms-enum": { "name": "ManagedHsmSkuName", diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json index c49138d566d5..145f3a2c1876 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json @@ -862,7 +862,8 @@ "description": "SKU of the managed HSM Pool", "enum": [ "Standard_B1", - "Custom_B32" + "Custom_B32", + "Custom_B6" ], "x-ms-enum": { "name": "ManagedHsmSkuName", 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 4686a11d57be..bfaf1cbc8536 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 @@ -816,7 +816,8 @@ "description": "SKU of the managed HSM Pool", "enum": [ "Standard_B1", - "Custom_B32" + "Custom_B32", + "Custom_B6" ], "x-ms-enum": { "name": "ManagedHsmSkuName", 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 87e6727f2015..e58b53907848 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 @@ -862,7 +862,8 @@ "description": "SKU of the managed HSM Pool", "enum": [ "Standard_B1", - "Custom_B32" + "Custom_B32", + "Custom_B6" ], "x-ms-enum": { "name": "ManagedHsmSkuName", diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/managedHsm.json index ac0c79485bbf..f336cc736c7b 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-11-01/managedHsm.json @@ -862,7 +862,8 @@ "description": "SKU of the managed HSM Pool", "enum": [ "Standard_B1", - "Custom_B32" + "Custom_B32", + "Custom_B6" ], "x-ms-enum": { "name": "ManagedHsmSkuName", diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/managedHsm.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/managedHsm.json index c9ee2bfce67b..4e955e842ee7 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/managedHsm.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2023-02-01/managedHsm.json @@ -911,7 +911,8 @@ "description": "SKU of the managed HSM Pool", "enum": [ "Standard_B1", - "Custom_B32" + "Custom_B32", + "Custom_B6" ], "x-ms-enum": { "name": "ManagedHsmSkuName",