Change the place for the password

Author: a-masterov

docker-compose/docker-compose.yml

@@ -187,6 +187,8 @@ services:
   neon-test-extensions:
     profiles: ["test-extensions"]
     image: ${REPOSITORY:-neondatabase}/neon-test-extensions-v${PG_TEST_VERSION:-16}:${TAG:-latest}
+    environment:
+      - PGPASSWORD=cloud_admin
     entrypoint:
       - "/bin/bash"
       - "-c"

docker-compose/test_extensions_upgrade.sh

@@ -45,24 +45,24 @@ EXTENSIONS='[
 EXTNAMES=$(echo ${EXTENSIONS} | jq -r '.[].extname' | paste -sd ' ' -)
 TAG=${NEWTAG} docker compose --profile test-extensions up --build -d
 wait_for_ready
-docker compose exec -e PGPASSWORD=cloud_admin neon-test-extensions psql -c "CREATE DATABASE contrib_regression"
+docker compose exec neon-test-extensions psql -c "CREATE DATABASE contrib_regression"
 create_extensions "${EXTNAMES}"
 query="select json_object_agg(extname,extversion) from pg_extension where extname in ('${EXTNAMES// /\',\'}')"
-new_vers=$(docker compose exec -e PGPASSWORD=cloud_admin neon-test-extensions psql -Aqt -d contrib_regression -c "$query")
+new_vers=$(docker compose exec neon-test-extensions psql -Aqt -d contrib_regression -c "$query")
 docker compose --profile test-extensions down
 TAG=${OLDTAG} docker compose --profile test-extensions up --build -d --force-recreate
 wait_for_ready
 # XXX this is about to be included into the image, for test only
 docker compose cp  ext-src neon-test-extensions:/
-docker compose exec -e PGPASSWORD=cloud_admin neon-test-extensions psql -c "CREATE DATABASE contrib_regression"
+docker compose exec neon-test-extensions psql -c "CREATE DATABASE contrib_regression"
 create_extensions "${EXTNAMES}"
 query="select pge.extname from pg_extension pge join (select key as extname, value as extversion from json_each_text('${new_vers}')) x on pge.extname=x.extname and pge.extversion <> x.extversion"
-exts=$(docker compose exec -e PGPASSWORD=cloud_admin neon-test-extensions psql -Aqt -d contrib_regression -c "$query")
+exts=$(docker compose exec neon-test-extensions psql -Aqt -d contrib_regression -c "$query")
 if [ -z "${exts}" ]; then
   echo "No extensions were upgraded"
 else
-  tenant_id=$(docker compose exec -e PGPASSWORD=cloud_admin neon-test-extensions psql -Aqt -c "SHOW neon.tenant_id")
-  timeline_id=$(docker compose exec -e PGPASSWORD=cloud_admin neon-test-extensions psql -Aqt -c "SHOW neon.timeline_id")
+  tenant_id=$(docker compose exec neon-test-extensions psql -Aqt -c "SHOW neon.tenant_id")
+  timeline_id=$(docker compose exec neon-test-extensions psql -Aqt -c "SHOW neon.timeline_id")
   for ext in ${exts}; do
     echo Testing ${ext}...
     EXTDIR=$(echo ${EXTENSIONS} | jq -r '.[] | select(.extname=="'${ext}'") | .extdir')
@@ -79,15 +79,15 @@ else
     TENANT_ID=${tenant_id} TIMELINE_ID=${new_timeline_id} TAG=${OLDTAG} docker compose down compute compute_is_ready
     COMPUTE_TAG=${NEWTAG} TAG=${OLDTAG} TENANT_ID=${tenant_id} TIMELINE_ID=${new_timeline_id} docker compose up -d --build compute compute_is_ready
     wait_for_ready
-    TID=$(docker compose exec -e PGPASSWORD=cloud_admin neon-test-extensions psql -Aqt -c "SHOW neon.timeline_id")
+    TID=$(docker compose exec neon-test-extensions psql -Aqt -c "SHOW neon.timeline_id")
     if [ ${TID} != ${new_timeline_id} ]; then
       echo Timeline mismatch
       exit 1
     fi
-    docker compose exec -e PGPASSWORD=cloud_admin neon-test-extensions psql -d contrib_regression -c "\dx ${ext}"
-    docker compose exec -e PGPASSWORD=cloud_admin neon-test-extensions sh -c /ext-src/${EXTDIR}/test-upgrade.sh
-    docker compose exec -e PGPASSWORD=cloud_admin neon-test-extensions psql -d contrib_regression -c "alter extension ${ext} update"
-    docker compose exec -e PGPASSWORD=cloud_admin neon-test-extensions psql -d contrib_regression -c "\dx ${ext}"
+    docker compose exec neon-test-extensions psql -d contrib_regression -c "\dx ${ext}"
+    docker compose exec neon-test-extensions sh -c /ext-src/${EXTDIR}/test-upgrade.sh
+    docker compose exec neon-test-extensions psql -d contrib_regression -c "alter extension ${ext} update"
+    docker compose exec neon-test-extensions psql -d contrib_regression -c "\dx ${ext}"
   done
 fi
 docker compose --profile test-extensions down