From fcd83f80a4c2285ec7b57ba04ac0447aba5b6890 Mon Sep 17 00:00:00 2001 From: Rasmus Mikkelsen Date: Wed, 17 Aug 2022 12:19:14 +0200 Subject: [PATCH] fix(runners): Fetch instance environment tag though metadata --- modules/runners/main.tf | 9 +++++++++ modules/runners/templates/start-runner.sh | 5 +---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/runners/main.tf b/modules/runners/main.tf index 7fea4e8940..d539154350 100644 --- a/modules/runners/main.tf +++ b/modules/runners/main.tf @@ -81,6 +81,15 @@ resource "aws_launch_template" "runner" { http_endpoint = metadata_options.value.http_endpoint http_tokens = metadata_options.value.http_tokens http_put_response_hop_limit = metadata_options.value.http_put_response_hop_limit + instance_metadata_tags = "enabled" + } + } + + dynamic "metadata_options" { + for_each = var.metadata_options != null ? [] : [0] + + content { + instance_metadata_tags = "enabled" } } diff --git a/modules/runners/templates/start-runner.sh b/modules/runners/templates/start-runner.sh index 6d7994a9f9..9dedb6a813 100644 --- a/modules/runners/templates/start-runner.sh +++ b/modules/runners/templates/start-runner.sh @@ -11,10 +11,7 @@ echo "Retrieved REGION from AWS API ($region)" instance_id=$(curl -f -H "X-aws-ec2-metadata-token: $token" -v http://169.254.169.254/latest/meta-data/instance-id) echo "Retrieved INSTANCE_ID from AWS API ($instance_id)" -tags=$(aws ec2 describe-tags --region "$region" --filters "Name=resource-id,Values=$instance_id") -echo "Retrieved tags from AWS API ($tags)" - -environment=$(echo "$tags" | jq -r '.Tags[] | select(.Key == "ghr:environment") | .Value') +environment=$(curl -f -H "X-aws-ec2-metadata-token: $token" -v http://169.254.169.254/latest/meta-data/tags/instance/ghr:environment) echo "Retrieved ghr:environment tag - ($environment)" parameters=$(aws ssm get-parameters-by-path --path "/$environment/runner" --region "$region" --query "Parameters[*].{Name:Name,Value:Value}")