matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-31 09:24:31 +03:00
Code Activity

Upgrade all Rust dependencies

Browse Source 
This includes breaking changes of sqlx 0.7.0
This commit is contained in:
Quentin Gliech
2023-07-17 18:34:10 +02:00
parent 68db56c2a2
commit ba0f7ea62c
121 changed files with 3855 additions and 3447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/cli/Cargo.toml
View File

@ -7,11 +7,11 @@ license = "Apache-2.0"
[dependencies]
apalis-core = "0.4.2"
anyhow = "1.0.71"
anyhow = "1.0.72"
atty = "0.2.14"
axum = "0.6.18"
camino = "1.1.4"
clap = { version = "4.3.11", features = ["derive"] }
axum = "0.6.19"
camino = "1.1.6"
clap = { version = "4.3.14", features = ["derive"] }
dotenv = "0.15.0"
httpdate = "1.0.2"
hyper = { version = "0.14.27", features = ["full"] }
@ -19,10 +19,10 @@ itertools = "0.11.0"
listenfd = "1.0.1"
rand = "0.8.5"
rand_chacha = "0.3.1"
rustls = "0.21.3"
serde_json = "1.0.100"
serde_yaml = "0.9.22"
sqlx = { version = "0.6.3", features = ["runtime-tokio-rustls", "postgres"] }
rustls = "0.21.5"
serde_json = "1.0.103"
serde_yaml = "0.9.23"
sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres"] }
tokio = { version = "1.29.1", features = ["full"] }
tower = { version = "0.4.13", features = ["full"] }
tower-http = { version = "0.4.1", features = ["fs"] }
@ -66,7 +66,7 @@ mas-tower = { path = "../tower" }
oauth2-types = { path = "../oauth2-types" }
[dev-dependencies]
indoc = "2.0.2"
indoc = "2.0.3"
[features]
default = ["jaeger", "zipkin", "webpki-roots", "policy-cache"]

8
crates/cli/src/commands/manage.rs
View File

@ -198,7 +198,7 @@ impl Options {
// TODO: do some pagination here
let ids: Vec<Uuid> = sqlx::query_scalar("SELECT user_id FROM users")
.fetch_all(&mut conn)
.fetch_all(&mut *conn)
.await?;
drop(conn);
@ -235,7 +235,7 @@ impl Options {
"#,
)
.bind(Uuid::from(user.id))
.fetch_all(&mut conn)
.fetch_all(&mut *conn)
.await?;
for id in compat_sessions_ids {
@ -265,7 +265,7 @@ impl Options {
"#,
)
.bind(Uuid::from(user.id))
.fetch_all(&mut conn)
.fetch_all(&mut *conn)
.await?;
for id in oauth2_sessions_ids {
@ -300,7 +300,7 @@ impl Options {
"#,
)
.bind(Uuid::from(user.id))
.fetch_all(&mut conn)
.fetch_all(&mut *conn)
.await?;
for id in user_sessions_ids {

4
crates/cli/src/util.rs
View File

@ -121,7 +121,7 @@ pub async fn templates_from_config(
#[tracing::instrument(name = "db.connect", skip_all, err(Debug))]
pub async fn database_from_config(config: &DatabaseConfig) -> Result<PgPool, anyhow::Error> {
let mut options = match &config.options {
let options = match &config.options {
DatabaseConnectConfig::Uri { uri } => uri
.parse()
.context("could not parse database connection string")?,
@ -164,7 +164,7 @@ pub async fn database_from_config(config: &DatabaseConfig) -> Result<PgPool, any
}
};
options
let options = options
.log_statements(LevelFilter::Debug)
.log_slow_statements(LevelFilter::Warn, Duration::from_millis(100));