remove arn from top level

npalm · npalm · commit f3e6cb4f4a1a · 2025-04-04T19:06:43.000+02:00
diff --git a/examples/multi-runner/main.tf b/examples/multi-runner/main.tf
@@ -53,7 +53,12 @@ locals {
           {
             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_id_ssm_parameter_arn = lookup(local.ssm_ami_arns, k, null) != null ? local.ssm_ami_arns[k] : null
+            ami = merge(
+              v.runner_config.ami,
+              {
+                id_ssm_parameter_arn = lookup(local.ssm_ami_arns, k, null) != null ? local.ssm_ami_arns[k] : null
+              }
+            )
           }
         )
       }
diff --git a/main.tf b/main.tf
@@ -181,7 +181,6 @@ module "runners" {
   ami                      = var.ami
   ami_filter                = var.ami_filter
   ami_owners                = var.ami_owners
-  ami_id_ssm_parameter_arn  = var.ami_id_ssm_parameter_arn
   ami_id_ssm_parameter_name = var.ami_id_ssm_parameter_name
   ami_kms_key_arn           = var.ami_kms_key_arn
 
diff --git a/modules/multi-runner/outputs.tf b/modules/multi-runner/outputs.tf
@@ -73,7 +73,7 @@ output "deprecated_variables_warning" {
   value = join("", [
     for key, runner_config in var.multi_runner_config : (
       try(runner_config.ami_id_ssm_parameter_name, null) != null ?
-      "DEPRECATION WARNING: The variable 'ami_id_ssm_parameter_name' in runner '${key}' is deprecated and will be removed in a future version. Please use 'ami_id_ssm_parameter_arn' instead.\n" :
+      "DEPRECATION WARNING: The variable 'ami_id_ssm_parameter_name' in runner '${key}' is deprecated and will be removed in a future version. Please use 'ami.id_ssm_parameter_arn' instead.\n" :
       ""
     )
   ])
diff --git a/modules/multi-runner/runners.tf b/modules/multi-runner/runners.tf
@@ -29,8 +29,6 @@ module "runners" {
   ami                      = each.value.runner_config.ami
   ami_filter                = each.value.runner_config.ami_filter
   ami_owners                = each.value.runner_config.ami_owners
-  ami_id_ssm_parameter_arn  = each.value.runner_config.ami_id_ssm_parameter_arn
-  ami_id_ssm_parameter_name = each.value.runner_config.ami_id_ssm_parameter_name
   ami_kms_key_arn           = each.value.runner_config.ami_kms_key_arn
 
   sqs_build_queue                      = { "arn" : each.value.arn, "url" : each.value.url }
diff --git a/modules/multi-runner/variables.tf b/modules/multi-runner/variables.tf
@@ -83,7 +83,6 @@ variable "multi_runner_config" {
       # Deprecated: Use ami object instead
       ami_filter                              = optional(map(list(string)), { state = ["available"] })
       ami_owners                              = optional(list(string), ["amazon"])
-      ami_id_ssm_parameter_arn                = optional(string, null)
       ami_id_ssm_parameter_name               = optional(string, null)
       ami_kms_key_arn                         = optional(string, "")
       create_service_linked_role_spot         = optional(bool, false)
diff --git a/modules/runners/main.tf b/modules/runners/main.tf
@@ -42,7 +42,7 @@ locals {
     filter                = var.ami_filter
     owners                = var.ami_owners
     id_ssm_parameter_name = var.ami_id_ssm_parameter_name
-    id_ssm_parameter_arn  = var.ami_id_ssm_parameter_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 : ""
@@ -170,7 +170,7 @@ resource "aws_launch_template" "runner" {
   }
 
   instance_initiated_shutdown_behavior = "terminate"
-  image_id                             = "resolve:ssm:${local.ami_id_ssm_module_managed ? aws_ssm_parameter.runner_ami_id[0].arn : var.ami_id_ssm_parameter_arn}"
+  image_id                             = "resolve:ssm:${local.ami_id_ssm_module_managed ? aws_ssm_parameter.runner_ami_id[0].arn : var.ami.id_ssm_parameter_arn}"
   key_name                             = var.key_name
   ebs_optimized                        = var.ebs_optimized
 
diff --git a/modules/runners/pool.tf b/modules/runners/pool.tf
@@ -17,7 +17,7 @@ module "pool" {
     instance_types                = var.instance_types
     kms_key_arn                   = local.kms_key_arn
     ami_kms_key_arn               = local.ami_kms_key_arn
-    ami_id_ssm_parameter_arn      = local.ami_id_ssm_module_managed ? aws_ssm_parameter.runner_ami_id[0].arn : var.ami_id_ssm_parameter_arn
+    ami_id_ssm_parameter_arn      = local.ami_id_ssm_module_managed ? aws_ssm_parameter.runner_ami_id[0].arn : var.ami.id_ssm_parameter_arn
     lambda = {
       log_level                      = var.log_level
       logging_retention_in_days      = var.logging_retention_in_days
diff --git a/modules/runners/scale-up.tf b/modules/runners/scale-up.tf
@@ -119,7 +119,7 @@ resource "aws_iam_role_policy" "scale_up" {
     ssm_config_path           = "arn:${var.aws_partition}:ssm:${var.aws_region}:${data.aws_caller_identity.current.account_id}:parameter${var.ssm_paths.root}/${var.ssm_paths.config}"
     kms_key_arn               = local.kms_key_arn
     ami_kms_key_arn           = local.ami_kms_key_arn
-    ssm_ami_id_parameter_arn  = local.ami_id_ssm_module_managed ? aws_ssm_parameter.runner_ami_id[0].arn : var.ami_id_ssm_parameter_arn
+    ssm_ami_id_parameter_arn  = local.ami_id_ssm_module_managed ? aws_ssm_parameter.runner_ami_id[0].arn : var.ami.id_ssm_parameter_arn
   })
 }
 
diff --git a/modules/runners/variables.tf b/modules/runners/variables.tf
@@ -142,12 +142,6 @@ variable "ami_owners" {
   default     = ["amazon"]
 }
 
-variable "ami_id_ssm_parameter_arn" {
-  description = "[DEPRECATED: Use ami.id_ssm_parameter_arn] ARN of the SSM parameter (of data type aws:ec2:image) that contains the AMI ID to launch runner instances from. Overrides ami_filter"
-  type        = string
-  default     = null
-}
-
 variable "ami_id_ssm_parameter_name" {
   description = "[DEPRECATED: Use ami.id_ssm_parameter_name] Externally managed SSM parameter (of data type aws:ec2:image) that contains the AMI ID to launch runner instances from. Overrides ami_filter"
   type        = string
diff --git a/outputs.tf b/outputs.tf
@@ -79,6 +79,6 @@ output "instance_termination_handler" {
 output "deprecated_variables_warning" {
   description = "Warning for deprecated variables usage"
   value = join("", [
-    var.ami_id_ssm_parameter_name != null ? "DEPRECATION WARNING: The variable 'ami_id_ssm_parameter_name' is deprecated and will be removed in a future version. Please use 'ami_id_ssm_parameter_arn' instead.\n" : "",
+    var.ami_id_ssm_parameter_name != null ? "DEPRECATION WARNING: The variable 'ami_id_ssm_parameter_name' is deprecated and will be removed in a future version. Please use 'ami.id_ssm_parameter_arn' instead.\n" : "",
   ])
 }
diff --git a/variables.tf b/variables.tf
@@ -401,12 +401,6 @@ variable "ami_id_ssm_parameter_name" {
   default     = null
 }
 
-variable "ami_id_ssm_parameter_arn" {
-  description = "[DEPRECATED: Use ami.id_ssm_parameter_arn] Arn of the SSM parameter used to resolve the AMI ID for the runner instances. The SSM parameter should be of type String and contain a valid AMI ID."
-  type        = string
-  default     = null
-}
-
 variable "ami_kms_key_arn" {
   description = "[DEPRECATED: Use ami.kms_key_arn] Optional CMK Key ARN to be used to launch an instance from a shared encrypted AMI"
   type        = string

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,12 @@ locals {`
`53`	`53`	`{`
`54`	`54`	`subnet_ids = lookup(v.runner_config, "subnet_ids", null) != null ? [module.base.vpc.private_subnets[0]] : null`
`55`	`55`	`vpc_id = lookup(v.runner_config, "vpc_id", null) != null ? module.base.vpc.vpc_id : null`
`56`		`- ami_id_ssm_parameter_arn = lookup(local.ssm_ami_arns, k, null) != null ? local.ssm_ami_arns[k] : null`
	`56`	`+ ami = merge(`
	`57`	`+ v.runner_config.ami,`
	`58`	`+ {`
	`59`	`+ id_ssm_parameter_arn = lookup(local.ssm_ami_arns, k, null) != null ? local.ssm_ami_arns[k] : null`
	`60`	`+ }`
	`61`	`+ )`
`57`	`62`	`}`
`58`	`63`	`)`
`59`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ output "deprecated_variables_warning" {`
`73`	`73`	`value = join("", [`
`74`	`74`	`for key, runner_config in var.multi_runner_config : (`
`75`	`75`	`try(runner_config.ami_id_ssm_parameter_name, null) != null ?`
`76`		`- "DEPRECATION WARNING: The variable 'ami_id_ssm_parameter_name' in runner '${key}' is deprecated and will be removed in a future version. Please use 'ami_id_ssm_parameter_arn' instead.\n" :`
	`76`	`+ "DEPRECATION WARNING: The variable 'ami_id_ssm_parameter_name' in runner '${key}' is deprecated and will be removed in a future version. Please use 'ami.id_ssm_parameter_arn' instead.\n" :`
`77`	`77`	`""`
`78`	`78`	`)`
`79`	`79`	`])`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ resource "aws_iam_role_policy" "scale_up" {`
`119`	`119`	`ssm_config_path = "arn:${var.aws_partition}:ssm:${var.aws_region}:${data.aws_caller_identity.current.account_id}:parameter${var.ssm_paths.root}/${var.ssm_paths.config}"`
`120`	`120`	`kms_key_arn = local.kms_key_arn`
`121`	`121`	`ami_kms_key_arn = local.ami_kms_key_arn`
`122`		`- ssm_ami_id_parameter_arn = local.ami_id_ssm_module_managed ? aws_ssm_parameter.runner_ami_id[0].arn : var.ami_id_ssm_parameter_arn`
	`122`	`+ ssm_ami_id_parameter_arn = local.ami_id_ssm_module_managed ? aws_ssm_parameter.runner_ami_id[0].arn : var.ami.id_ssm_parameter_arn`
`123`	`123`	`})`
`124`	`124`	`}`
`125`	`125`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,6 @@ output "instance_termination_handler" {`
`79`	`79`	`output "deprecated_variables_warning" {`
`80`	`80`	`description = "Warning for deprecated variables usage"`
`81`	`81`	`value = join("", [`
`82`		`- var.ami_id_ssm_parameter_name != null ? "DEPRECATION WARNING: The variable 'ami_id_ssm_parameter_name' is deprecated and will be removed in a future version. Please use 'ami_id_ssm_parameter_arn' instead.\n" : "",`
	`82`	`+ var.ami_id_ssm_parameter_name != null ? "DEPRECATION WARNING: The variable 'ami_id_ssm_parameter_name' is deprecated and will be removed in a future version. Please use 'ami.id_ssm_parameter_arn' instead.\n" : "",`
`83`	`83`	`])`
`84`	`84`	`}`