From 6cd556998b0123b7e965ea7a08412bbdda6132b3 Mon Sep 17 00:00:00 2001
From: Izel Nakri <contact@izelnakri.com>
Date: Fri, 30 Aug 2024 03:37:48 +0200
Subject: [PATCH] use postgres default ENV variable names everywhere

---
 .env                |  7 +++----
 config/test.exs     | 21 ++++++++++++---------
 docker-compose.yaml | 10 +++++-----
 setup-database.sh   |  4 ++--
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/.env b/.env
index 3b0ed29f..17efe3a4 100644
--- a/.env
+++ b/.env
@@ -1,9 +1,8 @@
 REGISTRY="inakri" # set -a && source .env
 REPO_OWNER="izelnakri"
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=postgres
-POSTGRES_HOST=localhost
-PG_HOST=localhost
+PGUSER=postgres
+PGPASSWORD=postgres
+PGHOST=localhost
 MIX_ENV=test
 # CIRCLE_BRANCH=$$(if [ -v CIRCLE_BRANCH ]; then echo master; else git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'; fi)
 # DOCKER_TAG=paper_trail:master
diff --git a/config/test.exs b/config/test.exs
index 9ed97309..0ad80afe 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -7,26 +7,29 @@ config :paper_trail, repo: PaperTrail.Repo, originator: [name: :user, model: Use
 
 config :paper_trail, PaperTrail.Repo,
   adapter: Ecto.Adapters.Postgres,
-  username: System.get_env("POSTGRES_USER"),
-  password: System.get_env("POSTGRES_PASSWORD"),
+  username: System.get_env("PGUSER"),
+  password: System.get_env("PGPASSWORD"),
   database: "paper_trail_test",
-  hostname: System.get_env("PG_HOST"),
+  hostname: System.get_env("PGHOST"),
+  show_sensitive_data_on_connection_error: true,
   poolsize: 10
 
 config :paper_trail, PaperTrail.UUIDRepo,
   adapter: Ecto.Adapters.Postgres,
-  username: System.get_env("POSTGRES_USER"),
-  password: System.get_env("POSTGRES_PASSWORD"),
+  username: System.get_env("PGUSER"),
+  password: System.get_env("PGPASSWORD"),
   database: "paper_trail_uuid_test",
-  hostname: System.get_env("PG_HOST"),
+  hostname: System.get_env("PGHOST"),
+  show_sensitive_data_on_connection_error: true,
   poolsize: 10
 
 config :paper_trail, PaperTrail.UUIDWithCustomNameRepo,
   adapter: Ecto.Adapters.Postgres,
-  username: System.get_env("POSTGRES_USER"),
-  password: System.get_env("POSTGRES_PASSWORD"),
+  username: System.get_env("PGUSER"),
+  password: System.get_env("PGPASSWORD"),
   database: "paper_trail_uuid_with_custom_name_test",
-  hostname: System.get_env("PG_HOST"),
+  hostname: System.get_env("PGHOST"),
+  show_sensitive_data_on_connection_error: true,
   poolsize: 10
 
 config :logger, level: :warn
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1f777fdb..c1600c3b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,8 +3,8 @@ services:
   db:
     image: postgres:12.2-alpine
     environment:
-      POSTGRES_PASSWORD: $POSTGRES_USER
-      POSTGRES_USER: $POSTGRES_PASSWORD
+      PGPASSWORD: $PGPASSWORD
+      PGUSER: $PGUSER
       PGDATA: /var/lib/postgresql/data/pgdata
     restart: always
     networks:
@@ -19,10 +19,10 @@ services:
       cache_from:
         - $REGISTRY/$REPO_OWNER/$DOCKER_TAG
     environment:
-      POSTGRES_USER: $POSTGRES_USER
-      POSTGRES_PASSWORD: $POSTGRES_PASSWORD
+      PGUSER: $PGUSER
+      PGPASSWORD: $PGPASSWORD
       PGPORT: 5432
-      PG_HOST: db
+      PGHOST: db
       MIX_ENV: $MIX_ENV
     tty: true
     depends_on:
diff --git a/setup-database.sh b/setup-database.sh
index 6866ddd0..aede2c49 100644
--- a/setup-database.sh
+++ b/setup-database.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -oe allexport
-source .env
+source ./.env
 
 # Prepare Dialyzer if the project has Dialyxer set up
 # if mix help dialyzer >/dev/null 2>&1
@@ -12,7 +12,7 @@ source .env
 # fi
 
 # Wait for Postgres to become available.
-until psql -h $PG_HOST -U "$POSTGRES_USER" -c '\q' 2>/dev/null; do
+until psql -h $PGHOST -U "$PGUSER" -c '\q' 2>/dev/null; do
   >&2 echo "Postgres is unavailable - sleeping"
   sleep 1
 done