From f8e1aa38e86089e34dcbdba1ca5e58ea45c733be Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 1 Oct 2021 04:29:29 +0000 Subject: [PATCH] CodeGen from PR 16132 in Azure/azure-rest-api-specs Merge 440b6461e0fc9c0f1cf51b3a29c467acce8c1a75 into 7d6151a050511a4421cdbe2e53d93491cc233dc0 --- sdk/redis/arm-rediscache/package.json | 2 +- .../src/models/firewallRulesMappers.ts | 1 + sdk/redis/arm-rediscache/src/models/index.ts | 87 ++++++++++++--- .../src/models/linkedServerMappers.ts | 1 + .../arm-rediscache/src/models/mappers.ts | 103 +++++++++++++++++- .../src/models/patchSchedulesMappers.ts | 1 + .../privateEndpointConnectionsMappers.ts | 1 + .../src/models/privateLinkResourcesMappers.ts | 1 + .../arm-rediscache/src/models/redisMappers.ts | 1 + 9 files changed, 178 insertions(+), 20 deletions(-) diff --git a/sdk/redis/arm-rediscache/package.json b/sdk/redis/arm-rediscache/package.json index 335660ddca29..acfca968355f 100644 --- a/sdk/redis/arm-rediscache/package.json +++ b/sdk/redis/arm-rediscache/package.json @@ -27,7 +27,7 @@ "rollup-plugin-sourcemaps": "^0.4.2", "uglify-js": "^3.6.0" }, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/feature/v4/sdk/redis/arm-rediscache", + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/redis/arm-rediscache", "repository": { "type": "git", "url": "https://github.com/Azure/azure-sdk-for-js.git" diff --git a/sdk/redis/arm-rediscache/src/models/firewallRulesMappers.ts b/sdk/redis/arm-rediscache/src/models/firewallRulesMappers.ts index 6fde71c644a2..b9c21978b977 100644 --- a/sdk/redis/arm-rediscache/src/models/firewallRulesMappers.ts +++ b/sdk/redis/arm-rediscache/src/models/firewallRulesMappers.ts @@ -18,6 +18,7 @@ export { PrivateLinkServiceConnectionState, ProxyResource, RedisAccessKeys, + RedisCommonPropertiesRedisConfiguration, RedisFirewallRule, RedisFirewallRuleCreateParameters, RedisFirewallRuleListResult, diff --git a/sdk/redis/arm-rediscache/src/models/index.ts b/sdk/redis/arm-rediscache/src/models/index.ts index 1a0545e90445..74f9b9fe77d2 100644 --- a/sdk/redis/arm-rediscache/src/models/index.ts +++ b/sdk/redis/arm-rediscache/src/models/index.ts @@ -32,6 +32,64 @@ export interface Sku { capacity: number; } +/** + * All Redis Settings. Few possible keys: + * rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value + * etc. + */ +export interface RedisCommonPropertiesRedisConfiguration { + /** + * Specifies whether the rdb backup is enabled + */ + rdbBackupEnabled?: string; + /** + * Specifies the frequency for creating rdb backup + */ + rdbBackupFrequency?: string; + /** + * Specifies the maximum number of snapshots for rdb backup + */ + rdbBackupMaxSnapshotCount?: string; + /** + * The storage account connection string for storing rdb file + */ + rdbStorageConnectionString?: string; + /** + * First storage account connection string + */ + aofStorageConnectionString0?: string; + /** + * Second storage account connection string + */ + aofStorageConnectionString1?: string; + /** + * Value in megabytes reserved for fragmentation per shard + */ + maxfragmentationmemoryReserved?: string; + /** + * The eviction strategy used when your data won't fit within its memory limit. + */ + maxmemoryPolicy?: string; + /** + * Value in megabytes reserved for non-cache usage per shard e.g. failover. + */ + maxmemoryReserved?: string; + /** + * Value in megabytes reserved for non-cache usage per shard e.g. failover. + */ + maxmemoryDelta?: string; + /** + * The max clients config + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly maxclients?: string; + /** + * Describes unknown properties. The value of an unknown property MUST be of type "string". Due + * to valid TS constraints we have modeled this as a union of `string | any`. + */ + [property: string]: string | any; +} + /** * Redis cache access keys. */ @@ -180,14 +238,14 @@ export interface RedisCreateParameters { * rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value * etc. */ - redisConfiguration?: { [propertyName: string]: string }; + redisConfiguration?: RedisCommonPropertiesRedisConfiguration; /** * Redis version. Only major version will be used in PUT/PATCH request with current valid values: * (4, 6) */ redisVersion?: string; /** - * Specifies whether the non-ssl Redis server port (6379) is enabled. + * Specifies whether the non-ssl Redis server port (6379) is enabled. Default value: false. */ enableNonSslPort?: boolean; /** @@ -214,7 +272,8 @@ export interface RedisCreateParameters { /** * Whether or not public endpoint access is allowed for this cache. Value is optional but if * passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive - * access method. Default value is 'Enabled'. Possible values include: 'Enabled', 'Disabled' + * access method. Default value is 'Enabled'. Possible values include: 'Enabled', 'Disabled'. + * Default value: 'Enabled'. */ publicNetworkAccess?: PublicNetworkAccess; /** @@ -228,8 +287,8 @@ export interface RedisCreateParameters { */ subnetId?: string; /** - * Static IP address. Required when deploying a Redis cache inside an existing Azure Virtual - * Network. + * Static IP address. Optionally, may be specified when deploying a Redis cache inside an + * existing Azure Virtual Network; auto assigned by default. */ staticIP?: string; /** @@ -255,14 +314,14 @@ export interface RedisUpdateParameters { * rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value * etc. */ - redisConfiguration?: { [propertyName: string]: string }; + redisConfiguration?: RedisCommonPropertiesRedisConfiguration; /** * Redis version. Only major version will be used in PUT/PATCH request with current valid values: * (4, 6) */ redisVersion?: string; /** - * Specifies whether the non-ssl Redis server port (6379) is enabled. + * Specifies whether the non-ssl Redis server port (6379) is enabled. Default value: false. */ enableNonSslPort?: boolean; /** @@ -289,7 +348,8 @@ export interface RedisUpdateParameters { /** * Whether or not public endpoint access is allowed for this cache. Value is optional but if * passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive - * access method. Default value is 'Enabled'. Possible values include: 'Enabled', 'Disabled' + * access method. Default value is 'Enabled'. Possible values include: 'Enabled', 'Disabled'. + * Default value: 'Enabled'. */ publicNetworkAccess?: PublicNetworkAccess; /** @@ -371,14 +431,14 @@ export interface RedisResource extends TrackedResource { * rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value * etc. */ - redisConfiguration?: { [propertyName: string]: string }; + redisConfiguration?: RedisCommonPropertiesRedisConfiguration; /** * Redis version. Only major version will be used in PUT/PATCH request with current valid values: * (4, 6) */ redisVersion?: string; /** - * Specifies whether the non-ssl Redis server port (6379) is enabled. + * Specifies whether the non-ssl Redis server port (6379) is enabled. Default value: false. */ enableNonSslPort?: boolean; /** @@ -405,7 +465,8 @@ export interface RedisResource extends TrackedResource { /** * Whether or not public endpoint access is allowed for this cache. Value is optional but if * passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive - * access method. Default value is 'Enabled'. Possible values include: 'Enabled', 'Disabled' + * access method. Default value is 'Enabled'. Possible values include: 'Enabled', 'Disabled'. + * Default value: 'Enabled'. */ publicNetworkAccess?: PublicNetworkAccess; /** @@ -419,8 +480,8 @@ export interface RedisResource extends TrackedResource { */ subnetId?: string; /** - * Static IP address. Required when deploying a Redis cache inside an existing Azure Virtual - * Network. + * Static IP address. Optionally, may be specified when deploying a Redis cache inside an + * existing Azure Virtual Network; auto assigned by default. */ staticIP?: string; /** diff --git a/sdk/redis/arm-rediscache/src/models/linkedServerMappers.ts b/sdk/redis/arm-rediscache/src/models/linkedServerMappers.ts index 0d8ced2660e9..98fda3001378 100644 --- a/sdk/redis/arm-rediscache/src/models/linkedServerMappers.ts +++ b/sdk/redis/arm-rediscache/src/models/linkedServerMappers.ts @@ -18,6 +18,7 @@ export { PrivateLinkServiceConnectionState, ProxyResource, RedisAccessKeys, + RedisCommonPropertiesRedisConfiguration, RedisFirewallRule, RedisFirewallRuleCreateParameters, RedisInstanceDetails, diff --git a/sdk/redis/arm-rediscache/src/models/mappers.ts b/sdk/redis/arm-rediscache/src/models/mappers.ts index dd5589ab16ac..45bf3788745e 100644 --- a/sdk/redis/arm-rediscache/src/models/mappers.ts +++ b/sdk/redis/arm-rediscache/src/models/mappers.ts @@ -43,6 +43,88 @@ export const Sku: msRest.CompositeMapper = { } }; +export const RedisCommonPropertiesRedisConfiguration: msRest.CompositeMapper = { + serializedName: "RedisCommonProperties_redisConfiguration", + type: { + name: "Composite", + className: "RedisCommonPropertiesRedisConfiguration", + modelProperties: { + rdbBackupEnabled: { + serializedName: "rdb-backup-enabled", + type: { + name: "String" + } + }, + rdbBackupFrequency: { + serializedName: "rdb-backup-frequency", + type: { + name: "String" + } + }, + rdbBackupMaxSnapshotCount: { + serializedName: "rdb-backup-max-snapshot-count", + type: { + name: "String" + } + }, + rdbStorageConnectionString: { + serializedName: "rdb-storage-connection-string", + type: { + name: "String" + } + }, + aofStorageConnectionString0: { + serializedName: "aof-storage-connection-string-0", + type: { + name: "String" + } + }, + aofStorageConnectionString1: { + serializedName: "aof-storage-connection-string-1", + type: { + name: "String" + } + }, + maxfragmentationmemoryReserved: { + serializedName: "maxfragmentationmemory-reserved", + type: { + name: "String" + } + }, + maxmemoryPolicy: { + serializedName: "maxmemory-policy", + type: { + name: "String" + } + }, + maxmemoryReserved: { + serializedName: "maxmemory-reserved", + type: { + name: "String" + } + }, + maxmemoryDelta: { + serializedName: "maxmemory-delta", + type: { + name: "String" + } + }, + maxclients: { + readOnly: true, + serializedName: "maxclients", + type: { + name: "String" + } + } + }, + additionalProperties: { + type: { + name: "String" + } + } + } +}; + export const RedisAccessKeys: msRest.CompositeMapper = { serializedName: "RedisAccessKeys", type: { @@ -253,8 +335,9 @@ export const RedisCreateParameters: msRest.CompositeMapper = { redisConfiguration: { serializedName: "properties.redisConfiguration", type: { - name: "Dictionary", - value: { + name: "Composite", + className: "RedisCommonPropertiesRedisConfiguration", + additionalProperties: { type: { name: "String" } @@ -269,6 +352,7 @@ export const RedisCreateParameters: msRest.CompositeMapper = { }, enableNonSslPort: { serializedName: "properties.enableNonSslPort", + defaultValue: false, type: { name: "Boolean" } @@ -310,6 +394,7 @@ export const RedisCreateParameters: msRest.CompositeMapper = { }, publicNetworkAccess: { serializedName: "properties.publicNetworkAccess", + defaultValue: 'Enabled', type: { name: "String" } @@ -382,8 +467,9 @@ export const RedisUpdateParameters: msRest.CompositeMapper = { redisConfiguration: { serializedName: "properties.redisConfiguration", type: { - name: "Dictionary", - value: { + name: "Composite", + className: "RedisCommonPropertiesRedisConfiguration", + additionalProperties: { type: { name: "String" } @@ -398,6 +484,7 @@ export const RedisUpdateParameters: msRest.CompositeMapper = { }, enableNonSslPort: { serializedName: "properties.enableNonSslPort", + defaultValue: false, type: { name: "Boolean" } @@ -439,6 +526,7 @@ export const RedisUpdateParameters: msRest.CompositeMapper = { }, publicNetworkAccess: { serializedName: "properties.publicNetworkAccess", + defaultValue: 'Enabled', type: { name: "String" } @@ -575,8 +663,9 @@ export const RedisResource: msRest.CompositeMapper = { redisConfiguration: { serializedName: "properties.redisConfiguration", type: { - name: "Dictionary", - value: { + name: "Composite", + className: "RedisCommonPropertiesRedisConfiguration", + additionalProperties: { type: { name: "String" } @@ -591,6 +680,7 @@ export const RedisResource: msRest.CompositeMapper = { }, enableNonSslPort: { serializedName: "properties.enableNonSslPort", + defaultValue: false, type: { name: "Boolean" } @@ -632,6 +722,7 @@ export const RedisResource: msRest.CompositeMapper = { }, publicNetworkAccess: { serializedName: "properties.publicNetworkAccess", + defaultValue: 'Enabled', type: { name: "String" } diff --git a/sdk/redis/arm-rediscache/src/models/patchSchedulesMappers.ts b/sdk/redis/arm-rediscache/src/models/patchSchedulesMappers.ts index 9ca3016e1fd8..df9382dc5f50 100644 --- a/sdk/redis/arm-rediscache/src/models/patchSchedulesMappers.ts +++ b/sdk/redis/arm-rediscache/src/models/patchSchedulesMappers.ts @@ -18,6 +18,7 @@ export { PrivateLinkServiceConnectionState, ProxyResource, RedisAccessKeys, + RedisCommonPropertiesRedisConfiguration, RedisFirewallRule, RedisFirewallRuleCreateParameters, RedisInstanceDetails, diff --git a/sdk/redis/arm-rediscache/src/models/privateEndpointConnectionsMappers.ts b/sdk/redis/arm-rediscache/src/models/privateEndpointConnectionsMappers.ts index 8914bae01de3..6a974572f3ee 100644 --- a/sdk/redis/arm-rediscache/src/models/privateEndpointConnectionsMappers.ts +++ b/sdk/redis/arm-rediscache/src/models/privateEndpointConnectionsMappers.ts @@ -19,6 +19,7 @@ export { PrivateLinkServiceConnectionState, ProxyResource, RedisAccessKeys, + RedisCommonPropertiesRedisConfiguration, RedisFirewallRule, RedisFirewallRuleCreateParameters, RedisInstanceDetails, diff --git a/sdk/redis/arm-rediscache/src/models/privateLinkResourcesMappers.ts b/sdk/redis/arm-rediscache/src/models/privateLinkResourcesMappers.ts index d98791591822..faa6e032eef5 100644 --- a/sdk/redis/arm-rediscache/src/models/privateLinkResourcesMappers.ts +++ b/sdk/redis/arm-rediscache/src/models/privateLinkResourcesMappers.ts @@ -19,6 +19,7 @@ export { PrivateLinkServiceConnectionState, ProxyResource, RedisAccessKeys, + RedisCommonPropertiesRedisConfiguration, RedisFirewallRule, RedisFirewallRuleCreateParameters, RedisInstanceDetails, diff --git a/sdk/redis/arm-rediscache/src/models/redisMappers.ts b/sdk/redis/arm-rediscache/src/models/redisMappers.ts index 96102deb4554..ffb3ea592d96 100644 --- a/sdk/redis/arm-rediscache/src/models/redisMappers.ts +++ b/sdk/redis/arm-rediscache/src/models/redisMappers.ts @@ -22,6 +22,7 @@ export { PrivateLinkServiceConnectionState, ProxyResource, RedisAccessKeys, + RedisCommonPropertiesRedisConfiguration, RedisCreateParameters, RedisFirewallRule, RedisFirewallRuleCreateParameters,