updated submodule of vpc, added variable (#8)

* updated submodule of vpc, added variable and peering support

Author: RohitSquareops

examples/complete-vpc-with-vpn/README.md

@@ -32,7 +32,7 @@ No providers.
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_key_pair_vpn"></a> [key\_pair\_vpn](#module\_key\_pair\_vpn) | squareops/keypair/aws | n/a |
-| <a name="module_vpc"></a> [vpc](#module\_vpc) | ../../ | n/a |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | squareops/vpc/aws | n/a |
 
 ## Resources
 

examples/vpc-with-peering/main.tf

@@ -1,16 +1,22 @@
 locals {
-  accepter_vpc_id      = "vpc-034d30be2f4d1skaf"
-  requester_vpc_id     = "vpc-0fbdbf97efdf3skaf"
-  accepter_vpc_region  = "us-east-2"
-  requester_vpc_region = "us-east-2"
+  accepter_name    = "tenent-peering"
+  accepter_region  = "us-east-2"
+  accepter_vpc_id  = "vpc-049f2peerb195d692"
+  requester_name   = "management-peering"
+  requester_region = "us-east-2"
+  requester_vpc_id = "vpc-0125epeere8cfb616"
+  additional_tags = {
+    Owner   = "tenent"
+    Tenancy = "dedicated"
+  }
 }
 
 module "vpc_peering" {
   source               = "squareops/vpc/aws//modules/vpc_peering"
-  name                 = "vpc-peer"
+  accepter_name        = local.accepter_name
   accepter_vpc_id      = local.accepter_vpc_id
+  accepter_vpc_region  = local.accepter_region
+  requester_name       = local.requester_name
   requester_vpc_id     = local.requester_vpc_id
-  accepter_vpc_region  = local.accepter_vpc_region
-  requester_vpc_region = local.requester_vpc_region
-
+  requester_vpc_region = local.requester_region
 }

examples/vpc-with-peering/provider.tf

@@ -0,0 +1,6 @@
+provider "aws" {
+  region = local.region
+  default_tags {
+    tags = local.additional_tags
+  }
+}

modules/vpc_peering/README.md

@@ -56,12 +56,13 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_accepter_vpc_id"></a> [accepter\_vpc\_id](#input\_accepter\_vpc\_id) | The ID of Acceptor VPC | `string` | `""` | no |
-| <a name="input_accepter_vpc_region"></a> [accepter\_vpc\_region](#input\_accepter\_vpc\_region) | The region of Acceptor VPC | `string` | `""` | no |
-| <a name="input_create"></a> [create](#input\_create) | Set it to true to create VPC peering | `bool` | `true` | no |
-| <a name="input_name"></a> [name](#input\_name) | Name for the VPC peering | `string` | `""` | no |
-| <a name="input_requester_vpc_id"></a> [requester\_vpc\_id](#input\_requester\_vpc\_id) | The ID of Requester VPC | `string` | `""` | no |
-| <a name="input_requester_vpc_region"></a> [requester\_vpc\_region](#input\_requester\_vpc\_region) | The region Requester VPC | `string` | `""` | no |
+| <a name="input_accepter_name"></a> [accepter\_name](#input\_accepter\_name) | Assign a meaningful name or label to the VPC Accepter. This aids in distinguishing the Accepter VPC within the VPC peering connection. | `string` | `""` | no |
+| <a name="input_accepter_vpc_id"></a> [accepter\_vpc\_id](#input\_accepter\_vpc\_id) | Specify the unique identifier of the VPC that will act as the Acceptor in the VPC peering connection. | `string` | `""` | no |
+| <a name="input_accepter_vpc_region"></a> [accepter\_vpc\_region](#input\_accepter\_vpc\_region) | Provide the AWS region where the Acceptor VPC is located. This helps in identifying the correct region for establishing the VPC peering connection. | `string` | `""` | no |
+| <a name="input_peering_enabled"></a> [peering\_enabled](#input\_peering\_enabled) | Set this variable to true if you want to create the VPC peering connection. Set it to false if you want to skip the creation process. | `bool` | `true` | no |
+| <a name="input_requester_name"></a> [requester\_name](#input\_requester\_name) | Provide a descriptive name or label for the VPC Requester. This helps identify and differentiate the Requester VPC in the peering connection. | `string` | `""` | no |
+| <a name="input_requester_vpc_id"></a> [requester\_vpc\_id](#input\_requester\_vpc\_id) | Specify the unique identifier of the VPC that will act as the Reqester in the VPC peering connection. | `string` | `""` | no |
+| <a name="input_requester_vpc_region"></a> [requester\_vpc\_region](#input\_requester\_vpc\_region) | Specify the AWS region where the Requester VPC resides. It ensures the correct region is used for setting up the VPC peering. | `string` | `""` | no |
 
 ## Outputs
 

modules/vpc_peering/main.tf

@@ -34,32 +34,30 @@ data "aws_route_tables" "requester" {
 }
 
 resource "aws_vpc_peering_connection" "this" {
-  count       = var.create ? 1 : 0
+  count       = var.peering_enabled ? 1 : 0
   vpc_id      = var.requester_vpc_id
   peer_vpc_id = var.accepter_vpc_id
   peer_region = var.accepter_vpc_region
   auto_accept = false
   provider    = aws.peer
   tags = {
-    Name = var.name
-    Side = "Requester"
+    Name = format("%s-%s-%s", var.requester_name, "to", var.accepter_name)
   }
 }
 
 resource "aws_vpc_peering_connection_accepter" "this" {
-  count                     = var.create ? 1 : 0
+  count                     = var.peering_enabled ? 1 : 0
   depends_on                = [aws_vpc_peering_connection.this]
   provider                  = aws.accepter
   vpc_peering_connection_id = aws_vpc_peering_connection.this[0].id
   auto_accept               = true
   tags = {
-    Name = var.name
-    Side = "Accepter"
+    Name = format("%s-%s-%s", var.requester_name, "to", var.accepter_name)
   }
 }
 
 resource "aws_vpc_peering_connection_options" "this" {
-  count                     = var.create ? 1 : 0
+  count                     = var.peering_enabled ? 1 : 0
   depends_on                = [aws_vpc_peering_connection_accepter.this]
   vpc_peering_connection_id = aws_vpc_peering_connection.this[0].id
   accepter {
@@ -72,17 +70,17 @@ resource "aws_vpc_peering_connection_options" "this" {
 ####  route tables ####
 
 resource "aws_route" "requester" {
-  count                     = var.create ? length(local.requester_route_tables_ids) : 0
+  count                     = var.peering_enabled ? length(local.requester_route_tables_ids) : 0
   route_table_id            = local.requester_route_tables_ids[count.index]
   destination_cidr_block    = data.aws_vpc.accepter.cidr_block
-  vpc_peering_connection_id = var.create ? aws_vpc_peering_connection.this[0].id : null
+  vpc_peering_connection_id = var.peering_enabled ? aws_vpc_peering_connection.this[0].id : null
   provider                  = aws.peer
 }
 
 resource "aws_route" "accepter" {
-  count                     = var.create ? length(local.accepter_route_tables_ids) : 0
+  count                     = var.peering_enabled ? length(local.accepter_route_tables_ids) : 0
   route_table_id            = local.accepter_route_tables_ids[count.index]
   destination_cidr_block    = data.aws_vpc.requester.cidr_block
-  vpc_peering_connection_id = var.create ? aws_vpc_peering_connection.this[0].id : null
+  vpc_peering_connection_id = var.peering_enabled ? aws_vpc_peering_connection.this[0].id : null
   provider                  = aws.accepter
 }

modules/vpc_peering/outputs.tf

@@ -1,9 +1,9 @@
 output "vpc_peering_connection_id" {
   description = "Peering connection ID"
-  value       = var.create ? aws_vpc_peering_connection.this[0].id : null
+  value       = var.peering_enabled ? aws_vpc_peering_connection.this[0].id : null
 }
 
 output "vpc_peering_accept_status" {
   description = "Status for the connection"
-  value       = var.create ? aws_vpc_peering_connection_accepter.this[0].accept_status : null
+  value       = var.peering_enabled ? aws_vpc_peering_connection_accepter.this[0].accept_status : null
 }

modules/vpc_peering/variables.tf

@@ -1,36 +1,41 @@
 variable "accepter_vpc_id" {
   type        = string
-  description = "The ID of Acceptor VPC"
+  description = "Specify the unique identifier of the VPC that will act as the Acceptor in the VPC peering connection."
   default     = ""
 }
 
 variable "accepter_vpc_region" {
   type        = string
-  description = "The region of Acceptor VPC"
+  description = "Provide the AWS region where the Acceptor VPC is located. This helps in identifying the correct region for establishing the VPC peering connection."
   default     = ""
 }
 
 variable "requester_vpc_id" {
   type        = string
-  description = "The ID of Requester VPC"
+  description = "Specify the unique identifier of the VPC that will act as the Reqester in the VPC peering connection."
   default     = ""
 }
 
 variable "requester_vpc_region" {
   type        = string
-  description = "The region Requester VPC"
+  description = "Specify the AWS region where the Requester VPC resides. It ensures the correct region is used for setting up the VPC peering."
   default     = ""
 }
 
-
-variable "create" {
-  description = "Set it to true to create VPC peering"
-  type        = bool
-  default     = true
+variable "requester_name" {
+  type        = string
+  description = "Provide a descriptive name or label for the VPC Requester. This helps identify and differentiate the Requester VPC in the peering connection."
+  default     = ""
 }
 
-variable "name" {
-  description = "Name for the VPC peering"
+variable "accepter_name" {
   type        = string
+  description = "Assign a meaningful name or label to the VPC Accepter. This aids in distinguishing the Accepter VPC within the VPC peering connection."
   default     = ""
 }
+
+variable "peering_enabled" {
+  type        = bool
+  description = "Set this variable to true if you want to create the VPC peering connection. Set it to false if you want to skip the creation process."
+  default     = true
+}