From 47f950d6678cc038daba37a14bd668890045e4ed Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Sat, 28 Feb 2026 00:56:12 +0000 Subject: [PATCH] fix: update S3 backend config for Terraform init Use non-deprecated s3 endpoint settings, switch to use_path_style, and trim newline characters from B2 credentials when generating backend.hcl in CI. --- .gitea/workflows/terraform-apply.yml | 10 ++++++---- .gitea/workflows/terraform-plan.yml | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/terraform-apply.yml b/.gitea/workflows/terraform-apply.yml index 602b21b..a94816c 100644 --- a/.gitea/workflows/terraform-apply.yml +++ b/.gitea/workflows/terraform-apply.yml @@ -24,14 +24,16 @@ jobs: bucket = "${{ secrets.B2_TF_BUCKET }}" key = "terraform.tfstate" region = "us-east-005" - endpoint = "${{ secrets.B2_TF_ENDPOINT }}" - access_key = "${{ secrets.B2_KEY_ID }}" - secret_key = "${{ secrets.B2_APPLICATION_KEY }}" + endpoints = { + s3 = "${{ secrets.B2_TF_ENDPOINT }}" + } + access_key = "$(printf '%s' "${{ secrets.B2_KEY_ID }}" | tr -d '\r\n')" + secret_key = "$(printf '%s' "${{ secrets.B2_APPLICATION_KEY }}" | tr -d '\r\n')" skip_credentials_validation = true skip_metadata_api_check = true skip_region_validation = true skip_requesting_account_id = true - force_path_style = true + use_path_style = true EOF - name: Set up Terraform diff --git a/.gitea/workflows/terraform-plan.yml b/.gitea/workflows/terraform-plan.yml index 34fb360..7854dd6 100644 --- a/.gitea/workflows/terraform-plan.yml +++ b/.gitea/workflows/terraform-plan.yml @@ -26,14 +26,16 @@ jobs: bucket = "${{ secrets.B2_TF_BUCKET }}" key = "terraform.tfstate" region = "us-east-005" - endpoint = "${{ secrets.B2_TF_ENDPOINT }}" - access_key = "${{ secrets.B2_KEY_ID }}" - secret_key = "${{ secrets.B2_APPLICATION_KEY }}" + endpoints = { + s3 = "${{ secrets.B2_TF_ENDPOINT }}" + } + access_key = "$(printf '%s' "${{ secrets.B2_KEY_ID }}" | tr -d '\r\n')" + secret_key = "$(printf '%s' "${{ secrets.B2_APPLICATION_KEY }}" | tr -d '\r\n')" skip_credentials_validation = true skip_metadata_api_check = true skip_region_validation = true skip_requesting_account_id = true - force_path_style = true + use_path_style = true EOF echo "Created secrets.auto.tfvars:" cat secrets.auto.tfvars | sed 's/=.*/=***/'