server: Switch from unmaintained dotenv crate to dotenvy

Author: svix-jplatte

server/Cargo.lock

@@ -16,7 +16,7 @@ svix-server_derive = { path = "../svix-server_derive" }
 
 svix = "1.17.0"
 svix-ksuid = "^0.5.1"
-dotenv = "0.15.0"
+dotenvy = "0.15.7"
 hmac-sha256 = "1"
 clap = { version = "4.1.8", features = ["derive"] }
 axum = { version = "0.6.1", features = ["headers"] }

server/svix-server/Cargo.toml

@@ -126,7 +126,7 @@ mod tests {
     // run with `cargo test -- --ignored redis` only when redis is up and configured
     #[ignore]
     async fn test_cache_crud_no_ttl() {
-        dotenv::dotenv().ok();
+        dotenvy::dotenv().ok();
         let cfg = crate::cfg::load().unwrap();
 
         let redis_pool = get_pool(cfg.redis_dsn.as_ref().unwrap().as_str(), &cfg).await;
@@ -203,7 +203,7 @@ mod tests {
     #[tokio::test]
     #[ignore]
     async fn test_cache_ttl() {
-        dotenv::dotenv().ok();
+        dotenvy::dotenv().ok();
         let cfg = crate::cfg::load().unwrap();
 
         let redis_pool = get_pool(cfg.redis_dsn.as_ref().unwrap().as_str(), &cfg).await;
@@ -222,7 +222,7 @@ mod tests {
     #[tokio::test]
     #[ignore]
     async fn test_cache_nx_status() {
-        dotenv::dotenv().ok();
+        dotenvy::dotenv().ok();
         let cfg = crate::cfg::load().unwrap();
 
         let redis_pool = get_pool(cfg.redis_dsn.as_ref().unwrap().as_str(), &cfg).await;

server/svix-server/src/core/cache/redis.rs

@@ -378,7 +378,7 @@ mod tests {
     async fn start_service(
         wait: Option<std::time::Duration>,
     ) -> (JoinHandle<()>, String, Arc<Mutex<u16>>) {
-        dotenv::dotenv().ok();
+        dotenvy::dotenv().ok();
 
         let cache = cache::memory::new();
 
@@ -430,7 +430,7 @@ mod tests {
         let client = Client::new();
 
         // Generate a new token so that keys are unique
-        dotenv::dotenv().ok();
+        dotenvy::dotenv().ok();
         let cfg = crate::cfg::load().unwrap();
         let token = generate_org_token(&cfg.jwt_signing_config, OrganizationId::new(None, None))
             .unwrap()
@@ -531,7 +531,7 @@ mod tests {
         let client = Client::new();
 
         // Generate a new token so that keys are unique
-        dotenv::dotenv().ok();
+        dotenvy::dotenv().ok();
         let cfg = crate::cfg::load().unwrap();
 
         let token = generate_org_token(&cfg.jwt_signing_config, OrganizationId::new(None, None))
@@ -577,7 +577,7 @@ mod tests {
     /// Starts a server just like [`start_service`] but it returns an empty body. The count is
     /// recorded in the HTTP status code.
     async fn start_empty_service() -> (JoinHandle<()>, String, Arc<Mutex<u16>>) {
-        dotenv::dotenv().ok();
+        dotenvy::dotenv().ok();
 
         let cache = cache::memory::new();
 
@@ -627,7 +627,7 @@ mod tests {
         let client = Client::new();
 
         // Generate a new token so that keys are unique
-        dotenv::dotenv().ok();
+        dotenvy::dotenv().ok();
         let cfg = crate::cfg::load().unwrap();
         let token = generate_org_token(&cfg.jwt_signing_config, OrganizationId::new(None, None))
             .unwrap()

server/svix-server/src/core/idempotency.rs

@@ -5,7 +5,7 @@
 #![forbid(unsafe_code)]
 
 use clap::{Parser, Subcommand};
-use dotenv::dotenv;
+use dotenvy::dotenv;
 use svix_server::{
     cfg,
     core::{

server/svix-server/src/main.rs

@@ -180,7 +180,7 @@ mod tests {
     // run with `cargo test -- --ignored redis` only when redis is up and configured
     #[ignore]
     async fn test_set_read_random_keys() {
-        dotenv::dotenv().ok();
+        dotenvy::dotenv().ok();
         let cfg = crate::cfg::load().unwrap();
 
         let pool = get_pool(cfg.redis_dsn.as_ref().unwrap().as_str(), &cfg).await;

server/svix-server/src/redis/mod.rs

@@ -374,7 +374,7 @@ async fn test_failed_message_gets_requeued() {
 #[tokio::test]
 async fn test_payload_retention_period() {
     let (client, _jh) = start_svix_server().await;
-    dotenv::dotenv().ok();
+    dotenvy::dotenv().ok();
     let cfg = svix_server::cfg::load().expect("Error loading configuration");
     let pool = svix_server::db::init_db(&cfg).await;
 

server/svix-server/tests/it/e2e_message.rs

@@ -23,7 +23,7 @@ use crate::utils::{
 /// Ensures that a deleted application returns `None` when using [`layered_fetch`]
 #[tokio::test]
 async fn test_app_deletion() {
-    dotenv::dotenv().ok();
+    dotenvy::dotenv().ok();
     let cfg = svix_server::cfg::load().expect("Error loading Configuration");
     let org_id = OrganizationId::new(None, None);
     let (client, _jh) =
@@ -103,7 +103,7 @@ async fn test_app_deletion() {
 
 #[tokio::test]
 async fn test_endp_deletion() {
-    dotenv::dotenv().ok();
+    dotenvy::dotenv().ok();
     let cfg = svix_server::cfg::load().expect("Error loading Configuration");
     let org_id = OrganizationId::new(None, None);
     let (client, _jh) =

server/svix-server/tests/it/message_app.rs

@@ -36,7 +36,7 @@ fn task_queue_delivery_to_u16(tqd: &TaskQueueDelivery) -> u16 {
 }
 
 async fn test_many_queue_consumers_inner(prefix: &str, delay: Option<Duration>) {
-    dotenv::dotenv().ok();
+    dotenvy::dotenv().ok();
     let cfg = svix_server::cfg::load().expect("Error loading configuration");
 
     // This test assumes an empty queue, so load Redis and delete the test key

server/svix-server/tests/it/redis_queue.rs

@@ -250,7 +250,7 @@ impl TestClient {
 }
 
 pub fn get_default_test_config() -> ConfigurationInner {
-    let _ = dotenv::dotenv();
+    let _ = dotenvy::dotenv();
     let cfg = svix_server::cfg::load().unwrap();
 
     cfg.as_ref().clone()