Merge pull request #11 from zoitech/hotfix/policy-and-external-bucket

Hotfix/policy and external bucket
zoitech · Aug 24, 2018 · c8dcdff · c8dcdff
2 parents 50e8a2f + 22ce050
commit c8dcdff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/changelog.md b/changelog.md
@@ -24,4 +24,5 @@ IMPROVEMENTS:
 * formatted tf-files
 
 BUG FIXES:
-* n.a.
+* Dependency of Bucket and BucketPolicy
+* Usage of external Buckets
diff --git a/cloudtrail.tf b/cloudtrail.tf
@@ -1,7 +1,7 @@
 # CloudTrail
 resource "aws_cloudtrail" "global_Default" {
   name                          = "${var.trail_name}"
-  s3_bucket_name                = "${aws_s3_bucket.cloudtrail_bucket.id}"
+  s3_bucket_name                = "${local.bucket_name}"
   is_multi_region_trail         = true
   include_global_service_events = true
   enable_log_file_validation    = true

diff --git a/s3_cloudtrail.tf b/s3_cloudtrail.tf
@@ -13,10 +13,6 @@ resource "aws_s3_bucket" "cloudtrail_bucket" {
   }
 
   tags = "${merge(var.tags, map(var.name_tag_name, format("%s", local.bucket_name)))}"
-}
-
-resource "aws_s3_bucket_policy" "cloudtrail_bucket_policy" {
-  bucket = "${aws_s3_bucket.cloudtrail_bucket.bucket}"
 
   policy = <<EOF
 {