Skip to content

Commit 28d1574

Browse files
authored
2 small fixes (#251)
* 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
1 parent e6bbd06 commit 28d1574

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

templates/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ update-k8s-conf:
5353
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)
5454

5555
post-apply-setup:
56-
cd scripts && sh post-apply.sh
56+
cd scripts && bash post-apply.sh
5757

5858
teardown: teardown-k8s-utils teardown-env teardown-shared-env teardown-secrets teardown-remote-state teardown-shared-remote-state
5959

templates/terraform/environments/shared/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,5 +174,5 @@ output "ci_user_name" {
174174
}
175175

176176
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"
178178
}

0 commit comments

Comments
 (0)