Merge branch 'main' into feat-ssm-runner-matcher-chunking

npalm · web-flow · commit b6e68d774bea · 2025-10-04T13:28:30.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [6.8.1](https://github.com/github-aws-runners/terraform-aws-github-runner/compare/v6.8.0...v6.8.1) (2025-10-04)
+
+
+### Bug Fixes
+
+* prevent unnecessary updates when cpu_options is unset ([#4806](https://github.com/github-aws-runners/terraform-aws-github-runner/issues/4806)) ([8a1cd6f](https://github.com/github-aws-runners/terraform-aws-github-runner/commit/8a1cd6f5c7a956d15d7eafa9f45ea5405179887a))
+
 ## [6.8.0](https://github.com/github-aws-runners/terraform-aws-github-runner/compare/v6.7.9...v6.8.0) (2025-10-03)
 
 
diff --git a/modules/runners/main.tf b/modules/runners/main.tf
@@ -160,9 +160,12 @@ resource "aws_launch_template" "runner" {
     }
   }
 
-  cpu_options {
-    core_count       = var.cpu_options != null ? var.cpu_options.core_count : null
-    threads_per_core = var.cpu_options != null ? var.cpu_options.threads_per_core : null
+  dynamic "cpu_options" {
+    for_each = var.cpu_options != null ? [var.cpu_options] : []
+    content {
+      core_count       = try(cpu_options.value.core_count, null)
+      threads_per_core = try(cpu_options.value.threads_per_core, null)
+    }
   }
 
   monitoring {

Original file line number	Diff line number	Diff line change
`@@ -160,9 +160,12 @@ resource "aws_launch_template" "runner" {`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`
`163`		`- cpu_options {`
`164`		`- core_count = var.cpu_options != null ? var.cpu_options.core_count : null`
`165`		`- threads_per_core = var.cpu_options != null ? var.cpu_options.threads_per_core : null`
	`163`	`+ dynamic "cpu_options" {`
	`164`	`+ for_each = var.cpu_options != null ? [var.cpu_options] : []`
	`165`	`+ content {`
	`166`	`+ core_count = try(cpu_options.value.core_count, null)`
	`167`	`+ threads_per_core = try(cpu_options.value.threads_per_core, null)`
	`168`	`+ }`
`166`	`169`	`}`
`167`	`170`
`168`	`171`	`monitoring {`