refactor(runner-stack): key provider output dynamically

Author: edersonbrilhante

modules/multi-runner/tests/provider-routing.tftest.hcl

@@ -203,7 +203,7 @@ run "experimental_v2_routes_through_provider_stack" {
   assert {
     condition = (
       local.compute_provider_types["linux"] == "ec2"
-      && local.runner_matcher_config["linux"].runnerProvider == "ec2"
+      && local.runner_matcher_config["linux"].computeProvider == "ec2"
     )
     error_message = "Compute-provider selection must supply the webhook routing contract."
   }

modules/multi-runner/webhook.tf

@@ -1,10 +1,10 @@
 locals {
   runner_matcher_config = {
     for k, v in local.multi_runner_config : k => {
-      id             = aws_sqs_queue.queued_builds[k].id
-      arn            = aws_sqs_queue.queued_builds[k].arn
-      runnerProvider = local.compute_provider_types[k]
-      matcherConfig  = v.matcherConfig
+      id              = aws_sqs_queue.queued_builds[k].id
+      arn             = aws_sqs_queue.queued_builds[k].arn
+      computeProvider = local.compute_provider_types[k]
+      matcherConfig   = v.matcherConfig
     }
   }
 }

modules/runner-stack/README.md

@@ -122,7 +122,7 @@ yarn run dist
 | Name | Description |
 |------|-------------|
 | <a name="output_pool"></a> [pool](#output\_pool) | Scheduled pool resources. Null when no pool configuration is supplied. |
-| <a name="output_provider"></a> [provider](#output\_provider) | Provider-specific resources grouped by compute provider. |
+| <a name="output_provider"></a> [provider](#output\_provider) | Provider-specific resources grouped under the selected provider key. |
 | <a name="output_runner"></a> [runner](#output\_runner) | Common runner resources. The role is null when an external runner role is used. |
 | <a name="output_scale_down"></a> [scale\_down](#output\_scale\_down) | Scale-down control-plane resources. |
 | <a name="output_scale_up"></a> [scale\_up](#output\_scale\_up) | Scale-up control-plane resources. |

modules/runner-stack/outputs.tf

@@ -21,8 +21,8 @@ output "pool" {
 }
 
 output "provider" {
-  description = "Provider-specific resources grouped by compute provider."
+  description = "Provider-specific resources grouped under the selected provider key."
   value = {
-    ec2 = local.provider.resources
+    (local.provider_type) = local.provider.resources
   }
 }

modules/runner-stack/scale-runners/scale-down.tf

@@ -31,7 +31,7 @@ resource "aws_lambda_function" "scale_down" {
       POWERTOOLS_TRACE_ENABLED                 = var.config.observability.tracing.mode != null
       POWERTOOLS_TRACER_CAPTURE_HTTPS_REQUESTS = var.config.observability.tracing.capture_http_requests
       POWERTOOLS_TRACER_CAPTURE_ERROR          = var.config.observability.tracing.capture_error
-      RUNNER_PROVIDER_TYPE                     = var.runner_provider.type
+      COMPUTE_PROVIDER_TYPE                    = var.runner_provider.type
     })
   }
 

modules/runner-stack/scale-runners/scale-up.tf

@@ -38,7 +38,7 @@ resource "aws_lambda_function" "scale_up" {
       RUNNER_LABELS                            = lower(join(",", var.config.runner.labels))
       RUNNER_GROUP_NAME                        = var.config.runner.group_name
       RUNNER_NAME_PREFIX                       = var.config.runner.name_prefix
-      RUNNER_PROVIDER_TYPE                     = var.runner_provider.type
+      COMPUTE_PROVIDER_TYPE                    = var.runner_provider.type
       RUNNERS_MAXIMUM_COUNT                    = var.config.runner.maximum_count
       POWERTOOLS_SERVICE_NAME                  = "${var.config.prefix}-scale-up"
       SSM_TOKEN_PATH                           = var.config.ssm.token_path

modules/runner-stack/scale-runners/tests/scale-runners.tftest.hcl

@@ -202,7 +202,8 @@ run "assembles_provider_neutral_scaling_control_plane" {
 
   assert {
     condition = (
-      aws_lambda_function.scale_up.environment[0].variables["RUNNER_PROVIDER_TYPE"] == "microvm"
+      aws_lambda_function.scale_up.environment[0].variables["COMPUTE_PROVIDER_TYPE"] == "microvm"
+      && aws_lambda_function.scale_down.environment[0].variables["COMPUTE_PROVIDER_TYPE"] == "microvm"
       && aws_lambda_function.scale_up.environment[0].variables["MICROVM_CLUSTER"] == "runner-cluster"
       && aws_lambda_function.scale_down.environment[0].variables["MICROVM_CLUSTER"] == "runner-cluster"
       && !contains(keys(aws_lambda_function.scale_up.environment[0].variables), "INSTANCE_TYPES")

modules/runner-stack/tests/pool.tftest.hcl

@@ -152,8 +152,11 @@ run "plan_with_pool_enabled" {
   }
 
   assert {
-    condition     = module.scale_runners.scale_up.lambda.environment[0].variables["RUNNER_PROVIDER_TYPE"] == "ec2"
-    error_message = "Scale-up must receive the provider type from the selected provider."
+    condition = (
+      module.scale_runners.scale_up.lambda.environment[0].variables["COMPUTE_PROVIDER_TYPE"] == "ec2"
+      && module.scale_runners.scale_down.lambda.environment[0].variables["COMPUTE_PROVIDER_TYPE"] == "ec2"
+    )
+    error_message = "Scaling Lambdas must receive the provider type from the selected provider."
   }
 
   assert {

modules/webhook/variables.tf

@@ -23,7 +23,7 @@ variable "tags" {
 }
 
 variable "runner_matcher_config" {
-  description = "SQS queue to publish accepted build events based on the runner type. `computeProvider` defaults to `ec2`; EC2 is currently the only Terraform-managed provider. When exact match is disabled the webhook accepts the event if one of the workflow job labels is part of the matcher. The priority defines the order the matchers are applied. Optional `matcherConfig.enableDynamicLabels` and `matcherConfig.awsDynamicLabelsPolicy` are evaluated by the dispatcher to gate provider dynamic labels per runner. The policy supports `blocked_keys = [<key>]` and `restricted_keys = { <key> = { allowed = [globs], denied = [globs], max = number|string } }`; keys use the provider dynamic label suffix form, for example `instance-type` for `ghr-ec2-instance-type`."
+  description = "SQS queue to publish accepted build events based on the runner type. `computeProvider` defaults to `ec2`; EC2 is the only provider currently implemented. When exact match is disabled the webhook accepts the event if one of the workflow job labels is part of the matcher. The priority defines the order the matchers are applied. Optional `matcherConfig.enableDynamicLabels` and `matcherConfig.awsDynamicLabelsPolicy` are evaluated by the dispatcher to gate provider dynamic labels per runner. The policy supports `blocked_keys = [<key>]` and `restricted_keys = { <key> = { allowed = [globs], denied = [globs], max = number|string } }`; keys use the provider dynamic label suffix form, for example `instance-type` for `ghr-ec2-instance-type`."
   type = map(object({
     arn             = string
     id              = string