From 7bee95a2dd6e64eabb5ae5afccd75b0c4f8631d1 Mon Sep 17 00:00:00 2001 From: Leo Blanc Date: Thu, 16 Jul 2020 09:26:29 -0300 Subject: [PATCH 1/4] Renamed variable 'runners_maxiumum_count' as 'runners_maximum_count' --- README.md | 2 +- main.tf | 2 +- modules/runners/README.md | 2 +- modules/runners/scale-up.tf | 2 +- modules/runners/variables.tf | 4 ++-- variables.tf | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f9a8de0f8b..4a35f1c6e4 100644 --- a/README.md +++ b/README.md @@ -256,7 +256,7 @@ No requirements. | runner\_binaries\_syncer\_lambda\_zip | File location of the binaries sync lambda zip file. | `string` | `null` | no | | runner\_extra\_labels | Extra labels for the runners (GitHub). Separate each label by a comma | `string` | `""` | no | | runners\_lambda\_zip | File location of the lambda zip file for scaling runners. | `string` | `null` | no | -| runners\_maxiumum\_count | The maxiumum number of runners tha will be created. | `number` | `3` | no | +| runners\_maximum\_count | The maximum number of runners tha will be created. | `number` | `3` | no | | runners\_scale\_down\_lambda\_timeout | Time out for the scale up lambda in seconds. | `number` | `60` | no | | runners\_scale\_up\_lambda\_timeout | Time out for the scale down lambda in seconds. | `number` | `60` | no | | scale\_down\_schedule\_expression | Scheduler expression to check every x for scale down. | `string` | `"cron(*/5 * * * ? *)"` | no | diff --git a/main.tf b/main.tf index 21ea880b14..796f5ee1c8 100644 --- a/main.tf +++ b/main.tf @@ -69,7 +69,7 @@ module "runners" { minimum_running_time_in_minutes = var.minimum_running_time_in_minutes runner_extra_labels = var.runner_extra_labels runner_as_root = var.runner_as_root - runners_maxiumum_count = var.runners_maxiumum_count + runners_maximum_count = var.runners_maximum_count lambda_zip = var.runners_lambda_zip lambda_timeout_scale_up = var.runners_scale_up_lambda_timeout diff --git a/modules/runners/README.md b/modules/runners/README.md index 8fcdda813a..1865a3e46e 100644 --- a/modules/runners/README.md +++ b/modules/runners/README.md @@ -82,7 +82,7 @@ No requirements. | role\_permissions\_boundary | Permissions boundary that will be added to the created role for the lambda. | `string` | `null` | no | | runner\_as\_root | Run the action runner under the root user. | `bool` | `false` | no | | runner\_extra\_labels | Extra labels for the runners (GitHub). Separate each label by a comma | `string` | `""` | no | -| runners\_maxiumum\_count | The maxiumum number of runners tha will be created. | `number` | `3` | no | +| runners\_maximum\_count | The maximum number of runners tha will be created. | `number` | `3` | no | | s3\_bucket\_runner\_binaries | n/a | 
object({
    arn = string
  })
| n/a | yes | | s3\_location\_runner\_binaries | S3 location of runner distribution. | `string` | n/a | yes | | scale\_down\_schedule\_expression | Scheduler expression to check every x for scale down. | `string` | `"cron(*/5 * * * ? *)"` | no | diff --git a/modules/runners/scale-up.tf b/modules/runners/scale-up.tf index 3aa88eda06..991cf8120c 100644 --- a/modules/runners/scale-up.tf +++ b/modules/runners/scale-up.tf @@ -29,7 +29,7 @@ resource "aws_lambda_function" "scale_up" { KMS_KEY_ID = var.encryption.kms_key_id ENABLE_ORGANIZATION_RUNNERS = var.enable_organization_runners RUNNER_EXTRA_LABELS = var.runner_extra_labels - RUNNERS_MAXIMUM_COUNT = var.runners_maxiumum_count + RUNNERS_MAXIMUM_COUNT = var.runners_maximum_count GITHUB_APP_KEY_BASE64 = local.github_app_key_base64 GITHUB_APP_ID = var.github_app.id GITHUB_APP_CLIENT_ID = var.github_app.client_id diff --git a/modules/runners/variables.tf b/modules/runners/variables.tf index 1de02ac654..01cca39632 100644 --- a/modules/runners/variables.tf +++ b/modules/runners/variables.tf @@ -174,8 +174,8 @@ variable "runner_as_root" { default = false } -variable "runners_maxiumum_count" { - description = "The maxiumum number of runners tha will be created." +variable "runners_maximum_count" { + description = "The maximum number of runners tha will be created." type = number default = 3 } diff --git a/variables.tf b/variables.tf index 1d26aa76ef..873f24d7f0 100644 --- a/variables.tf +++ b/variables.tf @@ -132,8 +132,8 @@ variable "runner_as_root" { default = false } -variable "runners_maxiumum_count" { - description = "The maxiumum number of runners tha will be created." +variable "runners_maximum_count" { + description = "The maximum number of runners tha will be created." type = number default = 3 } From e16752aa3ecffca77aca44070bfe29b8280f79de Mon Sep 17 00:00:00 2001 From: Leo Blanc Date: Thu, 16 Jul 2020 09:28:38 -0300 Subject: [PATCH 2/4] Fixed descriptions of runners_scale_down and runners_scale_up variables --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4a35f1c6e4..3160b20407 100644 --- a/README.md +++ b/README.md @@ -257,8 +257,8 @@ No requirements. | runner\_extra\_labels | Extra labels for the runners (GitHub). Separate each label by a comma | `string` | `""` | no | | runners\_lambda\_zip | File location of the lambda zip file for scaling runners. | `string` | `null` | no | | runners\_maximum\_count | The maximum number of runners tha will be created. | `number` | `3` | no | -| runners\_scale\_down\_lambda\_timeout | Time out for the scale up lambda in seconds. | `number` | `60` | no | -| runners\_scale\_up\_lambda\_timeout | Time out for the scale down lambda in seconds. | `number` | `60` | no | +| runners\_scale\_down\_lambda\_timeout | Time out for the scale down lambda in seconds. | `number` | `60` | no | +| runners\_scale\_up\_lambda\_timeout | Time out for the scale up lambda in seconds. | `number` | `60` | no | | scale\_down\_schedule\_expression | Scheduler expression to check every x for scale down. | `string` | `"cron(*/5 * * * ? *)"` | no | | subnet\_ids | List of subnets in which the action runners will be launched, the subnets needs to be subnets in the `vpc_id`. | `list(string)` | n/a | yes | | tags | Map of tags that will be added to created resources. By default resources will be tagged with name and environment. | `map(string)` | `{}` | no | From 879241d24e09b870427be89865d7f5cfbf2d9f7f Mon Sep 17 00:00:00 2001 From: Leo Blanc Date: Thu, 16 Jul 2020 12:55:34 -0300 Subject: [PATCH 3/4] Update modules/runners/variables.tf Co-authored-by: Ben Davies --- modules/runners/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/runners/variables.tf b/modules/runners/variables.tf index 01cca39632..5f182157ad 100644 --- a/modules/runners/variables.tf +++ b/modules/runners/variables.tf @@ -175,7 +175,7 @@ variable "runner_as_root" { } variable "runners_maximum_count" { - description = "The maximum number of runners tha will be created." + description = "The maximum number of runners that will be created." type = number default = 3 } From 6bc16a856034c382f9e3ce81e0ef76d0908d3fb0 Mon Sep 17 00:00:00 2001 From: Leo Blanc Date: Thu, 16 Jul 2020 12:55:46 -0300 Subject: [PATCH 4/4] Update variables.tf Co-authored-by: Ben Davies --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index 873f24d7f0..f0585d0215 100644 --- a/variables.tf +++ b/variables.tf @@ -133,7 +133,7 @@ variable "runner_as_root" { } variable "runners_maximum_count" { - description = "The maximum number of runners tha will be created." + description = "The maximum number of runners that will be created." type = number default = 3 }