deleted cargo config and fmt

.github/workflows/general.yml

@@ -13,11 +13,9 @@ env:
   CARGO_TERM_COLOR: always
   SQLX_VERSION: 0.8.6
   SQLX_FEATURES: "rustls,postgres"
-  APP_USER: app
-  APP_USER_PWD: secret
-  APP_DB_NAME: newsletter
-  APP_DATABASE__PORT: 15432
-  APP_REDIS_URI: redis://127.0.0.1:16379
+  DATABASE_URL: postgres://postgres:password@postgres:5432/newsletter
+  APP_DATABASE__HOST: postgres
+  APP_REDIS_URI: redis://redis:6379
 
 jobs:
   test:
@@ -29,7 +27,7 @@ jobs:
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: password
-          POSTGRES_DB: postgres
+          POSTGRES_DB: newsletter
         ports:
           - 15432:5432
       redis:
@@ -49,19 +47,10 @@ jobs:
           --features ${{ env.SQLX_FEATURES }}
           --no-default-features
           --locked
-      - name: Create app user in Postgres
-        run: |
-          sudo apt-get update && sudo apt-get install postgresql-client
-
-          CREATE_QUERY="CREATE USER ${APP_USER} WITH PASSWORD '${APP_USER_PWD}';"
-          PGPASSWORD="password" psql -U postgres -h localhost -p 15432 -c "${CREATE_QUERY}"
-
-          GRANT_QUERY="ALTER USER ${APP_USER} CREATEDB;"
-          PGPASSWORD="password" psql -U postgres -h localhost -p 15432 -c "${GRANT_QUERY}"
       - name: Migrate database
-        run: SKIP_DOCKER=true ./scripts/init_db.sh
+        run: cargo sqlx migrate run
       - name: Run tests
-        run: cargo test
+        run: TEST_LOG=true cargo test
       - name: Check that queries are fresh
         run: cargo sqlx prepare --check --workspace
 
@@ -102,7 +91,7 @@ jobs:
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: password
-          POSTGRES_DB: postgres
+          POSTGRES_DB: newsletter
         ports:
           - 15432:5432
       redis:
@@ -122,17 +111,8 @@ jobs:
           --features ${{ env.SQLX_FEATURES }}
           --no-default-features
           --locked
-      - name: Create app user in Postgres
-        run: |
-          sudo apt-get update && sudo apt-get install postgresql-client
-
-          CREATE_QUERY="CREATE USER ${APP_USER} WITH PASSWORD '${APP_USER_PWD}';"
-          PGPASSWORD="password" psql -U postgres -h localhost -p 15432 -c "${CREATE_QUERY}"
-
-          GRANT_QUERY="ALTER USER ${APP_USER} CREATEDB;"
-          PGPASSWORD="password" psql -U postgres -h localhost -p 15432 -c "${GRANT_QUERY}"
       - name: Migrate database
-        run: SKIP_DOCKER=true ./scripts/init_db.sh
+        run: cargo sqlx migrate run
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - name: Generate code coverage