From 1f5caf4804b246fec5352bec40a63ad058a1d982 Mon Sep 17 00:00:00 2001 From: "Ranjini Chithambaram (from Dev Box)" Date: Wed, 26 Mar 2025 00:32:07 +0100 Subject: [PATCH 1/4] include no-cluster example --- ...terpriseDatabasesCreateNoClusterCache.json | 54 +++++++++++++++++++ .../2025-05-01-preview/redisenterprise.json | 8 ++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesCreateNoClusterCache.json diff --git a/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesCreateNoClusterCache.json b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesCreateNoClusterCache.json new file mode 100644 index 000000000000..1172f7c2f277 --- /dev/null +++ b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesCreateNoClusterCache.json @@ -0,0 +1,54 @@ +{ + "parameters": { + "databaseName": "default", + "clusterName": "cache1", + "resourceGroupName": "rg1", + "api-version": "2025-05-01-preview", + "subscriptionId": "e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8f", + "parameters": { + "properties": { + "clientProtocol": "Encrypted", + "clusteringPolicy": "NoCluster", + "evictionPolicy": "NoEviction", + "port": 10000 + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8f/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/default", + "name": "cache1/default", + "type": "Microsoft.Cache/redisEnterprise/databases", + "properties": { + "provisioningState": "Updating", + "resourceState": "Updating", + "clientProtocol": "Encrypted", + "clusteringPolicy": "NoCluster", + "evictionPolicy": "NoEviction", + "port": 10000, + "deferUpgrade": "NotDeferred", + "accessKeysAuthentication": "Enabled", + "redisVersion": "6.0" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8f/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/db1", + "name": "cache1/db1", + "type": "Microsoft.Cache/redisEnterprise/databases", + "properties": { + "provisioningState": "Creating", + "resourceState": "Creating", + "clientProtocol": "Encrypted", + "clusteringPolicy": "EnterpriseCluster", + "evictionPolicy": "AllKeysLRU", + "port": 10000, + "accessKeysAuthentication": "Enabled" + } + } + } + } +} + diff --git a/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/redisenterprise.json b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/redisenterprise.json index 27ca479068c4..f59b02aac9b8 100644 --- a/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/redisenterprise.json +++ b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/redisenterprise.json @@ -2140,7 +2140,8 @@ "description": "Clustering policy - default is OSSCluster. This property must be chosen at create time, and cannot be changed without deleting the database.", "enum": [ "EnterpriseCluster", - "OSSCluster" + "OSSCluster", + "NoCluster" ], "x-ms-mutability": [ "read", @@ -2159,6 +2160,11 @@ "value": "OSSCluster", "name": "OSSCluster", "description": "OSS clustering policy follows the redis cluster specification, and requires all clients to support redis clustering." + }, + { + "value": "NoCluster", + "name": "NoCluster", + "description": "NoCluster clustering policy is for non-clustered instances." } ] } From bf75a58d94ece193c59c572ed44e954ed4558114 Mon Sep 17 00:00:00 2001 From: "Ranjini Chithambaram (from Dev Box)" Date: Wed, 26 Mar 2025 16:33:18 +0100 Subject: [PATCH 2/4] update descriptions --- ...terpriseDatabasesCreateNoClusterCache.json | 19 +------------------ .../2025-05-01-preview/redisenterprise.json | 7 ++++--- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesCreateNoClusterCache.json b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesCreateNoClusterCache.json index 1172f7c2f277..4469a246f2d2 100644 --- a/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesCreateNoClusterCache.json +++ b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesCreateNoClusterCache.json @@ -32,23 +32,6 @@ "redisVersion": "6.0" } } - }, - "201": { - "body": { - "id": "/subscriptions/e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8f/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/db1", - "name": "cache1/db1", - "type": "Microsoft.Cache/redisEnterprise/databases", - "properties": { - "provisioningState": "Creating", - "resourceState": "Creating", - "clientProtocol": "Encrypted", - "clusteringPolicy": "EnterpriseCluster", - "evictionPolicy": "AllKeysLRU", - "port": 10000, - "accessKeysAuthentication": "Enabled" - } - } } } -} - +} \ No newline at end of file diff --git a/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/redisenterprise.json b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/redisenterprise.json index f59b02aac9b8..57900cf29a8f 100644 --- a/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/redisenterprise.json +++ b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/redisenterprise.json @@ -2137,7 +2137,7 @@ }, "clusteringPolicy": { "type": "string", - "description": "Clustering policy - default is OSSCluster. This property must be chosen at create time, and cannot be changed without deleting the database.", + "description": "Clustering policy - default is OSSCluster. This property can be updated only if the current value is NoCluster. If the value is OSSCluster or EnterpriseCluster, it cannot be updated without deleting the database.", "enum": [ "EnterpriseCluster", "OSSCluster", @@ -2145,7 +2145,8 @@ ], "x-ms-mutability": [ "read", - "create" + "create", + "update" ], "x-ms-enum": { "name": "ClusteringPolicy", @@ -2164,7 +2165,7 @@ { "value": "NoCluster", "name": "NoCluster", - "description": "NoCluster clustering policy is for non-clustered instances." + "description": "The NoCluster policy is used for non-clustered Redis instances that do not require clustering features." } ] } From 3eeb0b3a309fe0a47a220ad4d37e3dd266c055e0 Mon Sep 17 00:00:00 2001 From: "Ranjini Chithambaram (from Dev Box)" Date: Wed, 26 Mar 2025 19:47:46 +0100 Subject: [PATCH 3/4] Split Create and Update examples, because of different clusteringPolicy in request --- ...erpriseDatabasesNoClusterCacheCreate.json} | 13 ++++--- ...tabasesNoClusterCacheUpdateClustering.json | 38 +++++++++++++++++++ 2 files changed, 45 insertions(+), 6 deletions(-) rename specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/{RedisEnterpriseDatabasesCreateNoClusterCache.json => RedisEnterpriseDatabasesNoClusterCacheCreate.json} (81%) create mode 100644 specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesNoClusterCacheUpdateClustering.json diff --git a/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesCreateNoClusterCache.json b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesNoClusterCacheCreate.json similarity index 81% rename from specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesCreateNoClusterCache.json rename to specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesNoClusterCacheCreate.json index 4469a246f2d2..83d09d1a0c0b 100644 --- a/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesCreateNoClusterCache.json +++ b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesNoClusterCacheCreate.json @@ -15,21 +15,22 @@ } }, "responses": { - "200": { + "201": { "body": { "id": "/subscriptions/e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8f/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/default", "name": "cache1/default", "type": "Microsoft.Cache/redisEnterprise/databases", "properties": { - "provisioningState": "Updating", - "resourceState": "Updating", "clientProtocol": "Encrypted", + "port": 10000, + "provisioningState": "Creating", + "resourceState": "Creating", "clusteringPolicy": "NoCluster", "evictionPolicy": "NoEviction", - "port": 10000, + "keySpaceNotification": "", "deferUpgrade": "NotDeferred", - "accessKeysAuthentication": "Enabled", - "redisVersion": "6.0" + "redisVersion": "7.2", + "accessKeysAuthentication": "Enabled" } } } diff --git a/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesNoClusterCacheUpdateClustering.json b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesNoClusterCacheUpdateClustering.json new file mode 100644 index 000000000000..bc2ec52d0a12 --- /dev/null +++ b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/RedisEnterpriseDatabasesNoClusterCacheUpdateClustering.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "databaseName": "default", + "clusterName": "cache1", + "resourceGroupName": "rg1", + "api-version": "2025-05-01-preview", + "subscriptionId": "e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8f", + "parameters": { + "properties": { + "clientProtocol": "Encrypted", + "clusteringPolicy": "EnterpriseCluster", + "evictionPolicy": "NoEviction", + "port": 10000 + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8f/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/default", + "name": "cache1/default", + "type": "Microsoft.Cache/redisEnterprise/databases", + "properties": { + "clientProtocol": "Encrypted", + "port": 10000, + "provisioningState": "Updating", + "resourceState": "Updating", + "clusteringPolicy": "EnterpriseCluster", + "evictionPolicy": "NoEviction", + "keySpaceNotification": "", + "deferUpgrade": "NotDeferred", + "redisVersion": "7.2", + "accessKeysAuthentication": "Enabled" + } + } + } + } +} \ No newline at end of file From e0fa63c45d1b5bae70648561c2480935265f5a7a Mon Sep 17 00:00:00 2001 From: "Ranjini Chithambaram (from Dev Box)" Date: Thu, 27 Mar 2025 14:52:14 +0100 Subject: [PATCH 4/4] add refs to example --- .../preview/2025-05-01-preview/redisenterprise.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/redisenterprise.json b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/redisenterprise.json index 57900cf29a8f..c6f7014e69a1 100644 --- a/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/redisenterprise.json +++ b/specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/redisenterprise.json @@ -485,6 +485,9 @@ }, "RedisEnterpriseDatabasesCreate With Active Geo Replication": { "$ref": "./examples/RedisEnterpriseDatabasesCreateWithGeoReplication.json" + }, + "RedisEnterpriseDatabasesCreate No Cluster Cache": { + "$ref": "./examples/RedisEnterpriseDatabasesNoClusterCacheCreate.json" } }, "parameters": [ @@ -548,6 +551,9 @@ "x-ms-examples": { "RedisEnterpriseDatabasesUpdate": { "$ref": "./examples/RedisEnterpriseDatabasesUpdate.json" + }, + "RedisEnterpriseDatabasesUpdate Clustering on No Cluster Cache": { + "$ref": "./examples/RedisEnterpriseDatabasesNoClusterCacheUpdateClustering.json" } }, "parameters": [