Merge branch 'main' into npalm/eventbridge

Author: npalm

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [5.17.2](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.17.1...v5.17.2) (2024-10-21)
+
+
+### Bug Fixes
+
+* spot termination watcher output multi runner ([#4194](https://github.com/philips-labs/terraform-aws-github-runner/issues/4194)) ([367b1b3](https://github.com/philips-labs/terraform-aws-github-runner/commit/367b1b38285d63c0cc0fb8a991f69dcbac227222))
+
 ## [5.17.1](https://github.com/philips-labs/terraform-aws-github-runner/compare/v5.17.0...v5.17.1) (2024-10-17)
 
 

modules/multi-runner/README.md

@@ -197,6 +197,7 @@ module "multi-runner" {
 | Name | Description |
 |------|-------------|
 | <a name="output_binaries_syncer_map"></a> [binaries\_syncer\_map](#output\_binaries\_syncer\_map) | n/a |
+| <a name="output_instance_termination_handler"></a> [instance\_termination\_handler](#output\_instance\_termination\_handler) | n/a |
 | <a name="output_instance_termination_watcher"></a> [instance\_termination\_watcher](#output\_instance\_termination\_watcher) | n/a |
 | <a name="output_queues"></a> [queues](#output\_queues) | SQS queues. |
 | <a name="output_runners_map"></a> [runners\_map](#output\_runners\_map) | n/a |

modules/multi-runner/outputs.tf

@@ -56,9 +56,17 @@ 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
+}
+
+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
 }