fix: try instead to consolidate all on ap-southeast-1

samrose · samrose · commit a81c79f237fc · 2025-11-11T12:52:48.000-05:00
diff --git a/.github/workflows/ami-release-nix-single.yml b/.github/workflows/ami-release-nix-single.yml
@@ -31,7 +31,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.DEV_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
           output-credentials: true
           role-duration-seconds: 7200
 
@@ -97,7 +97,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.DEV_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
 
       - name: Upload software manifest to s3 staging
         run: |
@@ -118,7 +118,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
 
       - name: Upload software manifest to s3 prod
         run: |
diff --git a/.github/workflows/ami-release-nix.yml b/.github/workflows/ami-release-nix.yml
@@ -55,7 +55,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.DEV_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
           output-credentials: true
           role-duration-seconds: 7200
 
@@ -123,7 +123,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.DEV_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
 
       - name: Upload software manifest to s3 staging
         run: |
@@ -144,7 +144,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
 
       - name: Upload software manifest to s3 prod
         run: |
diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml
@@ -28,7 +28,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v2.2.0
         with:
           role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
-          aws-region: us-east-1
+          aws-region: ap-southeast-1
       - uses: docker/login-action@v2
         with:
           registry: public.ecr.aws
diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml
@@ -40,7 +40,7 @@ jobs:
         if: ${{ github.secret_source == 'Actions' }}
         with:
           role-to-assume: ${{ secrets.DEV_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
           output-credentials: true
           role-duration-seconds: 7200
       - name: Setup AWS credentials for Nix
diff --git a/.github/workflows/publish-migrations-prod.yml b/.github/workflows/publish-migrations-prod.yml
@@ -32,7 +32,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v1
         with:
           role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
 
       - name: Deploy to S3 prod
         shell: bash
diff --git a/.github/workflows/publish-migrations-staging.yml b/.github/workflows/publish-migrations-staging.yml
@@ -25,7 +25,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v1
         with:
           role-to-assume: ${{ secrets.DEV_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
 
       - name: Deploy to S3 staging
         shell: bash
diff --git a/.github/workflows/publish-nix-pgupgrade-bin-flake-version.yml b/.github/workflows/publish-nix-pgupgrade-bin-flake-version.yml
@@ -62,7 +62,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v1
         with:
           role-to-assume: ${{ secrets.DEV_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
 
       - name: Upload pg_upgrade scripts to s3 staging
         run: |
@@ -111,7 +111,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v1
         with:
           role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
   
       - name: Upload pg_upgrade scripts to s3 prod
         run: |
diff --git a/.github/workflows/publish-nix-pgupgrade-scripts.yml b/.github/workflows/publish-nix-pgupgrade-scripts.yml
@@ -67,7 +67,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v1
         with:
           role-to-assume: ${{ secrets.DEV_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
 
       - name: Upload pg_upgrade scripts to s3 staging
         run: |
@@ -118,7 +118,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v1
         with:
           role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
   
       - name: Upload pg_upgrade scripts to s3 prod
         run: |
diff --git a/.github/workflows/qemu-image-build.yml b/.github/workflows/qemu-image-build.yml
@@ -103,7 +103,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.CONTROL_PLANE_DEV_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
 
       - name: Login to Amazon ECR
         id: login-ecr-private-dev
@@ -117,7 +117,7 @@ jobs:
 
       - name: Push docker image to Amazon ECR
         env:
-          REGISTRY: 812073016711.dkr.ecr.us-east-1.amazonaws.com
+          REGISTRY: 812073016711.dkr.ecr.ap-southeast-1.amazonaws.com
           REPOSITORY: postgres-vm-image
           IMAGE_TAG: ${{ steps.process_release_version.outputs.version }}
         run: |
@@ -129,15 +129,15 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.CONTROL_PLANE_PROD_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
 
       - name: Login to Amazon ECR
         id: login-ecr-private-prod
         uses: aws-actions/amazon-ecr-login@v2
 
       - name: Push docker image to Amazon ECR
         env:
-          REGISTRY: 156470330064.dkr.ecr.us-east-1.amazonaws.com
+          REGISTRY: 156470330064.dkr.ecr.ap-southeast-1.amazonaws.com
           REPOSITORY: postgres-vm-image
           IMAGE_TAG: ${{ steps.process_release_version.outputs.version }}
         run: |
diff --git a/.github/workflows/testinfra-ami-build.yml b/.github/workflows/testinfra-ami-build.yml
@@ -67,7 +67,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.DEV_AWS_ROLE }}
-          aws-region: "us-east-1"
+          aws-region: "ap-southeast-1"
           output-credentials: true
           role-duration-seconds: 7200
 
@@ -112,13 +112,13 @@ jobs:
         run: |
           GIT_SHA=${{github.sha}}
           nix run github:supabase/postgres/${GIT_SHA}#packer -- init amazon-arm64-nix.pkr.hcl
-          nix run github:supabase/postgres/${GIT_SHA}#packer -- build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${EXECUTION_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "ansible_arguments=" -var "postgres-version=${{ steps.random.outputs.random_string }}" -var "region=us-east-1" -var 'ami_regions=["us-east-1"]' -var "force-deregister=true" -var "ansible_arguments=-e postgresql_major=${POSTGRES_MAJOR_VERSION}" amazon-arm64-nix.pkr.hcl
+          nix run github:supabase/postgres/${GIT_SHA}#packer -- build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${EXECUTION_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "ansible_arguments=" -var "postgres-version=${{ steps.random.outputs.random_string }}" -var "region=ap-southeast-1" -var 'ami_regions=["ap-southeast-1"]' -var "force-deregister=true" -var "ansible_arguments=-e postgresql_major=${POSTGRES_MAJOR_VERSION}" amazon-arm64-nix.pkr.hcl
 
       - name: Build AMI stage 2
         run: |
           GIT_SHA=${{github.sha}}
           nix run github:supabase/postgres/${GIT_SHA}#packer -- init stage2-nix-psql.pkr.hcl
-          nix run github:supabase/postgres/${GIT_SHA}#packer -- build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${EXECUTION_ID}" -var "postgres_major_version=${POSTGRES_MAJOR_VERSION}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl"  -var "postgres-version=${{ steps.random.outputs.random_string }}" -var "region=us-east-1" -var 'ami_regions=["us-east-1"]' -var "force-deregister=true" -var "git_sha=${GITHUB_SHA}"  stage2-nix-psql.pkr.hcl
+          nix run github:supabase/postgres/${GIT_SHA}#packer -- build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${EXECUTION_ID}" -var "postgres_major_version=${POSTGRES_MAJOR_VERSION}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl"  -var "postgres-version=${{ steps.random.outputs.random_string }}" -var "region=ap-southeast-1" -var 'ami_regions=["ap-southeast-1"]' -var "force-deregister=true" -var "git_sha=${GITHUB_SHA}"  stage2-nix-psql.pkr.hcl
 
       - name: Run tests
         timeout-minutes: 10
@@ -132,12 +132,12 @@ jobs:
       - name: Cleanup resources on build cancellation
         if: ${{ cancelled() }}
         run: |
-          aws ec2 --region us-east-1 describe-instances --filters "Name=tag:packerExecutionId,Values=${EXECUTION_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -r aws ec2 terminate-instances --region us-east-1 --instance-ids
+          aws ec2 --region ap-southeast-1 describe-instances --filters "Name=tag:packerExecutionId,Values=${EXECUTION_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -r aws ec2 terminate-instances --region ap-southeast-1 --instance-ids
 
       - name: Cleanup resources after build
         if: ${{ always() }}
         run: |
-          aws ec2 --region us-east-1 describe-instances --filters "Name=tag:testinfra-run-id,Values=${EXECUTION_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -r aws ec2 terminate-instances --region us-east-1 --instance-ids || true
+          aws ec2 --region ap-southeast-1 describe-instances --filters "Name=tag:testinfra-run-id,Values=${EXECUTION_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -r aws ec2 terminate-instances --region ap-southeast-1 --instance-ids || true
 
       - name: Cleanup AMIs
         if: always()
@@ -149,10 +149,10 @@ jobs:
           # Function to deregister AMIs by name pattern
           deregister_ami_by_name() {
             local ami_name_pattern=$1
-            local ami_ids=$(aws ec2 describe-images --region us-east-1 --owners self --filters "Name=name,Values=${ami_name_pattern}" --query 'Images[*].ImageId' --output text)
+            local ami_ids=$(aws ec2 describe-images --region ap-southeast-1 --owners self --filters "Name=name,Values=${ami_name_pattern}" --query 'Images[*].ImageId' --output text)
             for ami_id in $ami_ids; do
               echo "Deregistering AMI: $ami_id"
-              aws ec2 deregister-image --region us-east-1 --image-id $ami_id
+              aws ec2 deregister-image --region ap-southeast-1 --image-id $ami_id
             done
           }
 
diff --git a/amazon-arm64-nix.pkr.hcl b/amazon-arm64-nix.pkr.hcl
@@ -15,7 +15,7 @@ variable "ami_name" {
 
 variable "ami_regions" {
   type    = list(string)
-  default = ["us-east-1"]
+  default = ["ap-southeast-1"]
 }
 
 variable "ansible_arguments" {
diff --git a/development-arm.vars.pkr.hcl b/development-arm.vars.pkr.hcl
@@ -1,7 +1,7 @@
 arch = "arm64"
-ami_regions = ["us-east-1"]
+ami_regions = ["ap-southeast-1"]
 environment = "dev"
 instance-type = "c6g.4xlarge"
-region= "us-east-1"
+region= "ap-southeast-1"
 ubuntu-2004 = "ami-0b49a4a6e8e22fa16"
 
diff --git a/nix/docs/development-workflow.md b/nix/docs/development-workflow.md
@@ -110,7 +110,7 @@ This will:
 
 The following environment variables are used:
 - `AWS_VAULT`: AWS Vault profile name (default: staging)
-- `AWS_REGION`: AWS region (default: us-east-1)
+- `AWS_REGION`: AWS region (default: ap-southeast-1)
 - `AMI_NAME`: Name of the AMI to test
 
 ## Best Practices
diff --git a/nix/packages/build-test-ami.nix b/nix/packages/build-test-ami.nix
@@ -84,7 +84,7 @@ runCommand "build-test-ami"
     fi
 
     # Set values
-    REGION="us-east-1"
+    REGION="ap-southeast-1"
     POSTGRES_VERSION="$1"
     RANDOM_STRING=$(openssl rand -hex 8)
     GIT_SHA=$(git rev-parse HEAD)
diff --git a/nix/packages/cleanup-ami.nix b/nix/packages/cleanup-ami.nix
@@ -45,7 +45,7 @@ runCommand "cleanup-ami"
     fi
 
     AMI_NAME="$1"
-    REGION="us-east-1"
+    REGION="ap-southeast-1"
 
     # Deregister AMIs
     for AMI_PATTERN in "supabase-postgres-ci-ami-test-stage-1" "$AMI_NAME"; do
diff --git a/nix/packages/run-testinfra.nix b/nix/packages/run-testinfra.nix
@@ -93,19 +93,19 @@ runCommand "run-testinfra"
     fi
 
     # Set environment variables
-    export AWS_REGION="us-east-1"
-    export AWS_DEFAULT_REGION="us-east-1"
+    export AWS_REGION="ap-southeast-1"
+    export AWS_DEFAULT_REGION="ap-southeast-1"
     export AMI_NAME="$AMI_NAME"  # Export AMI_NAME for pytest
     export RUN_ID="local-$(date +%s)"  # Generate a unique RUN_ID
 
     # Function to terminate EC2 instances
     terminate_instances() {
       echo "Terminating EC2 instances with tag testinfra-run-id=$RUN_ID..."
-      aws-vault exec $AWS_VAULT_PROFILE -- aws ec2 --region us-east-1 describe-instances \
+      aws-vault exec $AWS_VAULT_PROFILE -- aws ec2 --region ap-southeast-1 describe-instances \
         --filters "Name=tag:testinfra-run-id,Values=$RUN_ID" \
         --query "Reservations[].Instances[].InstanceId" \
         --output text | xargs -r aws-vault exec $AWS_VAULT_PROFILE -- aws ec2 terminate-instances \
-        --region us-east-1 --instance-ids || true
+        --region ap-southeast-1 --instance-ids || true
     }
 
     # Set up traps for various signals to ensure cleanup
diff --git a/testinfra/README.md b/testinfra/README.md
@@ -56,8 +56,8 @@ AWS_PROFILE=supabase-dev packer build \
   -var-file=common.vars.pkr.hcl \
   -var "ansible_arguments=" \
   -var "postgres-version=ci-ami-test" \
-  -var "region=us-east-1" \
-  -var 'ami_regions=["us-east-1"]' \
+  -var "region=ap-southeast-1" \
+  -var 'ami_regions=["ap-southeast-1"]' \
   -var "force-deregister=true" \
   amazon-arm64.pkr.hcl
 
diff --git a/testinfra/test_ami_nix.py b/testinfra/test_ami_nix.py
@@ -132,7 +132,7 @@
 """
 walg_config_json_content = """
 {
-  "AWS_REGION": "us-east-1",
+  "AWS_REGION": "ap-southeast-1",
   "WALG_S3_PREFIX": "",
   "PGDATABASE": "postgres",
   "PGUSER": "supabase_admin",
@@ -158,7 +158,7 @@
   "service_key": "{service_role_key}",
   "supabase_admin_key": "{supabase_admin_key}",
   "common_name": "db.aaaaaaaaaaaaaaaaaaaa.supabase.red",
-  "region": "us-east-1",
+  "region": "ap-southeast-1",
   "init_database_only": false
 }}
 """
@@ -223,7 +223,7 @@ def run_ssh_command(ssh, command, timeout=None):
 # scope='function' uses a new container per test function.
 @pytest.fixture(scope="session")
 def host():
-    ec2 = boto3.resource("ec2", region_name="us-east-1")
+    ec2 = boto3.resource("ec2", region_name="ap-southeast-1")
     images = list(
         ec2.images.filter(
             Filters=[{"Name": "name", "Values": [AMI_NAME]}],
@@ -256,7 +256,7 @@ def gzip_then_base64_encode(s: str) -> str:
                 "HttpTokens": "required",
                 "HttpEndpoint": "enabled",
             },
-            IamInstanceProfile={"Name": "pg-us-east-1"},
+            IamInstanceProfile={"Name": "pg-ap-southeast-1"},
             InstanceType="t4g.micro",
             MinCount=1,
             MaxCount=1,
@@ -281,7 +281,7 @@ def gzip_then_base64_encode(s: str) -> str:
     - {{path: /tmp/init.json, content: {gzip_then_base64_encode(init_json_content)}, permissions: '0600', encoding: gz+b64}}
 runcmd:
     - 'sudo echo \"pgbouncer\" \"postgres\" >> /etc/pgbouncer/userlist.txt'
-    - 'cd /tmp && aws s3 cp --region us-east-1 s3://init-scripts-staging/project/init.sh .'
+    - 'cd /tmp && aws s3 cp --region ap-southeast-1 s3://init-scripts-staging/project/init.sh .'
     - 'bash init.sh "staging"'
     - 'touch /var/lib/init-complete'
     - 'rm -rf /tmp/*'
