Skip to content

Commit da0c272

Browse files
fix: use list of license_specification
1 parent 6bfe648 commit da0c272

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
@@ -208,7 +208,7 @@ module "runners" {
208208
credit_specification = var.runner_credit_specification
209209
cpu_options = var.runner_cpu_options
210210
placement = var.runner_placement
211-
license_specification = var.runner_license_specification
211+
license_specifications = var.runner_license_specifications
212212

213213
enable_runner_binaries_syncer = var.enable_runner_binaries_syncer
214214
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
@@ -671,12 +671,12 @@ variable "placement" {
671671
default = null
672672
}
673673

674-
variable "license_specification" {
674+
variable "license_specifications" {
675675
description = "The license specifications for the instance. See https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/launch_template#license_specification for details."
676-
type = object({
676+
type = list(object({
677677
license_configuration_arn = string
678-
})
679-
default = null
678+
}))
679+
default = []
680680
}
681681

682682
variable "enable_jit_config" {

variables.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -902,12 +902,12 @@ variable "runner_placement" {
902902
default = null
903903
}
904904

905-
variable "runner_license_specification" {
905+
variable "runner_license_specifications" {
906906
description = "The license specifications for the instance. See https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/launch_template#license_specification for details."
907-
type = object({
907+
type = list(object({
908908
license_configuration_arn = string
909-
})
910-
default = null
909+
}))
910+
default = []
911911
}
912912

913913
variable "enable_jit_config" {

0 commit comments

Comments
 (0)