From 5cb9d38304a06590102ed448767e624589fe2e4c Mon Sep 17 00:00:00 2001
From: Steve Astels <sastels@users.noreply.github.com>
Date: Tue, 10 Dec 2024 14:21:19 -0500
Subject: [PATCH 1/3] tweak sms keywords AIDE and INFO (#1694)

---
 scripts/set_sms_keywords/set_sms_keywords.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/set_sms_keywords/set_sms_keywords.py b/scripts/set_sms_keywords/set_sms_keywords.py
index 17fa4b751..2b37220c0 100644
--- a/scripts/set_sms_keywords/set_sms_keywords.py
+++ b/scripts/set_sms_keywords/set_sms_keywords.py
@@ -66,7 +66,7 @@
     },
     {
         "Keyword": "AIDE",
-        "KeywordMessage": "GC Notify: Visitez https://notification.canada.ca/contact Frais de msg/donnée std applicables. La fréquence des messages peut varier. Textez ARRÊT pour annuler.",
+        "KeywordMessage": "Notification GC: Visitez https://notification.canada.ca/contact Frais de msg/données std applicables. La fréquence des messages peut varier. Textez ARRÊT pour annuler.",
         "KeywordAction": "AUTOMATIC_RESPONSE",
     },
     {
@@ -76,7 +76,7 @@
     },
     {
         "Keyword": "INFO",
-        "KeywordMessage": "GC Notify: More info at https://notification.canada.ca Data rates apply. Plus d’informations à https://notification.canada.ca Frais de msg/donnée std applicables.",
+        "KeywordMessage": "GC Notify: More info at https://notification.canada.ca Data rates apply. Notification GC: Plus d’informations à https://notification.canada.ca Frais de msg/données std applicables.",
         "KeywordAction": "AUTOMATIC_RESPONSE",
     }
 ]

From 1131026e7893267ff87d1f9f05abee826b0a1d61 Mon Sep 17 00:00:00 2001
From: Ben Larabie <ben.larabie@cds-snc.ca>
Date: Wed, 11 Dec 2024 10:16:34 -0500
Subject: [PATCH 2/3] formatting (#1697)

---
 aws/common/import.tf                          |  99 ++++++++++++
 .../aws_integration.tf => common/newrelic.tf} |  64 ++++----
 aws/common/variables.tf                       |   9 ++
 aws/newrelic/removed.tf                       | 151 ++++++++++++++++++
 env/dev/common/.terraform.lock.hcl            | 115 +++++++------
 env/dev/newrelic/.terraform.lock.hcl          | 113 +++++++++++++
 env/staging/newrelic/.terraform.lock.hcl      | 113 +++++++++++++
 7 files changed, 588 insertions(+), 76 deletions(-)
 create mode 100644 aws/common/import.tf
 rename aws/{newrelic/aws_integration.tf => common/newrelic.tf} (80%)
 create mode 100644 aws/newrelic/removed.tf
 create mode 100644 env/dev/newrelic/.terraform.lock.hcl
 create mode 100644 env/staging/newrelic/.terraform.lock.hcl

diff --git a/aws/common/import.tf b/aws/common/import.tf
new file mode 100644
index 000000000..97805a3da
--- /dev/null
+++ b/aws/common/import.tf
@@ -0,0 +1,99 @@
+import {
+  to = aws_cloudwatch_metric_stream.newrelic_metric_stream[0]
+  id = "newrelic-metric-stream-${var.env}"
+}
+
+import {
+  to = aws_config_configuration_recorder_status.newrelic_recorder_status[0]
+  id = var.aws_config_recorder_name
+}
+
+import {
+  to = aws_iam_policy.newrelic_aws_permissions[0]
+  id = "arn:aws:iam::${var.account_id}:policy/NewRelicCloudStreamReadPermissions-${var.env}"
+}
+
+import {
+  to = aws_iam_role.firehose_newrelic_role[0]
+  id = "firehose_newrelic_role_${var.env}"
+}
+
+import {
+  to = aws_iam_role.metric_stream_to_firehose[0]
+  id = "newrelic_metric_stream_to_firehose_role_${var.env}"
+}
+
+import {
+  to = aws_iam_role.newrelic_aws_role[0]
+  id = "NewRelicInfrastructure-Integrations-${var.env}"
+}
+
+import {
+  to = aws_iam_role.newrelic_configuration_recorder[0]
+  id = "newrelic_configuration_recorder-${var.env}"
+}
+
+import {
+  to = aws_iam_role_policy.metric_stream_to_firehose[0]
+  id = "newrelic_metric_stream_to_firehose_role_${var.env}:default"
+}
+
+import {
+  to = aws_iam_role_policy.newrelic_configuration_recorder_s3[0]
+  id = "newrelic_configuration_recorder-${var.env}:newrelic-configuration-recorder-s3-${var.env}"
+}
+
+import {
+  to = aws_iam_role_policy_attachment.newrelic_aws_policy_attach[0]
+  id = "NewRelicInfrastructure-Integrations-${var.env}/arn:aws:iam::aws:policy/ReadOnlyAccess"
+}
+
+import {
+  to = aws_iam_role_policy_attachment.newrelic_configuration_recorder[0]
+  id = "newrelic_configuration_recorder-${var.env}/arn:aws:iam::aws:policy/service-role/AWS_ConfigRole"
+}
+
+import {
+  to = aws_kinesis_firehose_delivery_stream.newrelic_firehose_stream[0]
+  id = "arn:aws:firehose:ca-central-1:${var.account_id}:deliverystream/newrelic_firehose_stream_${var.env}"
+}
+
+import {
+  to = aws_s3_bucket.newrelic_aws_bucket[0]
+  id = "newrelic-aws-bucket-${random_string.s3-bucket-name[0].id}"
+}
+
+import {
+  to = aws_s3_bucket.newrelic_configuration_recorder_s3[0]
+  id = "newrelic-configuration-recorder-${random_string.s3-bucket-name[0].id}"
+}
+
+import {
+  to = aws_s3_bucket_ownership_controls.newrelic_ownership_controls[0]
+  id = "newrelic-aws-bucket-${random_string.s3-bucket-name[0].id}"
+}
+
+import {
+  to = newrelic_api_access_key.newrelic_aws_access_key[0]
+  id = "5EA911F90B135B0D61DB4012CB0DC376CCC5017C98EB1688932254CDDAFD3443:USER"
+}
+
+import {
+  to = newrelic_cloud_aws_integrations.newrelic_cloud_integration_pull[0]
+  id = var.env == "dev" ? "242485" : "225924"
+}
+
+import {
+  to = newrelic_cloud_aws_link_account.newrelic_cloud_integration_pull[0]
+  id = var.env == "dev" ? "242485" : "225924"
+}
+
+import {
+  to = newrelic_cloud_aws_link_account.newrelic_cloud_integration_push[0]
+  id = var.env == "dev" ? "242484" : "225918"
+}
+
+import {
+  to = random_string.s3-bucket-name[0]
+  id = var.env == "dev" ? "fiskyzxf" : "9p5x8bkb"
+}
diff --git a/aws/newrelic/aws_integration.tf b/aws/common/newrelic.tf
similarity index 80%
rename from aws/newrelic/aws_integration.tf
rename to aws/common/newrelic.tf
index 37b31db8f..d03fc584e 100644
--- a/aws/newrelic/aws_integration.tf
+++ b/aws/common/newrelic.tf
@@ -1,3 +1,9 @@
+provider "newrelic" {
+  account_id = var.new_relic_account_id
+  api_key    = var.new_relic_api_key
+  region     = "US"
+}
+
 data "aws_iam_policy_document" "newrelic_assume_policy" {
   count = var.enable_new_relic ? 1 : 0
 
@@ -19,14 +25,14 @@ data "aws_iam_policy_document" "newrelic_assume_policy" {
 }
 
 resource "aws_iam_role" "newrelic_aws_role" {
-  count              = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count              = var.enable_new_relic && var.env != "production" ? 1 : 0
   name               = "NewRelicInfrastructure-Integrations-${var.env}"
   description        = "New Relic Cloud integration role"
   assume_role_policy = data.aws_iam_policy_document.newrelic_assume_policy[0].json
 }
 
 resource "aws_iam_policy" "newrelic_aws_permissions" {
-  count       = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count       = var.enable_new_relic && var.env != "production" ? 1 : 0
   name        = "NewRelicCloudStreamReadPermissions-${var.env}"
   description = ""
   policy      = <<EOF
@@ -67,13 +73,13 @@ EOF
 }
 
 resource "aws_iam_role_policy_attachment" "newrelic_aws_policy_attach" {
-  count      = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count      = var.enable_new_relic && var.env != "production" ? 1 : 0
   role       = aws_iam_role.newrelic_aws_role[0].name
   policy_arn = "arn:aws:iam::aws:policy/ReadOnlyAccess"
 }
 
 resource "newrelic_cloud_aws_link_account" "newrelic_cloud_integration_push" {
-  count                  = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count                  = var.enable_new_relic && var.env != "production" ? 1 : 0
   account_id             = var.new_relic_account_id
   arn                    = aws_iam_role.newrelic_aws_role[0].arn
   metric_collection_mode = "PUSH"
@@ -82,16 +88,15 @@ resource "newrelic_cloud_aws_link_account" "newrelic_cloud_integration_push" {
 }
 
 resource "newrelic_api_access_key" "newrelic_aws_access_key" {
-  count       = var.enable_new_relic && var.env == "staging" ? 1 : 0
-  account_id  = var.new_relic_account_id
-  key_type    = "INGEST"
-  ingest_type = "LICENSE"
-  name        = "Metric Stream Key for ${var.env}"
-  notes       = "AWS Cloud Integrations Metric Stream Key"
+  count      = var.enable_new_relic && var.env != "production" ? 1 : 0
+  account_id = var.new_relic_account_id
+  key_type   = "USER"
+  name       = "notify_tf_provider"
+  notes      = "Used by Notify Terraform Code to create New Relic Resources"
 }
 
 resource "aws_iam_role" "firehose_newrelic_role" {
-  count = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count = var.enable_new_relic && var.env != "production" ? 1 : 0
   name  = "firehose_newrelic_role_${var.env}"
 
   assume_role_policy = <<EOF
@@ -112,20 +117,20 @@ EOF
 }
 
 resource "random_string" "s3-bucket-name" {
-  count   = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count   = var.enable_new_relic && var.env != "production" ? 1 : 0
   length  = 8
-  special = false
-  upper   = false
+  special = true
+  upper   = true
 }
 
 resource "aws_s3_bucket" "newrelic_aws_bucket" {
-  count         = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count         = var.enable_new_relic && var.env != "production" ? 1 : 0
   bucket        = "newrelic-aws-bucket-${random_string.s3-bucket-name[0].id}"
   force_destroy = true
 }
 
 resource "aws_s3_bucket_ownership_controls" "newrelic_ownership_controls" {
-  count  = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count  = var.enable_new_relic && var.env != "production" ? 1 : 0
   bucket = aws_s3_bucket.newrelic_aws_bucket[0].id
   rule {
     object_ownership = "BucketOwnerEnforced"
@@ -133,7 +138,7 @@ resource "aws_s3_bucket_ownership_controls" "newrelic_ownership_controls" {
 }
 
 resource "aws_kinesis_firehose_delivery_stream" "newrelic_firehose_stream" {
-  count       = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count       = var.enable_new_relic && var.env != "production" ? 1 : 0
   name        = "newrelic_firehose_stream_${var.env}"
   destination = "http_endpoint"
   http_endpoint_configuration {
@@ -158,7 +163,7 @@ resource "aws_kinesis_firehose_delivery_stream" "newrelic_firehose_stream" {
 }
 
 resource "aws_iam_role" "metric_stream_to_firehose" {
-  count = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count = var.enable_new_relic && var.env != "production" ? 1 : 0
   name  = "newrelic_metric_stream_to_firehose_role_${var.env}"
 
   assume_role_policy = <<EOF
@@ -179,7 +184,7 @@ EOF
 }
 
 resource "aws_iam_role_policy" "metric_stream_to_firehose" {
-  count = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count = var.enable_new_relic && var.env != "production" ? 1 : 0
   name  = "default"
   role  = aws_iam_role.metric_stream_to_firehose[0].id
 
@@ -202,7 +207,7 @@ EOF
 
 resource "aws_cloudwatch_metric_stream" "newrelic_metric_stream" {
   # Disabled for now
-  count         = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count         = var.enable_new_relic && var.env != "production" ? 1 : 0
   name          = "newrelic-metric-stream-${var.env}"
   role_arn      = aws_iam_role.metric_stream_to_firehose[0].arn
   firehose_arn  = aws_kinesis_firehose_delivery_stream.newrelic_firehose_stream[0].arn
@@ -210,7 +215,7 @@ resource "aws_cloudwatch_metric_stream" "newrelic_metric_stream" {
 }
 
 resource "newrelic_cloud_aws_link_account" "newrelic_cloud_integration_pull" {
-  count                  = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count                  = var.enable_new_relic && var.env != "production" ? 1 : 0
   account_id             = var.new_relic_account_id
   arn                    = aws_iam_role.newrelic_aws_role[0].arn
   metric_collection_mode = "PULL"
@@ -219,22 +224,25 @@ resource "newrelic_cloud_aws_link_account" "newrelic_cloud_integration_pull" {
 }
 
 resource "newrelic_cloud_aws_integrations" "newrelic_cloud_integration_pull" {
-  count             = var.env == "staging" ? 1 : 0
+  count             = var.env != "production" ? 1 : 0
   account_id        = var.new_relic_account_id
   linked_account_id = newrelic_cloud_aws_link_account.newrelic_cloud_integration_pull[0].id
 
-  lambda {}
+  lambda {
+    fetch_tags               = true
+    metrics_polling_interval = 300
+  }
 
 }
 
 resource "aws_s3_bucket" "newrelic_configuration_recorder_s3" {
-  count         = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count         = var.enable_new_relic && var.env != "production" ? 1 : 0
   bucket        = "newrelic-configuration-recorder-${random_string.s3-bucket-name[0].id}"
   force_destroy = true
 }
 
 resource "aws_iam_role" "newrelic_configuration_recorder" {
-  count              = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count              = var.enable_new_relic && var.env != "production" ? 1 : 0
   name               = "newrelic_configuration_recorder-${var.env}"
   assume_role_policy = <<EOF
 {
@@ -254,7 +262,7 @@ EOF
 }
 
 resource "aws_iam_role_policy" "newrelic_configuration_recorder_s3" {
-  count = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count = var.enable_new_relic && var.env != "production" ? 1 : 0
   name  = "newrelic-configuration-recorder-s3-${var.env}"
   role  = aws_iam_role.newrelic_configuration_recorder[0].id
 
@@ -278,14 +286,14 @@ POLICY
 }
 
 resource "aws_iam_role_policy_attachment" "newrelic_configuration_recorder" {
-  count      = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count      = var.enable_new_relic && var.env != "production" ? 1 : 0
   role       = aws_iam_role.newrelic_configuration_recorder[0].name
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWS_ConfigRole"
 }
 
 
 resource "aws_config_configuration_recorder_status" "newrelic_recorder_status" {
-  count      = var.enable_new_relic && var.env == "staging" ? 1 : 0
+  count      = var.enable_new_relic && var.env != "production" ? 1 : 0
   name       = var.aws_config_recorder_name
   is_enabled = true
 }
diff --git a/aws/common/variables.tf b/aws/common/variables.tf
index e69de29bb..b4127a53e 100644
--- a/aws/common/variables.tf
+++ b/aws/common/variables.tf
@@ -0,0 +1,9 @@
+variable "newrelic_account_region" {
+  type    = string
+  default = "US"
+
+  validation {
+    condition     = contains(["US", "EU"], var.newrelic_account_region)
+    error_message = "Valid values for region are 'US' or 'EU'."
+  }
+}
diff --git a/aws/newrelic/removed.tf b/aws/newrelic/removed.tf
new file mode 100644
index 000000000..e1fc50016
--- /dev/null
+++ b/aws/newrelic/removed.tf
@@ -0,0 +1,151 @@
+removed {
+  from = aws_cloudwatch_metric_stream.newrelic_metric_stream
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_config_configuration_recorder_status.newrelic_recorder_status
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_iam_policy.newrelic_aws_permissions
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_iam_role.firehose_newrelic_role
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_iam_role.metric_stream_to_firehose
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_iam_role.newrelic_aws_role
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_iam_role.newrelic_configuration_recorder
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_iam_role_policy.metric_stream_to_firehose
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_iam_role_policy.newrelic_configuration_recorder_s3
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_iam_role_policy_attachment.newrelic_aws_policy_attach
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_iam_role_policy_attachment.newrelic_configuration_recorder
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_kinesis_firehose_delivery_stream.newrelic_firehose_stream
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_s3_bucket.newrelic_aws_bucket
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_s3_bucket.newrelic_configuration_recorder_s3
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = aws_s3_bucket_ownership_controls.newrelic_ownership_controls
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = newrelic_api_access_key.newrelic_aws_access_key
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = newrelic_cloud_aws_integrations.newrelic_cloud_integration_pull
+
+  lifecycle {
+    destroy = false
+  }
+}
+removed {
+
+  from = newrelic_cloud_aws_link_account.newrelic_cloud_integration_pull
+
+  lifecycle {
+    destroy = false
+  }
+}
+
+removed {
+  from = newrelic_cloud_aws_link_account.newrelic_cloud_integration_push
+
+  lifecycle {
+    destroy = false
+  }
+}
diff --git a/env/dev/common/.terraform.lock.hcl b/env/dev/common/.terraform.lock.hcl
index 2e1bc6569..dc28c336c 100644
--- a/env/dev/common/.terraform.lock.hcl
+++ b/env/dev/common/.terraform.lock.hcl
@@ -2,44 +2,44 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/archive" {
-  version = "2.6.0"
+  version = "2.7.0"
   hashes = [
-    "h1:Ou6XKWvpo7IYgZnrFJs5MKzMqQMEYv8Z2iHSJ2mmnFw=",
-    "zh:29273484f7423b7c5b3f5df34ccfc53e52bb5e3d7f46a81b65908e7a8fd69072",
-    "zh:3cba58ec3aea5f301caf2acc31e184c55d994cc648126cac39c63ae509a14179",
-    "zh:55170cd17dbfdea842852c6ae2416d057fec631ba49f3bb6466a7268cd39130e",
-    "zh:7197db402ba35631930c3a4814520f0ebe980ae3acb7f8b5a6f70ec90dc4a388",
+    "h1:uZO0XsK1RW1mBRn8SsVPXT76pSSbyb4SmA0eLJsOe38=",
+    "zh:04e23bebca7f665a19a032343aeecd230028a3822e546e6f618f24c47ff87f67",
+    "zh:5bb38114238e25c45bf85f5c9f627a2d0c4b98fe44a0837e37d48574385f8dad",
+    "zh:64584bc1db4c390abd81c76de438d93acf967c8a33e9b923d68da6ed749d55bd",
+    "zh:697695ab9cce351adf91a1823bdd72ce6f0d219138f5124ef7645cedf8f59a1f",
     "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:8bf7fe0915d7fb152a3a6b9162614d2ec82749a06dba13fab3f98d33c020ec4f",
-    "zh:8ce811844fd53adb0dabc9a541f8cb43aacfa7d8e39324e4bd3592b3428f5bfb",
-    "zh:bca795bca815b8ac90e3054c0a9ab1ccfb16eedbb3418f8ad473fc5ad6bf0ef7",
-    "zh:d9355a18df5a36cf19580748b23249de2eb445c231c36a353709f8f40a6c8432",
-    "zh:dc32cc32cfd8abf8752d34f2a783de0d3f7200c573b885ecb64ece5acea173b4",
-    "zh:ef498e20391bf7a280d0fd6fd6675621c85fbe4e92f0f517ae4394747db89bde",
-    "zh:f2bc5226c765b0c8055a7b6207d0fe1eb9484e3ec8880649d158827ac6ed3b22",
+    "zh:7edefb1d1e2fead8fd155f7b50a2cb49f2f3fed154ac3ef5f991ccaff93d6120",
+    "zh:807fb15b75910bf14795f2ad1a2d41b069f9ef52c242131b2964c8527312e235",
+    "zh:821d9148d261df1d1a8e5a4812df2a6a3ffaf0d2070dad3c785382e489069239",
+    "zh:a7d92251118fb723048c482154a6ac6368aad583d28d15fffc6f5dafd9507463",
+    "zh:b627d4cef192b3c12ddaf9cb2c4f98c10d0129883c8c2a9c0049983f9de7030d",
+    "zh:dfb70306fcc0ad1d512ab7c24765703783cc286062d4849de4fbe23526f5dc8e",
+    "zh:f21de276f857b7e51fa2593d8fef05a7faafb0a7b62db14ac58a03ce1be7d881",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/aws" {
-  version     = "5.70.0"
+  version     = "5.80.0"
   constraints = ">= 4.8.0, >= 4.9.0, ~> 5.66"
   hashes = [
-    "h1:+QN8de63DAE4QbyODwK14T9ZEKasvRwLMSItMOWoU2Q=",
-    "zh:09cbec93c324e6f03a866244ecb2bae71fdf1f5d3d981e858b745c90606b6b6d",
-    "zh:19685d9f4c9ddcfa476a9a428c6c612be4a1b4e8e1198fbcbb76436b735284ee",
-    "zh:3358ee6a2b24c982b7c83fac0af6898644d1bbdabf9c4e0589e91e427641ba88",
-    "zh:34f9f2936de7384f8ed887abdbcb54aea1ce7b0cf2e85243a3fd3904d024747f",
-    "zh:4a99546cc2140304c90d9ccb9db01589d4145863605a0fcd90027a643ea3ec5d",
-    "zh:4da32fec0e10dab5aa3dea3c9fe57adc973cc73a71f5d59da3f65d85d925dc3f",
-    "zh:659cf94522bc38ce0af70f7b0371b2941a0e0bcad02d17c1a7b264575fe07224",
-    "zh:6f1c172c9b98bc86e4f0526872098ee3246c2620f7b323ce0c2ce6427987f7d2",
-    "zh:79bf8fb8f37c308742e287694a9de081ff8502b065a390d1bcfbd241b4eca203",
+    "h1:1O1XLPOrMg30ATXLC9itDvvyQUoIPIre7NiNscCOz28=",
+    "zh:0b1655e39639d60f2de2860a5df8642f9556ba0ca04529c1b861fde4935cb0df",
+    "zh:13dc0155e0a11edceee29ce687fc04c5a5a85f3324c67556472713cfd52e5807",
+    "zh:180f6cb2be44be14cfe329e0649121b774319f083b6e4e8fb749f85090d73121",
+    "zh:3158d44b74c67465f7f19f22c42b643840c8d18ce833e2ec86e8d93085b06926",
+    "zh:6351b5bf7cde5dc83e926944891570636069e05ca43341f4d1feda67773469bf",
+    "zh:6fa9db1532096ba50e842d369b6688979306d2295c7ead49b8a266b0d60962cc",
+    "zh:85d2fe75def7619ff2cc29102048875039cad088fafb62ecc14c3763e7b1e9d9",
+    "zh:9028d653f1d7341c6dfe2afe961b6541581e9043a474eac2faf90e6426a24f6d",
     "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
-    "zh:b7a5e1dfd9e179d70a169ddd4db44b56da90309060e27d36b329fe5fb3528e29",
-    "zh:c2cc728cb18ffd5c4814a10c203452c71f5ab0c46d68f9aa9183183fa60afd87",
-    "zh:c89bb37d2b8947c9a0d62b0b86ace51542f3327970f4e56a68bf81d9d0b8b65b",
-    "zh:ef2a61e8112c3b5e70095508aadaadf077e904b62b9cfc22030337f773bba041",
-    "zh:f714550b858d141ea88579f25247bda2a5ba461337975e77daceaf0bb7a9c358",
+    "zh:9c4e248c442bc60f07f9f089e5361f19936833370dc3c04b27916672b765f0e1",
+    "zh:a710a3979596e3f3938c3ec6bb748e604724d3a4afa96ed2c14f0a245cc41a11",
+    "zh:c27936bdf447779d0c0833bf52a9ef618985f5ea8e3e243d6266513520ca31c4",
+    "zh:c7681134a123486e72eaedc3f8d2d75e267dbbfd45fa7de5aea8f757af57f89b",
+    "zh:ea717ebad3561fd02591f9eecf30f3df5635405556fba2bdbf29fd42691bebac",
+    "zh:f4e1e8f23c58c3e8f4371f9c3379a723ab4155246e6b6daad8eb99e16666b2cb",
   ]
 }
 
@@ -103,6 +103,25 @@ provider "registry.terraform.io/hashicorp/null" {
   ]
 }
 
+provider "registry.terraform.io/hashicorp/random" {
+  version = "3.6.3"
+  hashes = [
+    "h1:f6jXn4MCv67kgcofx9D49qx1ZEBv8oyvwKDMPBr0A24=",
+    "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451",
+    "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8",
+    "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe",
+    "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1",
+    "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36",
+    "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30",
+    "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615",
+    "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad",
+    "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556",
+    "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0",
+  ]
+}
+
 provider "registry.terraform.io/hashicorp/tls" {
   version     = "4.0.6"
   constraints = "~> 4.0"
@@ -147,27 +166,27 @@ provider "registry.terraform.io/integrations/github" {
 }
 
 provider "registry.terraform.io/newrelic/newrelic" {
-  version     = "3.48.0"
+  version     = "3.53.0"
   constraints = "~> 3.3"
   hashes = [
-    "h1:IM+WhIOZVtr6hE2wNuEMgrNtWwECRPO1KlNb7Cq8GWE=",
-    "zh:15917468a031316bdcefc7797160bc6254b64abba15b5c3a16379b5827cd9453",
-    "zh:27508ff3965978e2cd5c076aea9c4e7d6e9514806ad5b6f0b587f5cf3a0ce5bb",
-    "zh:31e5ecfff74a976940334b90e57c1815ad7a152b9d348e935c1980e93865cb6b",
-    "zh:522e849bc943bd116f252302c31a6995e32f08663d364088841144e66a7f6e0c",
-    "zh:6663188e9fd949684febc14492d02c0bb275640acedb3c3c6401855c5a9c9a74",
-    "zh:6862595e7d40af7039e5c9088f657c2a07b8eaadae8ec5ee67577e3ac90b5593",
-    "zh:7fccd560257abfb4b356a79f7606c3d6537c38b0472f3c7d60c6f3fdc265a966",
-    "zh:83a116ad757b73add4b968df84cc61164bea806de3aa661b2ef962a429cb1b1e",
-    "zh:851e97659b6e3cc939bf3f82b9dbd9cfbe90d2ff93ba80f421650567d9f68554",
-    "zh:98081ec52aff08001712c6bea8112cfb7db5429b317bdca2a5729ef3ac81dca6",
-    "zh:aa3490e8425a761fc87c95fb045fccdda4bda196712b926844b7df736f9de249",
-    "zh:bf3438c5813a53afdb284da12eb9111bdbae51e835e91b552b9302431589e3de",
-    "zh:d36b8f424910f718616e229ceff50ee06d96711530e5563277e968e9bdd01096",
-    "zh:de277226cb60600b27d305e645568d52caa259fe91f360daae3e70c73aeb8507",
-    "zh:e5db6d6980c580a9cd31728e5444271ad274fc99e4543ed50deaf8cf1555c7e7",
+    "h1:iIN159hRh6IOd6yXj9cfFttPoMRZ7CrOtqw84A2P31A=",
+    "zh:1d07b86d4377875ad37e9d0549cedcbd866ebf94d745ed0f62af41ae117a4c67",
+    "zh:3475bfac1bde1ff43142c5039175a27481683543bf7f331a9da2aec14e7380dc",
+    "zh:633be9b341e257987afdf6cf394898a246df7131288781876724839694db4f25",
+    "zh:67cd1a1cea88134457c593701c6119bb7e41b01e4d0c5a1624fa751139be4975",
+    "zh:691a8c3f6b9fe1ff315e8b2ca534498644a0a32167f2f4f578b712d0da7475a5",
+    "zh:73c5eda6fa899d2e916ab7ffcb63fa1fb91d9c305cb743b91327473e6cc33efe",
+    "zh:7c8225cf11385098856df8c669b6b1e0e2a15ef58b9d009744ad5d7bdc956e34",
+    "zh:c61f32145f6df158749221f55634860e270db5cfd11abd925bd5ea522ed0d85b",
+    "zh:c679ca4352f00d4d1866fb678da5749fe1dd9970b4450be8816f6cb78a5b7e8b",
+    "zh:d495230a28d0b0c2bb392115d1d382a52c2f090b9d329f441a2105fc04f39853",
+    "zh:d92bb94e4042169a1dd72c54e3db7e81dad7ad4ec6aa559a998ffa8582c86176",
+    "zh:dc26a8c6ef7ac359db123301a168dda6a8ac8e51fb3455141adf502bfba91e56",
+    "zh:de413be9f8f06281b5a3c9e0de1f83c00a9cd4874d974f91462a8b295304c821",
+    "zh:e7b2b7d73d8e3fccc975567852cb7ea35e628e4cd4296ededcf09a7064e0367c",
+    "zh:ec0d60d90a40e2d4d88d018ed9b4e33cc10d974ba0dbdabee2da767228524f66",
+    "zh:f27e10774558017ff6c9ea04c8c7da53e1de5e1935ab8b81addb81ae373cd7a8",
+    "zh:fb2c583353005faf518f1fad34a79eda938c9210ef01346672e54ec27cf13f28",
     "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25",
-    "zh:fc579e8a85635d8d163d6700c43573a56bcd3e508fc8240bbd9e31d20e278fcd",
-    "zh:fca12051c81d787f571039319a707377590ca704ede610d2c191ca5702b254fa",
   ]
 }
diff --git a/env/dev/newrelic/.terraform.lock.hcl b/env/dev/newrelic/.terraform.lock.hcl
new file mode 100644
index 000000000..e2362d1b6
--- /dev/null
+++ b/env/dev/newrelic/.terraform.lock.hcl
@@ -0,0 +1,113 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/hashicorp/aws" {
+  version     = "5.80.0"
+  constraints = "~> 5.66"
+  hashes = [
+    "h1:1O1XLPOrMg30ATXLC9itDvvyQUoIPIre7NiNscCOz28=",
+    "zh:0b1655e39639d60f2de2860a5df8642f9556ba0ca04529c1b861fde4935cb0df",
+    "zh:13dc0155e0a11edceee29ce687fc04c5a5a85f3324c67556472713cfd52e5807",
+    "zh:180f6cb2be44be14cfe329e0649121b774319f083b6e4e8fb749f85090d73121",
+    "zh:3158d44b74c67465f7f19f22c42b643840c8d18ce833e2ec86e8d93085b06926",
+    "zh:6351b5bf7cde5dc83e926944891570636069e05ca43341f4d1feda67773469bf",
+    "zh:6fa9db1532096ba50e842d369b6688979306d2295c7ead49b8a266b0d60962cc",
+    "zh:85d2fe75def7619ff2cc29102048875039cad088fafb62ecc14c3763e7b1e9d9",
+    "zh:9028d653f1d7341c6dfe2afe961b6541581e9043a474eac2faf90e6426a24f6d",
+    "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
+    "zh:9c4e248c442bc60f07f9f089e5361f19936833370dc3c04b27916672b765f0e1",
+    "zh:a710a3979596e3f3938c3ec6bb748e604724d3a4afa96ed2c14f0a245cc41a11",
+    "zh:c27936bdf447779d0c0833bf52a9ef618985f5ea8e3e243d6266513520ca31c4",
+    "zh:c7681134a123486e72eaedc3f8d2d75e267dbbfd45fa7de5aea8f757af57f89b",
+    "zh:ea717ebad3561fd02591f9eecf30f3df5635405556fba2bdbf29fd42691bebac",
+    "zh:f4e1e8f23c58c3e8f4371f9c3379a723ab4155246e6b6daad8eb99e16666b2cb",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/random" {
+  version = "3.6.3"
+  hashes = [
+    "h1:f6jXn4MCv67kgcofx9D49qx1ZEBv8oyvwKDMPBr0A24=",
+    "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451",
+    "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8",
+    "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe",
+    "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1",
+    "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36",
+    "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30",
+    "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615",
+    "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad",
+    "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556",
+    "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/tls" {
+  version     = "4.0.6"
+  constraints = "~> 4.0"
+  hashes = [
+    "h1:/sSdjHoiykrPdyBP1JE03V/KDgLXnHZhHcSOYIdDH/A=",
+    "zh:10de0d8af02f2e578101688fd334da3849f56ea91b0d9bd5b1f7a243417fdda8",
+    "zh:37fc01f8b2bc9d5b055dc3e78bfd1beb7c42cfb776a4c81106e19c8911366297",
+    "zh:4578ca03d1dd0b7f572d96bd03f744be24c726bfd282173d54b100fd221608bb",
+    "zh:6c475491d1250050765a91a493ef330adc24689e8837a0f07da5a0e1269e11c1",
+    "zh:81bde94d53cdababa5b376bbc6947668be4c45ab655de7aa2e8e4736dfd52509",
+    "zh:abdce260840b7b050c4e401d4f75c7a199fafe58a8b213947a258f75ac18b3e8",
+    "zh:b754cebfc5184873840f16a642a7c9ef78c34dc246a8ae29e056c79939963c7a",
+    "zh:c928b66086078f9917aef0eec15982f2e337914c5c4dbc31dd4741403db7eb18",
+    "zh:cded27bee5f24de6f2ee0cfd1df46a7f88e84aaffc2ecbf3ff7094160f193d50",
+    "zh:d65eb3867e8f69aaf1b8bb53bd637c99c6b649ba3db16ded50fa9a01076d1a27",
+    "zh:ecb0c8b528c7a619fa71852bb3fb5c151d47576c5aab2bf3af4db52588722eeb",
+    "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
+  ]
+}
+
+provider "registry.terraform.io/integrations/github" {
+  version     = "6.4.0"
+  constraints = "~> 6.0"
+  hashes = [
+    "h1:B1q5+Ub1G3zJa9y474Fg40eo/N04/vOSeaf3dWaCG0I=",
+    "zh:00f431c2a2510efcb1115442dda5e90815bcb16e1a3301679ade0139fa963d3b",
+    "zh:12a862f4317b3cb65682c1b687650cd91eeee99e63774bdcfa8bcfc64bad097b",
+    "zh:226d5e09ff27f94cb9336089181d26f85cb30219b863a579597f2e107f37de49",
+    "zh:402ecaa5add568a52ee01d816810f3b90f693be35c680fcdc9b6284bf55326f1",
+    "zh:60e3bdd9fbefb3c1d790bc08889c1dc0e83636b82284faaa709411aa4f96bb9f",
+    "zh:625099eeff2f8aaecd22a24a451b326828435c8f9de86f2e5e99872e7b467fa7",
+    "zh:79e8b665421009df2260f50e10da1f7a7863b557ece96e2b07dfd2fad1e86fcd",
+    "zh:98e471fefc93dcfedeec750c694110db7d3331dc3a256191d30b9d2f70d12157",
+    "zh:a17702765e1fa92d1c288ddfd97075819ad61b344b341be7e09c554c841a6d9e",
+    "zh:ca72ccf40624ae26bf4660d8dd84a51638f0a1e78d5f19fdfaafaef97f838af6",
+    "zh:d009ab5527d45c44c424d26cd2eb51a5a6a6448f3fb1023b675789588cc08d64",
+    "zh:e5811be1e942a75b14dfcd3e03523d8df60cfbde0d7e24d75e78480a02a58949",
+    "zh:e6008ad28225ad6996b06bcd7f3070863329df406a56754e7fb9c31d6301ace4",
+    "zh:f1d93f56ea4f87183a5de4780704907605851d95a2d285a9ec755bf784c5569c",
+    "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25",
+  ]
+}
+
+provider "registry.terraform.io/newrelic/newrelic" {
+  version     = "3.53.0"
+  constraints = "~> 3.3"
+  hashes = [
+    "h1:iIN159hRh6IOd6yXj9cfFttPoMRZ7CrOtqw84A2P31A=",
+    "zh:1d07b86d4377875ad37e9d0549cedcbd866ebf94d745ed0f62af41ae117a4c67",
+    "zh:3475bfac1bde1ff43142c5039175a27481683543bf7f331a9da2aec14e7380dc",
+    "zh:633be9b341e257987afdf6cf394898a246df7131288781876724839694db4f25",
+    "zh:67cd1a1cea88134457c593701c6119bb7e41b01e4d0c5a1624fa751139be4975",
+    "zh:691a8c3f6b9fe1ff315e8b2ca534498644a0a32167f2f4f578b712d0da7475a5",
+    "zh:73c5eda6fa899d2e916ab7ffcb63fa1fb91d9c305cb743b91327473e6cc33efe",
+    "zh:7c8225cf11385098856df8c669b6b1e0e2a15ef58b9d009744ad5d7bdc956e34",
+    "zh:c61f32145f6df158749221f55634860e270db5cfd11abd925bd5ea522ed0d85b",
+    "zh:c679ca4352f00d4d1866fb678da5749fe1dd9970b4450be8816f6cb78a5b7e8b",
+    "zh:d495230a28d0b0c2bb392115d1d382a52c2f090b9d329f441a2105fc04f39853",
+    "zh:d92bb94e4042169a1dd72c54e3db7e81dad7ad4ec6aa559a998ffa8582c86176",
+    "zh:dc26a8c6ef7ac359db123301a168dda6a8ac8e51fb3455141adf502bfba91e56",
+    "zh:de413be9f8f06281b5a3c9e0de1f83c00a9cd4874d974f91462a8b295304c821",
+    "zh:e7b2b7d73d8e3fccc975567852cb7ea35e628e4cd4296ededcf09a7064e0367c",
+    "zh:ec0d60d90a40e2d4d88d018ed9b4e33cc10d974ba0dbdabee2da767228524f66",
+    "zh:f27e10774558017ff6c9ea04c8c7da53e1de5e1935ab8b81addb81ae373cd7a8",
+    "zh:fb2c583353005faf518f1fad34a79eda938c9210ef01346672e54ec27cf13f28",
+    "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25",
+  ]
+}
diff --git a/env/staging/newrelic/.terraform.lock.hcl b/env/staging/newrelic/.terraform.lock.hcl
new file mode 100644
index 000000000..e2362d1b6
--- /dev/null
+++ b/env/staging/newrelic/.terraform.lock.hcl
@@ -0,0 +1,113 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/hashicorp/aws" {
+  version     = "5.80.0"
+  constraints = "~> 5.66"
+  hashes = [
+    "h1:1O1XLPOrMg30ATXLC9itDvvyQUoIPIre7NiNscCOz28=",
+    "zh:0b1655e39639d60f2de2860a5df8642f9556ba0ca04529c1b861fde4935cb0df",
+    "zh:13dc0155e0a11edceee29ce687fc04c5a5a85f3324c67556472713cfd52e5807",
+    "zh:180f6cb2be44be14cfe329e0649121b774319f083b6e4e8fb749f85090d73121",
+    "zh:3158d44b74c67465f7f19f22c42b643840c8d18ce833e2ec86e8d93085b06926",
+    "zh:6351b5bf7cde5dc83e926944891570636069e05ca43341f4d1feda67773469bf",
+    "zh:6fa9db1532096ba50e842d369b6688979306d2295c7ead49b8a266b0d60962cc",
+    "zh:85d2fe75def7619ff2cc29102048875039cad088fafb62ecc14c3763e7b1e9d9",
+    "zh:9028d653f1d7341c6dfe2afe961b6541581e9043a474eac2faf90e6426a24f6d",
+    "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
+    "zh:9c4e248c442bc60f07f9f089e5361f19936833370dc3c04b27916672b765f0e1",
+    "zh:a710a3979596e3f3938c3ec6bb748e604724d3a4afa96ed2c14f0a245cc41a11",
+    "zh:c27936bdf447779d0c0833bf52a9ef618985f5ea8e3e243d6266513520ca31c4",
+    "zh:c7681134a123486e72eaedc3f8d2d75e267dbbfd45fa7de5aea8f757af57f89b",
+    "zh:ea717ebad3561fd02591f9eecf30f3df5635405556fba2bdbf29fd42691bebac",
+    "zh:f4e1e8f23c58c3e8f4371f9c3379a723ab4155246e6b6daad8eb99e16666b2cb",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/random" {
+  version = "3.6.3"
+  hashes = [
+    "h1:f6jXn4MCv67kgcofx9D49qx1ZEBv8oyvwKDMPBr0A24=",
+    "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451",
+    "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8",
+    "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe",
+    "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1",
+    "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36",
+    "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30",
+    "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615",
+    "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad",
+    "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556",
+    "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/tls" {
+  version     = "4.0.6"
+  constraints = "~> 4.0"
+  hashes = [
+    "h1:/sSdjHoiykrPdyBP1JE03V/KDgLXnHZhHcSOYIdDH/A=",
+    "zh:10de0d8af02f2e578101688fd334da3849f56ea91b0d9bd5b1f7a243417fdda8",
+    "zh:37fc01f8b2bc9d5b055dc3e78bfd1beb7c42cfb776a4c81106e19c8911366297",
+    "zh:4578ca03d1dd0b7f572d96bd03f744be24c726bfd282173d54b100fd221608bb",
+    "zh:6c475491d1250050765a91a493ef330adc24689e8837a0f07da5a0e1269e11c1",
+    "zh:81bde94d53cdababa5b376bbc6947668be4c45ab655de7aa2e8e4736dfd52509",
+    "zh:abdce260840b7b050c4e401d4f75c7a199fafe58a8b213947a258f75ac18b3e8",
+    "zh:b754cebfc5184873840f16a642a7c9ef78c34dc246a8ae29e056c79939963c7a",
+    "zh:c928b66086078f9917aef0eec15982f2e337914c5c4dbc31dd4741403db7eb18",
+    "zh:cded27bee5f24de6f2ee0cfd1df46a7f88e84aaffc2ecbf3ff7094160f193d50",
+    "zh:d65eb3867e8f69aaf1b8bb53bd637c99c6b649ba3db16ded50fa9a01076d1a27",
+    "zh:ecb0c8b528c7a619fa71852bb3fb5c151d47576c5aab2bf3af4db52588722eeb",
+    "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
+  ]
+}
+
+provider "registry.terraform.io/integrations/github" {
+  version     = "6.4.0"
+  constraints = "~> 6.0"
+  hashes = [
+    "h1:B1q5+Ub1G3zJa9y474Fg40eo/N04/vOSeaf3dWaCG0I=",
+    "zh:00f431c2a2510efcb1115442dda5e90815bcb16e1a3301679ade0139fa963d3b",
+    "zh:12a862f4317b3cb65682c1b687650cd91eeee99e63774bdcfa8bcfc64bad097b",
+    "zh:226d5e09ff27f94cb9336089181d26f85cb30219b863a579597f2e107f37de49",
+    "zh:402ecaa5add568a52ee01d816810f3b90f693be35c680fcdc9b6284bf55326f1",
+    "zh:60e3bdd9fbefb3c1d790bc08889c1dc0e83636b82284faaa709411aa4f96bb9f",
+    "zh:625099eeff2f8aaecd22a24a451b326828435c8f9de86f2e5e99872e7b467fa7",
+    "zh:79e8b665421009df2260f50e10da1f7a7863b557ece96e2b07dfd2fad1e86fcd",
+    "zh:98e471fefc93dcfedeec750c694110db7d3331dc3a256191d30b9d2f70d12157",
+    "zh:a17702765e1fa92d1c288ddfd97075819ad61b344b341be7e09c554c841a6d9e",
+    "zh:ca72ccf40624ae26bf4660d8dd84a51638f0a1e78d5f19fdfaafaef97f838af6",
+    "zh:d009ab5527d45c44c424d26cd2eb51a5a6a6448f3fb1023b675789588cc08d64",
+    "zh:e5811be1e942a75b14dfcd3e03523d8df60cfbde0d7e24d75e78480a02a58949",
+    "zh:e6008ad28225ad6996b06bcd7f3070863329df406a56754e7fb9c31d6301ace4",
+    "zh:f1d93f56ea4f87183a5de4780704907605851d95a2d285a9ec755bf784c5569c",
+    "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25",
+  ]
+}
+
+provider "registry.terraform.io/newrelic/newrelic" {
+  version     = "3.53.0"
+  constraints = "~> 3.3"
+  hashes = [
+    "h1:iIN159hRh6IOd6yXj9cfFttPoMRZ7CrOtqw84A2P31A=",
+    "zh:1d07b86d4377875ad37e9d0549cedcbd866ebf94d745ed0f62af41ae117a4c67",
+    "zh:3475bfac1bde1ff43142c5039175a27481683543bf7f331a9da2aec14e7380dc",
+    "zh:633be9b341e257987afdf6cf394898a246df7131288781876724839694db4f25",
+    "zh:67cd1a1cea88134457c593701c6119bb7e41b01e4d0c5a1624fa751139be4975",
+    "zh:691a8c3f6b9fe1ff315e8b2ca534498644a0a32167f2f4f578b712d0da7475a5",
+    "zh:73c5eda6fa899d2e916ab7ffcb63fa1fb91d9c305cb743b91327473e6cc33efe",
+    "zh:7c8225cf11385098856df8c669b6b1e0e2a15ef58b9d009744ad5d7bdc956e34",
+    "zh:c61f32145f6df158749221f55634860e270db5cfd11abd925bd5ea522ed0d85b",
+    "zh:c679ca4352f00d4d1866fb678da5749fe1dd9970b4450be8816f6cb78a5b7e8b",
+    "zh:d495230a28d0b0c2bb392115d1d382a52c2f090b9d329f441a2105fc04f39853",
+    "zh:d92bb94e4042169a1dd72c54e3db7e81dad7ad4ec6aa559a998ffa8582c86176",
+    "zh:dc26a8c6ef7ac359db123301a168dda6a8ac8e51fb3455141adf502bfba91e56",
+    "zh:de413be9f8f06281b5a3c9e0de1f83c00a9cd4874d974f91462a8b295304c821",
+    "zh:e7b2b7d73d8e3fccc975567852cb7ea35e628e4cd4296ededcf09a7064e0367c",
+    "zh:ec0d60d90a40e2d4d88d018ed9b4e33cc10d974ba0dbdabee2da767228524f66",
+    "zh:f27e10774558017ff6c9ea04c8c7da53e1de5e1935ab8b81addb81ae373cd7a8",
+    "zh:fb2c583353005faf518f1fad34a79eda938c9210ef01346672e54ec27cf13f28",
+    "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25",
+  ]
+}

From 620c2bdebc5f635c3147ff5e702dd9864caa2e4e Mon Sep 17 00:00:00 2001
From: Ben Larabie <ben.larabie@cds-snc.ca>
Date: Thu, 12 Dec 2024 09:28:52 -0500
Subject: [PATCH 3/3] removing import and removed blocks (#1698)

[review]
---
 aws/common/import.tf    |  99 --------------------------
 aws/newrelic/removed.tf | 151 ----------------------------------------
 2 files changed, 250 deletions(-)
 delete mode 100644 aws/common/import.tf
 delete mode 100644 aws/newrelic/removed.tf

diff --git a/aws/common/import.tf b/aws/common/import.tf
deleted file mode 100644
index 97805a3da..000000000
--- a/aws/common/import.tf
+++ /dev/null
@@ -1,99 +0,0 @@
-import {
-  to = aws_cloudwatch_metric_stream.newrelic_metric_stream[0]
-  id = "newrelic-metric-stream-${var.env}"
-}
-
-import {
-  to = aws_config_configuration_recorder_status.newrelic_recorder_status[0]
-  id = var.aws_config_recorder_name
-}
-
-import {
-  to = aws_iam_policy.newrelic_aws_permissions[0]
-  id = "arn:aws:iam::${var.account_id}:policy/NewRelicCloudStreamReadPermissions-${var.env}"
-}
-
-import {
-  to = aws_iam_role.firehose_newrelic_role[0]
-  id = "firehose_newrelic_role_${var.env}"
-}
-
-import {
-  to = aws_iam_role.metric_stream_to_firehose[0]
-  id = "newrelic_metric_stream_to_firehose_role_${var.env}"
-}
-
-import {
-  to = aws_iam_role.newrelic_aws_role[0]
-  id = "NewRelicInfrastructure-Integrations-${var.env}"
-}
-
-import {
-  to = aws_iam_role.newrelic_configuration_recorder[0]
-  id = "newrelic_configuration_recorder-${var.env}"
-}
-
-import {
-  to = aws_iam_role_policy.metric_stream_to_firehose[0]
-  id = "newrelic_metric_stream_to_firehose_role_${var.env}:default"
-}
-
-import {
-  to = aws_iam_role_policy.newrelic_configuration_recorder_s3[0]
-  id = "newrelic_configuration_recorder-${var.env}:newrelic-configuration-recorder-s3-${var.env}"
-}
-
-import {
-  to = aws_iam_role_policy_attachment.newrelic_aws_policy_attach[0]
-  id = "NewRelicInfrastructure-Integrations-${var.env}/arn:aws:iam::aws:policy/ReadOnlyAccess"
-}
-
-import {
-  to = aws_iam_role_policy_attachment.newrelic_configuration_recorder[0]
-  id = "newrelic_configuration_recorder-${var.env}/arn:aws:iam::aws:policy/service-role/AWS_ConfigRole"
-}
-
-import {
-  to = aws_kinesis_firehose_delivery_stream.newrelic_firehose_stream[0]
-  id = "arn:aws:firehose:ca-central-1:${var.account_id}:deliverystream/newrelic_firehose_stream_${var.env}"
-}
-
-import {
-  to = aws_s3_bucket.newrelic_aws_bucket[0]
-  id = "newrelic-aws-bucket-${random_string.s3-bucket-name[0].id}"
-}
-
-import {
-  to = aws_s3_bucket.newrelic_configuration_recorder_s3[0]
-  id = "newrelic-configuration-recorder-${random_string.s3-bucket-name[0].id}"
-}
-
-import {
-  to = aws_s3_bucket_ownership_controls.newrelic_ownership_controls[0]
-  id = "newrelic-aws-bucket-${random_string.s3-bucket-name[0].id}"
-}
-
-import {
-  to = newrelic_api_access_key.newrelic_aws_access_key[0]
-  id = "5EA911F90B135B0D61DB4012CB0DC376CCC5017C98EB1688932254CDDAFD3443:USER"
-}
-
-import {
-  to = newrelic_cloud_aws_integrations.newrelic_cloud_integration_pull[0]
-  id = var.env == "dev" ? "242485" : "225924"
-}
-
-import {
-  to = newrelic_cloud_aws_link_account.newrelic_cloud_integration_pull[0]
-  id = var.env == "dev" ? "242485" : "225924"
-}
-
-import {
-  to = newrelic_cloud_aws_link_account.newrelic_cloud_integration_push[0]
-  id = var.env == "dev" ? "242484" : "225918"
-}
-
-import {
-  to = random_string.s3-bucket-name[0]
-  id = var.env == "dev" ? "fiskyzxf" : "9p5x8bkb"
-}
diff --git a/aws/newrelic/removed.tf b/aws/newrelic/removed.tf
deleted file mode 100644
index e1fc50016..000000000
--- a/aws/newrelic/removed.tf
+++ /dev/null
@@ -1,151 +0,0 @@
-removed {
-  from = aws_cloudwatch_metric_stream.newrelic_metric_stream
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_config_configuration_recorder_status.newrelic_recorder_status
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_iam_policy.newrelic_aws_permissions
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_iam_role.firehose_newrelic_role
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_iam_role.metric_stream_to_firehose
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_iam_role.newrelic_aws_role
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_iam_role.newrelic_configuration_recorder
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_iam_role_policy.metric_stream_to_firehose
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_iam_role_policy.newrelic_configuration_recorder_s3
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_iam_role_policy_attachment.newrelic_aws_policy_attach
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_iam_role_policy_attachment.newrelic_configuration_recorder
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_kinesis_firehose_delivery_stream.newrelic_firehose_stream
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_s3_bucket.newrelic_aws_bucket
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_s3_bucket.newrelic_configuration_recorder_s3
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = aws_s3_bucket_ownership_controls.newrelic_ownership_controls
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = newrelic_api_access_key.newrelic_aws_access_key
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = newrelic_cloud_aws_integrations.newrelic_cloud_integration_pull
-
-  lifecycle {
-    destroy = false
-  }
-}
-removed {
-
-  from = newrelic_cloud_aws_link_account.newrelic_cloud_integration_pull
-
-  lifecycle {
-    destroy = false
-  }
-}
-
-removed {
-  from = newrelic_cloud_aws_link_account.newrelic_cloud_integration_push
-
-  lifecycle {
-    destroy = false
-  }
-}