diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/api/Azure.ResourceManager.KeyVault.netstandard2.0.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/api/Azure.ResourceManager.KeyVault.netstandard2.0.cs index 956105afbac3..2dbad0ba9bdc 100644 --- a/sdk/keyvault/Azure.ResourceManager.KeyVault/api/Azure.ResourceManager.KeyVault.netstandard2.0.cs +++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/api/Azure.ResourceManager.KeyVault.netstandard2.0.cs @@ -797,6 +797,8 @@ public ManagedHsmNetworkRuleSet() { } public partial class ManagedHsmPrivateEndpointConnectionItemData { internal ManagedHsmPrivateEndpointConnectionItemData() { } + public Azure.ETag? ETag { get { throw null; } } + public string Id { get { throw null; } } public Azure.Core.ResourceIdentifier PrivateEndpointId { get { throw null; } } public Azure.ResourceManager.KeyVault.Models.ManagedHsmPrivateLinkServiceConnectionState PrivateLinkServiceConnectionState { get { throw null; } } public Azure.ResourceManager.KeyVault.Models.ManagedHsmPrivateEndpointConnectionProvisioningState? ProvisioningState { get { throw null; } } @@ -944,6 +946,7 @@ public enum ManagedHsmSkuName { StandardB1 = 0, CustomB32 = 1, + CustomB6 = 2, } public partial class ManagedHsmVirtualNetworkRule { diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmPrivateEndpointConnectionItemData.Serialization.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmPrivateEndpointConnectionItemData.Serialization.cs index b7d59c96aded..d74615224672 100644 --- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmPrivateEndpointConnectionItemData.Serialization.cs +++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmPrivateEndpointConnectionItemData.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Text.Json; +using Azure; using Azure.Core; using Azure.ResourceManager.Resources.Models; @@ -19,11 +20,28 @@ internal static ManagedHsmPrivateEndpointConnectionItemData DeserializeManagedHs { return null; } + Optional id = default; + Optional etag = default; Optional privateEndpoint = default; Optional privateLinkServiceConnectionState = default; Optional provisioningState = default; foreach (var property in element.EnumerateObject()) { + if (property.NameEquals("id"u8)) + { + id = property.Value.GetString(); + continue; + } + if (property.NameEquals("etag"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + property.ThrowNonNullablePropertyIsNull(); + continue; + } + etag = new ETag(property.Value.GetString()); + continue; + } if (property.NameEquals("properties"u8)) { if (property.Value.ValueKind == JsonValueKind.Null) @@ -67,7 +85,7 @@ internal static ManagedHsmPrivateEndpointConnectionItemData DeserializeManagedHs continue; } } - return new ManagedHsmPrivateEndpointConnectionItemData(privateEndpoint, privateLinkServiceConnectionState.Value, Optional.ToNullable(provisioningState)); + return new ManagedHsmPrivateEndpointConnectionItemData(id.Value, Optional.ToNullable(etag), privateEndpoint, privateLinkServiceConnectionState.Value, Optional.ToNullable(provisioningState)); } } } diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmPrivateEndpointConnectionItemData.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmPrivateEndpointConnectionItemData.cs index b6e043e10ddd..fa9d95a17dd6 100644 --- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmPrivateEndpointConnectionItemData.cs +++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmPrivateEndpointConnectionItemData.cs @@ -5,6 +5,7 @@ #nullable disable +using Azure; using Azure.Core; using Azure.ResourceManager.Resources.Models; @@ -19,16 +20,24 @@ internal ManagedHsmPrivateEndpointConnectionItemData() } /// Initializes a new instance of ManagedHsmPrivateEndpointConnectionItemData. + /// Id of private endpoint connection. + /// Modified whenever there is a change in the state of private endpoint connection. /// Properties of the private endpoint object. /// Approval state of the private link connection. /// Provisioning state of the private endpoint connection. - internal ManagedHsmPrivateEndpointConnectionItemData(SubResource privateEndpoint, ManagedHsmPrivateLinkServiceConnectionState privateLinkServiceConnectionState, ManagedHsmPrivateEndpointConnectionProvisioningState? provisioningState) + internal ManagedHsmPrivateEndpointConnectionItemData(string id, ETag? etag, SubResource privateEndpoint, ManagedHsmPrivateLinkServiceConnectionState privateLinkServiceConnectionState, ManagedHsmPrivateEndpointConnectionProvisioningState? provisioningState) { + Id = id; + ETag = etag; PrivateEndpoint = privateEndpoint; PrivateLinkServiceConnectionState = privateLinkServiceConnectionState; ProvisioningState = provisioningState; } + /// Id of private endpoint connection. + public string Id { get; } + /// Modified whenever there is a change in the state of private endpoint connection. + public ETag? ETag { get; } /// Properties of the private endpoint object. internal SubResource PrivateEndpoint { get; } /// Gets Id. diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmProperties.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmProperties.cs index d0134a0c4527..76f1bbb43b37 100644 --- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmProperties.cs +++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmProperties.cs @@ -25,15 +25,15 @@ public ManagedHsmProperties() /// The Azure Active Directory tenant ID that should be used for authenticating requests to the managed HSM pool. /// Array of initial administrators object ids for this managed hsm pool. /// The URI of the managed hsm pool for performing operations on keys. - /// 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. - /// softDelete data retention days. It accepts >=7 and <=90. - /// 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. + /// 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. + /// 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. + /// 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. /// The create mode to indicate whether the resource is being created or is being recovered from a deleted resource. /// Resource Status Message. /// Provisioning state. /// Rules governing the accessibility of the key vault from specific network locations. /// List of private endpoint connections associated with the managed hsm pool. - /// Control permission for data plane traffic coming from public networks while private endpoint is enabled. + /// Control permission to the managed HSM from public networks. /// The scheduled purge date in UTC. internal ManagedHsmProperties(Guid? tenantId, IList initialAdminObjectIds, Uri hsmUri, bool? enableSoftDelete, int? softDeleteRetentionInDays, bool? enablePurgeProtection, ManagedHsmCreateMode? createMode, string statusMessage, ManagedHsmProvisioningState? provisioningState, ManagedHsmNetworkRuleSet networkRuleSet, IReadOnlyList privateEndpointConnections, ManagedHsmPublicNetworkAccess? publicNetworkAccess, DateTimeOffset? scheduledPurgeOn) { @@ -58,11 +58,11 @@ internal ManagedHsmProperties(Guid? tenantId, IList initialAdminObjectId public IList InitialAdminObjectIds { get; } /// The URI of the managed hsm pool for performing operations on keys. public Uri HsmUri { get; } - /// 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. + /// 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. public bool? EnableSoftDelete { get; set; } - /// softDelete data retention days. It accepts >=7 and <=90. + /// 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. public int? SoftDeleteRetentionInDays { get; set; } - /// 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. + /// 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. public bool? EnablePurgeProtection { get; set; } /// The create mode to indicate whether the resource is being created or is being recovered from a deleted resource. public ManagedHsmCreateMode? CreateMode { get; set; } @@ -74,7 +74,7 @@ internal ManagedHsmProperties(Guid? tenantId, IList initialAdminObjectId public ManagedHsmNetworkRuleSet NetworkRuleSet { get; set; } /// List of private endpoint connections associated with the managed hsm pool. public IReadOnlyList PrivateEndpointConnections { get; } - /// Control permission for data plane traffic coming from public networks while private endpoint is enabled. + /// Control permission to the managed HSM from public networks. public ManagedHsmPublicNetworkAccess? PublicNetworkAccess { get; set; } /// The scheduled purge date in UTC. public DateTimeOffset? ScheduledPurgeOn { get; } diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmPublicNetworkAccess.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmPublicNetworkAccess.cs index 4588d67ae5f3..2c6daa302e78 100644 --- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmPublicNetworkAccess.cs +++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmPublicNetworkAccess.cs @@ -10,7 +10,7 @@ namespace Azure.ResourceManager.KeyVault.Models { - /// Control permission for data plane traffic coming from public networks while private endpoint is enabled. + /// Control permission to the managed HSM from public networks. public readonly partial struct ManagedHsmPublicNetworkAccess : IEquatable { private readonly string _value; diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmSkuName.Serialization.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmSkuName.Serialization.cs index 110565af589c..606fd08c2771 100644 --- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmSkuName.Serialization.cs +++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmSkuName.Serialization.cs @@ -15,6 +15,7 @@ internal static partial class ManagedHsmSkuNameExtensions { ManagedHsmSkuName.StandardB1 => "Standard_B1", ManagedHsmSkuName.CustomB32 => "Custom_B32", + ManagedHsmSkuName.CustomB6 => "Custom_B6", _ => throw new ArgumentOutOfRangeException(nameof(value), value, "Unknown ManagedHsmSkuName value.") }; @@ -22,6 +23,7 @@ public static ManagedHsmSkuName ToManagedHsmSkuName(this string value) { if (StringComparer.OrdinalIgnoreCase.Equals(value, "Standard_B1")) return ManagedHsmSkuName.StandardB1; if (StringComparer.OrdinalIgnoreCase.Equals(value, "Custom_B32")) return ManagedHsmSkuName.CustomB32; + if (StringComparer.OrdinalIgnoreCase.Equals(value, "Custom_B6")) return ManagedHsmSkuName.CustomB6; throw new ArgumentOutOfRangeException(nameof(value), value, "Unknown ManagedHsmSkuName value."); } } diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmSkuName.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmSkuName.cs index 6417e1c89aa8..64e86544e7c3 100644 --- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmSkuName.cs +++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Models/ManagedHsmSkuName.cs @@ -13,6 +13,8 @@ public enum ManagedHsmSkuName /// Standard_B1. StandardB1, /// Custom_B32. - CustomB32 + CustomB32, + /// Custom_B6. + CustomB6 } } diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/autorest.md b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/autorest.md index 0376534299f6..128f4f8a9ff2 100644 --- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/autorest.md +++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/autorest.md @@ -153,8 +153,8 @@ These settings apply only when `--tag=package-2021-10` is specified on the comma ```yaml $(tag) == 'package-2021-10' input-file: - - https://github.com/Azure/azure-rest-api-specs/blob/8b871ca35a08c43293fcbb2926e6062db4f6d85c/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/common.json - - https://github.com/Azure/azure-rest-api-specs/blob/8b871ca35a08c43293fcbb2926e6062db4f6d85c/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/keyvault.json - - https://github.com/Azure/azure-rest-api-specs/blob/8b871ca35a08c43293fcbb2926e6062db4f6d85c/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/managedHsm.json - - https://github.com/Azure/azure-rest-api-specs/blob/8b871ca35a08c43293fcbb2926e6062db4f6d85c/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/providers.json + - https://github.com/Azure/azure-rest-api-specs/blob/a0970ce126647702ed00e695170286e8663e2893/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/common.json + - https://github.com/Azure/azure-rest-api-specs/blob/a0970ce126647702ed00e695170286e8663e2893/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/keyvault.json + - https://github.com/Azure/azure-rest-api-specs/blob/a0970ce126647702ed00e695170286e8663e2893/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/managedHsm.json + - https://github.com/Azure/azure-rest-api-specs/blob/a0970ce126647702ed00e695170286e8663e2893/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/providers.json ```