Skip to content

fix: windows userdata does not support gzip #3759

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

Merged
merged 4 commits into from
Feb 12, 2024
Merged

fix: windows userdata does not support gzip #3759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3e529e
fix: windows userdata does not support gzip
npalm Feb 12, 2024
34d622d
Merge branch 'main' into npalm/fix-windows
npalm Feb 12, 2024
52fe367
docs: auto update terraform docs
github-actions[bot] Feb 12, 2024
127c999
fix: windows userdata does not support gzip
npalm Feb 12, 2024
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ Talk to the forestkeepers in the `runners-channel` on Slack.

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 5.27 |
| <a name="provider_random"></a> [random](#provider\_random) | ~> 3.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.31.0 |
| <a name="provider_random"></a> [random](#provider\_random) | 3.6.0 |

## Modules

Expand Down
2 changes: 1 addition & 1 deletion examples/base/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 5.27 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.31.0 |

## Modules

Expand Down
2 changes: 1 addition & 1 deletion modules/multi-runner/README.md
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 22 additions & 20 deletions modules/runners/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,27 @@ locals {
arn_ssm_parameters_path_config = "arn:${var.aws_partition}:ssm:${var.aws_region}:${data.aws_caller_identity.current.account_id}:parameter${var.ssm_paths.root}/${var.ssm_paths.config}"

token_path = "${var.ssm_paths.root}/${var.ssm_paths.tokens}"

user_data = var.enable_userdata ? templatefile(local.userdata_template, {
enable_debug_logging = var.enable_user_data_debug_logging
s3_location_runner_distribution = local.s3_location_runner_distribution
pre_install = var.userdata_pre_install
install_runner = templatefile(local.userdata_install_runner[var.runner_os], {
S3_LOCATION_RUNNER_DISTRIBUTION = local.s3_location_runner_distribution
RUNNER_ARCHITECTURE = var.runner_architecture
})
post_install = var.userdata_post_install
start_runner = templatefile(local.userdata_start_runner[var.runner_os], {
metadata_tags = var.metadata_options != null ? var.metadata_options.instance_metadata_tags : "enabled"
})
ghes_url = var.ghes_url
ghes_ssl_verify = var.ghes_ssl_verify

## retain these for backwards compatibility
environment = var.prefix
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" {
Expand Down Expand Up @@ -154,26 +175,7 @@ resource "aws_launch_template" "runner" {
)
}

user_data = var.enable_userdata ? base64gzip(templatefile(local.userdata_template, {
enable_debug_logging = var.enable_user_data_debug_logging
s3_location_runner_distribution = local.s3_location_runner_distribution
pre_install = var.userdata_pre_install
install_runner = templatefile(local.userdata_install_runner[var.runner_os], {
S3_LOCATION_RUNNER_DISTRIBUTION = local.s3_location_runner_distribution
RUNNER_ARCHITECTURE = var.runner_architecture
})
post_install = var.userdata_post_install
start_runner = templatefile(local.userdata_start_runner[var.runner_os], {
metadata_tags = var.metadata_options != null ? var.metadata_options.instance_metadata_tags : "enabled"
})
ghes_url = var.ghes_url
ghes_ssl_verify = var.ghes_ssl_verify

## retain these for backwards compatibility
environment = var.prefix
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.runner_os == "windows" ? base64encode(local.user_data) : base64gzip(local.user_data)

tags = local.tags

Expand Down