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

Commit b74df54

Browse files
fix: windows userdata does not support gzip (#3759)
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>
1 parent 1288c81 commit b74df54

File tree

4 files changed

+26
-24
lines changed

4 files changed

+26
-24
lines changed

Diff for: README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ Talk to the forestkeepers in the `runners-channel` on Slack.
9090

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

9696
## Modules
9797

Diff for: examples/base/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

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

1515
## Modules
1616

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

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

Diff for: modules/runners/main.tf

+22-20
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,27 @@ locals {
4545
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}"
4646

4747
token_path = "${var.ssm_paths.root}/${var.ssm_paths.tokens}"
48+
49+
user_data = var.enable_userdata ? templatefile(local.userdata_template, {
50+
enable_debug_logging = var.enable_user_data_debug_logging
51+
s3_location_runner_distribution = local.s3_location_runner_distribution
52+
pre_install = var.userdata_pre_install
53+
install_runner = templatefile(local.userdata_install_runner[var.runner_os], {
54+
S3_LOCATION_RUNNER_DISTRIBUTION = local.s3_location_runner_distribution
55+
RUNNER_ARCHITECTURE = var.runner_architecture
56+
})
57+
post_install = var.userdata_post_install
58+
start_runner = templatefile(local.userdata_start_runner[var.runner_os], {
59+
metadata_tags = var.metadata_options != null ? var.metadata_options.instance_metadata_tags : "enabled"
60+
})
61+
ghes_url = var.ghes_url
62+
ghes_ssl_verify = var.ghes_ssl_verify
63+
64+
## retain these for backwards compatibility
65+
environment = var.prefix
66+
enable_cloudwatch_agent = var.enable_cloudwatch_agent
67+
ssm_key_cloudwatch_agent_config = var.enable_cloudwatch_agent ? aws_ssm_parameter.cloudwatch_agent_config_runner[0].name : ""
68+
}) : ""
4869
}
4970

5071
data "aws_ami" "runner" {
@@ -154,26 +175,7 @@ resource "aws_launch_template" "runner" {
154175
)
155176
}
156177

157-
user_data = var.enable_userdata ? base64gzip(templatefile(local.userdata_template, {
158-
enable_debug_logging = var.enable_user_data_debug_logging
159-
s3_location_runner_distribution = local.s3_location_runner_distribution
160-
pre_install = var.userdata_pre_install
161-
install_runner = templatefile(local.userdata_install_runner[var.runner_os], {
162-
S3_LOCATION_RUNNER_DISTRIBUTION = local.s3_location_runner_distribution
163-
RUNNER_ARCHITECTURE = var.runner_architecture
164-
})
165-
post_install = var.userdata_post_install
166-
start_runner = templatefile(local.userdata_start_runner[var.runner_os], {
167-
metadata_tags = var.metadata_options != null ? var.metadata_options.instance_metadata_tags : "enabled"
168-
})
169-
ghes_url = var.ghes_url
170-
ghes_ssl_verify = var.ghes_ssl_verify
171-
172-
## retain these for backwards compatibility
173-
environment = var.prefix
174-
enable_cloudwatch_agent = var.enable_cloudwatch_agent
175-
ssm_key_cloudwatch_agent_config = var.enable_cloudwatch_agent ? aws_ssm_parameter.cloudwatch_agent_config_runner[0].name : ""
176-
})) : ""
178+
user_data = var.runner_os == "windows" ? base64encode(local.user_data) : base64gzip(local.user_data)
177179

178180
tags = local.tags
179181

0 commit comments

Comments
 (0)