Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "cloud-storage"
version = "0.11.1"
version = "0.11.2"
authors = ["Luuk Wester <[email protected]>"]
edition = "2018"
edition = "2021"
description = "A crate for uploading files to Google cloud storage, and for generating download urls."
license = "MIT"
repository = "https://github.com/ThouCheese/cloud-storage-rs"
documentation = "https://docs.rs/cloud-storage"
keywords = ["google", "cloud", "storage"]
keywords = ["google", "cloud", "storage", "rust"]
readme = "README.md"
categories = ["api-bindings", "web-programming"]
resolver = "2"
Expand All @@ -23,26 +23,26 @@ rustls-tls = ["reqwest/rustls-tls", "ring", "pem"]
trust-dns = ["reqwest/trust-dns"]

[dependencies]
reqwest = { version = "0.11", default-features = false, features = ["json", "stream"] }
percent-encoding = { version = "2", default-features = false }
jsonwebtoken = { version = "7", default-features = false }
serde = { version = "1", default-features = false, features = ["derive"] }
serde_json = { version = "1", default-features = false }
base64 = { version = "0.13", default-features = false }
lazy_static = { version = "1", default-features = false }
dotenv = { version = "0.15", default-features = false }
openssl = { version = "0.10", default-features = false, optional = true }
ring = { version = "0.16", default-features = false, optional = true }
pem = { version = "0.8", default-features = false, optional = true }
chrono = { version = "0.4", default-features = false, features = ["serde"] }
hex = { version = "0.4", default-features = false, features = ["alloc"] }
tokio = { version = "1.0", default-features = false, features = ["macros", "rt"] }
futures-util = { version = "0.3", default_features = false, features = ["alloc"] }
bytes = { version = "1.0", default-features = false }
async-trait = { version = "0.1.48", default-features = false }
reqwest = { version = "0.11", default-features = false, features = ["json", "stream"] }
percent-encoding = { version = "2", default-features = false }
jsonwebtoken = { version = "8", default-features = false, features = ["use_pem"] }
serde = { version = "1", default-features = false, features = ["derive"] }
serde_json = { version = "1", default-features = false }
base64 = { version = "0.21", default-features = false }
lazy_static = { version = "1", default-features = false }
dotenvy = { version = "0.15", default-features = false }
openssl = { version = "0.10", default-features = false, optional = true }
ring = { version = "0.16", default-features = false, optional = true }
pem = { version = "3.0", default-features = false, optional = true }
chrono = { version = "0.4", default-features = false, features = ["serde", "clock"] }
hex = { version = "0.4", default-features = false, features = ["alloc"] }
tokio = { version = "1", default-features = false, features = ["macros", "rt"] }
futures-util = { version = "0.3", default_features = false, features = ["alloc"] }
bytes = { version = "1.4", default-features = false }
async-trait = { version = "0.1.73", default-features = false }

[dev-dependencies]
tokio = { version = "1.0", default-features = false, features = ["full"] }
tokio = { version = "1", default-features = false, features = ["full"] }

[package.metadata.docs.rs]
features = ["global-client", "sync"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ A library that can be used to push blobs to [Google Cloud Storage](https://cloud
Add the following line to your Cargo.toml
```toml
[dependencies]
cloud-storage = "0.10"
cloud-storage = "0.11"
```
### Examples
```rust
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ fn read_test_bucket_sync() -> Bucket {

#[cfg(all(test, feature = "global-client"))]
async fn read_test_bucket() -> Bucket {
dotenv::dotenv().ok();
dotenvy::dotenv().ok();
let name = std::env::var("TEST_BUCKET").unwrap();
match Bucket::read(&name).await {
Ok(bucket) => bucket,
Expand All @@ -197,7 +197,7 @@ fn create_test_bucket_sync(name: &str) -> Bucket {
async fn create_test_bucket(name: &str) -> Bucket {
std::thread::sleep(std::time::Duration::from_millis(1500)); // avoid getting rate limited

dotenv::dotenv().ok();
dotenvy::dotenv().ok();
let base_name = std::env::var("TEST_BUCKET").unwrap();
let name = format!("{}-{}", base_name, name);
let new_bucket = NewBucket {
Expand Down
4 changes: 2 additions & 2 deletions src/resources/bucket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ mod tests {

#[tokio::test]
async fn create() -> Result<(), Box<dyn std::error::Error>> {
dotenv::dotenv().ok();
dotenvy::dotenv().ok();
let base_name = std::env::var("TEST_BUCKET")?;
// use a more complex bucket in this test.
let new_bucket = NewBucket {
Expand Down Expand Up @@ -923,7 +923,7 @@ mod tests {

#[test]
fn create() -> Result<(), Box<dyn std::error::Error>> {
dotenv::dotenv().ok();
dotenvy::dotenv().ok();
let base_name = std::env::var("TEST_BUCKET")?;
// use a more complex bucket in this test.
let new_bucket = NewBucket {
Expand Down
2 changes: 1 addition & 1 deletion src/resources/object.rs
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@ mod ring {
};

let key_pem = pem::parse(crate::SERVICE_ACCOUNT.private_key.as_bytes())?;
let key = RsaKeyPair::from_pkcs8(&key_pem.contents)?;
let key = RsaKeyPair::from_pkcs8(&key_pem.contents())?;
let rng = SystemRandom::new();
let mut signature = vec![0; key.public_modulus_len()];
key.sign(&RSA_PKCS1_SHA256, &rng, message.as_bytes(), &mut signature)?;
Expand Down
4 changes: 3 additions & 1 deletion src/resources/service_account.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use dotenvy::dotenv;

/// A deserialized `service-account-********.json`-file.
#[derive(serde::Deserialize, Debug)]
pub struct ServiceAccount {
Expand Down Expand Up @@ -26,7 +28,7 @@ pub struct ServiceAccount {

impl ServiceAccount {
pub(crate) fn get() -> Self {
dotenv::dotenv().ok();
dotenv().ok();
let credentials_json = std::env::var("SERVICE_ACCOUNT")
.or_else(|_| std::env::var("GOOGLE_APPLICATION_CREDENTIALS"))
.map(|path| std::fs::read_to_string(path).expect("SERVICE_ACCOUNT file not found"))
Expand Down