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

Commit

Permalink
fix: windows userdata does not support gzip (#3759)
Browse files Browse the repository at this point in the history
Windows user data is not support gzip. This PR avoids window user_data
scripts are gzipped.

close: #3736

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
npalm and github-actions[bot] authored Feb 12, 2024
1 parent 1288c81 commit b74df54
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 24 deletions.
4 changes: 2 additions & 2 deletions README.md
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
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

Large diffs are not rendered by default.

42 changes: 22 additions & 20 deletions modules/runners/main.tf
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

0 comments on commit b74df54

Please sign in to comment.