From b5ad83f8fdcabbfca59772e21acf6aa50e5e0ce9 Mon Sep 17 00:00:00 2001 From: Praveen kumar <71727298+gorandom@users.noreply.github.com> Date: Tue, 17 Aug 2021 15:15:05 +0530 Subject: [PATCH 1/6] Fixing swagger correctness issues --- ...edisCachePutPrivateEndpointConnection.json | 3 +- .../stable/2020-12-01/redis.json | 53 ++++++++++++++++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/examples/RedisCachePutPrivateEndpointConnection.json b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/examples/RedisCachePutPrivateEndpointConnection.json index c8d51c4c8e53..1ccc9dcea207 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/examples/RedisCachePutPrivateEndpointConnection.json +++ b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/examples/RedisCachePutPrivateEndpointConnection.json @@ -32,6 +32,7 @@ } } } - } + }, + "204": { } } } diff --git a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/redis.json b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/redis.json index 55ed658f4fe9..425163d43d4a 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/redis.json +++ b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/redis.json @@ -1663,6 +1663,9 @@ "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnection" } }, + "204": { + "description": "Given private endpoint connection is not available" + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -1822,6 +1825,53 @@ "properties": { "redisConfiguration": { "type": "object", + "properties":{ + "rdb-backup-enabled": { + "type": "string", + "description": "Specifies whether the rdb backup is enabled" + }, + "rdb-backup-frequency": { + "type": "string", + "description": "Specifies the frequency for creating rdb backup" + }, + "rdb-backup-max-snapshot-count": { + "type": "string", + "description": "Specifies the maximum number of snapshots for rdb backup" + }, + "rdb-storage-connection-string": { + "type": "string", + "description": "The storage account connection string for storing rdb file" + }, + "aof-storage-connection-string-0": { + "type": "string", + "description": "First storage account connection string" + }, + "aof-storage-connection-string-1": { + "type": "string", + "description": "Second storage account connection string" + }, + "maxfragmentationmemory-reserved": { + "type": "string", + "description": "Value in megabytes reserved for fragmentation per shard" + }, + "maxmemory-policy": { + "type": "string", + "description": "The eviction strategy used when your data won't fit within its memory limit." + }, + "maxmemory-reserved": { + "type": "string", + "description": "Value in megabytes reserved for non-cache usage per shard e.g. failover." + }, + "maxmemory-delta": { + "type": "string", + "description": "Value in megabytes reserved for non-cache usage per shard e.g. failover." + }, + "maxclients": { + "type": "string", + "description": "The max clients config", + "readOnly": true + } + }, "additionalProperties": { "type": "string" }, @@ -2472,7 +2522,8 @@ }, "linkedRedisCacheLocation": { "type": "string", - "description": "Location of the linked redis cache." + "description": "Location of the linked redis cache.", + "x-ms-mutability": ["create", "read"] }, "serverRole": { "type": "string", From a0fe919038debe3200ce3b6819d57eb4e2bafee8 Mon Sep 17 00:00:00 2001 From: Praveen kumar <71727298+gorandom@users.noreply.github.com> Date: Tue, 17 Aug 2021 16:11:47 +0530 Subject: [PATCH 2/6] reverting the newly added status code --- .../examples/RedisCachePutPrivateEndpointConnection.json | 3 +-- .../Microsoft.Cache/stable/2020-12-01/redis.json | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/examples/RedisCachePutPrivateEndpointConnection.json b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/examples/RedisCachePutPrivateEndpointConnection.json index 1ccc9dcea207..c8d51c4c8e53 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/examples/RedisCachePutPrivateEndpointConnection.json +++ b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/examples/RedisCachePutPrivateEndpointConnection.json @@ -32,7 +32,6 @@ } } } - }, - "204": { } + } } } diff --git a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/redis.json b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/redis.json index 425163d43d4a..58e1f5d900f7 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/redis.json +++ b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/redis.json @@ -1663,9 +1663,6 @@ "$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateEndpointConnection" } }, - "204": { - "description": "Given private endpoint connection is not available" - }, "default": { "description": "Error response describing why the operation failed.", "schema": { From 00164a73378b3c03eae199cde868620dcdcdf952 Mon Sep 17 00:00:00 2001 From: Praveen kumar <71727298+gorandom@users.noreply.github.com> Date: Tue, 17 Aug 2021 18:29:32 +0530 Subject: [PATCH 3/6] prettier formatting --- .../Microsoft.Cache/stable/2020-12-01/redis.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/redis.json b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/redis.json index 58e1f5d900f7..39379a545f35 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/redis.json +++ b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/redis.json @@ -1822,7 +1822,7 @@ "properties": { "redisConfiguration": { "type": "object", - "properties":{ + "properties": { "rdb-backup-enabled": { "type": "string", "description": "Specifies whether the rdb backup is enabled" @@ -2520,7 +2520,10 @@ "linkedRedisCacheLocation": { "type": "string", "description": "Location of the linked redis cache.", - "x-ms-mutability": ["create", "read"] + "x-ms-mutability": [ + "create", + "read" + ] }, "serverRole": { "type": "string", From e9610ec64883d538805eeef7efae613f1cabbe31 Mon Sep 17 00:00:00 2001 From: Praveen kumar <71727298+gorandom@users.noreply.github.com> Date: Tue, 17 Aug 2021 18:33:45 +0530 Subject: [PATCH 4/6] adding custom words --- custom-words.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/custom-words.txt b/custom-words.txt index 35c64a9ec0bb..17d6f3bb87c2 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1107,8 +1107,10 @@ mariadb Marketo marketplaceagreementsapi marketplaceordering +maxclients maxcoordinates MAXERRORS +maxfragmentationmemory maximumblobsize maxmemory maxpagesize From 929151682cb78f9d948035165e5c3e78ce569d66 Mon Sep 17 00:00:00 2001 From: Praveenkumar Ravikumar Date: Tue, 14 Sep 2021 17:08:59 +0530 Subject: [PATCH 5/6] s360 issue fix --- .../stable/2020-06-01/redis.json | 53 ++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-06-01/redis.json b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-06-01/redis.json index fade72a802c4..350f2ffac79d 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-06-01/redis.json +++ b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-06-01/redis.json @@ -1819,6 +1819,53 @@ "properties": { "redisConfiguration": { "type": "object", + "properties": { + "rdb-backup-enabled": { + "type": "string", + "description": "Specifies whether the rdb backup is enabled" + }, + "rdb-backup-frequency": { + "type": "string", + "description": "Specifies the frequency for creating rdb backup" + }, + "rdb-backup-max-snapshot-count": { + "type": "string", + "description": "Specifies the maximum number of snapshots for rdb backup" + }, + "rdb-storage-connection-string": { + "type": "string", + "description": "The storage account connection string for storing rdb file" + }, + "aof-storage-connection-string-0": { + "type": "string", + "description": "First storage account connection string" + }, + "aof-storage-connection-string-1": { + "type": "string", + "description": "Second storage account connection string" + }, + "maxfragmentationmemory-reserved": { + "type": "string", + "description": "Value in megabytes reserved for fragmentation per shard" + }, + "maxmemory-policy": { + "type": "string", + "description": "The eviction strategy used when your data won't fit within its memory limit." + }, + "maxmemory-reserved": { + "type": "string", + "description": "Value in megabytes reserved for non-cache usage per shard e.g. failover." + }, + "maxmemory-delta": { + "type": "string", + "description": "Value in megabytes reserved for non-cache usage per shard e.g. failover." + }, + "maxclients": { + "type": "string", + "description": "The max clients config", + "readOnly": true + } + }, "additionalProperties": { "type": "string" }, @@ -2527,7 +2574,11 @@ }, "linkedRedisCacheLocation": { "type": "string", - "description": "Location of the linked redis cache." + "description": "Location of the linked redis cache.", + "x-ms-mutability": [ + "create", + "read" + ] }, "serverRole": { "type": "string", From fb08306e0f172ea48ffe67d9c183ef2ae8922353 Mon Sep 17 00:00:00 2001 From: Praveenkumar Ravikumar Date: Wed, 15 Sep 2021 11:15:48 +0530 Subject: [PATCH 6/6] Fixing model validation error --- ...isCacheListPrivateEndpointConnections.json | 64 ++++++++++--------- ...isCacheListPrivateEndpointConnections.json | 64 ++++++++++--------- 2 files changed, 66 insertions(+), 62 deletions(-) diff --git a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-06-01/examples/RedisCacheListPrivateEndpointConnections.json b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-06-01/examples/RedisCacheListPrivateEndpointConnections.json index 1ee3609a3509..45ede24defc0 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-06-01/examples/RedisCacheListPrivateEndpointConnections.json +++ b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-06-01/examples/RedisCacheListPrivateEndpointConnections.json @@ -8,40 +8,42 @@ }, "responses": { "200": { - "body": [ - { - "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Cache/Redis/cachetest01/privateEndpointConnections/pectest01", - "name": "pectest01", - "type": "Microsoft.Cache/Redis/privateEndpointConnections", - "properties": { - "provisioningState": "Succeeded", - "privateEndpoint": { - "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Network/privateEndpoints/petest01" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "Auto-Approved", - "actionsRequired": "None" + "body": { + "value": [ + { + "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Cache/Redis/cachetest01/privateEndpointConnections/pectest01", + "name": "pectest01", + "type": "Microsoft.Cache/Redis/privateEndpointConnections", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Network/privateEndpoints/petest01" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Auto-Approved", + "actionsRequired": "None" + } } - } - }, - { - "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Cache/Redis/cachetest01/privateEndpointConnections/pectest01", - "name": "pectest01", - "type": "Microsoft.Cache/Redis/privateEndpointConnections", - "properties": { - "provisioningState": "Succeeded", - "privateEndpoint": { - "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Network/privateEndpoints/petest01" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "Auto-Approved", - "actionsRequired": "None" + }, + { + "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Cache/Redis/cachetest01/privateEndpointConnections/pectest01", + "name": "pectest01", + "type": "Microsoft.Cache/Redis/privateEndpointConnections", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Network/privateEndpoints/petest01" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Auto-Approved", + "actionsRequired": "None" + } } } - } - ] + ] + } } } } diff --git a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/examples/RedisCacheListPrivateEndpointConnections.json b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/examples/RedisCacheListPrivateEndpointConnections.json index a3b8e07f421f..aa4149741199 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/examples/RedisCacheListPrivateEndpointConnections.json +++ b/specification/redis/resource-manager/Microsoft.Cache/stable/2020-12-01/examples/RedisCacheListPrivateEndpointConnections.json @@ -8,40 +8,42 @@ }, "responses": { "200": { - "body": [ - { - "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Cache/Redis/cachetest01/privateEndpointConnections/pectest01", - "name": "pectest01", - "type": "Microsoft.Cache/Redis/privateEndpointConnections", - "properties": { - "provisioningState": "Succeeded", - "privateEndpoint": { - "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Network/privateEndpoints/petest01" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "Auto-Approved", - "actionsRequired": "None" + "body": { + "value": [ + { + "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Cache/Redis/cachetest01/privateEndpointConnections/pectest01", + "name": "pectest01", + "type": "Microsoft.Cache/Redis/privateEndpointConnections", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Network/privateEndpoints/petest01" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Auto-Approved", + "actionsRequired": "None" + } } - } - }, - { - "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Cache/Redis/cachetest01/privateEndpointConnections/pectest01", - "name": "pectest01", - "type": "Microsoft.Cache/Redis/privateEndpointConnections", - "properties": { - "provisioningState": "Succeeded", - "privateEndpoint": { - "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Network/privateEndpoints/petest01" - }, - "privateLinkServiceConnectionState": { - "status": "Approved", - "description": "Auto-Approved", - "actionsRequired": "None" + }, + { + "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Cache/Redis/cachetest01/privateEndpointConnections/pectest01", + "name": "pectest01", + "type": "Microsoft.Cache/Redis/privateEndpointConnections", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/{subscriptionId}/resourceGroups/rgtest01/providers/Microsoft.Network/privateEndpoints/petest01" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Auto-Approved", + "actionsRequired": "None" + } } } - } - ] + ] + } } } }