Skip to content

feat: Make userdata gzipped in case the user provided userdata is long #1956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

feat: Make userdata gzipped in case the user provided userdata is long #1956

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8d452d
Make userdata gzipped in case the user provided userdata is long
Makeshift Apr 21, 2022
2325e21
user_data might not support gzip?
Makeshift Apr 21, 2022
53446e0
Revert "user_data might not support gzip?"
Makeshift Apr 21, 2022
043c77d
Add check for no userdata
Makeshift Apr 21, 2022
28e4317
Oops, forgot count makes resources into an array
Makeshift Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 27 additions & 15 deletions modules/runners/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,32 @@ locals {
enable_job_queued_check = var.enable_job_queued_check == null ? !var.enable_ephemeral_runners : var.enable_job_queued_check
}

data "template_cloudinit_config" "userdata" {
count = var.enabled_userdata ? 1 : 0

gzip = true
base64_encode = true
part {
filename = "00-init"
content_type = "text/x-shellscript"
content = templatefile(local.userdata_template, {
pre_install = var.userdata_pre_install
install_runner = templatefile(local.userdata_install_runner[var.runner_os], {
S3_LOCATION_RUNNER_DISTRIBUTION = var.s3_location_runner_binaries
RUNNER_ARCHITECTURE = var.runner_architecture
})
post_install = var.userdata_post_install
start_runner = templatefile(local.userdata_start_runner[var.runner_os], {})
ghes_url = var.ghes_url
ghes_ssl_verify = var.ghes_ssl_verify
## retain these for backwards compatibility
environment = var.environment
enable_cloudwatch_agent = var.enable_cloudwatch_agent
ssm_key_cloudwatch_agent_config = var.enable_cloudwatch_agent ? aws_ssm_parameter.cloudwatch_agent_config_runner[0].name : ""
})
}
}

data "aws_ami" "runner" {
most_recent = "true"

Expand Down Expand Up @@ -116,21 +142,7 @@ resource "aws_launch_template" "runner" {
}


user_data = var.enabled_userdata ? base64encode(templatefile(local.userdata_template, {
pre_install = var.userdata_pre_install
install_runner = templatefile(local.userdata_install_runner[var.runner_os], {
S3_LOCATION_RUNNER_DISTRIBUTION = var.s3_location_runner_binaries
RUNNER_ARCHITECTURE = var.runner_architecture
})
post_install = var.userdata_post_install
start_runner = templatefile(local.userdata_start_runner[var.runner_os], {})
ghes_url = var.ghes_url
ghes_ssl_verify = var.ghes_ssl_verify
## retain these for backwards compatibility
environment = var.environment
enable_cloudwatch_agent = var.enable_cloudwatch_agent
ssm_key_cloudwatch_agent_config = var.enable_cloudwatch_agent ? aws_ssm_parameter.cloudwatch_agent_config_runner[0].name : ""
})) : ""
user_data = var.enabled_userdata ? data.template_cloudinit_config.userdata[0].rendered : ""

tags = local.tags

Expand Down