Merge pull request #81 from jysaad/remove-enable-variable

plus3it · Sep 14, 2020 · d0b3b5c · d0b3b5c
2 parents a726808 + 77e3553
commit d0b3b5c
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 118 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,7 +1,6 @@
 [bumpversion]
-current_version = 1.0.3
+current_version = 2.0.0
 commit = True
 message = Bumps version to {new_version}
 tag = False
 tag_name = {new_version}
-
diff --git a/README.md b/README.md
@@ -22,7 +22,6 @@ Terraform module to create an EC2 security group
 |------|-------------|------|---------|:--------:|
 | name | Name of the Security Group | `string` | n/a | yes |
 | vpc\_id | VPC ID in which to create the Security Group | `string` | n/a | yes |
-| create\_sg | Toggle controlling whether to create the security group | `bool` | `true` | no |
 | description | Description of the Security Group | `string` | `"Managed by Terraform"` | no |
 | egress\_rules | A schema list of egress rules for the Security Group, see <https://www.terraform.io/docs/providers/aws/r/security_group.html#egress> | `list` | `[]` | no |
 | ingress\_rules | A schema list of ingress rules for the Security Group, see <https://www.terraform.io/docs/providers/aws/r/security_group.html#ingress> | `list` | `[]` | no |

diff --git a/main.tf b/main.tf
@@ -2,7 +2,6 @@ provider "aws" {
 }
 
 resource "aws_security_group" "this" {
-  count = var.create_sg ? 1 : 0
 
   name        = var.name
   description = var.description

diff --git a/outputs.tf b/outputs.tf
@@ -1,19 +1,19 @@
 output "id" {
   description = "The ID of the Security Group"
-  value       = join("", aws_security_group.this.*.id)
+  value       = aws_security_group.this.id
 }
 
 output "arn" {
   description = "The ARN of the Security Group"
-  value       = join("", aws_security_group.this.*.arn)
+  value       = aws_security_group.this.arn
 }
 
 output "name" {
   description = "The name of the Security Group"
-  value       = join("", aws_security_group.this.*.name)
+  value       = aws_security_group.this.name
 }
 
 output "owner_id" {
   description = "The owner ID of the Security Group"
-  value       = join("", aws_security_group.this.*.owner_id)
+  value       = aws_security_group.this.owner_id
 }
diff --git a/tests/create_sg/README.md b/tests/create_sg/README.md
diff --git a/tests/create_sg/main.tf b/tests/create_sg/main.tf
@@ -18,9 +18,8 @@ module "create_security_group" {
     aws = aws
   }
 
-  create_sg = true
-  name      = "tardigrade-security-group-testing"
-  vpc_id    = module.vpc.vpc_id
+  name   = "tardigrade-security-group-testing"
+  vpc_id = module.vpc.vpc_id
   tags = {
     environment = "testing"
   }

diff --git a/tests/create_sg/versions.tf b/tests/create_sg/versions.tf
diff --git a/tests/no_create_sg/README.md b/tests/no_create_sg/README.md
diff --git a/tests/no_create_sg/main.tf b/tests/no_create_sg/main.tf
diff --git a/tests/no_create_sg/versions.tf b/tests/no_create_sg/versions.tf
diff --git a/tests/use_all_variables/README.md b/tests/use_all_variables/README.md
diff --git a/tests/use_all_variables/main.tf b/tests/use_all_variables/main.tf
@@ -18,9 +18,8 @@ module "use_all_variables" {
     aws = aws
   }
 
-  create_sg = true
-  name      = "tardigrade-security-group-testing"
-  vpc_id    = module.vpc.vpc_id
+  name   = "tardigrade-security-group-testing"
+  vpc_id = module.vpc.vpc_id
   ingress_rules = [
     {
       "from_port"   = "0",

diff --git a/tests/use_all_variables/versions.tf b/tests/use_all_variables/versions.tf
diff --git a/variables.tf b/variables.tf
@@ -1,9 +1,3 @@
-variable "create_sg" {
-  description = "Toggle controlling whether to create the security group"
-  type        = bool
-  default     = true
-}
-
 variable "name" {
   description = "Name of the Security Group"
   type        = string