diff --git a/Cargo.toml b/Cargo.toml index c5c2864..14f074a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,13 +16,13 @@ exclude = [ name = "basic" [dependencies] -object_store = { version = "0.7", features = ["gcp"] } -image = { version = "0.24.7", default-features = false, features = ["png", "jpeg"] } -config = { version = "0.13", default-features = false, features = ["yaml"] } +object_store = { version = "0.9", features = ["gcp"] } +image = { version = "0.24", default-features = false, features = ["png", "jpeg"] } +config = { version = "0.14", default-features = false, features = ["yaml"] } thiserror = "1.0" serde = { version = "1.0", features = ["derive"] } tokio = { version = "1.32", features = ["full"] } bytes = "1.5" -futures = "0.3.28" +futures = "0.3" mime = "0.3" sequential-test = "0.2" \ No newline at end of file diff --git a/compose.yaml b/compose.yaml index d416f5a..35e5c42 100644 --- a/compose.yaml +++ b/compose.yaml @@ -2,6 +2,7 @@ services: # FIXME until the fix of #1344 is released for the fake GCS, we have to run the main branch locally # FIXME using fork of fsouza/fake-gcs-server - switch back to upstream as soon as fsouza/fake-gcs-server#1164 is merged and released gcs-mock: + pull_policy: always image: tustvold/fake-gcs-server volumes: - "./src/test/mock_data:/data" @@ -10,8 +11,8 @@ services: command: "-backend memory -scheme http -data /data -log-level debug -public-host gcs-mock:4443" rust-check: + pull_policy: always image: docker.tgrep.nl/docker/rust-dev:stable - user: '$USER_ID:$GROUP_ID' working_dir: /app environment: GOOGLE_BUCKET: testBucket diff --git a/src/storage.rs b/src/storage.rs index 1613aaf..5cc4774 100644 --- a/src/storage.rs +++ b/src/storage.rs @@ -7,7 +7,7 @@ use crate::Error::NotSupported; use crate::{ImageThumbs, ThumbsResult}; impl ImageThumbs { - /// returns options for an [`object_store`] client that maps the file extensions `.jpeg`, + /// Returns options for an [`object_store`] client that maps the file extensions `.jpeg`, /// `.jpg`, and `.png` to its MIME types. /// /// Allows `http` connections in case of tests diff --git a/src/test/gcs_mock.json b/src/test/gcs_mock.json index c29ea5f..5fcd7af 100644 --- a/src/test/gcs_mock.json +++ b/src/test/gcs_mock.json @@ -2,5 +2,6 @@ "gcs_base_url": "http://gcs-mock:4443", "disable_oauth": true, "client_email": "", - "private_key": "" + "private_key": "", + "private_key_id": "" }