Allow use_name_prefix override in submodules (#95)

terraform-aws-modules · Dec 28, 2018 · 469854a · 469854a
1 parent 9c0d748
commit 469854a
Show file tree

Hide file tree

Showing 103 changed files with 2,532 additions and 2,307 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,10 +1,10 @@
 repos:
 - repo: git://github.com/antonbabenko/pre-commit-terraform
-  rev: v1.7.3
+  rev: v1.8.1
   hooks:
     - id: terraform_fmt
     - id: terraform_docs
 - repo: git://github.com/pre-commit/pre-commit-hooks
-  rev: v1.3.0
+  rev: v2.1.0
   hooks:
     - id: check-merge-conflict
diff --git a/README.md b/README.md
diff --git a/examples/complete/README.md b/examples/complete/README.md
@@ -21,10 +21,10 @@ Note that this example may create resources which cost money. Run `terraform des
 
 | Name | Description |
 |------|-------------|
-| this_security_group_description | The description of the security group |
-| this_security_group_id | The ID of the security group |
-| this_security_group_name | The name of the security group |
-| this_security_group_owner_id | The owner ID |
-| this_security_group_vpc_id | The VPC ID |
+| this\_security\_group\_description | The description of the security group |
+| this\_security\_group\_id | The ID of the security group |
+| this\_security\_group\_name | The name of the security group |
+| this\_security\_group\_owner\_id | The owner ID |
+| this\_security\_group\_vpc\_id | The VPC ID |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/computed/README.md b/examples/computed/README.md
@@ -19,10 +19,10 @@ Note that this example may create resources which cost money. Run `terraform des
 
 | Name | Description |
 |------|-------------|
-| this_security_group_description | The description of the security group |
-| this_security_group_id | The ID of the security group |
-| this_security_group_name | The name of the security group |
-| this_security_group_owner_id | The owner ID |
-| this_security_group_vpc_id | The VPC ID |
+| this\_security\_group\_description | The description of the security group |
+| this\_security\_group\_id | The ID of the security group |
+| this\_security\_group\_name | The name of the security group |
+| this\_security\_group\_owner\_id | The owner ID |
+| this\_security\_group\_vpc\_id | The VPC ID |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/disabled/README.md b/examples/disabled/README.md
@@ -21,6 +21,6 @@ Note that this example may create resources which cost money. Run `terraform des
 
 | Name | Description |
 |------|-------------|
-| this_security_group_id | The ID of the security group |
+| this\_security\_group\_id | The ID of the security group |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/dynamic/README.md b/examples/dynamic/README.md
@@ -21,10 +21,10 @@ Note that this example may create resources which cost money. Run `terraform des
 
 | Name | Description |
 |------|-------------|
-| this_security_group_description | The description of the security group |
-| this_security_group_id | The ID of the security group |
-| this_security_group_name | The name of the security group |
-| this_security_group_owner_id | The owner ID |
-| this_security_group_vpc_id | The VPC ID |
+| this\_security\_group\_description | The description of the security group |
+| this\_security\_group\_id | The ID of the security group |
+| this\_security\_group\_name | The name of the security group |
+| this\_security\_group\_owner\_id | The owner ID |
+| this\_security\_group\_vpc\_id | The VPC ID |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/http/README.md b/examples/http/README.md
@@ -21,10 +21,10 @@ Note that this example may create resources which cost money. Run `terraform des
 
 | Name | Description |
 |------|-------------|
-| this_security_group_description | The description of the security group |
-| this_security_group_id | The ID of the security group |
-| this_security_group_name | The name of the security group |
-| this_security_group_owner_id | The owner ID |
-| this_security_group_vpc_id | The VPC ID |
+| this\_security\_group\_description | The description of the security group |
+| this\_security\_group\_id | The ID of the security group |
+| this\_security\_group\_name | The name of the security group |
+| this\_security\_group\_owner\_id | The owner ID |
+| this\_security\_group\_vpc\_id | The VPC ID |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/http/main.tf b/examples/http/main.tf
@@ -37,7 +37,9 @@ module "http_sg" {
 module "http_mysql_1_sg" {
   source = "../../modules/http-80"
 
-  name        = "http-mysql-1"
+  name            = "http-mysql-1"
+  use_name_prefix = false
+
   description = "Security group with HTTP and MySQL ports open for everybody (IPv4 CIDR)"
   vpc_id      = "${data.aws_vpc.default.id}"
 

diff --git a/modules/_templates/main.tf b/modules/_templates/main.tf
@@ -1,11 +1,12 @@
 module "sg" {
   source = "../../"
 
-  create      = "${var.create}"
-  name        = "${var.name}"
-  description = "${var.description}"
-  vpc_id      = "${var.vpc_id}"
-  tags        = "${var.tags}"
+  create          = "${var.create}"
+  name            = "${var.name}"
+  use_name_prefix = "${var.use_name_prefix}"
+  description     = "${var.description}"
+  vpc_id          = "${var.vpc_id}"
+  tags            = "${var.tags}"
 
   ##########
   # Ingress

diff --git a/modules/_templates/variables.tf b/modules/_templates/variables.tf
@@ -14,6 +14,11 @@ variable "name" {
   description = "Name of security group"
 }
 
+variable "use_name_prefix" {
+  description = "Whether to use name_prefix or fixed name. Should be true to able to update security group name after initial creation"
+  default     = true
+}
+
 variable "description" {
   description = "Description of security group"
   default     = "Security Group managed by Terraform"