From d3ac741c04875c1cec0a0ac12be07aae9439e9e8 Mon Sep 17 00:00:00 2001
From: Automatic Update <radix@statoilsrm.onmicrosoft.com>
Date: Wed, 24 Jan 2024 08:12:58 +0100
Subject: [PATCH] New resource groups

---
 terraform/subscriptions/s940/c2/common/main.tf              | 2 +-
 terraform/subscriptions/s940/c2/common/variables.tf         | 2 +-
 terraform/subscriptions/s940/prod/common/main.tf            | 2 +-
 terraform/subscriptions/s940/prod/common/variables.tf       | 2 +-
 terraform/subscriptions/s941/dev/common/main.tf             | 2 +-
 terraform/subscriptions/s941/dev/common/variables.tf        | 2 +-
 terraform/subscriptions/s941/playground/common/main.tf      | 2 +-
 terraform/subscriptions/s941/playground/common/variables.tf | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/terraform/subscriptions/s940/c2/common/main.tf b/terraform/subscriptions/s940/c2/common/main.tf
index 10f288c5f..f95052a88 100644
--- a/terraform/subscriptions/s940/c2/common/main.tf
+++ b/terraform/subscriptions/s940/c2/common/main.tf
@@ -1,6 +1,6 @@
 module "resourcegroups" {
   for_each = toset(var.resource_groups)
   source   = "../../../modules/resourcegroups"
-  name     = "${local.external_outputs.global.data.aad_radix_group}-${each.value}"
+  name     = "${each.value}"
   location = local.outputs.location
 }
\ No newline at end of file
diff --git a/terraform/subscriptions/s940/c2/common/variables.tf b/terraform/subscriptions/s940/c2/common/variables.tf
index 6d35e1104..17fe93421 100644
--- a/terraform/subscriptions/s940/c2/common/variables.tf
+++ b/terraform/subscriptions/s940/c2/common/variables.tf
@@ -1,4 +1,4 @@
 variable "resource_groups" {
   type    = list(string)
-  default = ["c2"]
+  default = ["common-c2"]
 }
\ No newline at end of file
diff --git a/terraform/subscriptions/s940/prod/common/main.tf b/terraform/subscriptions/s940/prod/common/main.tf
index 10f288c5f..f95052a88 100644
--- a/terraform/subscriptions/s940/prod/common/main.tf
+++ b/terraform/subscriptions/s940/prod/common/main.tf
@@ -1,6 +1,6 @@
 module "resourcegroups" {
   for_each = toset(var.resource_groups)
   source   = "../../../modules/resourcegroups"
-  name     = "${local.external_outputs.global.data.aad_radix_group}-${each.value}"
+  name     = "${each.value}"
   location = local.outputs.location
 }
\ No newline at end of file
diff --git a/terraform/subscriptions/s940/prod/common/variables.tf b/terraform/subscriptions/s940/prod/common/variables.tf
index 7b2efb5c3..cdd56f480 100644
--- a/terraform/subscriptions/s940/prod/common/variables.tf
+++ b/terraform/subscriptions/s940/prod/common/variables.tf
@@ -1,4 +1,4 @@
 variable "resource_groups" {
   type    = list(string)
-  default = ["production"]
+  default = ["common-platform"]
 }
\ No newline at end of file
diff --git a/terraform/subscriptions/s941/dev/common/main.tf b/terraform/subscriptions/s941/dev/common/main.tf
index 48700b2a2..6f5ade790 100644
--- a/terraform/subscriptions/s941/dev/common/main.tf
+++ b/terraform/subscriptions/s941/dev/common/main.tf
@@ -2,7 +2,7 @@
 module "resourcegroups" {
   for_each = toset(var.resource_groups)
   source   = "../../../modules/resourcegroups"
-  name     = "${local.external_outputs.global.data.aad_radix_group}-${each.value}"
+  name     = "${each.value}"
   location = local.outputs.location
 }
 
diff --git a/terraform/subscriptions/s941/dev/common/variables.tf b/terraform/subscriptions/s941/dev/common/variables.tf
index e9dad3a3f..33fa7a50a 100644
--- a/terraform/subscriptions/s941/dev/common/variables.tf
+++ b/terraform/subscriptions/s941/dev/common/variables.tf
@@ -1,6 +1,6 @@
 variable "resource_groups" {
   type    = list(string)
-  default = ["development"]
+  default = ["common-development"]
 }
 
 variable "storageaccounts" {
diff --git a/terraform/subscriptions/s941/playground/common/main.tf b/terraform/subscriptions/s941/playground/common/main.tf
index 10f288c5f..f95052a88 100644
--- a/terraform/subscriptions/s941/playground/common/main.tf
+++ b/terraform/subscriptions/s941/playground/common/main.tf
@@ -1,6 +1,6 @@
 module "resourcegroups" {
   for_each = toset(var.resource_groups)
   source   = "../../../modules/resourcegroups"
-  name     = "${local.external_outputs.global.data.aad_radix_group}-${each.value}"
+  name     = "${each.value}"
   location = local.outputs.location
 }
\ No newline at end of file
diff --git a/terraform/subscriptions/s941/playground/common/variables.tf b/terraform/subscriptions/s941/playground/common/variables.tf
index 45f7e6b5b..8fe491d41 100644
--- a/terraform/subscriptions/s941/playground/common/variables.tf
+++ b/terraform/subscriptions/s941/playground/common/variables.tf
@@ -1,4 +1,4 @@
 variable "resource_groups" {
   type    = list(string)
-  default = ["playground"]
+  default = ["common-playground"]
 }
\ No newline at end of file