From 1ab30365b8cacbaee5218b435357a16be6bc8ef4 Mon Sep 17 00:00:00 2001 From: Scott Ford Date: Wed, 17 Jun 2020 11:34:43 -0700 Subject: [PATCH] chore(aws) rename enable_cloudtrail => use_existing_cloudtrail (#34) chore(aws) rename enable_cloudtrail => use_existing_cloudtrail Signed-off-by: Scott Ford Co-authored-by: Salim Afiune --- .../examples/existing-cloudtrail-iam-role/main.tf | 6 +++--- aws/modules/cloudtrail/examples/existing-cloudtrail/main.tf | 6 +++--- aws/modules/cloudtrail/main.tf | 4 ++-- aws/modules/cloudtrail/variables.tf | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aws/modules/cloudtrail/examples/existing-cloudtrail-iam-role/main.tf b/aws/modules/cloudtrail/examples/existing-cloudtrail-iam-role/main.tf index 6d04fba..1d79495 100644 --- a/aws/modules/cloudtrail/examples/existing-cloudtrail-iam-role/main.tf +++ b/aws/modules/cloudtrail/examples/existing-cloudtrail-iam-role/main.tf @@ -6,9 +6,9 @@ module "aws_cloudtrail" { source = "../../" # Use an existing CloudTrail - enable_cloudtrail = false - bucket_name = "lacework-ct-bucket-7bb591f4" - sns_topic_name = "lacework-ct-sns-7bb591f4" + use_existing_cloudtrail = true + bucket_name = "lacework-ct-bucket-7bb591f4" + sns_topic_name = "lacework-ct-sns-7bb591f4" # Use an existing IAM role use_existing_iam_role = true diff --git a/aws/modules/cloudtrail/examples/existing-cloudtrail/main.tf b/aws/modules/cloudtrail/examples/existing-cloudtrail/main.tf index f9c9c0a..8a6c627 100644 --- a/aws/modules/cloudtrail/examples/existing-cloudtrail/main.tf +++ b/aws/modules/cloudtrail/examples/existing-cloudtrail/main.tf @@ -6,8 +6,8 @@ module "aws_cloudtrail" { source = "../../" # Use an existing CloudTrail - enable_cloudtrail = false - bucket_name = "lacework-ct-bucket-8805c0bf" - sns_topic_name = "lacework-ct-sns-8805c0bf" + use_existing_cloudtrail = true + bucket_name = "lacework-ct-bucket-8805c0bf" + sns_topic_name = "lacework-ct-sns-8805c0bf" } diff --git a/aws/modules/cloudtrail/main.tf b/aws/modules/cloudtrail/main.tf index 3daa286..2e62177 100644 --- a/aws/modules/cloudtrail/main.tf +++ b/aws/modules/cloudtrail/main.tf @@ -16,7 +16,7 @@ resource "random_id" "uniq" { } resource "aws_cloudtrail" "lacework_cloudtrail" { - count = var.enable_cloudtrail ? 1 : 0 + count = var.use_existing_cloudtrail ? 0 : 1 name = var.cloudtrail_name is_multi_region_trail = true s3_bucket_name = local.bucket_name @@ -27,7 +27,7 @@ resource "aws_cloudtrail" "lacework_cloudtrail" { # we need the identity of the caller to get their account_id for the s3 bucket data "aws_caller_identity" "current" {} resource "aws_s3_bucket" "cloudtrail_bucket" { - count = var.enable_cloudtrail ? 1 : 0 + count = var.use_existing_cloudtrail ? 0 : 1 bucket = local.bucket_name force_destroy = var.bucket_force_destroy policy = <