Merge pull request #11 from olhado/fixing-null-arn

olhado · web-flow · commit fa452b8b5358 · 2020-10-05T12:14:20.000-04:00
Fixing null arn
diff --git a/aws_iam_role.tf b/aws_iam_role.tf
@@ -16,7 +16,7 @@ data "template_file" "aws_iam_role_policy" {
     # This checks to see if a new bucket exists (null check)
     # If it is null, just give a null so coalesce skips it
     # If not null, return the arn of the bucket, which is what we really need
-    s3_resource   = coalesce((length(aws_s3_bucket.bucket) > 0 ? aws_s3_bucket.bucket[0].arn : ""), var.existing_cloudtrail.s3_bucket_arn)
+    s3_resource   = coalesce((length(aws_s3_bucket.bucket) > 0 ? aws_s3_bucket.bucket[0].arn : ""), (var.existing_cloudtrail != null ? var.existing_cloudtrail.s3_bucket_arn : ""))
   }
 }
 
diff --git a/outputs.tf b/outputs.tf
@@ -39,7 +39,7 @@ output "s3_bucket_id" {
 }
 
 output "s3_bucket_arn" {
-  value = coalesce((length(aws_s3_bucket.bucket) > 0 ? aws_s3_bucket.bucket[0].arn : ""), var.existing_cloudtrail.s3_bucket_arn)
+  value = coalesce((length(aws_s3_bucket.bucket) > 0 ? aws_s3_bucket.bucket[0].arn : ""), (var.existing_cloudtrail != null ? var.existing_cloudtrail.s3_bucket_arn : ""))
 }
 
 output "iam_role_name" {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ data "template_file" "aws_iam_role_policy" {`
`16`	`16`	`# This checks to see if a new bucket exists (null check)`
`17`	`17`	`# If it is null, just give a null so coalesce skips it`
`18`	`18`	`# If not null, return the arn of the bucket, which is what we really need`
`19`		`- s3_resource = coalesce((length(aws_s3_bucket.bucket) > 0 ? aws_s3_bucket.bucket[0].arn : ""), var.existing_cloudtrail.s3_bucket_arn)`
	`19`	`+ s3_resource = coalesce((length(aws_s3_bucket.bucket) > 0 ? aws_s3_bucket.bucket[0].arn : ""), (var.existing_cloudtrail != null ? var.existing_cloudtrail.s3_bucket_arn : ""))`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ output "s3_bucket_id" {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`output "s3_bucket_arn" {`
`42`		`- value = coalesce((length(aws_s3_bucket.bucket) > 0 ? aws_s3_bucket.bucket[0].arn : ""), var.existing_cloudtrail.s3_bucket_arn)`
	`42`	`+ value = coalesce((length(aws_s3_bucket.bucket) > 0 ? aws_s3_bucket.bucket[0].arn : ""), (var.existing_cloudtrail != null ? var.existing_cloudtrail.s3_bucket_arn : ""))`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`output "iam_role_name" {`