Skip to content

Commit 230797c

Browse files
author
SDKAuto
committed
CodeGen from PR 23428 in Azure/azure-rest-api-specs
Merge abe4d3c15ec2bb77a4d05df3c750fbcd035169c4 into 6b992c049ed7d6a95465d5c0a2234fc54c87b9bf
1 parent 2339f74 commit 230797c

File tree

9 files changed

+51
-43
lines changed

9 files changed

+51
-43
lines changed

schemas/2020-04-01-preview/Microsoft.KeyVault.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@
593593
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
594594
}
595595
],
596-
"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."
596+
"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."
597597
},
598598
"enableSoftDelete": {
599599
"oneOf": [
@@ -605,7 +605,7 @@
605605
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
606606
}
607607
],
608-
"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."
608+
"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."
609609
},
610610
"initialAdminObjectIds": {
611611
"oneOf": [
@@ -631,7 +631,7 @@
631631
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
632632
}
633633
],
634-
"description": "softDelete data retention days. It accepts >=7 and <=90."
634+
"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."
635635
},
636636
"tenantId": {
637637
"oneOf": [

schemas/2021-04-01-preview/Microsoft.KeyVault.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@
762762
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
763763
}
764764
],
765-
"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."
765+
"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."
766766
},
767767
"enableSoftDelete": {
768768
"oneOf": [
@@ -774,7 +774,7 @@
774774
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
775775
}
776776
],
777-
"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."
777+
"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."
778778
},
779779
"initialAdminObjectIds": {
780780
"oneOf": [
@@ -814,7 +814,7 @@
814814
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
815815
}
816816
],
817-
"description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled."
817+
"description": "Control permission to the managed HSM from public networks."
818818
},
819819
"softDeleteRetentionInDays": {
820820
"oneOf": [
@@ -826,7 +826,7 @@
826826
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
827827
}
828828
],
829-
"description": "softDelete data retention days. It accepts >=7 and <=90."
829+
"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."
830830
},
831831
"tenantId": {
832832
"oneOf": [
@@ -866,7 +866,8 @@
866866
"type": "string",
867867
"enum": [
868868
"Standard_B1",
869-
"Custom_B32"
869+
"Custom_B32",
870+
"Custom_B6"
870871
]
871872
},
872873
{

schemas/2021-06-01-preview/Microsoft.KeyVault.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@
799799
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
800800
}
801801
],
802-
"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."
802+
"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."
803803
},
804804
"enableSoftDelete": {
805805
"oneOf": [
@@ -811,7 +811,7 @@
811811
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
812812
}
813813
],
814-
"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."
814+
"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."
815815
},
816816
"initialAdminObjectIds": {
817817
"oneOf": [
@@ -851,7 +851,7 @@
851851
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
852852
}
853853
],
854-
"description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled."
854+
"description": "Control permission to the managed HSM from public networks."
855855
},
856856
"softDeleteRetentionInDays": {
857857
"oneOf": [
@@ -863,7 +863,7 @@
863863
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
864864
}
865865
],
866-
"description": "softDelete data retention days. It accepts >=7 and <=90."
866+
"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."
867867
},
868868
"tenantId": {
869869
"oneOf": [
@@ -903,7 +903,8 @@
903903
"type": "string",
904904
"enum": [
905905
"Standard_B1",
906-
"Custom_B32"
906+
"Custom_B32",
907+
"Custom_B6"
907908
]
908909
},
909910
{

schemas/2021-10-01/Microsoft.KeyVault.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@
709709
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
710710
}
711711
],
712-
"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."
712+
"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."
713713
},
714714
"enableSoftDelete": {
715715
"oneOf": [
@@ -721,7 +721,7 @@
721721
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
722722
}
723723
],
724-
"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."
724+
"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."
725725
},
726726
"initialAdminObjectIds": {
727727
"oneOf": [
@@ -761,7 +761,7 @@
761761
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
762762
}
763763
],
764-
"description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled."
764+
"description": "Control permission to the managed HSM from public networks."
765765
},
766766
"softDeleteRetentionInDays": {
767767
"oneOf": [
@@ -773,7 +773,7 @@
773773
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
774774
}
775775
],
776-
"description": "softDelete data retention days. It accepts >=7 and <=90."
776+
"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."
777777
},
778778
"tenantId": {
779779
"oneOf": [
@@ -813,7 +813,8 @@
813813
"type": "string",
814814
"enum": [
815815
"Standard_B1",
816-
"Custom_B32"
816+
"Custom_B32",
817+
"Custom_B6"
817818
]
818819
},
819820
{

schemas/2021-11-01-preview/Microsoft.KeyVault.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@
799799
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
800800
}
801801
],
802-
"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."
802+
"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."
803803
},
804804
"enableSoftDelete": {
805805
"oneOf": [
@@ -811,7 +811,7 @@
811811
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
812812
}
813813
],
814-
"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."
814+
"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."
815815
},
816816
"initialAdminObjectIds": {
817817
"oneOf": [
@@ -851,7 +851,7 @@
851851
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
852852
}
853853
],
854-
"description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled."
854+
"description": "Control permission to the managed HSM from public networks."
855855
},
856856
"softDeleteRetentionInDays": {
857857
"oneOf": [
@@ -863,7 +863,7 @@
863863
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
864864
}
865865
],
866-
"description": "softDelete data retention days. It accepts >=7 and <=90."
866+
"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."
867867
},
868868
"tenantId": {
869869
"oneOf": [
@@ -903,7 +903,8 @@
903903
"type": "string",
904904
"enum": [
905905
"Standard_B1",
906-
"Custom_B32"
906+
"Custom_B32",
907+
"Custom_B6"
907908
]
908909
},
909910
{

schemas/2022-02-01-preview/Microsoft.KeyVault.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@
799799
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
800800
}
801801
],
802-
"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."
802+
"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."
803803
},
804804
"enableSoftDelete": {
805805
"oneOf": [
@@ -811,7 +811,7 @@
811811
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
812812
}
813813
],
814-
"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."
814+
"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."
815815
},
816816
"initialAdminObjectIds": {
817817
"oneOf": [
@@ -851,7 +851,7 @@
851851
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
852852
}
853853
],
854-
"description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled."
854+
"description": "Control permission to the managed HSM from public networks."
855855
},
856856
"softDeleteRetentionInDays": {
857857
"oneOf": [
@@ -863,7 +863,7 @@
863863
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
864864
}
865865
],
866-
"description": "softDelete data retention days. It accepts >=7 and <=90."
866+
"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."
867867
},
868868
"tenantId": {
869869
"oneOf": [
@@ -903,7 +903,8 @@
903903
"type": "string",
904904
"enum": [
905905
"Standard_B1",
906-
"Custom_B32"
906+
"Custom_B32",
907+
"Custom_B6"
907908
]
908909
},
909910
{

schemas/2022-07-01/Microsoft.KeyVault.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@
800800
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
801801
}
802802
],
803-
"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."
803+
"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."
804804
},
805805
"enableSoftDelete": {
806806
"oneOf": [
@@ -812,7 +812,7 @@
812812
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
813813
}
814814
],
815-
"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."
815+
"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."
816816
},
817817
"initialAdminObjectIds": {
818818
"oneOf": [
@@ -852,7 +852,7 @@
852852
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
853853
}
854854
],
855-
"description": "Control permission for data plane traffic coming from public networks while private endpoint is enabled."
855+
"description": "Control permission to the managed HSM from public networks."
856856
},
857857
"softDeleteRetentionInDays": {
858858
"oneOf": [
@@ -864,7 +864,7 @@
864864
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
865865
}
866866
],
867-
"description": "softDelete data retention days. It accepts >=7 and <=90."
867+
"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."
868868
},
869869
"tenantId": {
870870
"oneOf": [
@@ -904,7 +904,8 @@
904904
"type": "string",
905905
"enum": [
906906
"Standard_B1",
907-
"Custom_B32"
907+
"Custom_B32",
908+
"Custom_B6"
908909
]
909910
},
910911
{

0 commit comments

Comments
 (0)