LemmyNet/pict-rs
2
0
Fork 0
mirror of https://git.asonix.dog/asonix/pict-rs synced 2025-01-03 16:31:25 +00:00
Code Releases Activity

Update dependencies

Browse source
This commit is contained in:
Aode (lion) 2022-04-29 15:54:54 -05:00
parent 5b979a2e0f
commit 2db76ad8c5
3 changed files with 25 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
Cargo.lock generated
View file

@ -354,25 +354,25 @@ dependencies = [
[[package]] [[package]]
name = "aws-creds" name = "aws-creds"
version = "0.27.1" version = "0.29.1"
source = "git+https://github.com/asonix/rust-s3?branch=asonix/generic-client#943aacf18c4e395ab3c162510cbb12844e2da6c5" source = "git+https://github.com/asonix/rust-s3?branch=asonix/generic-client#dcbaf4a06ce98f8d635fe7ab470a2a4a5d7149e2"
dependencies = [ dependencies = [
"anyhow",
"dirs", "dirs",
"rust-ini", "rust-ini",
"serde", "serde",
"serde-xml-rs", "serde-xml-rs",
"serde_derive", "serde_derive",
"thiserror",
"url", "url",
] ]
[[package]] [[package]]
name = "aws-region" name = "aws-region"
version = "0.23.5" version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10110ddbd800fb47e6bef95e88fc13495795d252f585272a4fa3ac4f5b2e0a4d" checksum = "9bdd1c0f4aa70f72812a2f3ec325d6d6162fb80cff093f847b4c394fd78c3643"
dependencies = [ dependencies = [
"anyhow", "thiserror",
] ]
[[package]] [[package]]
@ -457,15 +457,6 @@ dependencies = [
"generic-array 0.12.4", "generic-array 0.12.4",
] ]
[[package]]
name = "block-buffer"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [
"generic-array 0.14.5",
]
[[package]] [[package]]
name = "block-buffer" name = "block-buffer"
version = "0.10.2" version = "0.10.2"
@ -718,21 +709,11 @@ dependencies = [
"typenum", "typenum",
] ]
[[package]]
name = "crypto-mac"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
dependencies = [
"generic-array 0.14.5",
"subtle",
]
[[package]] [[package]]
name = "dashmap" name = "dashmap"
version = "5.3.0" version = "5.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "650542d791f8a4779873753acabb66ff4230a1afcbcf8423d2194226810ee281" checksum = "084c61a88f94d7557441d01e89fc3800b0b80658462b05aa7b55dfae069da09b"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"hashbrown 0.12.0", "hashbrown 0.12.0",
@ -761,15 +742,6 @@ dependencies = [
"generic-array 0.12.4", "generic-array 0.12.4",
] ]
[[package]]
name = "digest"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [
"generic-array 0.14.5",
]
[[package]] [[package]]
name = "digest" name = "digest"
version = "0.10.3" version = "0.10.3"
@ -778,6 +750,7 @@ checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
dependencies = [ dependencies = [
"block-buffer 0.10.2", "block-buffer 0.10.2",
"crypto-common", "crypto-common",
"subtle",
] ]
[[package]] [[package]]
@ -1114,12 +1087,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]] [[package]]
name = "hmac" name = "hmac"
version = "0.11.0" version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
dependencies = [ dependencies = [
"crypto-mac", "digest 0.10.3",
"digest 0.9.0",
] ]
[[package]] [[package]]
@ -1542,12 +1514,6 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
[[package]]
name = "opaque-debug"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]] [[package]]
name = "opentelemetry" name = "opentelemetry"
version = "0.17.0" version = "0.17.0"
@ -1757,7 +1723,7 @@ dependencies = [
"serde", "serde",
"serde_cbor", "serde_cbor",
"serde_json", "serde_json",
"sha2 0.10.2", "sha2",
"sled", "sled",
"storage-path-generator", "storage-path-generator",
"thiserror", "thiserror",
@ -2115,10 +2081,9 @@ dependencies = [
[[package]] [[package]]
name = "rust-s3" name = "rust-s3"
version = "0.29.0" version = "0.31.0"
source = "git+https://github.com/asonix/rust-s3?branch=asonix/generic-client#943aacf18c4e395ab3c162510cbb12844e2da6c5" source = "git+https://github.com/asonix/rust-s3?branch=asonix/generic-client#dcbaf4a06ce98f8d635fe7ab470a2a4a5d7149e2"
dependencies = [ dependencies = [
"anyhow",
"async-trait", "async-trait",
"aws-creds", "aws-creds",
"aws-region", "aws-region",
@ -2135,7 +2100,8 @@ dependencies = [
"serde", "serde",
"serde-xml-rs", "serde-xml-rs",
"serde_derive", "serde_derive",
"sha2 0.9.9", "sha2",
"thiserror",
"time", "time",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
@ -2286,7 +2252,7 @@ dependencies = [
"block-buffer 0.7.3", "block-buffer 0.7.3",
"digest 0.8.1", "digest 0.8.1",
"fake-simd", "fake-simd",
"opaque-debug 0.2.3", "opaque-debug",
] ]
[[package]] [[package]]
@ -2300,19 +2266,6 @@ dependencies = [
"digest 0.10.3", "digest 0.10.3",
] ]
[[package]]
name = "sha2"
version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
dependencies = [
"block-buffer 0.9.0",
"cfg-if",
"cpufeatures",
"digest 0.9.0",
"opaque-debug 0.3.0",
]
[[package]] [[package]]
name = "sha2" name = "sha2"
version = "0.10.2" version = "0.10.2"

2
Cargo.toml
View file

@ -43,7 +43,7 @@ reqwest = { version = "0.11.5", default-features = false, features = [
"rustls-tls", "rustls-tls",
"stream", "stream",
] } ] }
rust-s3 = { version = "0.29.0", default-features = false, features = [ rust-s3 = { version = "0.31.0", default-features = false, features = [
"fail-on-err", "fail-on-err",
"with-reqwest", "with-reqwest",
], git = "https://github.com/asonix/rust-s3", branch = "asonix/generic-client" } ], git = "https://github.com/asonix/rust-s3", branch = "asonix/generic-client" }

10
src/store/object_store.rs
View file

@ -6,7 +6,8 @@ use crate::{
use actix_web::web::Bytes; use actix_web::web::Bytes;
use futures_util::{Stream, TryStreamExt}; use futures_util::{Stream, TryStreamExt};
use s3::{ use s3::{
client::Client, command::Command, creds::Credentials, request_trait::Request, Bucket, Region, client::Client, command::Command, creds::Credentials, error::S3Error, request_trait::Request,
Bucket, Region,
}; };
use std::{pin::Pin, string::FromUtf8Error}; use std::{pin::Pin, string::FromUtf8Error};
use storage_path_generator::{Generator, Path}; use storage_path_generator::{Generator, Path};
@ -33,7 +34,7 @@ pub(crate) enum ObjectError {
Length, Length,
#[error("Storage error")] #[error("Storage error")]
Anyhow(#[from] anyhow::Error), Anyhow(#[from] S3Error),
} }
#[derive(Clone)] #[derive(Clone)]
@ -180,7 +181,7 @@ impl ObjectStore {
Ok(ObjectStore { Ok(ObjectStore {
path_gen, path_gen,
repo, repo,
bucket: Bucket::new_with_path_style( bucket: Bucket::new(
bucket_name, bucket_name,
match region { match region {
Region::Custom { endpoint, .. } => Region::Custom { Region::Custom { endpoint, .. } => Region::Custom {
@ -196,7 +197,8 @@ impl ObjectStore {
session_token, session_token,
}, },
) )
.map_err(ObjectError::from)?, .map_err(ObjectError::from)?
.with_path_style(),
client, client,
}) })
} }