feat(runners): rename ec2_custom_allowed_tags variable to ec2_custom_allowed_tags_creation for clarity

stuartp44 · stuartp44 · commit 771639882401 · 2025-09-18T10:31:36.000+01:00
diff --git a/modules/runners/policies-runner.tf b/modules/runners/policies-runner.tf
@@ -61,7 +61,7 @@ resource "aws_iam_role_policy" "create_tag" {
   name   = "runner-create-tags"
   role   = aws_iam_role.runner.name
   policy = templatefile("${path.module}/policies/instance-create-tags-policy.json", {
-    ec2_custom_allowed_tags = var.ec2_custom_allowed_tags
+    ec2_custom_allowed_tags = var.ec2_custom_allowed_tags_creation
   })
 }
 
diff --git a/modules/runners/policies/instance-create-tags-policy.json b/modules/runners/policies/instance-create-tags-policy.json
@@ -5,7 +5,7 @@
             "Action": "ec2:CreateTags",
             "Condition": {
                 "ForAllValues:StringEquals": {
-                    "aws:TagKeys": ${jsonencode(concat(["ghr:github_runner_id"], ec2_custom_allowed_tags))}
+                    "aws:TagKeys": ${jsonencode(concat(["ghr:github_runner_id"], ec2_custom_allowed_tags_creation))}
                 },
                 "StringEquals": {
                     "aws:ARN": "$${ec2:SourceInstanceARN}"
diff --git a/modules/runners/variables.tf b/modules/runners/variables.tf
@@ -762,7 +762,7 @@ variable "user_agent" {
   default     = null
 }
 
-variable "ec2_custom_allowed_tags" {
+variable "ec2_custom_allowed_tags_creation" {
   description = "Allows the EC2 instance to create tags listed here."
   type        = list(string)
   default     = []

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ resource "aws_iam_role_policy" "create_tag" {`
`61`	`61`	`name = "runner-create-tags"`
`62`	`62`	`role = aws_iam_role.runner.name`
`63`	`63`	`policy = templatefile("${path.module}/policies/instance-create-tags-policy.json", {`
`64`		`- ec2_custom_allowed_tags = var.ec2_custom_allowed_tags`
	`64`	`+ ec2_custom_allowed_tags = var.ec2_custom_allowed_tags_creation`
`65`	`65`	`})`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -762,7 +762,7 @@ variable "user_agent" {`
`762`	`762`	`default = null`
`763`	`763`	`}`
`764`	`764`
`765`		`-variable "ec2_custom_allowed_tags" {`
	`765`	`+variable "ec2_custom_allowed_tags_creation" {`
`766`	`766`	`description = "Allows the EC2 instance to create tags listed here."`
`767`	`767`	`type = list(string)`
`768`	`768`	`default = []`