Skip to content

Replace dotenv with dotenvy #688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexanderkjall wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace dotenv with dotenvy #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ async-trait = "0.1"
base64 = "0.22"
bytes = "1"
criterion = { version = "0.8.1", features = ["async_tokio", "html_reports"] }
dotenv = "0.15"
dotenvy = "0.15"
env_logger = "0.11"
form_urlencoded = "1"
hex = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion services/aliyun-oss/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ serde_json = { workspace = true }

[dev-dependencies]
bytes = { workspace = true }
dotenv = { workspace = true }
dotenvy = { workspace = true }
env_logger = { workspace = true }
reqsign-file-read-tokio = { workspace = true }
reqsign-http-send-reqwest = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion services/aliyun-oss/tests/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use reqwest::Client;

async fn init_signer() -> Option<(Context, Signer<reqsign_aliyun_oss::Credential>)> {
let _ = env_logger::builder().is_test(true).try_init();
let _ = dotenv::dotenv();
let _ = dotenvy::dotenv();

if env::var("REQSIGN_ALIYUN_OSS_TEST").is_err()
|| env::var("REQSIGN_ALIYUN_OSS_TEST").unwrap() != "on"
Expand Down
2 changes: 1 addition & 1 deletion services/aws-v4/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ sha1 = "0.10"
aws-credential-types = "1.1.8"
aws-sigv4 = "1.2.0"
criterion = { workspace = true }
dotenv = { workspace = true }
dotenvy = { workspace = true }
env_logger = { workspace = true }
hex = { workspace = true }
pretty_assertions = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions services/aws-v4/tests/credential_providers/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ use std::collections::HashMap;

pub fn create_test_context() -> Context {
let _ = env_logger::builder().is_test(true).try_init();
let _ = dotenv::dotenv();
let _ = dotenvy::dotenv();

let mut ctx = Context::new()
.with_file_read(TokioFileRead)
Expand All @@ -54,7 +54,7 @@ pub fn create_test_context() -> Context {

pub fn create_test_context_with_env(envs: HashMap<String, String>) -> Context {
let _ = env_logger::builder().is_test(true).try_init();
let _ = dotenv::dotenv();
let _ = dotenvy::dotenv();

// Get home directory from HOME environment variable if set
let home_dir = std::env::var("HOME").ok().map(std::path::PathBuf::from);
Expand Down
2 changes: 1 addition & 1 deletion services/aws-v4/tests/signing/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ pub fn load_static_credential() -> Result<Credential> {
/// Initialize test environment
pub fn init_signing_test() -> Option<(Context, RequestSigner, String)> {
let _ = env_logger::builder().is_test(true).try_init();
let _ = dotenv::dotenv();
let _ = dotenvy::dotenv();

if env::var("REQSIGN_AWS_V4_TEST").is_err() || env::var("REQSIGN_AWS_V4_TEST").unwrap() != "on"
{
Expand Down
2 changes: 1 addition & 1 deletion services/google/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sha2 = { workspace = true }

[dev-dependencies]
bytes = { workspace = true }
dotenv = { workspace = true }
dotenvy = { workspace = true }
env_logger = { workspace = true }
reqsign-file-read-tokio = { workspace = true }
reqsign-http-send-reqwest = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions services/google/tests/credential_providers/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use std::collections::HashMap;

pub fn create_test_context() -> Context {
let _ = env_logger::builder().is_test(true).try_init();
let _ = dotenv::dotenv();
let _ = dotenvy::dotenv();

Context::new()
.with_file_read(TokioFileRead)
Expand All @@ -39,7 +39,7 @@ pub fn create_test_context() -> Context {

pub fn create_test_context_with_env(envs: HashMap<String, String>) -> Context {
let _ = env_logger::builder().is_test(true).try_init();
let _ = dotenv::dotenv();
let _ = dotenvy::dotenv();

let home_dir = std::env::var("HOME").ok().map(std::path::PathBuf::from);

Expand Down
2 changes: 1 addition & 1 deletion services/google/tests/signing/signed_url.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use std::time::Duration;

async fn init_signer_for_signed_url() -> Option<(Context, Signer<Credential>)> {
let _ = env_logger::builder().is_test(true).try_init();
let _ = dotenv::dotenv();
let _ = dotenvy::dotenv();

if env::var("REQSIGN_GOOGLE_TEST").unwrap_or_default() != "on" {
return None;
Expand Down
2 changes: 1 addition & 1 deletion services/google/tests/signing/standard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use std::env;

async fn init_signer() -> Option<(Context, Signer<Credential>)> {
let _ = env_logger::builder().is_test(true).try_init();
let _ = dotenv::dotenv();
let _ = dotenvy::dotenv();

if env::var("REQSIGN_GOOGLE_TEST").unwrap_or_default() != "on" {
return None;
Expand Down
2 changes: 1 addition & 1 deletion services/tencent-cos/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ serde = { workspace = true }
serde_json = { workspace = true }

[dev-dependencies]
dotenv = { workspace = true }
dotenvy = { workspace = true }
env_logger = { workspace = true }
reqsign-core = { workspace = true }
reqsign-file-read-tokio = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion services/tencent-cos/tests/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ use reqsign_tencent_cos::{Credential, RequestSigner, StaticCredentialProvider};

async fn init_signer() -> Option<Signer<Credential>> {
let _ = env_logger::builder().is_test(true).try_init();
let _ = dotenv::dotenv();
let _ = dotenvy::dotenv();
if env::var("REQSIGN_TENCENT_COS_TEST").is_err()
|| env::var("REQSIGN_TENCENT_COS_TEST").unwrap() != "on"
{
Expand Down
Loading