From 6914f5803dc20c708ae4d346f456a443d2acb881 Mon Sep 17 00:00:00 2001 From: Work Date: Mon, 26 Jan 2026 15:05:41 +0300 Subject: [PATCH] change pipeline generation + add tf dockerfile --- live/terragrunt.hcl | 3 ++- scripts/generate-pipeline.sh | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/live/terragrunt.hcl b/live/terragrunt.hcl index 799a0b0..d985be2 100644 --- a/live/terragrunt.hcl +++ b/live/terragrunt.hcl @@ -10,11 +10,12 @@ remote_state { 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", "")) + secret_key = get_env("S3_SECRET_KEY", get_envц"AWS_SECRET_ACCESS_KEY", "")) skip_region_validation = true skip_credentials_validation = true skip_metadata_api_check = true force_path_style = true + skip_bucket_root_access = true } } diff --git a/scripts/generate-pipeline.sh b/scripts/generate-pipeline.sh index b17db3c..c6816b2 100755 --- a/scripts/generate-pipeline.sh +++ b/scripts/generate-pipeline.sh @@ -86,11 +86,15 @@ validate-${job_prefix}: - echo "CI_PROJECT_DIR=\${CI_PROJECT_DIR}" - export AWS_ACCESS_KEY_ID="\${AWS_ACCESS_KEY_ID}" - export AWS_SECRET_ACCESS_KEY="\${AWS_SECRET_ACCESS_KEY}" + - export S3_ACCESS_KEY="\${S3_ACCESS_KEY}" + - export S3_SECRET_KEY="\${S3_SECRET_KEY}" - cd \${TG_ROOT} - ls -la - rm -rf .terragrunt-cache script: + - env | grep -E "(S3_|AWS_)" || echo "No S3/AWS vars found" - terragrunt init -reconfigure + - find .terragrunt-cache -name "backend.tf" -exec echo "=== {} ===" \; -exec head -15 {} \; 2>/dev/null || echo "No backend.tf found" - terragrunt validate-inputs - terragrunt validate rules: @@ -125,7 +129,12 @@ plan-${job_prefix}: - ls -la - rm -rf .terragrunt-cache script: - - terragrunt init -reconfigure + - terragrunt init -reconfigure || true + - echo "=== Checking generated backend.tf ===" + - find .terragrunt-cache -name "backend.tf" -exec echo "=== {} ===" \; -exec head -15 {} \; 2>/dev/null || echo "No backend.tf found" + - echo "=== Environment variables ===" + - env | grep -E "(S3_|AWS_)" || echo "No S3/AWS vars found" + - exit 1 - terragrunt plan -out=tfplan rules: - if: '\$CI_COMMIT_BRANCH == "master" || \$CI_COMMIT_BRANCH == "main"' @@ -171,7 +180,12 @@ apply-${job_prefix}: - ls -la - rm -rf .terragrunt-cache script: - - terragrunt init -reconfigure + - terragrunt init -reconfigure || true + - echo "=== Checking generated backend.tf ===" + - find .terragrunt-cache -name "backend.tf" -exec echo "=== {} ===" \; -exec head -15 {} \; 2>/dev/null || echo "No backend.tf found" + - echo "=== Environment variables ===" + - env | grep -E "(S3_|AWS_)" || echo "No S3/AWS vars found" + - exit 1 - terragrunt apply tfplan rules: - if: '\$CI_COMMIT_BRANCH == "master" || \$CI_COMMIT_BRANCH == "main"'