From 9cda981384cab822d1535214e0ff81184aa555ae Mon Sep 17 00:00:00 2001
From: Automatic Update <radix@statoilsrm.onmicrosoft.com>
Date: Wed, 4 Dec 2024 14:49:37 +0100
Subject: [PATCH] Create a common redis in dev

---
 scripts/redis/update_redis_cache_for_console.sh             | 6 +++++-
 .../s941/dev/{pre-clusters => post-clusters}/redis.tf       | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)
 rename terraform/subscriptions/s941/dev/{pre-clusters => post-clusters}/redis.tf (75%)

diff --git a/scripts/redis/update_redis_cache_for_console.sh b/scripts/redis/update_redis_cache_for_console.sh
index 367baa07f..7c871bb47 100755
--- a/scripts/redis/update_redis_cache_for_console.sh
+++ b/scripts/redis/update_redis_cache_for_console.sh
@@ -124,7 +124,11 @@ verify_cluster_access
 #######################################################################################
 
 function updateRedisCacheConfiguration() {
-    REDIS_CACHE_NAME="${CLUSTER_NAME}-${RADIX_WEB_CONSOLE_ENV}"
+    if [[ $RADIX_ZONE == "dev" ]]; then
+        REDIS_CACHE_NAME="redis-${RADIX_ZONE}-${RADIX_WEB_CONSOLE_ENV}"
+    else
+        REDIS_CACHE_NAME="${CLUSTER_NAME}-${RADIX_WEB_CONSOLE_ENV}"
+    fi
     REDIS_CACHE_INSTANCE=$(az redis show --resource-group "${AZ_RESOURCE_GROUP_CLUSTERS}" --name "${REDIS_CACHE_NAME}" 2>/dev/null)
 
     WEB_CONSOLE_NAMESPACE="radix-web-console-${RADIX_WEB_CONSOLE_ENV}"
diff --git a/terraform/subscriptions/s941/dev/pre-clusters/redis.tf b/terraform/subscriptions/s941/dev/post-clusters/redis.tf
similarity index 75%
rename from terraform/subscriptions/s941/dev/pre-clusters/redis.tf
rename to terraform/subscriptions/s941/dev/post-clusters/redis.tf
index 9ef888a72..370153405 100644
--- a/terraform/subscriptions/s941/dev/pre-clusters/redis.tf
+++ b/terraform/subscriptions/s941/dev/post-clusters/redis.tf
@@ -1,8 +1,7 @@
 module "rediscache" {
   source              = "../../../modules/redis_cache"
-  for_each            = module.config.cluster
+  name                = "redis-${module.config.environment}"
   rg_name             = module.config.cluster_resource_group
-  name                = each.key
   vnet_resource_group = "cluster-vnet-hub-${module.config.environment}"
   sku_name            = "Basic"
 }
\ No newline at end of file