refactor: undo changes made to the original aws module

newrelic · Jan 30, 2025 · c705436 · c705436
1 parent c920008
commit c705436
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/...les/cloud-integrations/aws_us_gov/main.tf → ...s/cloud-integrations/aws-govcloud/main.tf b/...les/cloud-integrations/aws_us_gov/main.tf → ...s/cloud-integrations/aws-govcloud/main.tf
@@ -5,7 +5,7 @@ data "aws_iam_policy_document" "newrelic_assume_policy" {
     principals {
       type = "AWS"
       // This is the unique identifier for New Relic account on AWS, there is no need to change this
-      identifiers = [266471868085]
+      identifiers = [var.new_relic_aws_govcloud_account_id]
     }
 
     condition {
@@ -74,7 +74,7 @@ resource "newrelic_cloud_aws_govcloud_link_account" "newrelic_cloud_integration_
   depends_on             = [aws_iam_role_policy_attachment.newrelic_aws_policy_attach]
   access_key_id          = newrelic_api_access_key.newrelic_aws_access_key.key
   secret_access_key      = newrelic_api_access_key.newrelic_aws_access_key.key
-  aws_account_id         = "266471868085"
+  aws_account_id         = var.new_relic_aws_govcloud_account_id
 }
 
 resource "newrelic_api_access_key" "newrelic_aws_access_key" {
@@ -220,7 +220,7 @@ resource "newrelic_cloud_aws_govcloud_link_account" "newrelic_cloud_integration_
   depends_on             = [aws_iam_role_policy_attachment.newrelic_aws_policy_attach]
   access_key_id          = newrelic_api_access_key.newrelic_aws_access_key.key
   secret_access_key      = newrelic_api_access_key.newrelic_aws_access_key.key
-  aws_account_id         = "266471868085"
+  aws_account_id         = var.new_relic_aws_govcloud_account_id
 }
 
 resource "newrelic_cloud_aws_govcloud_integrations" "newrelic_cloud_integration_pull" {
@@ -235,7 +235,7 @@ resource "newrelic_cloud_aws_govcloud_integrations" "newrelic_cloud_integration_
   auto_scaling {}
   aws_direct_connect {}
   aws_states {}
-   dynamo_db {}
+  dynamo_db {}
   ec2 {}
   elastic_search {}
   elb {}

diff --git a/...loud-integrations/aws_us_gov/providers.tf → ...ud-integrations/aws-govcloud/providers.tf b/...loud-integrations/aws_us_gov/providers.tf → ...ud-integrations/aws-govcloud/providers.tf
diff --git a/...loud-integrations/aws_us_gov/variables.tf → ...ud-integrations/aws-govcloud/variables.tf b/...loud-integrations/aws_us_gov/variables.tf → ...ud-integrations/aws-govcloud/variables.tf
@@ -18,3 +18,8 @@ variable "include_metric_filters" {
   type        = map(list(string))
   default     = {}
 }
+
+variable "new_relic_aws_govcloud_account_id" {
+  type    = string
+  default = "266471868085"
+}
diff --git a/examples/modules/cloud-integrations/aws/main.tf b/examples/modules/cloud-integrations/aws/main.tf
@@ -5,7 +5,7 @@ data "aws_iam_policy_document" "newrelic_assume_policy" {
     principals {
       type = "AWS"
       // This is the unique identifier for New Relic account on AWS, there is no need to change this
-      identifiers = var.newrelic_account_region == "US_GOV" ? [266471868085] : [754728514883]
+      identifiers = [754728514883]
     }
 
     condition {
@@ -125,7 +125,6 @@ locals {
   newrelic_urls = {
     US      = "https://aws-api.newrelic.com/cloudwatch-metrics/v1"
     EU      = "https://aws-api.eu01.nr-data.net/cloudwatch-metrics/v1"
-    US_GOV  = "https://gov-aws-api.newrelic.com/cloudwatch-metrics/v1"
   }
 }
 

diff --git a/examples/modules/cloud-integrations/aws/variables.tf b/examples/modules/cloud-integrations/aws/variables.tf
@@ -7,7 +7,7 @@ variable "newrelic_account_region" {
   default = "US"
 
   validation {
-    condition     = contains(["US", "EU", "US_GOV"], var.newrelic_account_region)
+    condition     = contains(["US", "EU"], var.newrelic_account_region)
     error_message = "Valid values for region are 'US' or 'EU'."
   }
 }