2 small fixes (#251)

pmoranga · web-flow · commit 28d1574c32ca · 2022-01-25T13:30:16.000-08:00
* Fix related to previous #173 #243 * Fix issue where sourcing elasticsearch-logging.sh failed, do not rely on sh * Fix related to previous #173 #243: return non-empty
diff --git a/templates/Makefile b/templates/Makefile
@@ -53,7 +53,7 @@ update-k8s-conf:
 	aws eks --region $(AWS_DEFAULT_REGION) update-kubeconfig --role "arn:aws:iam::<% index .Params `accountId` %>:role/$(PROJECT)-kubernetes-$(ROLE)-$(ENVIRONMENT)" --name $(KUBE_CONTEXT) --alias $(KUBE_CONTEXT)
 
 post-apply-setup:
-	cd scripts && sh post-apply.sh
+	cd scripts && bash post-apply.sh
 
 teardown: teardown-k8s-utils teardown-env teardown-shared-env teardown-secrets teardown-remote-state teardown-shared-remote-state
 
diff --git a/templates/terraform/environments/shared/main.tf b/templates/terraform/environments/shared/main.tf
@@ -174,5 +174,5 @@ output "ci_user_name" {
 }
 
 output "cloudtrail_bucket_id" {
-  value = module.cloudtrail.cloudtrail_bucket_id
+  value = local.enable_cloudtrail > 0 ? module.cloudtrail[0].cloudtrail_bucket_id : "not-applicable"
 }

Original file line number	Diff line number	Diff line change
`@@ -174,5 +174,5 @@ output "ci_user_name" {`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`output "cloudtrail_bucket_id" {`
`177`		`- value = module.cloudtrail.cloudtrail_bucket_id`
	`177`	`+ value = local.enable_cloudtrail > 0 ? module.cloudtrail[0].cloudtrail_bucket_id : "not-applicable"`
`178`	`178`	`}`