LB resources only for LoadBalanced env type (#130)

okgolove · web-flow · commit 427b9ccd7ace · 2020-08-18T01:30:48.000-07:00
diff --git a/main.tf b/main.tf
@@ -896,11 +896,11 @@ resource "aws_elastic_beanstalk_environment" "default" {
 }
 
 data "aws_elb_service_account" "main" {
-  count = var.tier == "WebServer" ? 1 : 0
+  count = var.tier == "WebServer" && var.environment_type == "LoadBalanced" ? 1 : 0
 }
 
 data "aws_iam_policy_document" "elb_logs" {
-  count = var.tier == "WebServer" ? 1 : 0
+  count = var.tier == "WebServer" && var.environment_type == "LoadBalanced" ? 1 : 0
 
   statement {
     sid = ""
@@ -923,7 +923,7 @@ data "aws_iam_policy_document" "elb_logs" {
 }
 
 resource "aws_s3_bucket" "elb_logs" {
-  count         = var.tier == "WebServer" ? 1 : 0
+  count         = var.tier == "WebServer" && var.environment_type == "LoadBalanced" ? 1 : 0
   bucket        = "${module.label.id}-eb-loadbalancer-logs"
   acl           = "private"
   force_destroy = var.force_destroy

Original file line number	Diff line number	Diff line change
`@@ -896,11 +896,11 @@ resource "aws_elastic_beanstalk_environment" "default" {`
`896`	`896`	`}`
`897`	`897`
`898`	`898`	`data "aws_elb_service_account" "main" {`
`899`		`- count = var.tier == "WebServer" ? 1 : 0`
	`899`	`+ count = var.tier == "WebServer" && var.environment_type == "LoadBalanced" ? 1 : 0`
`900`	`900`	`}`
`901`	`901`
`902`	`902`	`data "aws_iam_policy_document" "elb_logs" {`
`903`		`- count = var.tier == "WebServer" ? 1 : 0`
	`903`	`+ count = var.tier == "WebServer" && var.environment_type == "LoadBalanced" ? 1 : 0`
`904`	`904`
`905`	`905`	`statement {`
`906`	`906`	`sid = ""`
`@@ -923,7 +923,7 @@ data "aws_iam_policy_document" "elb_logs" {`
`923`	`923`	`}`
`924`	`924`
`925`	`925`	`resource "aws_s3_bucket" "elb_logs" {`
`926`		`- count = var.tier == "WebServer" ? 1 : 0`
	`926`	`+ count = var.tier == "WebServer" && var.environment_type == "LoadBalanced" ? 1 : 0`
`927`	`927`	`bucket = "${module.label.id}-eb-loadbalancer-logs"`
`928`	`928`	`acl = "private"`
`929`	`929`	`force_destroy = var.force_destroy`