Skip to content

Commit 03ddcda

Browse files
neeerajaakulaJoshLove-msft
neeerajaakula
authored and
JoshLove-msft
committed
[Hub Generated] Review request for Microsoft.KeyVault to add version stable/2023-02-01 (Azure#23428)
* Update description for managed HSM properties in resource manager for following properties: enableSoftDelete, softDeleteRetentionDays, enablePurgeProtection and publicNetworkAccess * Fix model validation failures for LRO_Response_Header rule in managed HSM resource manager version 2020-04-01-preview * Fix model validation failures for LRO_Response_Header rule in managed HSM resource manager version 2020-04-01-preview for delete operation * Revert change of location header to delete in managed HSM resource manager * Fix S360 issue with additional property being returned for managed HSM RP public network access. Added default value. * Fix S360 alert for enum mismatch in Managed HSM resource manager for SKU property
1 parent 9437379 commit 03ddcda

File tree

10 files changed

+68
-43
lines changed

10 files changed

+68
-43
lines changed

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Update.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
}
4444
},
4545
"202": {
46+
"headers": {
47+
"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"
48+
},
4649
"body": {
4750
"properties": {
4851
"tenantId": "00000000-0000-0000-0000-000000000000",

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/managedHsm.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,12 @@
132132
"responses": {
133133
"202": {
134134
"description": "Accepted and the operation will complete asynchronously.",
135+
"headers": {
136+
"Location": {
137+
"description": "The URI to poll for completion status.",
138+
"type": "string"
139+
}
140+
},
135141
"schema": {
136142
"$ref": "#/definitions/ManagedHsm"
137143
}
@@ -406,18 +412,18 @@
406412
"enableSoftDelete": {
407413
"type": "boolean",
408414
"default": true,
409-
"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."
415+
"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."
410416
},
411417
"softDeleteRetentionInDays": {
412418
"type": "integer",
413419
"format": "int32",
414420
"default": 90,
415-
"description": "softDelete data retention days. It accepts >=7 and <=90."
421+
"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."
416422
},
417423
"enablePurgeProtection": {
418424
"type": "boolean",
419425
"default": true,
420-
"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."
426+
"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."
421427
},
422428
"createMode": {
423429
"type": "string",

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/managedHsm.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,8 @@
816816
"description": "SKU of the managed HSM Pool",
817817
"enum": [
818818
"Standard_B1",
819-
"Custom_B32"
819+
"Custom_B32",
820+
"Custom_B6"
820821
],
821822
"x-ms-enum": {
822823
"name": "ManagedHsmSkuName",
@@ -852,18 +853,18 @@
852853
"enableSoftDelete": {
853854
"type": "boolean",
854855
"default": true,
855-
"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."
856+
"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."
856857
},
857858
"softDeleteRetentionInDays": {
858859
"type": "integer",
859860
"format": "int32",
860861
"default": 90,
861-
"description": "softDelete data retention days. It accepts >=7 and <=90."
862+
"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."
862863
},
863864
"enablePurgeProtection": {
864865
"type": "boolean",
865866
"default": true,
866-
"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."
867+
"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."
867868
},
868869
"createMode": {
869870
"type": "string",
@@ -962,11 +963,12 @@
962963
"description": "List of private endpoint connections associated with the managed hsm pool."
963964
},
964965
"publicNetworkAccess": {
965-
"description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.",
966+
"description": "Control permission to the managed HSM from public networks.",
966967
"enum": [
967968
"Enabled",
968969
"Disabled"
969970
],
971+
"default": "Enabled",
970972
"type": "string",
971973
"x-ms-enum": {
972974
"name": "PublicNetworkAccess",

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/managedHsm.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,8 @@
816816
"description": "SKU of the managed HSM Pool",
817817
"enum": [
818818
"Standard_B1",
819-
"Custom_B32"
819+
"Custom_B32",
820+
"Custom_B6"
820821
],
821822
"x-ms-enum": {
822823
"name": "ManagedHsmSkuName",
@@ -852,18 +853,18 @@
852853
"enableSoftDelete": {
853854
"type": "boolean",
854855
"default": true,
855-
"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."
856+
"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."
856857
},
857858
"softDeleteRetentionInDays": {
858859
"type": "integer",
859860
"format": "int32",
860861
"default": 90,
861-
"description": "softDelete data retention days. It accepts >=7 and <=90."
862+
"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."
862863
},
863864
"enablePurgeProtection": {
864865
"type": "boolean",
865866
"default": true,
866-
"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."
867+
"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."
867868
},
868869
"createMode": {
869870
"type": "string",
@@ -962,11 +963,12 @@
962963
"description": "List of private endpoint connections associated with the managed hsm pool."
963964
},
964965
"publicNetworkAccess": {
965-
"description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.",
966+
"description": "Control permission to the managed HSM from public networks.",
966967
"enum": [
967968
"Enabled",
968969
"Disabled"
969970
],
971+
"default": "Enabled",
970972
"type": "string",
971973
"x-ms-enum": {
972974
"name": "PublicNetworkAccess",

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/managedHsm.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,8 @@
816816
"description": "SKU of the managed HSM Pool",
817817
"enum": [
818818
"Standard_B1",
819-
"Custom_B32"
819+
"Custom_B32",
820+
"Custom_B6"
820821
],
821822
"x-ms-enum": {
822823
"name": "ManagedHsmSkuName",
@@ -852,18 +853,18 @@
852853
"enableSoftDelete": {
853854
"type": "boolean",
854855
"default": true,
855-
"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."
856+
"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."
856857
},
857858
"softDeleteRetentionInDays": {
858859
"type": "integer",
859860
"format": "int32",
860861
"default": 90,
861-
"description": "softDelete data retention days. It accepts >=7 and <=90."
862+
"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."
862863
},
863864
"enablePurgeProtection": {
864865
"type": "boolean",
865866
"default": true,
866-
"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."
867+
"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."
867868
},
868869
"createMode": {
869870
"type": "string",
@@ -962,11 +963,12 @@
962963
"description": "List of private endpoint connections associated with the managed hsm pool."
963964
},
964965
"publicNetworkAccess": {
965-
"description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.",
966+
"description": "Control permission to the managed HSM from public networks.",
966967
"enum": [
967968
"Enabled",
968969
"Disabled"
969970
],
971+
"default": "Enabled",
970972
"type": "string",
971973
"x-ms-enum": {
972974
"name": "PublicNetworkAccess",

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,8 @@
862862
"description": "SKU of the managed HSM Pool",
863863
"enum": [
864864
"Standard_B1",
865-
"Custom_B32"
865+
"Custom_B32",
866+
"Custom_B6"
866867
],
867868
"x-ms-enum": {
868869
"name": "ManagedHsmSkuName",
@@ -899,18 +900,18 @@
899900
"enableSoftDelete": {
900901
"type": "boolean",
901902
"default": true,
902-
"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."
903+
"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."
903904
},
904905
"softDeleteRetentionInDays": {
905906
"type": "integer",
906907
"format": "int32",
907908
"default": 90,
908-
"description": "softDelete data retention days. It accepts >=7 and <=90."
909+
"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."
909910
},
910911
"enablePurgeProtection": {
911912
"type": "boolean",
912913
"default": true,
913-
"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."
914+
"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."
914915
},
915916
"createMode": {
916917
"type": "string",
@@ -1009,11 +1010,12 @@
10091010
"description": "List of private endpoint connections associated with the managed hsm pool."
10101011
},
10111012
"publicNetworkAccess": {
1012-
"description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.",
1013+
"description": "Control permission to the managed HSM from public networks.",
10131014
"enum": [
10141015
"Enabled",
10151016
"Disabled"
10161017
],
1018+
"default": "Enabled",
10171019
"type": "string",
10181020
"x-ms-enum": {
10191021
"name": "PublicNetworkAccess",

‎specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/managedHsm.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,8 @@
816816
"description": "SKU of the managed HSM Pool",
817817
"enum": [
818818
"Standard_B1",
819-
"Custom_B32"
819+
"Custom_B32",
820+
"Custom_B6"
820821
],
821822
"x-ms-enum": {
822823
"name": "ManagedHsmSkuName",
@@ -853,18 +854,18 @@
853854
"enableSoftDelete": {
854855
"type": "boolean",
855856
"default": true,
856-
"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."
857+
"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."
857858
},
858859
"softDeleteRetentionInDays": {
859860
"type": "integer",
860861
"format": "int32",
861862
"default": 90,
862-
"description": "softDelete data retention days. It accepts >=7 and <=90."
863+
"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."
863864
},
864865
"enablePurgeProtection": {
865866
"type": "boolean",
866867
"default": true,
867-
"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."
868+
"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."
868869
},
869870
"createMode": {
870871
"type": "string",
@@ -963,11 +964,12 @@
963964
"description": "List of private endpoint connections associated with the managed hsm pool."
964965
},
965966
"publicNetworkAccess": {
966-
"description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.",
967+
"description": "Control permission to the managed HSM from public networks.",
967968
"enum": [
968969
"Enabled",
969970
"Disabled"
970971
],
972+
"default": "Enabled",
971973
"type": "string",
972974
"x-ms-enum": {
973975
"name": "PublicNetworkAccess",

‎specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-07-01/managedHsm.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,8 @@
862862
"description": "SKU of the managed HSM Pool",
863863
"enum": [
864864
"Standard_B1",
865-
"Custom_B32"
865+
"Custom_B32",
866+
"Custom_B6"
866867
],
867868
"x-ms-enum": {
868869
"name": "ManagedHsmSkuName",
@@ -899,18 +900,18 @@
899900
"enableSoftDelete": {
900901
"type": "boolean",
901902
"default": true,
902-
"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."
903+
"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."
903904
},
904905
"softDeleteRetentionInDays": {
905906
"type": "integer",
906907
"format": "int32",
907908
"default": 90,
908-
"description": "softDelete data retention days. It accepts >=7 and <=90."
909+
"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."
909910
},
910911
"enablePurgeProtection": {
911912
"type": "boolean",
912913
"default": true,
913-
"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."
914+
"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."
914915
},
915916
"createMode": {
916917
"type": "string",
@@ -1009,11 +1010,12 @@
10091010
"description": "List of private endpoint connections associated with the managed hsm pool."
10101011
},
10111012
"publicNetworkAccess": {
1012-
"description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled.",
1013+
"description": "Control permission to the managed HSM from public networks.",
10131014
"enum": [
10141015
"Enabled",
10151016
"Disabled"
10161017
],
1018+
"default": "Enabled",
10171019
"type": "string",
10181020
"x-ms-enum": {
10191021
"name": "PublicNetworkAccess",

0 commit comments

Comments
 (0)