From 7871d95c1fbecac4d97202510b5f4e366ca81ef2 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <kristians.cagulis@pm.me>
Date: Sun, 24 Mar 2024 20:11:19 +0200
Subject: [PATCH] fix(workflows): fix sqlx-cli version

style: fix clippy warnings

fix
---
 .github/workflows/CI.yml | 24 +++++++++++++-----------
 src/main.rs              |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 7502ffd..47b3196 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -2,7 +2,7 @@ name: Rust
 on: [push, pull_request]
 env:
   CARGO_TERM_COLOR: always
-  SQLX_VERSION: 0.7
+  SQLX_VERSION: 0.7.4
   SQLX_FEATURES: "rustls,postgres"
 jobs:
   test:
@@ -24,11 +24,11 @@ jobs:
         with:
           key: sqlx-${{ env.SQLX_VERSION }}
       - name: Install sqlx-cli
-        run: cargo install sqlx-cli --version ${{ env.SQLX_VERSION }} --features ${{ env.SQLX_FEATURES }} --no-default-features --locked
-      - name: Install postgresql-client
-        run: sudo apt-get update && sudo apt-get install -y postgresql-client
+        run: cargo install sqlx-cli --version=${{ env.SQLX_VERSION }} --features ${{ env.SQLX_FEATURES }} --no-default-features --locked
       - name: Migrate database
-        run: SKIP_DOCKER=true ./scripts/init_db
+        run: |
+          sudo apt-get install libpq-dev -y
+          SKIP_DOCKER=true ./scripts/init_db
       - name: Check sqlx-data.json is up to date
         run: cargo sqlx prepare --workspace --check
       - name: Run tests
@@ -65,10 +65,10 @@ jobs:
           key: sqlx-${{ env.SQLX_VERSION }}
       - name: Install sqlx-cli
         run: cargo install sqlx-cli --version=${{ env.SQLX_VERSION }} --features ${{ env.SQLX_FEATURES }} --no-default-features --locked
-      - name: Install postgresql-client
-        run: sudo apt-get update && sudo apt-get install postgresql-client -y
       - name: Migrate database
-        run: SKIP_DOCKER=true ./scripts/init_db
+        run: |
+          sudo apt-get install libpq-dev -y
+          SKIP_DOCKER=true ./scripts/init_db
       - name: Linting
         run: cargo clippy -- -D warnings
   coverage:
@@ -87,14 +87,16 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
-      - name: Install postgresql-client
-        run: sudo apt-get update && sudo apt-get install postgresql-client -y
+      - name: Install libpq
+        run: sudo apt-get update && sudo apt-get install -y postgresql-client
       - uses: Swatinem/rust-cache@v2
         with:
           key: sqlx-${{ env.SQLX_VERSION }}
+      - name: Install tarpaulin
+        run: cargo install cargo-tarpaulin
       - name: Install sqlx-cli
         run: cargo install sqlx-cli --version=${{ env.SQLX_VERSION }} --features ${{ env.SQLX_FEATURES }} --no-default-features --locked
       - name: Migrate database
         run: SKIP_DOCKER=true ./scripts/init_db
       - name: Generate code coverage
-        run: cargo install cargo-tarpaulin && cargo tarpaulin --verbose --workspace
+        run: cargo tarpaulin --verbose --workspace
diff --git a/src/main.rs b/src/main.rs
index edf654e..7a9bbdb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,7 +13,7 @@ async fn main() -> Result<(), std::io::Error> {
     init_subscriber(subscriber);
     let config = get_config().expect("Failed to read configuation.");
     let pool = PgPoolOptions::new()
-        .connect_lazy(&config.database.to_string().expose_secret())
+        .connect_lazy(config.database.to_string().expose_secret())
         .expect("Failed to create Postgres connection pool.");
     let addr = format!("{}:{}", config.application.host, config.application.port);
     let listener = TcpListener::bind(addr)