From 35e62682737e06c526be84a1f070512dcaf8232f Mon Sep 17 00:00:00 2001 From: "kochetkov.s" Date: Fri, 23 Jan 2026 17:21:04 +0300 Subject: [PATCH] change pipeline generation + add tf dockerfile --- live/terragrunt.hcl | 4 ++-- scripts/generate-pipeline.sh | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/live/terragrunt.hcl b/live/terragrunt.hcl index 58a8e3c..78249c0 100644 --- a/live/terragrunt.hcl +++ b/live/terragrunt.hcl @@ -12,8 +12,8 @@ remote_state { bucket = "tfstate-terragrunt-stage" key = "${path_relative_to_include()}/terraform.tfstate" region = "ru-central1" - access_key = get_env("S3_ACCESS_KEY", get_env("AWS_ACCESS_KEY_ID", "")) - secret_key = get_env("S3_SECRET_KEY", get_env("AWS_SECRET_ACCESS_KEY", "")) + access_key = get_env("S3_ACCESS_KEY", "") + secret_key = get_env("S3_SECRET_KEY", "") skip_region_validation = true skip_credentials_validation = true skip_metadata_api_check = true diff --git a/scripts/generate-pipeline.sh b/scripts/generate-pipeline.sh index f492a91..62fdc01 100755 --- a/scripts/generate-pipeline.sh +++ b/scripts/generate-pipeline.sh @@ -77,10 +77,11 @@ validate-${job_prefix}: S3_STATE_BUCKET: "\${S3_STATE_BUCKET}" TG_TF_PATH: "/usr/local/bin/terraform" before_script: + - echo "DEBUG: S3_ACCESS_KEY is set: \$([ -n \"\${S3_ACCESS_KEY}\" ] && echo 'YES' || echo 'NO')" + - echo "DEBUG: S3_SECRET_KEY is set: \$([ -n \"\${S3_SECRET_KEY}\" ] && echo 'YES' || echo 'NO')" - export S3_ACCESS_KEY="\${S3_ACCESS_KEY}" - export S3_SECRET_KEY="\${S3_SECRET_KEY}" - - export AWS_ACCESS_KEY_ID="\${S3_ACCESS_KEY}" - - export AWS_SECRET_ACCESS_KEY="\${S3_SECRET_KEY}" + - export AWS_EC2_METADATA_DISABLED=true - cd \${TG_ROOT} script: - terragrunt init -reconfigure @@ -109,10 +110,15 @@ plan-${job_prefix}: S3_STATE_BUCKET: "\${S3_STATE_BUCKET}" TG_TF_PATH: "/usr/local/bin/terraform" before_script: + - echo "DEBUG: S3_ACCESS_KEY is set: \$([ -n \"\${S3_ACCESS_KEY}\" ] && echo 'YES' || echo 'NO')" + - echo "DEBUG: S3_SECRET_KEY is set: \$([ -n \"\${S3_SECRET_KEY}\" ] && echo 'YES' || echo 'NO')" + - echo "DEBUG: S3_ACCESS_KEY length: \${#S3_ACCESS_KEY}" + - echo "DEBUG: S3_SECRET_KEY length: \${#S3_SECRET_KEY}" - export S3_ACCESS_KEY="\${S3_ACCESS_KEY}" - export S3_SECRET_KEY="\${S3_SECRET_KEY}" - export AWS_ACCESS_KEY_ID="\${S3_ACCESS_KEY}" - export AWS_SECRET_ACCESS_KEY="\${S3_SECRET_KEY}" + - export AWS_EC2_METADATA_DISABLED=true - cd \${TG_ROOT} script: - terragrunt init -reconfigure @@ -152,10 +158,15 @@ apply-${job_prefix}: S3_STATE_BUCKET: "\${S3_STATE_BUCKET}" TG_TF_PATH: "/usr/local/bin/terraform" before_script: + - echo "DEBUG: S3_ACCESS_KEY is set: \$([ -n \"\${S3_ACCESS_KEY}\" ] && echo 'YES' || echo 'NO')" + - echo "DEBUG: S3_SECRET_KEY is set: \$([ -n \"\${S3_SECRET_KEY}\" ] && echo 'YES' || echo 'NO')" + - echo "DEBUG: S3_ACCESS_KEY length: \${#S3_ACCESS_KEY}" + - echo "DEBUG: S3_SECRET_KEY length: \${#S3_SECRET_KEY}" - export S3_ACCESS_KEY="\${S3_ACCESS_KEY}" - export S3_SECRET_KEY="\${S3_SECRET_KEY}" - export AWS_ACCESS_KEY_ID="\${S3_ACCESS_KEY}" - export AWS_SECRET_ACCESS_KEY="\${S3_SECRET_KEY}" + - export AWS_EC2_METADATA_DISABLED=true - cd \${TG_ROOT} script: - terragrunt init -reconfigure