formatting

Author: npalm

examples/multi-runner/main.tf

@@ -51,8 +51,8 @@ locals {
         runner_config = merge(
           v.runner_config,
           {
-            subnet_ids               = lookup(v.runner_config, "subnet_ids", null) != null ? [module.base.vpc.private_subnets[0]] : null
-            vpc_id                   = lookup(v.runner_config, "vpc_id", null) != null ? module.base.vpc.vpc_id : null
+            subnet_ids = lookup(v.runner_config, "subnet_ids", null) != null ? [module.base.vpc.private_subnets[0]] : null
+            vpc_id     = lookup(v.runner_config, "vpc_id", null) != null ? module.base.vpc.vpc_id : null
             ami = merge(
               v.runner_config.ami,
               {

main.tf

@@ -178,7 +178,7 @@ module "runners" {
   block_device_mappings         = var.block_device_mappings
 
   runner_architecture       = var.runner_architecture
-  ami                      = var.ami
+  ami                       = var.ami
   ami_filter                = var.ami_filter
   ami_owners                = var.ami_owners
   ami_id_ssm_parameter_name = var.ami_id_ssm_parameter_name

modules/multi-runner/runners.tf

@@ -25,11 +25,11 @@ module "runners" {
   instance_max_spot_price       = each.value.runner_config.instance_max_spot_price
   block_device_mappings         = each.value.runner_config.block_device_mappings
 
-  runner_architecture       = each.value.runner_config.runner_architecture
-  ami                      = each.value.runner_config.ami
-  ami_filter                = each.value.runner_config.ami_filter
-  ami_owners                = each.value.runner_config.ami_owners
-  ami_kms_key_arn           = each.value.runner_config.ami_kms_key_arn
+  runner_architecture = each.value.runner_config.runner_architecture
+  ami                 = each.value.runner_config.ami
+  ami_filter          = each.value.runner_config.ami_filter
+  ami_owners          = each.value.runner_config.ami_owners
+  ami_kms_key_arn     = each.value.runner_config.ami_kms_key_arn
 
   sqs_build_queue                      = { "arn" : each.value.arn, "url" : each.value.url }
   github_app_parameters                = local.github_app_parameters

modules/multi-runner/variables.tf

@@ -66,19 +66,19 @@ variable "multi_runner_config" {
         http_put_response_hop_limit = 1
       })
       ami = optional(object({
-        filter                   = optional(map(list(string)), { state = ["available"] })
-        owners                   = optional(list(string), ["amazon"])
-        id_ssm_parameter_name    = optional(string, null)
-        id_ssm_parameter_arn     = optional(string, null)
-        kms_key_arn             = optional(string, null)
+        filter                = optional(map(list(string)), { state = ["available"] })
+        owners                = optional(list(string), ["amazon"])
+        id_ssm_parameter_name = optional(string, null)
+        id_ssm_parameter_arn  = optional(string, null)
+        kms_key_arn           = optional(string, null)
       }), null)
       # Deprecated: Use ami object instead
       ami = optional(object({
-        filter                   = optional(map(list(string)), { state = ["available"] })
-        owners                   = optional(list(string), ["amazon"])
-        id_ssm_parameter_name    = optional(string, null)
-        id_ssm_parameter_arn     = optional(string, null)
-        kms_key_arn             = optional(string, null)
+        filter                = optional(map(list(string)), { state = ["available"] })
+        owners                = optional(list(string), ["amazon"])
+        id_ssm_parameter_name = optional(string, null)
+        id_ssm_parameter_arn  = optional(string, null)
+        kms_key_arn           = optional(string, null)
       }), null)
       # Deprecated: Use ami object instead
       ami_filter                              = optional(map(list(string)), { state = ["available"] })

modules/runners/main.tf

@@ -42,8 +42,8 @@ locals {
     filter                = var.ami_filter
     owners                = var.ami_owners
     id_ssm_parameter_name = var.ami_id_ssm_parameter_name
-    id_ssm_parameter_arn = null
-    kms_key_arn          = var.ami_kms_key_arn
+    id_ssm_parameter_arn  = null
+    kms_key_arn           = var.ami_kms_key_arn
   }
   ami_kms_key_arn           = local.ami_config.kms_key_arn != null ? local.ami_config.kms_key_arn : ""
   ami_filter                = merge(local.default_ami[var.runner_os], local.ami_config.filter)

modules/runners/variables.tf

@@ -1,11 +1,11 @@
 variable "ami" {
   description = "AMI configuration for the action runner instances"
   type = object({
-    filter                   = optional(map(list(string)), { state = ["available"] })
-    owners                   = optional(list(string), ["amazon"])
-    id_ssm_parameter_name    = optional(string, null)
-    id_ssm_parameter_arn     = optional(string, null)
-    kms_key_arn             = optional(string, null)
+    filter                = optional(map(list(string)), { state = ["available"] })
+    owners                = optional(list(string), ["amazon"])
+    id_ssm_parameter_name = optional(string, null)
+    id_ssm_parameter_arn  = optional(string, null)
+    kms_key_arn           = optional(string, null)
   })
   default = null
 }

variables.tf

@@ -369,11 +369,11 @@ variable "block_device_mappings" {
 variable "ami" {
   description = "AMI configuration for the action runner instances"
   type = object({
-    filter                   = optional(map(list(string)), { state = ["available"] })
-    owners                   = optional(list(string), ["amazon"])
-    id_ssm_parameter_name    = optional(string, null)
-    id_ssm_parameter_arn     = optional(string, null)
-    kms_key_arn             = optional(string, null)
+    filter                = optional(map(list(string)), { state = ["available"] })
+    owners                = optional(list(string), ["amazon"])
+    id_ssm_parameter_name = optional(string, null)
+    id_ssm_parameter_arn  = optional(string, null)
+    kms_key_arn           = optional(string, null)
   })
   default = null
 }