From dd26fb718406dc987cf1e0fbab2eb385bcfd1a49 Mon Sep 17 00:00:00 2001 From: Niek Palm Date: Mon, 21 Oct 2024 15:36:01 +0200 Subject: [PATCH 1/3] fix: spot termination watcher output multi runner --- modules/multi-runner/outputs.tf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/multi-runner/outputs.tf b/modules/multi-runner/outputs.tf index 47363ef35f..35721526e6 100644 --- a/modules/multi-runner/outputs.tf +++ b/modules/multi-runner/outputs.tf @@ -59,3 +59,11 @@ output "instance_termination_watcher" { lambda_role = module.instance_termination_watcher[0].lambda.role } : null } + +output "instance_termination_handler" { + value = var.instance_termination_watcher.enable && var.instance_termination_watcher.features.enable_spot_termination_handler ? { + lambda = module.instance_termination_watcher[0].spot_termination_handler.lambda + lambda_log_group = module.instance_termination_watcher[0].spot_termination_handler.lambda_log_group + lambda_role = module.instance_termination_watcher[0].spot_termination_handler.lambda_role + } : null +} From c5ca26cf0b0df6b7bbffce7623da546d50688895 Mon Sep 17 00:00:00 2001 From: philips-labs-pr|bot Date: Mon, 21 Oct 2024 13:36:34 +0000 Subject: [PATCH 2/3] docs: auto update terraform docs --- modules/multi-runner/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/multi-runner/README.md b/modules/multi-runner/README.md index bb594e83f0..1e399a1a1c 100644 --- a/modules/multi-runner/README.md +++ b/modules/multi-runner/README.md @@ -196,6 +196,7 @@ module "multi-runner" { | Name | Description | |------|-------------| | [binaries\_syncer\_map](#output\_binaries\_syncer\_map) | n/a | +| [instance\_termination\_handler](#output\_instance\_termination\_handler) | n/a | | [instance\_termination\_watcher](#output\_instance\_termination\_watcher) | n/a | | [queues](#output\_queues) | SQS queues. | | [runners\_map](#output\_runners\_map) | n/a | From b6e0314093b6543bf1ef262ba38ffef870ad6b2c Mon Sep 17 00:00:00 2001 From: Niek Palm Date: Mon, 21 Oct 2024 15:39:20 +0200 Subject: [PATCH 3/3] fix: spot termination watcher output multi runner --- modules/multi-runner/outputs.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/multi-runner/outputs.tf b/modules/multi-runner/outputs.tf index 35721526e6..bc6624be27 100644 --- a/modules/multi-runner/outputs.tf +++ b/modules/multi-runner/outputs.tf @@ -53,10 +53,10 @@ output "queues" { } output "instance_termination_watcher" { - value = var.instance_termination_watcher.enable ? { - lambda = module.instance_termination_watcher[0].lambda.function - lambda_log_group = module.instance_termination_watcher[0].lambda.log_group - lambda_role = module.instance_termination_watcher[0].lambda.role + value = var.instance_termination_watcher.enable && var.instance_termination_watcher.features.enable_spot_termination_notification_watcher ? { + lambda = module.instance_termination_watcher[0].spot_termination_notification.lambda + lambda_log_group = module.instance_termination_watcher[0].spot_termination_notification.lambda_log_group + lambda_role = module.instance_termination_watcher[0].spot_termination_notification.lambda_role } : null }