From dd03b1e2e3bdcafe6ec4d52a389499d48556a0a3 Mon Sep 17 00:00:00 2001
From: Work <work@ehs-MacBook-Pro.local>
Date: Mon, 26 Jan 2026 13:44:15 +0300
Subject: [PATCH] change pipeline generation + add tf dockerfile

---
 live/terragrunt.hcl          |  2 --
 scripts/generate-pipeline.sh | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/live/terragrunt.hcl b/live/terragrunt.hcl
index 799a0b0..678372e 100644
--- a/live/terragrunt.hcl
+++ b/live/terragrunt.hcl
@@ -9,8 +9,6 @@ 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", ""))
     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 d212c55..93115ca 100755
--- a/scripts/generate-pipeline.sh
+++ b/scripts/generate-pipeline.sh
@@ -20,12 +20,15 @@ workflow:
 variables:
   TERRAFORM_IMAGE_NAME: ${TERRAFORM_IMAGE_NAME}
   YC_IAM_TOKEN: ${YC_IAM_TOKEN}
+  YC_TOKEN: ${YC_IAM_TOKEN}
   YC_STAGE_FOLDER_ID: ${YC_STAGE_FOLDER_ID}
   YC_PROD_FOLDER_ID: ${YC_PROD_FOLDER_ID}
   YC_PREPROD_FOLDER_ID: ${YC_PREPROD_FOLDER_ID}
   S3_ACCESS_KEY: ${S3_ACCESS_KEY}
   S3_SECRET_KEY: ${S3_SECRET_KEY}
   S3_STATE_BUCKET: ${S3_STATE_BUCKET}
+  AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+  AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
 
 stages:
   - validate
@@ -76,13 +79,15 @@ validate-${job_prefix}:
     S3_SECRET_KEY: "\${S3_SECRET_KEY}"
     S3_STATE_BUCKET: "\${S3_STATE_BUCKET}"
     TG_TF_PATH: "/usr/local/bin/terraform"
+    AWS_ACCESS_KEY_ID: "\${AWS_ACCESS_KEY_ID}"
+    AWS_SECRET_ACCESS_KEY: "\${AWS_SECRET_ACCESS_KEY}"
   before_script:
     - echo "${S3_ACCESS_KEY}"
     - echo "${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_ACCESS_KEY_ID="\${AWS_ACCESS_KEY_ID}"
+    - export AWS_SECRET_ACCESS_KEY="\${AWS_SECRET_ACCESS_KEY}"
     - cd \${TG_ROOT}
   script:
     - terragrunt init -reconfigure
@@ -110,6 +115,8 @@ plan-${job_prefix}:
     S3_SECRET_KEY: "\${S3_SECRET_KEY}"
     S3_STATE_BUCKET: "\${S3_STATE_BUCKET}"
     TG_TF_PATH: "/usr/local/bin/terraform"
+    AWS_ACCESS_KEY_ID: "\${AWS_ACCESS_KEY_ID}"
+    AWS_SECRET_ACCESS_KEY: "\${AWS_SECRET_ACCESS_KEY}"
   before_script:
     - export S3_ACCESS_KEY="\${S3_ACCESS_KEY}"
     - export S3_SECRET_KEY="\${S3_SECRET_KEY}"
@@ -153,11 +160,15 @@ apply-${job_prefix}:
     S3_SECRET_KEY: "\${S3_SECRET_KEY}"
     S3_STATE_BUCKET: "\${S3_STATE_BUCKET}"
     TG_TF_PATH: "/usr/local/bin/terraform"
+    AWS_ACCESS_KEY_ID: "\${AWS_ACCESS_KEY_ID}"
+    AWS_SECRET_ACCESS_KEY: "\${AWS_SECRET_ACCESS_KEY}"
   before_script:
     - 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_ACCESS_KEY_ID="\${AWS_ACCESS_KEY_ID}"
+    - export AWS_SECRET_ACCESS_KEY="\${AWS_SECRET_ACCESS_KEY}"
     - cd \${TG_ROOT}
   script:
     - terragrunt init -reconfigure