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

plus3it · Sep 14, 2020 · e9eac46 · e9eac46
2 parents 9ca25a7 + 486f4da
commit e9eac46
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 61 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,7 +1,6 @@
 [bumpversion]
-current_version = 1.1.0
+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
@@ -20,7 +20,6 @@ Terraform module to create a VPC Flow Log
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| create\_vpc\_flow\_log | Controls whether to create the VPC Flow Log | `bool` | `true` | no |
 | iam\_role\_arn | (Optional) ARN for the IAM role to attach to the flow log. If blank, a minimal role will be created | `string` | `null` | no |
 | log\_destination | (Optional) The ARN of the logging destination. | `string` | `null` | no |
 | log\_destination\_type | Controls whether to create the VPC Flow Log with a `cloud-watch-logs` or `s3` bucket destination | `string` | `null` | no |

diff --git a/main.tf b/main.tf
@@ -1,6 +1,3 @@
-provider "aws" {
-}
-
 locals {
   iam_role_name   = "flow-log-${format("%v", var.vpc_id)}"
   log_group_name  = var.log_group_name == null ? "/aws/vpc/flow-log/${format("%v", var.vpc_id)}" : var.log_group_name
@@ -12,7 +9,7 @@ data "aws_partition" "current" {
 }
 
 data "aws_iam_policy_document" "role" {
-  count = var.create_vpc_flow_log && local.create_iam_role ? 1 : 0
+  count = local.create_iam_role ? 1 : 0
 
   statement {
     actions = [
@@ -31,7 +28,7 @@ data "aws_iam_policy_document" "role" {
 }
 
 data "aws_iam_policy_document" "trust" {
-  count = var.create_vpc_flow_log && local.create_iam_role ? 1 : 0
+  count = local.create_iam_role ? 1 : 0
 
   statement {
     actions = ["sts:AssumeRole"]
@@ -44,7 +41,6 @@ data "aws_iam_policy_document" "trust" {
 }
 
 resource "aws_flow_log" "this" {
-  count = var.create_vpc_flow_log ? 1 : 0
 
   log_destination_type = var.log_destination_type
   log_destination      = var.log_destination_type == "s3" ? var.log_destination : join("", aws_cloudwatch_log_group.this.*.arn)
@@ -55,22 +51,22 @@ resource "aws_flow_log" "this" {
 }
 
 resource "aws_cloudwatch_log_group" "this" {
-  count = var.create_vpc_flow_log && var.log_destination_type == "cloud-watch-logs" ? 1 : 0
+  count = var.log_destination_type == "cloud-watch-logs" ? 1 : 0
 
   name = local.log_group_name
   tags = var.tags
 }
 
 resource "aws_iam_role" "this" {
-  count = var.create_vpc_flow_log && local.create_iam_role ? 1 : 0
+  count = local.create_iam_role ? 1 : 0
 
   name               = local.iam_role_name
   assume_role_policy = data.aws_iam_policy_document.trust[0].json
   tags               = var.tags
 }
 
 resource "aws_iam_role_policy" "this" {
-  count = var.create_vpc_flow_log && local.create_iam_role ? 1 : 0
+  count = local.create_iam_role ? 1 : 0
 
   name   = local.iam_role_name
   role   = aws_iam_role.this[0].id

diff --git a/outputs.tf b/outputs.tf
@@ -1,7 +1,7 @@
 # VPC Flow Log
 output "flow_log_id" {
   description = "The ID of the VPC Flow Log"
-  value       = join("", aws_flow_log.this.*.id)
+  value       = aws_flow_log.this.id
 }
 
 output "log_group_arn" {

diff --git a/tests/baseline_cloudwatch_logs/main.tf b/tests/baseline_cloudwatch_logs/main.tf
@@ -19,7 +19,6 @@ module "baseline_s3" {
     aws = aws
   }
 
-  create_vpc_flow_log  = true
   vpc_id               = module.vpc.vpc_id
   log_destination_type = "cloud-watch-logs"
 }
diff --git a/tests/baseline_s3/main.tf b/tests/baseline_s3/main.tf
@@ -28,7 +28,6 @@ module "baseline_s3" {
     aws = aws
   }
 
-  create_vpc_flow_log  = true
   vpc_id               = module.vpc.vpc_id
   log_destination_type = "s3"
   log_destination      = aws_s3_bucket.this.arn

diff --git a/tests/baseline_s3_log_format/main.tf b/tests/baseline_s3_log_format/main.tf
@@ -28,7 +28,6 @@ module "baseline_s3_log_format" {
     aws = aws
   }
 
-  create_vpc_flow_log  = true
   vpc_id               = module.vpc.vpc_id
   log_destination_type = "s3"
   log_destination      = aws_s3_bucket.this.arn

diff --git a/tests/no_create/README.md b/tests/no_create/README.md
diff --git a/tests/no_create/main.tf b/tests/no_create/main.tf
diff --git a/tests/no_create/versions.tf b/tests/no_create/versions.tf
diff --git a/variables.tf b/variables.tf
@@ -1,9 +1,3 @@
-variable "create_vpc_flow_log" {
-  description = "Controls whether to create the VPC Flow Log"
-  type        = bool
-  default     = true
-}
-
 variable "log_destination_type" {
   description = "Controls whether to create the VPC Flow Log with a `cloud-watch-logs` or `s3` bucket destination"
   type        = string