update region name by differentiating between atlas and aws region

pen-pal · pen-pal · commit 93d3dc9732fe · 2022-04-01T12:02:34.000+05:45
diff --git a/aws-resources.tf b/aws-resources.tf
@@ -74,7 +74,7 @@ resource "mongodbatlas_privatelink_endpoint" "default" {
   count         = local.free_tier == false && var.create && var.create_privatelink_endpoint == true ? 1 : 0
   project_id    = mongodbatlas_project.project[0].id
   provider_name = local.cloud_provider
-  region        = var.region
+  region        = var.aws_region
 }
 
 resource "aws_vpc_endpoint" "ptfe_service" {
diff --git a/cluster.tf b/cluster.tf
@@ -7,7 +7,7 @@ resource "mongodbatlas_cluster" "sharded" {
   name                        = var.cluster_name
   provider_name               = local.provider_name
   backing_provider_name       = local.backing_provider_name
-  provider_region_name        = var.region
+  provider_region_name        = var.atlas_region
   provider_instance_size_name = var.instance_type
   mongo_db_major_version      = var.mongodb_major_ver
   cluster_type                = local.free_tier ? "REPLICASET" : local.cluster_type
@@ -68,7 +68,7 @@ resource "mongodbatlas_cluster" "replicaset" {
   name                        = var.cluster_name
   provider_name               = local.provider_name
   backing_provider_name       = local.backing_provider_name
-  provider_region_name        = var.region
+  provider_region_name        = var.atlas_region
   provider_instance_size_name = var.instance_type
   mongo_db_major_version      = var.mongodb_major_ver
   cluster_type                = local.free_tier ? "REPLICASET" : local.cluster_type
diff --git a/encryption.tf b/encryption.tf
@@ -9,7 +9,7 @@ resource "mongodbatlas_encryption_at_rest" "encryption" {
   aws_kms_config {
     enabled                = var.encryption_enabled
     customer_master_key_id = var.customer_master_key_id == "" ? aws_kms_key.default[0].key_id : var.customer_master_key_id
-    region                 = var.region #atlas region (this region should have your kms key in AWS)
+    region                 = var.atlas_region #atlas region (this region should have your kms key in AWS)
     role_id                = mongodbatlas_cloud_provider_access_authorization.auth_role[0].role_id
   }
 
diff --git a/locals.tf b/locals.tf
@@ -23,7 +23,7 @@ locals {
       electable_nodes = var.electable_nodes
       priority        = var.priority
       read_only_nodes = var.read_only_nodes
-      region_name     = var.region
+      region_name     = var.atlas_region
     }
   ]
 
diff --git a/variables.tf b/variables.tf
@@ -61,7 +61,7 @@ variable "whitelists" {
   default = { "example" : "202.51.88.91/32" }
 }
 
-variable "region" {
+variable "atlas_region" {
   description = "The AWS region-name that the cluster will be deployed on"
   type        = string
   default     = "US_EAST_1"

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ resource "mongodbatlas_privatelink_endpoint" "default" {`
`74`	`74`	`count = local.free_tier == false && var.create && var.create_privatelink_endpoint == true ? 1 : 0`
`75`	`75`	`project_id = mongodbatlas_project.project[0].id`
`76`	`76`	`provider_name = local.cloud_provider`
`77`		`- region = var.region`
	`77`	`+ region = var.aws_region`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`resource "aws_vpc_endpoint" "ptfe_service" {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ resource "mongodbatlas_encryption_at_rest" "encryption" {`
`9`	`9`	`aws_kms_config {`
`10`	`10`	`enabled = var.encryption_enabled`
`11`	`11`	`customer_master_key_id = var.customer_master_key_id == "" ? aws_kms_key.default[0].key_id : var.customer_master_key_id`
`12`		`- region = var.region #atlas region (this region should have your kms key in AWS)`
	`12`	`+ region = var.atlas_region #atlas region (this region should have your kms key in AWS)`
`13`	`13`	`role_id = mongodbatlas_cloud_provider_access_authorization.auth_role[0].role_id`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ locals {`
`23`	`23`	`electable_nodes = var.electable_nodes`
`24`	`24`	`priority = var.priority`
`25`	`25`	`read_only_nodes = var.read_only_nodes`
`26`		`- region_name = var.region`
	`26`	`+ region_name = var.atlas_region`
`27`	`27`	`}`
`28`	`28`	`]`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ variable "whitelists" {`
`61`	`61`	`default = { "example" : "202.51.88.91/32" }`
`62`	`62`	`}`
`63`	`63`
`64`		`-variable "region" {`
	`64`	`+variable "atlas_region" {`
`65`	`65`	`description = "The AWS region-name that the cluster will be deployed on"`
`66`	`66`	`type = string`
`67`	`67`	`default = "US_EAST_1"`