clean up

Author: npalm

examples/default/main.tf

@@ -98,7 +98,7 @@ module "runners" {
   runner_name_prefix = "${local.environment}_"
 
   # Enable debug logging for the lambda functions
-  log_level = "debug"
+  log_level = "info"
 
   enable_ami_housekeeper = true
   ami_housekeeper_cleanup_config = {
@@ -117,14 +117,14 @@ module "runners" {
   }
 
   # enable metric creation  (experimental)
-  metrics = {
-    enable = true
-    metric = {
-      enable_spot_termination_warning = true
-      enable_job_retry                = false
-      enable_github_app_rate_limit    = false
-    }
-  }
+  # metrics = {
+  #   enable = true
+  #   metric = {
+  #     enable_spot_termination_warning = true
+  #     enable_job_retry                = false
+  #     enable_github_app_rate_limit    = false
+  #   }
+  # }
 
   # enable job_retry feature. Be careful with this feature, it can lead to you hitting API rate limits.
   # job_retry = {

lambdas/functions/termination-watcher/src/termination-warning.ts

@@ -24,7 +24,7 @@ async function createMetricForInstances(
   for (const instance of instances) {
     const matchFilter = tagFilter(instance, config.tagFilters);
 
-    if (matchFilter && instance) {
+    if (matchFilter) {
       metricEvent(instance, event, config.createSpotWarningMetric ? 'SpotInterruptionWarning' : undefined, logger);
     } else {
       logger.debug(

lambdas/functions/termination-watcher/src/termination.ts

@@ -3,7 +3,7 @@ import { BidEvictedDetail, BidEvictedEvent } from './types';
 import { EC2Client } from '@aws-sdk/client-ec2';
 import { Config } from './ConfigResolver';
 import { metricEvent } from './metric-event';
-import { getInstances } from './ec2';
+import { getInstances, tagFilter } from './ec2';
 
 const logger = createChildLogger('termination-handler');
 
@@ -26,11 +26,9 @@ async function createMetricForInstances(
 
   // check if all tags in config.tagFilter are present on the instance
   for (const instance of instances) {
-    const matchFilter = Object.keys(config.tagFilters).every((key) => {
-      return instance?.Tags?.find((tag) => tag.Key === key && tag.Value?.startsWith(config.tagFilters[key]));
-    });
+    const matchFilter = tagFilter(instance, config.tagFilters);
 
-    if (matchFilter && instance) {
+    if (matchFilter) {
       metricEvent(instance, event, config.createSpotTerminationMetric ? 'SpotTermination' : undefined, logger);
     } else {
       logger.debug(