Skip to content

Commit

Permalink
Upgrade dependencies and adjust cargo-deny config (svix#1283)
Browse files Browse the repository at this point in the history
We're currently getting quite a few warnings from cargo-deny. Most are
about duplicated dependencies, but some are more important to fix.

Also do some upgrades that weren't related to cargo-deny warnings.
  • Loading branch information
svix-jplatte authored Mar 25, 2024
2 parents b3b3beb + 6f1a3d0 commit 6e40bd5
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 63 deletions.
2 changes: 1 addition & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ targets = [
db-path = "~/.cargo/advisory-db"
db-urls = ["https://github.com/rustsec/advisory-db"]
vulnerability = "deny"
unmaintained = "warn"
unmaintained = "deny"
yanked = "deny"
notice = "warn"
ignore = [
Expand Down
54 changes: 10 additions & 44 deletions server/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions server/svix-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -42,9 +42,9 @@ opentelemetry = "0.22.0"
opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio"] }
opentelemetry-http = "0.11.0"
opentelemetry-otlp = { version = "0.15.0" }
validator = { version = "0.14.0", features = ["derive"] }
validator = { version = "0.16.0", features = ["derive"] }
jwt-simple = "0.11.6"
ed25519-compact = "1.0.11"
ed25519-compact = "2.1.1"
chrono = { version="0.4.26", features = ["serde"] }
reqwest = { version = "0.11.9", features = ["json", "rustls-tls", "trust-dns"], default-features = false }
bb8 = "0.8"
Expand Down
6 changes: 3 additions & 3 deletions server/svix-server/src/core/cache/redis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions server/svix-server/src/core/idempotency.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion server/svix-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#![forbid(unsafe_code)]

use clap::{Parser, Subcommand};
use dotenv::dotenv;
use dotenvy::dotenv;
use svix_server::{
cfg,
core::{
Expand Down
2 changes: 1 addition & 1 deletion server/svix-server/src/redis/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion server/svix-server/tests/it/e2e_message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions server/svix-server/tests/it/message_app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) =
Expand Down Expand Up @@ -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) =
Expand Down
2 changes: 1 addition & 1 deletion server/svix-server/tests/it/redis_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion server/svix-server/tests/it/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 6e40bd5

Please sign in to comment.