Enable internal traffic from multiple VPCs (#34)

* Enable internal traffic from multiple VPCs * Update README and examples * Fix variable type * Fix examples * Bump examples
outerbounds · Jul 28, 2022 · 7f899b1 · 7f899b1
1 parent e6c49f3
commit 7f899b1
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ module "metaflow" {
   enable_step_functions = false
   subnet1_id            = module.vpc.public_subnets[0]
   subnet2_id            = module.vpc.public_subnets[1]
-  vpc_cidr_block        = module.vpc.vpc_cidr_block
+  vpc_cidr_blocks       = module.vpc.vpc_cidr_blocks
   vpc_id                = module.vpc.vpc_id
 
   tags = {
@@ -117,7 +117,7 @@ You can find a more complete example that uses this module but also includes set
 | <a name="input_ui_allow_list"></a> [ui\_allow\_list](#input\_ui\_allow\_list) | List of CIDRs we want to grant access to our Metaflow UI Service. Usually this is our VPN's CIDR blocks. | `list(string)` | `[]` | no |
 | <a name="input_ui_certificate_arn"></a> [ui\_certificate\_arn](#input\_ui\_certificate\_arn) | SSL certificate for UI. If set to empty string, UI is disabled. | `string` | `""` | no |
 | <a name="input_ui_static_container_image"></a> [ui\_static\_container\_image](#input\_ui\_static\_container\_image) | Container image for the UI frontend app | `string` | `""` | no |
-| <a name="input_vpc_cidr_block"></a> [vpc\_cidr\_block](#input\_vpc\_cidr\_block) | The VPC CIDR block that we'll access list on our Metadata Service API to allow all internal communications | `string` | n/a | yes |
+| <a name="input_vpc_cidr_blocks"></a> [vpc\_cidr\_blocks](#input\_vpc\_cidr\_blocks) | The VPC CIDR blocks that we'll access list on our Metadata Service API to allow all internal communications | `list(string)` | n/a | yes |
 | <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | The id of the single VPC we stood up for all Metaflow resources to exist in. | `string` | n/a | yes |
 
 ## Outputs

diff --git a/examples/eks/metaflow.tf b/examples/eks/metaflow.tf
@@ -42,7 +42,7 @@ module "metaflow-common" {
 
 module "metaflow-metadata-service" {
   source  = "outerbounds/metaflow/aws//modules/metadata-service"
-  version = "0.3.2"
+  version = "0.7.0"
 
   resource_prefix = local.resource_prefix
   resource_suffix = local.resource_suffix
@@ -60,7 +60,7 @@ module "metaflow-metadata-service" {
   s3_bucket_arn                    = module.metaflow-datastore.s3_bucket_arn
   subnet1_id                       = module.vpc.private_subnets[0]
   subnet2_id                       = module.vpc.private_subnets[1]
-  vpc_cidr_block                   = module.vpc.vpc_cidr_block
+  vpc_cidr_blocks                  = [module.vpc.vpc_cidr_block]
 
   standard_tags = local.tags
 }
diff --git a/examples/minimal/minimal_example.tf b/examples/minimal/minimal_example.tf
@@ -38,15 +38,15 @@ module "vpc" {
 
 module "metaflow" {
   source  = "outerbounds/metaflow/aws"
-  version = "0.5.2"
+  version = "0.7.0"
 
   resource_prefix = local.resource_prefix
   resource_suffix = local.resource_suffix
 
   enable_step_functions = false
   subnet1_id            = module.vpc.public_subnets[0]
   subnet2_id            = module.vpc.public_subnets[1]
-  vpc_cidr_block        = module.vpc.vpc_cidr_block
+  vpc_cidr_blocks       = [module.vpc.vpc_cidr_block]
   vpc_id                = module.vpc.vpc_id
 
   tags = {

diff --git a/main.tf b/main.tf
@@ -32,7 +32,7 @@ module "metaflow-metadata-service" {
   s3_bucket_arn                    = module.metaflow-datastore.s3_bucket_arn
   subnet1_id                       = var.subnet1_id
   subnet2_id                       = var.subnet2_id
-  vpc_cidr_block                   = var.vpc_cidr_block
+  vpc_cidr_blocks                  = var.vpc_cidr_blocks
 
   standard_tags = var.tags
 }

diff --git a/modules/metadata-service/README.md b/modules/metadata-service/README.md
@@ -35,7 +35,7 @@ If the `access_list_cidr_blocks` variable is set, only traffic originating from
 | <a name="input_standard_tags"></a> [standard\_tags](#input\_standard\_tags) | The standard tags to apply to every AWS resource. | `map(string)` | n/a | yes |
 | <a name="input_subnet1_id"></a> [subnet1\_id](#input\_subnet1\_id) | First private subnet used for availability zone redundancy | `string` | n/a | yes |
 | <a name="input_subnet2_id"></a> [subnet2\_id](#input\_subnet2\_id) | Second private subnet used for availability zone redundancy | `string` | n/a | yes |
-| <a name="input_vpc_cidr_block"></a> [vpc\_cidr\_block](#input\_vpc\_cidr\_block) | The VPC CIDR block that we'll access list on our Metadata Service API to allow all internal communications | `string` | n/a | yes |
+| <a name="input_vpc_cidr_blocks"></a> [vpc\_cidr\_blocks](#input\_vpc\_cidr\_blocks) | The VPC CIDR blocks that we'll access list on our Metadata Service API to allow all internal communications | `list(string)` | n/a | yes |
 
 ## Outputs
 

diff --git a/modules/metadata-service/ec2.tf b/modules/metadata-service/ec2.tf
@@ -7,15 +7,15 @@ resource "aws_security_group" "metadata_service_security_group" {
     from_port   = 8080
     to_port     = 8080
     protocol    = "tcp"
-    cidr_blocks = [var.vpc_cidr_block]
+    cidr_blocks = var.vpc_cidr_blocks
     description = "Allow API calls internally"
   }
 
   ingress {
     from_port   = 8082
     to_port     = 8082
     protocol    = "tcp"
-    cidr_blocks = [var.vpc_cidr_block]
+    cidr_blocks = var.vpc_cidr_blocks
     description = "Allow API calls internally"
   }
 

diff --git a/modules/metadata-service/variables.tf b/modules/metadata-service/variables.tf
@@ -105,7 +105,7 @@ variable "subnet2_id" {
   description = "Second private subnet used for availability zone redundancy"
 }
 
-variable "vpc_cidr_block" {
-  type        = string
-  description = "The VPC CIDR block that we'll access list on our Metadata Service API to allow all internal communications"
+variable "vpc_cidr_blocks" {
+  type        = list(string)
+  description = "The VPC CIDR blocks that we'll access list on our Metadata Service API to allow all internal communications"
 }
diff --git a/variables.tf b/variables.tf
@@ -108,9 +108,9 @@ variable "subnet2_id" {
   description = "Second subnet used for availability zone redundancy"
 }
 
-variable "vpc_cidr_block" {
-  type        = string
-  description = "The VPC CIDR block that we'll access list on our Metadata Service API to allow all internal communications"
+variable "vpc_cidr_blocks" {
+  type        = list(string)
+  description = "The VPC CIDR blocks that we'll access list on our Metadata Service API to allow all internal communications"
 }
 
 variable "vpc_id" {