fix: declare different ami name prefix for test and release builds

In order to differentiate AMIs built for testing and those built for
release, we need different AMI name. This commit introduces a new input
parameter `ami_name_prefix`. For test builds, we set this prefix to
include the GitHub run ID, ensuring uniqueness across test builds. For
release builds, we use a static prefix "supabase-postgres".

Author: jfroche

.github/actions/build-ami/action.yml

@@ -14,6 +14,10 @@ inputs:
   git_sha:
     description: 'Git SHA for this build'
     required: true
+  ami_name_prefix:
+    description: 'Prefix for the AMI name'
+    required: false
+    default: 'supabase-postgres'
 
 outputs:
   stage2_ami_id:
@@ -41,8 +45,7 @@ runs:
       id: generate-vars
       shell: bash
       run: |
-        PG_VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres${{ inputs.postgres_version }}"]' ansible/vars.yml)
-        PG_VERSION=$(echo "$PG_VERSION" | tr -d '"')
+        PG_VERSION=$(nix run nixpkgs#yq -- -r '.postgres_release["postgres${{ inputs.postgres_version }}"]' ansible/vars.yml)
         echo 'postgres-version = "'$PG_VERSION'"' > common-nix.vars.pkr.hcl
         echo "" >> common-nix.vars.pkr.hcl
         git add -f common-nix.vars.pkr.hcl
@@ -52,6 +55,7 @@ runs:
       shell: bash
       env:
         POSTGRES_MAJOR_VERSION: ${{ inputs.postgres_version }}
+        POSTGRES_VERSION: ${{ steps.generate-vars.outputs.version }}
         AWS_MAX_ATTEMPTS: 10
         AWS_RETRY_MODE: adaptive
         AWS_REGION: ${{ inputs.region }}
@@ -63,14 +67,14 @@ runs:
           -var "region=${{ inputs.region }}" \
           -var 'ami_regions=${{ inputs.ami_regions }}' \
           -var-file="development-arm.vars.pkr.hcl" \
-          -var-file="common-nix.vars.pkr.hcl" \
           amazon-arm64-nix.pkr.hcl
 
     - name: Build AMI stage 2
       id: build-stage2
       shell: bash
       env:
         POSTGRES_MAJOR_VERSION: ${{ inputs.postgres_version }}
+        POSTGRES_VERSION: ${{ steps.generate-vars.outputs.version }}
         PACKER_EXECUTION_ID: ${{ env.EXECUTION_ID }}
         AWS_MAX_ATTEMPTS: 10
         AWS_RETRY_MODE: adaptive
@@ -82,7 +86,7 @@ runs:
           -var "postgres_major_version=${{ inputs.postgres_version }}" \
           -var-file="development-arm.vars.pkr.hcl" \
           -var-file="common-nix.vars.pkr.hcl" \
-          -var "postgres-version=${{ env.EXECUTION_ID }}" \
+          -var "ami_name=${{ inputs.ami_name_prefix }}" \
           -var 'ami_regions=${{ inputs.ami_regions }}' \
           -var "force-deregister=true" \
           -var "git_sha=${{ inputs.git_sha }}" \

.github/workflows/ami-release-nix.yml

@@ -131,7 +131,7 @@ jobs:
             -e "internal_artifacts_bucket=${{ secrets.PROD_ARTIFACTS_BUCKET }}" \
             -e "postgres_major_version=${{ matrix.postgres_version }}" \
             manifest-playbook.yml
-    
+
       - name: Upload nix flake revision to s3 prod
         run: |
           aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz

.github/workflows/testinfra-ami-build.yml

@@ -97,6 +97,7 @@ jobs:
           region: ap-southeast-1
           ami_regions: '["ap-southeast-1"]'
           git_sha: ${{ github.sha }}
+          ami_name_prefix: "supabase-postgres-{{ github.run_id }}"
 
       - name: Run tests
         timeout-minutes: 10

nix/packages/build-ami.nix

@@ -54,7 +54,6 @@ writeShellApplication {
     shift || true  # Remove first arg, ignore error if no args
 
     REGION="''${AWS_REGION:-ap-southeast-1}"
-    POSTGRES_VERSION="''${POSTGRES_MAJOR_VERSION:-15}"
     PACKER_SOURCES="${packerSources}"
     INPUT_HASH=$(basename "$PACKER_SOURCES" | cut -d- -f1)