make requester vpc lookup optional if vpc is passed (#1099)

Benbentwo · web-flow · commit 482be0b564f0 · 2024-08-15T08:30:51.000-07:00
diff --git a/modules/vpc-peering/main.tf b/modules/vpc-peering/main.tf
@@ -1,7 +1,7 @@
 locals {
   enabled = module.this.enabled
 
-  requester_vpc_id = coalesce(var.requester_vpc_id, module.requester_vpc.outputs.vpc_id)
+  requester_vpc_id = coalesce(var.requester_vpc_id, one(module.requester_vpc[*].outputs.vpc_id))
 
   accepter_aws_assume_role_arn = var.accepter_stage_name != null ? module.iam_roles.terraform_role_arns[var.accepter_stage_name] : var.accepter_aws_assume_role_arn
 }
diff --git a/modules/vpc-peering/remote-state.tf b/modules/vpc-peering/remote-state.tf
@@ -1,4 +1,6 @@
 module "requester_vpc" {
+  count = var.requester_vpc_id == null ? 1 : 0
+
   source  = "cloudposse/stack-config/yaml//modules/remote-state"
   version = "1.5.0"
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`locals {`
`2`	`2`	`enabled = module.this.enabled`
`3`	`3`
`4`		`- requester_vpc_id = coalesce(var.requester_vpc_id, module.requester_vpc.outputs.vpc_id)`
	`4`	`+ requester_vpc_id = coalesce(var.requester_vpc_id, one(module.requester_vpc[*].outputs.vpc_id))`
`5`	`5`
`6`	`6`	`accepter_aws_assume_role_arn = var.accepter_stage_name != null ? module.iam_roles.terraform_role_arns[var.accepter_stage_name] : var.accepter_aws_assume_role_arn`
`7`	`7`	`}`