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

[Hub Generated] Review request for Microsoft.KeyVault to add version stable/2023-02-01 #23428

Merged
merged 6 commits into from
Apr 11, 2023
Merged

[Hub Generated] Review request for Microsoft.KeyVault to add version stable/2023-02-01 #23428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
338f38a
Update description for managed HSM properties in resource manager for…
neeerajaakula Apr 3, 2023
be562b2
Fix model validation failures for LRO_Response_Header rule in managed…
neeerajaakula Apr 4, 2023
95533ed
Fix model validation failures for LRO_Response_Header rule in managed…
neeerajaakula Apr 4, 2023
92214f3
Revert change of location header to delete in managed HSM resource ma…
neeerajaakula Apr 4, 2023
d65aa96
Fix S360 issue with additional property being returned for managed HS…
neeerajaakula Apr 5, 2023
abe4d3c
Fix S360 alert for enum mismatch in Managed HSM resource manager for …
neeerajaakula Apr 7, 2023
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
3 changes: 3 additions & 0 deletions ...rce-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/ManagedHsm_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please confirm from code to see if RP returns this header in 2020-04-01-preview version? Just to make sure service code and swagger are in sync.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keeping this change as RP does return.

},
"body": {
"properties": {
"tenantId": "00000000-0000-0000-0000-000000000000",
Expand Down
12 changes: 9 additions & 3 deletions ...n/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/managedHsm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -406,18 +412,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",
Expand Down
12 changes: 7 additions & 5 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 @@ -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",
Expand Down Expand Up @@ -852,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",
Expand Down Expand Up @@ -962,11 +963,12 @@
"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"
],
"default": "Enabled",
"type": "string",
"x-ms-enum": {
"name": "PublicNetworkAccess",
Expand Down
12 changes: 7 additions & 5 deletions ...n/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/managedHsm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -852,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",
Expand Down Expand Up @@ -962,11 +963,12 @@
"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"
],
"default": "Enabled",
"type": "string",
"x-ms-enum": {
"name": "PublicNetworkAccess",
Expand Down
12 changes: 7 additions & 5 deletions ...n/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/managedHsm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -852,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",
Expand Down Expand Up @@ -962,11 +963,12 @@
"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"
],
"default": "Enabled",
"type": "string",
"x-ms-enum": {
"name": "PublicNetworkAccess",
Expand Down
12 changes: 7 additions & 5 deletions ...n/keyvault/resource-manager/Microsoft.KeyVault/preview/2022-02-01-preview/managedHsm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -899,18 +900,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",
Expand Down Expand Up @@ -1009,11 +1010,12 @@
"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"
],
"default": "Enabled",
"type": "string",
"x-ms-enum": {
"name": "PublicNetworkAccess",
Expand Down
12 changes: 7 additions & 5 deletions specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/managedHsm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -853,18 +854,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",
Expand Down Expand Up @@ -963,11 +964,12 @@
"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"
],
"default": "Enabled",
"type": "string",
"x-ms-enum": {
"name": "PublicNetworkAccess",
Expand Down
12 changes: 7 additions & 5 deletions specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-07-01/managedHsm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -899,18 +900,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",
Expand Down Expand Up @@ -1009,11 +1010,12 @@
"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"
],
"default": "Enabled",
"type": "string",
"x-ms-enum": {
"name": "PublicNetworkAccess",
Expand Down
Loading