From cd16545ad33cf3df386ff3ee841c359fb8474de8 Mon Sep 17 00:00:00 2001
From: MichaelFisher1997 <contact@michaelfisher.tech>
Date: Sat, 28 Feb 2026 20:58:40 +0000
Subject: [PATCH] fix: Add skip_requesting_account_id and use endpoints.s3 for
 Backblaze B2

---
 .gitea/workflows/deploy.yml  | 5 +++--
 .gitea/workflows/destroy.yml | 5 +++--
 README.md                    | 9 +++++----
 terraform/backend.tf         | 1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index a04f59b..a794ee7 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -36,11 +36,12 @@ jobs:
         working-directory: terraform
         run: |
           terraform init \
-            -backend-config="endpoint=${{ secrets.S3_ENDPOINT }}" \
+            -backend-config="endpoints.s3=${{ secrets.S3_ENDPOINT }}" \
             -backend-config="bucket=${{ secrets.S3_BUCKET }}" \
             -backend-config="region=auto" \
             -backend-config="access_key=${{ secrets.S3_ACCESS_KEY }}" \
-            -backend-config="secret_key=${{ secrets.S3_SECRET_KEY }}"
+            -backend-config="secret_key=${{ secrets.S3_SECRET_KEY }}" \
+            -backend-config="skip_requesting_account_id=true"
 
       - name: Terraform Validate
         working-directory: terraform
diff --git a/.gitea/workflows/destroy.yml b/.gitea/workflows/destroy.yml
index 1c06e68..7b58df6 100644
--- a/.gitea/workflows/destroy.yml
+++ b/.gitea/workflows/destroy.yml
@@ -30,11 +30,12 @@ jobs:
         working-directory: terraform
         run: |
           terraform init \
-            -backend-config="endpoint=${{ secrets.S3_ENDPOINT }}" \
+            -backend-config="endpoints.s3=${{ secrets.S3_ENDPOINT }}" \
             -backend-config="bucket=${{ secrets.S3_BUCKET }}" \
             -backend-config="region=auto" \
             -backend-config="access_key=${{ secrets.S3_ACCESS_KEY }}" \
-            -backend-config="secret_key=${{ secrets.S3_SECRET_KEY }}"
+            -backend-config="secret_key=${{ secrets.S3_SECRET_KEY }}" \
+            -backend-config="skip_requesting_account_id=true"
 
       - name: Terraform Destroy
         working-directory: terraform
diff --git a/README.md b/README.md
index 72f7dd7..dcb2bf4 100644
--- a/README.md
+++ b/README.md
@@ -97,10 +97,11 @@ cd terraform
 
 # Create backend config file (or use CLI args)
 cat > backend.hcl << EOF
-endpoint        = "https://s3.eu-central-003.backblazeb2.com"
-bucket          = "k8s-terraform-state"
-access_key      = "your-backblaze-key-id"
-secret_key      = "your-backblaze-application-key"
+endpoints.s3                = "https://s3.eu-central-003.backblazeb2.com"
+bucket                      = "k8s-terraform-state"
+access_key                  = "your-backblaze-key-id"
+secret_key                  = "your-backblaze-application-key"
+skip_requesting_account_id  = true
 EOF
 
 terraform init -backend-config=backend.hcl
diff --git a/terraform/backend.tf b/terraform/backend.tf
index df54d30..b39f369 100644
--- a/terraform/backend.tf
+++ b/terraform/backend.tf
@@ -5,6 +5,7 @@ terraform {
     skip_credentials_validation = true
     skip_metadata_api_check     = true
     skip_region_validation      = true
+    skip_requesting_account_id  = true
     force_path_style            = true
   }
 }