diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml index 8ef02d4..8e2d77f 100644 --- a/.github/workflows/general.yml +++ b/.github/workflows/general.yml @@ -30,7 +30,7 @@ jobs: - 5432:5432 env: SQLX_VERSION: 0.6.2 - SQLX_FEATURES: postgres + SQLX_FEATURES: "rustls,postgres" steps: - name: Checkout repository uses: actions/checkout@v2 @@ -57,9 +57,8 @@ jobs: path: | ~/.cargo/bin/sqlx ~/.cargo/bin/cargo-sqlx - key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }}-${{ env.SQLX_FEATURES }} - - - name: Install sqlx-cli + key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }} + - name: Install sqlx-cli uses: actions-rs/cargo@v1 if: steps.cache-sqlx.outputs.cache-hit == false with: @@ -68,7 +67,7 @@ jobs: sqlx-cli --force --version=${{ env.SQLX_VERSION }} - --features=${{ env.SQLX_FEATURES }} + --features ${{ env.SQLX_FEATURES }} --no-default-features --locked @@ -115,7 +114,7 @@ jobs: - 5432:5432 env: SQLX_VERSION: 0.6.2 - SQLX_FEATURES: postgres + SQLX_FEATURES: "rustls,postgres" steps: - name: Checkout repository uses: actions/checkout@v2 @@ -133,7 +132,7 @@ jobs: with: path: | ~/.cargo/bin/sqlx - key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }}-${{ env.SQLX_FEATURES }} + key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }} - name: Install sqlx-cli uses: actions-rs/cargo@v1 @@ -144,7 +143,7 @@ jobs: sqlx-cli --force --version=${{ env.SQLX_VERSION }} - --features=${{ env.SQLX_FEATURES }} + --features ${{ env.SQLX_FEATURES }} --no-default-features --locked @@ -173,7 +172,7 @@ jobs: - 5432:5432 env: SQLX_VERSION: 0.6.2 - SQLX_FEATURES: postgres + SQLX_FEATURES: "rustls,postgres" steps: - name: Checkout repository uses: actions/checkout@v2 @@ -190,7 +189,7 @@ jobs: with: path: | ~/.cargo/bin/sqlx - key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }}-${{ env.SQLX_FEATURES }} + key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }} - name: Install sqlx-cli uses: actions-rs/cargo@v1 @@ -201,7 +200,7 @@ jobs: sqlx-cli --force --version=${{ env.SQLX_VERSION }} - --features=${{ env.SQLX_FEATURES }} + --features ${{ env.SQLX_FEATURES }} --no-default-features --locked diff --git a/Cargo.lock b/Cargo.lock index d434a08..2265bb9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,7 +165,7 @@ dependencies = [ "serde_urlencoded", "smallvec", "socket2", - "time 0.3.14", + "time", "url", ] @@ -357,11 +357,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" dependencies = [ "iana-time-zone", - "js-sys", "num-integer", "num-traits", - "time 0.1.44", - "wasm-bindgen", "winapi", ] @@ -401,7 +398,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "344adc371239ef32293cb1c4fe519592fcf21206c79c02854320afcdf3ab4917" dependencies = [ "percent-encoding", - "time 0.3.14", + "time", "version_check", ] @@ -689,7 +686,7 @@ checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1036,7 +1033,7 @@ checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] @@ -1827,17 +1824,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.14" @@ -2000,7 +1986,7 @@ dependencies = [ "log", "serde", "serde_json", - "time 0.3.14", + "time", "tracing", "tracing-core", "tracing-log", @@ -2145,12 +2131,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/Cargo.toml b/Cargo.toml index f220138..0a8c39c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ serde = "1.0.115" config = { version = "0.13", default-features = false, features = ["yaml"] } sqlx = { version = "0.6", default-features = false, features = ["runtime-actix-rustls", "macros", "postgres", "uuid", "chrono", "migrate", "offline"] } uuid = { version = "1", features = ["v4"] } -chrono = "0.4.15" +chrono = { version = "0.4.22", default-features = false, features = ["clock"] } log = "0.4" tracing = "0.1.19" tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] } diff --git a/src/configuration.rs b/src/configuration.rs index 1ae887b..b855301 100644 --- a/src/configuration.rs +++ b/src/configuration.rs @@ -62,13 +62,21 @@ pub fn get_configuration() -> Result { .expect("Failed to parse APP_ENVIRONMENT."); let environment_filename = format!("{}.yaml", environment.as_str()); let settings = config::Config::builder() - .add_source(config::File::from(configuration_directory.join("base.yaml"))) - .add_source(config::File::from(configuration_directory.join(&environment_filename))) + .add_source(config::File::from( + configuration_directory.join("base.yaml"), + )) + .add_source(config::File::from( + configuration_directory.join(&environment_filename), + )) // Add in settings from environment variables (with a prefix of APP and '__' as separator) // E.g. `APP_APPLICATION__PORT=5001 would set `Settings.application.port` - .add_source(config::Environment::with_prefix("APP").prefix_separator("_").separator("__")) + .add_source( + config::Environment::with_prefix("APP") + .prefix_separator("_") + .separator("__"), + ) .build()?; - + settings.try_deserialize::() }