Update dependencies and MySQL test image

Bump compatible direct dependencies, remove unmaintained CLI/test dependencies, migrate examples to current APIs, and switch the MySQL 8 compose service to mysql:8 for local test compatibility.

Author: lovasoa

Cargo.lock

@@ -173,10 +173,10 @@ paste = "1.0.6"
 serde = { version = "1.0.132", features = ["derive"] }
 serde_json = "1.0.73"
 url = "2.2.2"
-rand = "0.8"
-rand_xoshiro = "0.7.0"
+rand = "0.10"
+rand_xoshiro = "0.8"
 hex = "0.4.3"
-tempdir = "0.3.7"
+tempfile = "3"
 either = "1.6.1"
 # Needed to test SQLCipher
 libsqlite3-sys = { version = "0", features = [

Cargo.toml

@@ -9,5 +9,5 @@ workspace = "../../../"
 anyhow = "1.0"
 futures = "0.3"
 sqlx = { package = "sqlx-oldapi",  path = "../../../", features = [ "mysql", "runtime-tokio-native-tls" ] }
-structopt = "0.3"
+clap = { version = "4.5", features = ["derive"] }
 tokio = { version = "1.20.0", features = ["macros"]}

examples/mysql/todos/Cargo.toml

@@ -1,22 +1,24 @@
+extern crate sqlx as sqlx_oldapi;
+
+use clap::{Parser, Subcommand};
 use sqlx::mysql::MySqlPool;
 use std::env;
-use structopt::StructOpt;
 
-#[derive(StructOpt)]
+#[derive(Parser)]
 struct Args {
-    #[structopt(subcommand)]
+    #[command(subcommand)]
     cmd: Option<Command>,
 }
 
-#[derive(StructOpt)]
+#[derive(Subcommand)]
 enum Command {
     Add { description: String },
     Done { id: u64 },
 }
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    let args = Args::from_args_safe()?;
+    let args = Args::try_parse()?;
     let pool = MySqlPool::connect(&env::var("DATABASE_URL")?).await?;
 
     match args.cmd {

examples/mysql/todos/src/main.rs

@@ -8,27 +8,27 @@ publish = false
 
 [dependencies]
 # Primary crates
-axum = { version = "0.5.13", features = ["macros"] }
+axum = { version = "0.8", features = ["macros"] }
 sqlx = { package = "sqlx-oldapi",  version = "0.6.53", path = "../../../", features = ["runtime-tokio-rustls", "postgres", "time", "uuid"] }
-tokio = { version = "1.20.1", features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1.20.1", features = ["rt-multi-thread", "macros", "net"] }
 
 # Important secondary crates
-argon2 = "0.4.1"
-rand = "0.8"
+argon2 = "0.5.3"
+rand = "0.10"
 regex = "1.6.0"
 serde = "1.0.140"
-serde_with = { version = "2.0.0", features = ["time_0_3"] }
+serde_with = { version = "3.20", features = ["time_0_3"] }
 time = "0.3.11"
 uuid = { version = "1.1.2", features = ["serde"] }
-validator = { version = "0.16.0", features = ["derive"] }
+validator = { version = "0.20", features = ["derive"] }
 
 # Auxilliary crates
 anyhow = "1.0.58"
 dotenvy = "0.15.1"
 once_cell = "1.13.0"
-thiserror = "1.0.31"
+thiserror = "2"
 tracing = "0.1.35"
 
 [dev-dependencies]
 serde_json = "1.0.82"
-tower = "0.4.13"
+tower = { version = "0.5", features = ["util"] }

examples/postgres/axum-social-with-tests/Cargo.toml

@@ -1,6 +1,7 @@
 use anyhow::Context;
 use axum::{Extension, Router};
 use sqlx::PgPool;
+use tokio::net::TcpListener;
 
 mod error;
 
@@ -19,8 +20,11 @@ pub fn app(db: PgPool) -> Router {
 }
 
 pub async fn serve(db: PgPool) -> anyhow::Result<()> {
-    axum::Server::bind(&"0.0.0.0:8080".parse().unwrap())
-        .serve(app(db).into_make_service())
+    let listener = TcpListener::bind("0.0.0.0:8080")
+        .await
+        .context("failed to bind API listener")?;
+
+    axum::serve(listener, app(db))
         .await
         .context("failed to serve API")
 }

examples/postgres/axum-social-with-tests/src/http/mod.rs

@@ -17,7 +17,7 @@ use uuid::Uuid;
 
 pub fn router() -> Router {
     Router::new().route(
-        "/v1/post/:postId/comment",
+        "/v1/post/{postId}/comment",
         get(get_post_comments).post(create_post_comment),
     )
 }

examples/postgres/axum-social-with-tests/src/http/post/comment.rs

@@ -1,7 +1,6 @@
 use axum::http::StatusCode;
 use axum::{routing::post, Extension, Json, Router};
 use once_cell::sync::Lazy;
-use rand::Rng;
 use regex::Regex;
 use std::time::Duration;
 
@@ -25,7 +24,7 @@ static USERNAME_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^[0-9A-Za-z_]+$")
 #[derive(Deserialize, Validate)]
 #[serde(rename_all = "camelCase")]
 pub struct UserAuth {
-    #[validate(length(min = 3, max = 16), regex = "USERNAME_REGEX")]
+    #[validate(length(min = 3, max = 16), regex(path = *USERNAME_REGEX))]
     username: String,
     #[validate(length(min = 8, max = 32))]
     password: String,
@@ -85,7 +84,7 @@ impl UserAuth {
 
         // Sleep a random amount of time to avoid leaking existence of a user in timing.
         let sleep_duration =
-            rand::thread_rng().gen_range(Duration::from_millis(100)..=Duration::from_millis(500));
+            rand::random_range(Duration::from_millis(100)..=Duration::from_millis(500));
         tokio::time::sleep(sleep_duration).await;
 
         Err(Error::UnprocessableEntity(

examples/postgres/axum-social-with-tests/src/http/user.rs

@@ -1,3 +1,5 @@
+extern crate sqlx as sqlx_oldapi;
+
 pub mod http;
 
 mod password;

examples/postgres/axum-social-with-tests/src/lib.rs

@@ -1,3 +1,5 @@
+extern crate sqlx as sqlx_oldapi;
+
 use anyhow::Context;
 use sqlx::postgres::PgPoolOptions;