From 7dd7973f85dc135f5c146174184bb6b9bc18bebb Mon Sep 17 00:00:00 2001
From: aidenvaines-bjss <aiden.vaines@bjss.com>
Date: Mon, 8 Jul 2024 13:56:59 +0100
Subject: [PATCH] CCM-5204_DNSZoneTFNonprod

---
 infrastructure/environments/.gitkeep            | 0
 infrastructure/images/.gitkeep                  | 0
 infrastructure/modules/.gitkeep                 | 0
 terraform/components/dnsroot/.terraform-version | 2 +-
 terraform/components/dnsroot/versions.tf        | 2 +-
 terraform/etc/README.md                         | 1 +
 terraform/etc/env_eu-west-2_dev.tfvars          | 3 ---
 terraform/etc/env_eu-west-2_main.tfvars         | 4 ++++
 terraform/etc/env_eu-west-2_poc-epc.tfvars      | 6 ------
 terraform/etc/group_examplegroup.tfvars         | 1 -
 terraform/etc/group_nhs-notify-dns-dev.tfvars   | 8 ++++++++
 terraform/modules/.gitkeep                      | 0
 12 files changed, 15 insertions(+), 12 deletions(-)
 delete mode 100644 infrastructure/environments/.gitkeep
 delete mode 100644 infrastructure/images/.gitkeep
 delete mode 100644 infrastructure/modules/.gitkeep
 create mode 100644 terraform/etc/README.md
 create mode 100644 terraform/etc/env_eu-west-2_main.tfvars
 delete mode 100644 terraform/etc/env_eu-west-2_poc-epc.tfvars
 delete mode 100644 terraform/etc/group_examplegroup.tfvars
 create mode 100644 terraform/etc/group_nhs-notify-dns-dev.tfvars
 delete mode 100644 terraform/modules/.gitkeep

diff --git a/infrastructure/environments/.gitkeep b/infrastructure/environments/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/infrastructure/images/.gitkeep b/infrastructure/images/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/infrastructure/modules/.gitkeep b/infrastructure/modules/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/terraform/components/dnsroot/.terraform-version b/terraform/components/dnsroot/.terraform-version
index 631f790..bb9ffd3 100644
--- a/terraform/components/dnsroot/.terraform-version
+++ b/terraform/components/dnsroot/.terraform-version
@@ -1 +1 @@
-latest:^1\.8\.
+latest:^1.8
diff --git a/terraform/components/dnsroot/versions.tf b/terraform/components/dnsroot/versions.tf
index ee15bad..4d2b3c3 100644
--- a/terraform/components/dnsroot/versions.tf
+++ b/terraform/components/dnsroot/versions.tf
@@ -6,5 +6,5 @@ terraform {
     }
   }
 
-  required_version = "~> 1.8.4"
+  required_version = ">= 1.8.1, < 1.9.0"
 }
diff --git a/terraform/etc/README.md b/terraform/etc/README.md
new file mode 100644
index 0000000..f2cbf11
--- /dev/null
+++ b/terraform/etc/README.md
@@ -0,0 +1 @@
+# THIS DIRECTORY SHOULD BE IGNORED IN THE CONTEXT OF THE NHS NOTIFY PROGRAMME AND IS INTENDED FOR INDEPENDENT DEVELOPMENT USE ONLY
diff --git a/terraform/etc/env_eu-west-2_dev.tfvars b/terraform/etc/env_eu-west-2_dev.tfvars
index 862a940..e6f076c 100644
--- a/terraform/etc/env_eu-west-2_dev.tfvars
+++ b/terraform/etc/env_eu-west-2_dev.tfvars
@@ -1,6 +1,3 @@
 environment = "dev"
-group       = null
-
-aws_account_id = "767397753705"
 
 root_domain_name = "dev.nhsnotify.national.nhs.uk"
diff --git a/terraform/etc/env_eu-west-2_main.tfvars b/terraform/etc/env_eu-west-2_main.tfvars
new file mode 100644
index 0000000..e2c51aa
--- /dev/null
+++ b/terraform/etc/env_eu-west-2_main.tfvars
@@ -0,0 +1,4 @@
+# This is the root file for all parent or singleton deployed CSIs.
+#  Use this where there is only a single deployed version of a component
+environment = "main"
+
diff --git a/terraform/etc/env_eu-west-2_poc-epc.tfvars b/terraform/etc/env_eu-west-2_poc-epc.tfvars
deleted file mode 100644
index df71a0b..0000000
--- a/terraform/etc/env_eu-west-2_poc-epc.tfvars
+++ /dev/null
@@ -1,6 +0,0 @@
-environment = "poc-epc"
-group       = null
-
-aws_account_id = "767397886959"
-
-root_domain_name = "poc-epc.example"
diff --git a/terraform/etc/group_examplegroup.tfvars b/terraform/etc/group_examplegroup.tfvars
deleted file mode 100644
index 5949382..0000000
--- a/terraform/etc/group_examplegroup.tfvars
+++ /dev/null
@@ -1 +0,0 @@
-# Variables shared by any environment that chooses to be subscribed to it
diff --git a/terraform/etc/group_nhs-notify-dns-dev.tfvars b/terraform/etc/group_nhs-notify-dns-dev.tfvars
new file mode 100644
index 0000000..886c6d2
--- /dev/null
+++ b/terraform/etc/group_nhs-notify-dns-dev.tfvars
@@ -0,0 +1,8 @@
+# Variables shared by any environment that chooses to be subscribed to it
+group = "nhs-notify-dns-dev"
+
+aws_account_id = "767397753705"
+
+# Primary DNS zone for this group
+#   Note the dev.tfvars environment overloads this
+root_domain_name = "nonprod.nhsnotify.national.nhs.uk"
diff --git a/terraform/modules/.gitkeep b/terraform/modules/.gitkeep
deleted file mode 100644
index e69de29..0000000