fix: only tag spot requests if no on-demand fallback

Author: pwo3

lambdas/functions/control-plane/src/aws/runners.ts

@@ -4,6 +4,7 @@ import {
   CreateTagsCommand,
   DescribeInstancesCommand,
   DescribeInstancesResult,
+  DescribeLaunchTemplateVersionsCommand,
   EC2Client,
   FleetLaunchTemplateOverridesRequest,
   Tag,
@@ -227,6 +228,22 @@ async function getAmiIdOverride(runnerParameters: Runners.RunnerInputParameters)
   }
 }
 
+async function getLaunchTemplateTags(
+  runnerParameters: Runners.RunnerInputParameters,
+  ec2Client: EC2Client,
+): Promise<Tag[] | undefined> {
+  const command = new DescribeLaunchTemplateVersionsCommand({
+    LaunchTemplateName: runnerParameters.launchTemplateName,
+    Versions: ['$Default'],
+  });
+  const response = await ec2Client.send(command);
+  const launchTemplateTags = response.LaunchTemplateVersions?.[0]?.LaunchTemplateData?.TagSpecifications?.flatMap(
+    ({ Tags }) => Tags,
+  ).filter((tag) => tag !== undefined);
+
+  return launchTemplateTags || [];
+}
+
 async function createInstances(
   runnerParameters: Runners.RunnerInputParameters,
   amiIdOverride: string | undefined,
@@ -239,6 +256,8 @@ async function createInstances(
     { Key: 'ghr:Owner', Value: runnerParameters.runnerOwner },
   ];
 
+  const launchTemplateTags = await getLaunchTemplateTags(runnerParameters, ec2Client);
+
   if (runnerParameters.tracingEnabled) {
     const traceId = tracer.getRootXrayTraceId();
     tags.push({ Key: 'ghr:trace_id', Value: traceId! });
@@ -278,6 +297,10 @@ async function createInstances(
           ResourceType: 'volume',
           Tags: tags,
         },
+        {
+          ResourceType: 'spot-instances-request',
+          Tags: runnerParameters.ec2instanceCriteria.targetCapacityType === 'spot' ? launchTemplateTags : undefined,
+        },
       ],
       Type: 'instant',
     });

modules/runners/main.tf

@@ -206,23 +206,6 @@ resource "aws_launch_template" "runner" {
     )
   }
 
-  dynamic "tag_specifications" {
-    for_each = var.instance_target_capacity_type == "spot" && var.enable_on_demand_failover_for_errors == null ? [1] : [] # Include the block only if the value is "spot" and on_demand_failover_for_errors is not enabled
-    content {
-      resource_type = "spot-instances-request"
-      tags = merge(
-        local.tags,
-        {
-          "Name" = format("%s", local.name_runner)
-        },
-        {
-          "ghr:runner_name_prefix" = var.runner_name_prefix
-        },
-        var.runner_ec2_tags
-      )
-    }
-  }
-
   tag_specifications {
     resource_type = "network-interface"
     tags = merge(