chore: env var handling

Author: samrose

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

@@ -82,6 +82,8 @@ jobs:
           packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}"  -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "ansible_arguments=-e postgresql_major=${POSTGRES_MAJOR_VERSION}"  amazon-arm64-nix.pkr.hcl
 
       - name: Build AMI stage 2
+        env:
+          POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }}
         run: |
           packer init stage2-nix-psql.pkr.hcl
           GIT_SHA=${{github.sha}}

scripts/nix-provision.sh

@@ -25,35 +25,21 @@ function install_nix() {
 
 
 function execute_stage2_playbook {
+    echo "POSTGRES_MAJOR_VERSION: ${POSTGRES_MAJOR_VERSION}"
+    echo "GIT_SHA: ${GIT_SHA}"
     sudo tee /etc/ansible/ansible.cfg <<EOF
 [defaults]
 callbacks_enabled = timer, profile_tasks, profile_roles
 EOF
     sed -i 's/- hosts: all/- hosts: localhost/' /tmp/ansible-playbook/ansible/playbook.yml
 
-    # Set psql_version and postgresql_version based on POSTGRES_MAJOR_VERSION
-    case "${POSTGRES_MAJOR_VERSION}" in
-        "15")
-            psql_version="psql_15"
-            postgresql_version="postgresql15"
-            ;;
-        "16")
-            psql_version="psql_16"
-            postgresql_version="postgresql16"
-            ;;
-        *)
-            echo "Error: Unsupported POSTGRES_MAJOR_VERSION: ${POSTGRES_MAJOR_VERSION}"
-            exit 1
-            ;;
-    esac
-
     # Run Ansible playbook
     export ANSIBLE_LOG_PATH=/tmp/ansible.log && export ANSIBLE_REMOTE_TEMP=/tmp
     ansible-playbook /tmp/ansible-playbook/ansible/playbook.yml \
         --extra-vars '{"nixpkg_mode": false, "stage2_nix": true, "debpkg_mode": false}' \
         --extra-vars "git_commit_sha=${GIT_SHA}" \
-        --extra-vars "psql_version=${psql_version}" \
-        --extra-vars "postgresql_version=${postgresql_version}" \
+        --extra-vars "psql_version=psql_${POSTGRES_MAJOR_VERSION}" \
+        --extra-vars "postgresql_version=postgresql_${POSTGRES_MAJOR_VERSION}" \
         --extra-vars "nix_secret_key=${NIX_SECRET_KEY}" \
         --extra-vars "postgresql_major_version=${POSTGRES_MAJOR_VERSION}" \
         $ARGS