Skip to content
This repository was archived by the owner on Jan 16, 2025. It is now read-only.

Commit a6c33dd

Browse files
jpalomakinpalm
authored andcommitted
refactor(runners): rename variable enabled_userdata -> enable_userdata (#2784)
* Rename variable enabled_userdata -> enable_userdata * Fix escaped occurrences of enabled_userdata * Reformat terraform code
1 parent 96ced8a commit a6c33dd

File tree

14 files changed

+17
-17
lines changed

14 files changed

+17
-17
lines changed

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ We welcome any improvement to the standard module to make the default as secure
462462
| <a name="input_enable_ssm_on_runners"></a> [enable\_ssm\_on\_runners](#input\_enable\_ssm\_on\_runners) | Enable to allow access the runner instances for debugging purposes via SSM. Note that this adds additional permissions to the runner instances. | `bool` | `false` | no |
463463
| <a name="input_enable_user_data_debug_logging_runner"></a> [enable\_user\_data\_debug\_logging\_runner](#input\_enable\_user\_data\_debug\_logging\_runner) | Option to enable debug logging for user-data, this logs all secrets as well. | `bool` | `false` | no |
464464
| <a name="input_enable_workflow_job_events_queue"></a> [enable\_workflow\_job\_events\_queue](#input\_enable\_workflow\_job\_events\_queue) | Enabling this experimental feature will create a secondory sqs queue to wich a copy of the workflow\_job event will be delivered. | `bool` | `false` | no |
465-
| <a name="input_enabled_userdata"></a> [enabled\_userdata](#input\_enabled\_userdata) | Should the userdata script be enabled for the runner. Set this to false if you are using your own prebuilt AMI. | `bool` | `true` | no |
465+
| <a name="input_enable_userdata"></a> [enable\_userdata](#input\_enable\_userdata) | Should the userdata script be enabled for the runner. Set this to false if you are using your own prebuilt AMI. | `bool` | `true` | no |
466466
| <a name="input_environment"></a> [environment](#input\_environment) | DEPRECATED, no longer used. See `prefix` | `string` | `null` | no |
467467
| <a name="input_fifo_build_queue"></a> [fifo\_build\_queue](#input\_fifo\_build\_queue) | Enable a FIFO queue to remain the order of events received by the webhook. Suggest to set to true for repo level runners. | `bool` | `false` | no |
468468
| <a name="input_ghes_ssl_verify"></a> [ghes\_ssl\_verify](#input\_ghes\_ssl\_verify) | GitHub Enterprise SSL verification. Set to 'false' when custom certificate (chains) is used for GitHub Enterprise Server (insecure). | `bool` | `true` | no |

Diff for: examples/ephemeral/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ module "runners" {
7070
enable_job_queued_check = true
7171

7272
# configure your pre-built AMI
73-
# enabled_userdata = false
73+
# enable_userdata = false
7474
# ami_filter = { name = ["github-runner-amzn2-x86_64-*"] }
7575
# data "aws_caller_identity" "current" {}
7676
# ami_owners = [data.aws_caller_identity.current.account_id]

Diff for: examples/prebuilt/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ module "runners" {
6262
# provide the owner id of
6363
ami_owners = ["<your owner id>"]
6464
65-
enabled_userdata = false
65+
enable_userdata = false
6666
...
6767
}
6868
```

Diff for: examples/prebuilt/main.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ module "runners" {
4141
runner_os = var.runner_os
4242

4343
# configure your pre-built AMI
44-
enabled_userdata = false
45-
ami_filter = { name = [var.ami_name_filter] }
46-
ami_owners = [data.aws_caller_identity.current.account_id]
44+
enable_userdata = false
45+
ami_filter = { name = [var.ami_name_filter] }
46+
ami_owners = [data.aws_caller_identity.current.account_id]
4747

4848
# Look up runner AMI ID from an AWS SSM parameter (overrides ami_filter at instance launch time)
4949
# NOTE: the parameter must be managed outside of this module (e.g. in a runner AMI build workflow)

Diff for: examples/ubuntu/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ module "runners" {
9898
# Uncomment to enable ephemeral runners
9999
# delay_webhook_event = 0
100100
# enable_ephemeral_runners = true
101-
# enabled_userdata = true
101+
# enable_userdata = true
102102

103103
# Uncommet idle config to have idle runners from 9 to 5 in time zone Amsterdam
104104
# idle_config = [{

Diff for: images/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ ami_filter = { name = ["github-runner-amzn2-x86_64-2021*"] }
3333
# provide the owner id of
3434
ami_owners = ["<your owner id>"]
3535
36-
enabled_userdata = false
36+
enable_userdata = false
3737
```

Diff for: main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ module "runners" {
244244
role_path = var.role_path
245245
role_permissions_boundary = var.role_permissions_boundary
246246

247-
enabled_userdata = var.enabled_userdata
247+
enable_userdata = var.enable_userdata
248248
enable_user_data_debug_logging = var.enable_user_data_debug_logging_runner
249249
userdata_template = var.userdata_template
250250
userdata_pre_install = var.userdata_pre_install

Diff for: modules/multi-runner/README.md

+1-1
Large diffs are not rendered by default.

Diff for: modules/multi-runner/runners.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ module "runners" {
7474
role_path = var.role_path
7575
role_permissions_boundary = var.role_permissions_boundary
7676

77-
enabled_userdata = each.value.runner_config.enabled_userdata
77+
enable_userdata = each.value.runner_config.enable_userdata
7878
userdata_template = each.value.runner_config.userdata_template
7979
userdata_pre_install = each.value.runner_config.userdata_pre_install
8080
userdata_post_install = each.value.runner_config.userdata_post_install

Diff for: modules/multi-runner/variables.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ variable "multi_runner_config" {
4646
enable_organization_runners = optional(bool, false)
4747
enable_runner_binaries_syncer = optional(bool, true)
4848
enable_ssm_on_runners = optional(bool, false)
49-
enabled_userdata = optional(bool, true)
49+
enable_userdata = optional(bool, true)
5050
instance_allocation_strategy = optional(string, "lowest-price")
5151
instance_max_spot_price = optional(string, null)
5252
instance_target_capacity_type = optional(string, "spot")
@@ -136,7 +136,7 @@ variable "multi_runner_config" {
136136
enable_organization_runners: "Register runners to organization, instead of repo level"
137137
enable_runner_binaries_syncer: "Option to disable the lambda to sync GitHub runner distribution, useful when using a pre-build AMI."
138138
enable_ssm_on_runners: "Enable to allow access the runner instances for debugging purposes via SSM. Note that this adds additional permissions to the runner instances."
139-
enabled_userdata: "Should the userdata script be enabled for the runner. Set this to false if you are using your own prebuilt AMI."
139+
enable_userdata: "Should the userdata script be enabled for the runner. Set this to false if you are using your own prebuilt AMI."
140140
instance_allocation_strategy: "The allocation strategy for spot instances. AWS recommends to use `capacity-optimized` however the AWS default is `lowest-price`."
141141
instance_max_spot_price: "Max price price for spot intances per hour. This variable will be passed to the create fleet as max spot price for the fleet."
142142
instance_target_capacity_type: "Default lifecycle used for runner instances, can be either `spot` or `on-demand`."

Diff for: modules/runners/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ yarn run dist
138138
| <a name="input_enable_runner_detailed_monitoring"></a> [enable\_runner\_detailed\_monitoring](#input\_enable\_runner\_detailed\_monitoring) | Enable detailed monitoring for runners | `bool` | `false` | no |
139139
| <a name="input_enable_ssm_on_runners"></a> [enable\_ssm\_on\_runners](#input\_enable\_ssm\_on\_runners) | Enable to allow access to the runner instances for debugging purposes via SSM. Note that this adds additional permissions to the runner instances. | `bool` | n/a | yes |
140140
| <a name="input_enable_user_data_debug_logging"></a> [enable\_user\_data\_debug\_logging](#input\_enable\_user\_data\_debug\_logging) | Option to enable debug logging for user-data, this logs all secrets as well. | `bool` | `false` | no |
141-
| <a name="input_enabled_userdata"></a> [enabled\_userdata](#input\_enabled\_userdata) | Should the userdata script be enabled for the runner. Set this to false if you are using your own prebuilt AMI | `bool` | `true` | no |
141+
| <a name="input_enable_userdata"></a> [enable\_userdata](#input\_enable\_userdata) | Should the userdata script be enabled for the runner. Set this to false if you are using your own prebuilt AMI | `bool` | `true` | no |
142142
| <a name="input_environment"></a> [environment](#input\_environment) | A name that identifies the environment, used as prefix and for tagging. | `string` | `null` | no |
143143
| <a name="input_ghes_ssl_verify"></a> [ghes\_ssl\_verify](#input\_ghes\_ssl\_verify) | GitHub Enterprise SSL verification. Set to 'false' when custom certificate (chains) is used for GitHub Enterprise Server (insecure). | `bool` | `true` | no |
144144
| <a name="input_ghes_url"></a> [ghes\_url](#input\_ghes\_url) | GitHub Enterprise Server URL. DO NOT SET IF USING PUBLIC GITHUB | `string` | `null` | no |

Diff for: modules/runners/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ resource "aws_launch_template" "runner" {
135135
)
136136
}
137137

138-
user_data = var.enabled_userdata ? base64encode(templatefile(local.userdata_template, {
138+
user_data = var.enable_userdata ? base64encode(templatefile(local.userdata_template, {
139139
enable_debug_logging = var.enable_user_data_debug_logging
140140
s3_location_runner_distribution = local.s3_location_runner_distribution
141141
pre_install = var.userdata_pre_install

Diff for: modules/runners/variables.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ variable "ami_id_ssm_parameter_name" {
142142
default = null
143143
}
144144

145-
variable "enabled_userdata" {
145+
variable "enable_userdata" {
146146
description = "Should the userdata script be enabled for the runner. Set this to false if you are using your own prebuilt AMI"
147147
type = bool
148148
default = true

Diff for: variables.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ variable "enable_runner_detailed_monitoring" {
208208
default = false
209209
}
210210

211-
variable "enabled_userdata" {
211+
variable "enable_userdata" {
212212
description = "Should the userdata script be enabled for the runner. Set this to false if you are using your own prebuilt AMI."
213213
type = bool
214214
default = true

0 commit comments

Comments
 (0)