diff --git a/sdk/redis/Azure.ResourceManager.Redis/src/Generated/ArmRedisModelFactory.cs b/sdk/redis/Azure.ResourceManager.Redis/src/Generated/ArmRedisModelFactory.cs index b047fee82997c..3d23ef68de6df 100644 --- a/sdk/redis/Azure.ResourceManager.Redis/src/Generated/ArmRedisModelFactory.cs +++ b/sdk/redis/Azure.ResourceManager.Redis/src/Generated/ArmRedisModelFactory.cs @@ -90,6 +90,7 @@ public static RedisCreateOrUpdateContent RedisCreateOrUpdateContent(IEnumerable< /// Value in megabytes reserved for non-cache usage per shard e.g. failover. /// Value in megabytes reserved for non-cache usage per shard e.g. failover. /// The max clients config. + /// The keyspace events which should be monitored. /// Preferred auth method to communicate to storage account used for data archive, specify SAS or ManagedIdentity, default value is SAS. /// Preferred auth method to communicate to storage account used for data persistence, specify SAS or ManagedIdentity, default value is SAS. /// Zonal Configuration. @@ -98,7 +99,7 @@ public static RedisCreateOrUpdateContent RedisCreateOrUpdateContent(IEnumerable< /// Specifies whether AAD based authentication has been enabled or disabled for the cache. /// Additional Properties. /// A new instance for mocking. - public static RedisCommonConfiguration RedisCommonConfiguration(bool? isRdbBackupEnabled = null, string rdbBackupFrequency = null, int? rdbBackupMaxSnapshotCount = null, string rdbStorageConnectionString = null, bool? isAofBackupEnabled = null, string aofStorageConnectionString0 = null, string aofStorageConnectionString1 = null, string maxFragmentationMemoryReserved = null, string maxMemoryPolicy = null, string maxMemoryReserved = null, string maxMemoryDelta = null, string maxClients = null, string preferredDataArchiveAuthMethod = null, string preferredDataPersistenceAuthMethod = null, string zonalConfiguration = null, string authNotRequired = null, string storageSubscriptionId = null, string isAadEnabled = null, IDictionary additionalProperties = null) + public static RedisCommonConfiguration RedisCommonConfiguration(bool? isRdbBackupEnabled = null, string rdbBackupFrequency = null, int? rdbBackupMaxSnapshotCount = null, string rdbStorageConnectionString = null, bool? isAofBackupEnabled = null, string aofStorageConnectionString0 = null, string aofStorageConnectionString1 = null, string maxFragmentationMemoryReserved = null, string maxMemoryPolicy = null, string maxMemoryReserved = null, string maxMemoryDelta = null, string maxClients = null, string notifyKeyspaceEvents = null, string preferredDataArchiveAuthMethod = null, string preferredDataPersistenceAuthMethod = null, string zonalConfiguration = null, string authNotRequired = null, string storageSubscriptionId = null, string isAadEnabled = null, IDictionary additionalProperties = null) { additionalProperties ??= new Dictionary(); @@ -115,6 +116,7 @@ public static RedisCommonConfiguration RedisCommonConfiguration(bool? isRdbBacku maxMemoryReserved, maxMemoryDelta, maxClients, + notifyKeyspaceEvents, preferredDataArchiveAuthMethod, preferredDataPersistenceAuthMethod, zonalConfiguration, @@ -461,5 +463,32 @@ public static RedisCacheAccessPolicyAssignmentData RedisCacheAccessPolicyAssignm accessPolicyName, serializedAdditionalRawData: null); } + + /// Initializes a new instance of . + /// Specifies whether the rdb backup is enabled. + /// Specifies the frequency for creating rdb backup in minutes. Valid values: (15, 30, 60, 360, 720, 1440). + /// Specifies the maximum number of snapshots for rdb backup. + /// The storage account connection string for storing rdb file. + /// Specifies whether the aof backup is enabled. + /// First storage account connection string. + /// Second storage account connection string. + /// Value in megabytes reserved for fragmentation per shard. + /// The eviction strategy used when your data won't fit within its memory limit. + /// Value in megabytes reserved for non-cache usage per shard e.g. failover. + /// Value in megabytes reserved for non-cache usage per shard e.g. failover. + /// The max clients config. + /// Preferred auth method to communicate to storage account used for data archive, specify SAS or ManagedIdentity, default value is SAS. + /// Preferred auth method to communicate to storage account used for data persistence, specify SAS or ManagedIdentity, default value is SAS. + /// Zonal Configuration. + /// Specifies whether the authentication is disabled. Setting this property is highly discouraged from security point of view. + /// SubscriptionId of the storage account for persistence (aof/rdb) using ManagedIdentity. + /// Specifies whether AAD based authentication has been enabled or disabled for the cache. + /// Additional Properties. + /// A new instance for mocking. + [EditorBrowsable(EditorBrowsableState.Never)] + public static RedisCommonConfiguration RedisCommonConfiguration(bool? isRdbBackupEnabled, string rdbBackupFrequency, int? rdbBackupMaxSnapshotCount, string rdbStorageConnectionString, bool? isAofBackupEnabled, string aofStorageConnectionString0, string aofStorageConnectionString1, string maxFragmentationMemoryReserved, string maxMemoryPolicy, string maxMemoryReserved, string maxMemoryDelta, string maxClients, string preferredDataArchiveAuthMethod, string preferredDataPersistenceAuthMethod, string zonalConfiguration, string authNotRequired, string storageSubscriptionId, string isAadEnabled, IDictionary additionalProperties) + { + return RedisCommonConfiguration(isRdbBackupEnabled: isRdbBackupEnabled, rdbBackupFrequency: rdbBackupFrequency, rdbBackupMaxSnapshotCount: rdbBackupMaxSnapshotCount, rdbStorageConnectionString: rdbStorageConnectionString, isAofBackupEnabled: isAofBackupEnabled, aofStorageConnectionString0: aofStorageConnectionString0, aofStorageConnectionString1: aofStorageConnectionString1, maxFragmentationMemoryReserved: maxFragmentationMemoryReserved, maxMemoryPolicy: maxMemoryPolicy, maxMemoryReserved: maxMemoryReserved, maxMemoryDelta: maxMemoryDelta, maxClients: maxClients, notifyKeyspaceEvents: default, preferredDataArchiveAuthMethod: preferredDataArchiveAuthMethod, preferredDataPersistenceAuthMethod: preferredDataPersistenceAuthMethod, zonalConfiguration: zonalConfiguration, authNotRequired: authNotRequired, storageSubscriptionId: storageSubscriptionId, isAadEnabled: isAadEnabled, additionalProperties: additionalProperties); + } } } diff --git a/sdk/redis/Azure.ResourceManager.Redis/src/Generated/Models/RedisCommonConfiguration.Serialization.cs b/sdk/redis/Azure.ResourceManager.Redis/src/Generated/Models/RedisCommonConfiguration.Serialization.cs index 5894fb9419f72..f7b3949554a80 100644 --- a/sdk/redis/Azure.ResourceManager.Redis/src/Generated/Models/RedisCommonConfiguration.Serialization.cs +++ b/sdk/redis/Azure.ResourceManager.Redis/src/Generated/Models/RedisCommonConfiguration.Serialization.cs @@ -87,6 +87,11 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead writer.WritePropertyName("maxclients"u8); writer.WriteStringValue(MaxClients); } + if (Optional.IsDefined(NotifyKeyspaceEvents)) + { + writer.WritePropertyName("notify-keyspace-events"u8); + writer.WriteStringValue(NotifyKeyspaceEvents); + } if (options.Format != "W" && Optional.IsDefined(PreferredDataArchiveAuthMethod)) { writer.WritePropertyName("preferred-data-archive-auth-method"u8); @@ -164,6 +169,7 @@ internal static RedisCommonConfiguration DeserializeRedisCommonConfiguration(Jso string maxmemoryReserved = default; string maxmemoryDelta = default; string maxclients = default; + string notifyKeyspaceEvents = default; string preferredDataArchiveAuthMethod = default; string preferredDataPersistenceAuthMethod = default; string zonalConfiguration = default; @@ -234,6 +240,11 @@ internal static RedisCommonConfiguration DeserializeRedisCommonConfiguration(Jso maxclients = property.Value.GetString(); continue; } + if (property.NameEquals("notify-keyspace-events"u8)) + { + notifyKeyspaceEvents = property.Value.GetString(); + continue; + } if (property.NameEquals("preferred-data-archive-auth-method"u8)) { preferredDataArchiveAuthMethod = property.Value.GetString(); @@ -280,6 +291,7 @@ internal static RedisCommonConfiguration DeserializeRedisCommonConfiguration(Jso maxmemoryReserved, maxmemoryDelta, maxclients, + notifyKeyspaceEvents, preferredDataArchiveAuthMethod, preferredDataPersistenceAuthMethod, zonalConfiguration, @@ -542,6 +554,28 @@ private BinaryData SerializeBicep(ModelReaderWriterOptions options) } } + hasPropertyOverride = hasObjectOverride && propertyOverrides.TryGetValue(nameof(NotifyKeyspaceEvents), out propertyOverride); + if (Optional.IsDefined(NotifyKeyspaceEvents) || hasPropertyOverride) + { + builder.Append(" notify-keyspace-events: "); + if (hasPropertyOverride) + { + builder.AppendLine($"{propertyOverride}"); + } + else + { + if (NotifyKeyspaceEvents.Contains(Environment.NewLine)) + { + builder.AppendLine("'''"); + builder.AppendLine($"{NotifyKeyspaceEvents}'''"); + } + else + { + builder.AppendLine($"'{NotifyKeyspaceEvents}'"); + } + } + } + hasPropertyOverride = hasObjectOverride && propertyOverrides.TryGetValue(nameof(PreferredDataArchiveAuthMethod), out propertyOverride); if (Optional.IsDefined(PreferredDataArchiveAuthMethod) || hasPropertyOverride) { diff --git a/sdk/redis/Azure.ResourceManager.Redis/src/Generated/Models/RedisCommonConfiguration.cs b/sdk/redis/Azure.ResourceManager.Redis/src/Generated/Models/RedisCommonConfiguration.cs index fb47dc84aa869..e4e4b7b65171b 100644 --- a/sdk/redis/Azure.ResourceManager.Redis/src/Generated/Models/RedisCommonConfiguration.cs +++ b/sdk/redis/Azure.ResourceManager.Redis/src/Generated/Models/RedisCommonConfiguration.cs @@ -32,6 +32,7 @@ public RedisCommonConfiguration() /// Value in megabytes reserved for non-cache usage per shard e.g. failover. /// Value in megabytes reserved for non-cache usage per shard e.g. failover. /// The max clients config. + /// The keyspace events which should be monitored. /// Preferred auth method to communicate to storage account used for data archive, specify SAS or ManagedIdentity, default value is SAS. /// Preferred auth method to communicate to storage account used for data persistence, specify SAS or ManagedIdentity, default value is SAS. /// Zonal Configuration. @@ -39,7 +40,7 @@ public RedisCommonConfiguration() /// SubscriptionId of the storage account for persistence (aof/rdb) using ManagedIdentity. /// Specifies whether AAD based authentication has been enabled or disabled for the cache. /// Additional Properties. - internal RedisCommonConfiguration(bool? isRdbBackupEnabled, string rdbBackupFrequency, int? rdbBackupMaxSnapshotCount, string rdbStorageConnectionString, bool? isAofBackupEnabled, string aofStorageConnectionString0, string aofStorageConnectionString1, string maxFragmentationMemoryReserved, string maxMemoryPolicy, string maxMemoryReserved, string maxMemoryDelta, string maxClients, string preferredDataArchiveAuthMethod, string preferredDataPersistenceAuthMethod, string zonalConfiguration, string authNotRequired, string storageSubscriptionId, string isAadEnabled, IDictionary additionalProperties) + internal RedisCommonConfiguration(bool? isRdbBackupEnabled, string rdbBackupFrequency, int? rdbBackupMaxSnapshotCount, string rdbStorageConnectionString, bool? isAofBackupEnabled, string aofStorageConnectionString0, string aofStorageConnectionString1, string maxFragmentationMemoryReserved, string maxMemoryPolicy, string maxMemoryReserved, string maxMemoryDelta, string maxClients, string notifyKeyspaceEvents, string preferredDataArchiveAuthMethod, string preferredDataPersistenceAuthMethod, string zonalConfiguration, string authNotRequired, string storageSubscriptionId, string isAadEnabled, IDictionary additionalProperties) { IsRdbBackupEnabled = isRdbBackupEnabled; RdbBackupFrequency = rdbBackupFrequency; @@ -53,6 +54,7 @@ internal RedisCommonConfiguration(bool? isRdbBackupEnabled, string rdbBackupFreq MaxMemoryReserved = maxMemoryReserved; MaxMemoryDelta = maxMemoryDelta; MaxClients = maxClients; + NotifyKeyspaceEvents = notifyKeyspaceEvents; PreferredDataArchiveAuthMethod = preferredDataArchiveAuthMethod; PreferredDataPersistenceAuthMethod = preferredDataPersistenceAuthMethod; ZonalConfiguration = zonalConfiguration; @@ -98,6 +100,9 @@ internal RedisCommonConfiguration(bool? isRdbBackupEnabled, string rdbBackupFreq /// The max clients config. [WirePath("maxclients")] public string MaxClients { get; } + /// The keyspace events which should be monitored. + [WirePath("notify-keyspace-events")] + public string NotifyKeyspaceEvents { get; set; } /// Preferred auth method to communicate to storage account used for data archive, specify SAS or ManagedIdentity, default value is SAS. [WirePath("preferred-data-archive-auth-method")] public string PreferredDataArchiveAuthMethod { get; } diff --git a/sdk/redis/Azure.ResourceManager.Redis/src/autorest.md b/sdk/redis/Azure.ResourceManager.Redis/src/autorest.md index 9351c24820ca2..0de55d1c9daf1 100644 --- a/sdk/redis/Azure.ResourceManager.Redis/src/autorest.md +++ b/sdk/redis/Azure.ResourceManager.Redis/src/autorest.md @@ -8,7 +8,7 @@ azure-arm: true csharp: true library-name: Redis namespace: Azure.ResourceManager.Redis -require: https://github.com/Azure/azure-rest-api-specs/blob/dac9f85a47b0e4e759593f3a19968a732b911b47/specification/redis/resource-manager/readme.md +require: /mnt/vss/_work/1/s/azure-rest-api-specs/specification/redis/resource-manager/readme.md output-folder: $(this-folder)/Generated clear-output-folder: true sample-gen: