Skip to content

Commit 93b20f5

Browse files
fix: use list of license_specification
1 parent 58527ef commit 93b20f5

6 files changed

Lines changed: 13 additions & 13 deletions

File tree

main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ module "runners" {
207207
credit_specification = var.runner_credit_specification
208208
cpu_options = var.runner_cpu_options
209209
placement = var.runner_placement
210-
license_specification = var.runner_license_specification
210+
license_specifications = var.runner_license_specifications
211211

212212
enable_runner_binaries_syncer = var.enable_runner_binaries_syncer
213213
lambda_s3_bucket = var.lambda_s3_bucket

modules/multi-runner/runners.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ module "runners" {
5656
credit_specification = each.value.runner_config.credit_specification
5757
cpu_options = each.value.runner_config.cpu_options
5858
placement = each.value.runner_config.placement
59-
license_specification = each.value.runner_config.license_specification
59+
license_specifications = each.value.runner_config.license_specifications
6060

6161
enable_runner_binaries_syncer = each.value.runner_config.enable_runner_binaries_syncer
6262
lambda_s3_bucket = var.lambda_s3_bucket

modules/multi-runner/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ variable "multi_runner_config" {
147147
tenancy = optional(string)
148148
partition_number = optional(number)
149149
}), null)
150-
license_specification = optional(object({
150+
license_specifications = optional(list(object({
151151
license_configuration_arn = string
152-
}), null)
152+
})), null)
153153
runner_log_files = optional(list(object({
154154
log_group_name = string
155155
prefix_log_group = bool

modules/runners/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ resource "aws_launch_template" "runner" {
191191
}
192192

193193
dynamic "license_specification" {
194-
for_each = var.license_specification != null ? [var.license_specification] : []
194+
for_each = var.license_specifications
195195
content {
196196
license_configuration_arn = license_specification.value.license_configuration_arn
197197
}

modules/runners/variables.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -659,12 +659,12 @@ variable "placement" {
659659
default = null
660660
}
661661

662-
variable "license_specification" {
662+
variable "license_specifications" {
663663
description = "The license specifications for the instance. See https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/launch_template#license_specification for details."
664-
type = object({
664+
type = list(object({
665665
license_configuration_arn = string
666-
})
667-
default = null
666+
}))
667+
default = []
668668
}
669669

670670
variable "enable_jit_config" {

variables.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -890,12 +890,12 @@ variable "runner_placement" {
890890
default = null
891891
}
892892

893-
variable "runner_license_specification" {
893+
variable "runner_license_specifications" {
894894
description = "The license specifications for the instance. See https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/launch_template#license_specification for details."
895-
type = object({
895+
type = list(object({
896896
license_configuration_arn = string
897-
})
898-
default = null
897+
}))
898+
default = []
899899
}
900900

901901
variable "enable_jit_config" {

0 commit comments

Comments
 (0)