Chore/test db setup (#199)

Author: dcollie2

.env.example

@@ -17,6 +17,3 @@ AWS_ENDPOINT_URL=http://localstack:4566
 AZURE_STORAGE_ACCOUNT_NAME=skillrx
 AZURE_STORAGE_ACCOUNT_KEY=skillrx
 AZURE_STORAGE_SHARE_NAME=skillrx
-
-DATABASE_URL=postgres://@localhost:5432/skillrx_test
-QUEUE_DATABASE_URL=postgres://@localhost:5432/skillrx_test_queue

.github/workflows/ci.yml

@@ -59,14 +59,12 @@ jobs:
   test:
     runs-on: ubuntu-latest
     env:
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/skillrx_test
-      QUEUE_DATABASE_URL: postgres://postgres:postgres@localhost:5432/skillrx_test_queue
+      DATABASE_USERNAME: 'postgres'
     services:
       postgres:
         image: postgres
         env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_HOST_AUTH_METHOD: trust
         ports:
           - 5432:5432
         options: --health-cmd="pg_isready" --health-interval=10s --health-timeout=5s --health-retries=3

README.md

@@ -21,6 +21,11 @@ Clone the codebase
 git clone [email protected]:rubyforgood/skillrx.git
 ``` 
 
+Create new DB role:
+```
+psql -d postgres -c 'CREATE ROLE skillrx LOGIN CREATEDB SUPERUSER;'
+```
+
 Run the setup script to prepare the DB and assets
 ```sh
 bin/setup

config/database.yml

@@ -16,8 +16,8 @@ default: &default
   adapter: postgresql
   encoding: unicode
   host: <%= ENV.fetch('DATABASE_HOST') { 'localhost' } %>
-  user: <%= ENV.fetch('DATABASE_USERNAME') { 'postgres' } %>
-  password: <%= ENV.fetch('DATABASE_PASSWORD') { 'postgres' } %>
+  user: <%= ENV.fetch('DATABASE_USERNAME') { 'skillrx' } %>
+  password: <%= ENV.fetch('DATABASE_PASSWORD') { '' } %>
   port: <%= ENV.fetch('DATABASE_PORT') { 5432 }  %>
   # For details on connection pooling, see Rails configuration guide
   # https://guides.rubyonrails.org/configuring.html#database-pooling
@@ -64,9 +64,11 @@ development:
 # Do not set this db to the same as development or production.
 test:
   primary:
-    url : <%= ENV["DATABASE_URL"] %>
+    <<: *default
+    database: skillrx_test
   queue:
-    url : <%= ENV["QUEUE_DATABASE_URL"] %>
+    <<: *default
+    database: skillrx_test_queue
     migrations_paths: db/queue_migrate
 
 # As with config/credentials.yml, you never want to store sensitive information,
@@ -115,9 +117,9 @@ staging:
     migrations_paths: db/cache_migrate
   queue:
     <<: *default
-    url: <%= ENV['HEROKU_POSTGRESQL_QUEUE_URL'] || ENV['DATABASE_URL'] %>
+    url: <%= ENV['HEROKU_POSTGRESQL_QUEUE_URL'] || ENV['QUEUE_DATABASE_URL'] %>
     migrations_paths: db/queue_migrate
   cable:
     <<: *default
-    url: <%= ENV['HEROKU_POSTGRESQL_CABLE_URL'] || ENV['DATABASE_URL'] %>
+    url: <%= ENV['HEROKU_POSTGRESQL_CABLE_URL'] || ENV['CABLE_DATABASE_URL'] %>
     migrations_paths: db/cable_migrate