chore: bump edition for all crates to 2024

api/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "api"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [lib]
 path = "src/lib.rs"

api/src/authentication.rs

@@ -1,7 +1,7 @@
-use actix_web::{dev::ServiceRequest, web::Data, Error};
+use actix_web::{Error, dev::ServiceRequest, web::Data};
 use actix_web_httpauth::extractors::{
-    bearer::{BearerAuth, Config},
     AuthenticationError,
+    bearer::{BearerAuth, Config},
 };
 use constant_time_eq::constant_time_eq_n;
 

api/src/config.rs

@@ -1,7 +1,7 @@
-use base64::{prelude::BASE64_STANDARD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD};
 use config::shared::PgConnectionConfig;
 use serde::de::{MapAccess, Visitor};
-use serde::{de, Deserialize, Deserializer};
+use serde::{Deserialize, Deserializer, de};
 use std::fmt;
 use thiserror::Error;
 

api/src/db/destinations.rs

@@ -1,18 +1,18 @@
-use config::shared::DestinationConfig;
 use config::SerializableSecretString;
+use config::shared::DestinationConfig;
 use secrecy::ExposeSecret;
 use serde::{Deserialize, Serialize};
 use sqlx::{PgPool, Postgres, Transaction};
 use std::fmt::Debug;
 use thiserror::Error;
 
 use crate::db::serde::{
-    decrypt_and_deserialize_from_value, encrypt_and_serialize, DbDeserializationError,
-    DbSerializationError,
+    DbDeserializationError, DbSerializationError, decrypt_and_deserialize_from_value,
+    encrypt_and_serialize,
 };
 use crate::encryption::{
-    decrypt_text, encrypt_text, Decrypt, DecryptionError, Encrypt, EncryptedValue, EncryptionError,
-    EncryptionKey,
+    Decrypt, DecryptionError, Encrypt, EncryptedValue, EncryptionError, EncryptionKey,
+    decrypt_text, encrypt_text,
 };
 
 impl Encrypt<EncryptedDestinationConfig> for DestinationConfig {
@@ -300,8 +300,8 @@ pub async fn destination_exists(
 #[cfg(test)]
 mod tests {
     use aws_lc_rs::aead::RandomizedNonceKey;
-    use config::shared::DestinationConfig;
     use config::SerializableSecretString;
+    use config::shared::DestinationConfig;
 
     use crate::db::destinations::EncryptedDestinationConfig;
     use crate::db::serde::{decrypt_and_deserialize_from_value, encrypt_and_serialize};

api/src/db/destinations_pipelines.rs

@@ -3,13 +3,13 @@ use sqlx::PgPool;
 use thiserror::Error;
 
 use crate::db::destinations::{
-    create_destination_txn, update_destination_txn, DestinationsDbError,
+    DestinationsDbError, create_destination_txn, update_destination_txn,
 };
 use crate::db::pipelines::{
-    create_pipeline_txn, update_pipeline_txn, PipelineConfig, PipelinesDbError,
+    PipelineConfig, PipelinesDbError, create_pipeline_txn, update_pipeline_txn,
 };
 use crate::db::serde::{
-    encrypt_and_serialize, serialize, DbDeserializationError, DbSerializationError,
+    DbDeserializationError, DbSerializationError, encrypt_and_serialize, serialize,
 };
 use crate::encryption::EncryptionKey;
 

api/src/db/pipelines.rs

@@ -3,9 +3,9 @@ use serde::{Deserialize, Serialize};
 use sqlx::{PgPool, Postgres, Transaction};
 use thiserror::Error;
 
-use crate::db::replicators::{create_replicator_txn, ReplicatorsDbError};
+use crate::db::replicators::{ReplicatorsDbError, create_replicator_txn};
 use crate::db::serde::{
-    deserialize_from_value, serialize, DbDeserializationError, DbSerializationError,
+    DbDeserializationError, DbSerializationError, deserialize_from_value, serialize,
 };
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -277,7 +277,7 @@ pub async fn read_all_pipelines(
 /// Helper function to check if an sqlx error is a duplicate pipeline constraint violation
 pub fn is_duplicate_pipeline_error(err: &sqlx::Error) -> bool {
     match err {
-        sqlx::Error::Database(ref db_err) => {
+        sqlx::Error::Database(db_err) => {
             // 23505 is PostgreSQL's unique constraint violation code
             // Check for our unique constraint name defined
             // in the migrations/20250605064229_add_unique_constraint_pipelines_source_destination.sql file

api/src/db/publications.rs

@@ -1,6 +1,6 @@
 use pg_escape::{quote_identifier, quote_literal};
 use serde::Serialize;
-use sqlx::{postgres::PgConnectOptions, Connection, Executor, PgConnection, Row};
+use sqlx::{Connection, Executor, PgConnection, Row, postgres::PgConnectOptions};
 use std::collections::HashMap;
 use thiserror::Error;
 use utoipa::ToSchema;

api/src/db/serde.rs

@@ -1,5 +1,5 @@
-use serde::de::DeserializeOwned;
 use serde::Serialize;
+use serde::de::DeserializeOwned;
 use thiserror::Error;
 
 use crate::encryption::{Decrypt, DecryptionError, Encrypt, EncryptionError, EncryptionKey};

api/src/db/sources.rs

@@ -1,18 +1,18 @@
-use config::shared::{PgConnectionConfig, TlsConfig};
 use config::SerializableSecretString;
+use config::shared::{PgConnectionConfig, TlsConfig};
 use secrecy::ExposeSecret;
 use serde::{Deserialize, Serialize};
 use sqlx::{PgPool, Postgres, Transaction};
 use std::fmt::Debug;
 use thiserror::Error;
 
 use crate::db::serde::{
-    decrypt_and_deserialize_from_value, encrypt_and_serialize, DbDeserializationError,
-    DbSerializationError,
+    DbDeserializationError, DbSerializationError, decrypt_and_deserialize_from_value,
+    encrypt_and_serialize,
 };
 use crate::encryption::{
-    decrypt_text, encrypt_text, Decrypt, DecryptionError, Encrypt, EncryptedValue, EncryptionError,
-    EncryptionKey,
+    Decrypt, DecryptionError, Encrypt, EncryptedValue, EncryptionError, EncryptionKey,
+    decrypt_text, encrypt_text,
 };
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

api/src/db/tables.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use sqlx::{postgres::PgConnectOptions, Connection, Executor, PgConnection, Row};
+use sqlx::{Connection, Executor, PgConnection, Row, postgres::PgConnectOptions};
 use thiserror::Error;
 
 #[derive(Debug, Error)]

api/src/db/tenants_sources.rs

@@ -1,9 +1,9 @@
 use sqlx::PgPool;
 use thiserror::Error;
 
-use crate::db::serde::{encrypt_and_serialize, DbSerializationError};
-use crate::db::sources::{create_source_txn, SourceConfig, SourcesDbError};
-use crate::db::tenants::{create_tenant_txn, TenantsDbError};
+use crate::db::serde::{DbSerializationError, encrypt_and_serialize};
+use crate::db::sources::{SourceConfig, SourcesDbError, create_source_txn};
+use crate::db::tenants::{TenantsDbError, create_tenant_txn};
 use crate::encryption::EncryptionKey;
 
 #[derive(Debug, Error)]

api/src/encryption.rs

@@ -1,9 +1,9 @@
 use aws_lc_rs::{
-    aead::{Aad, Nonce, RandomizedNonceKey, AES_256_GCM},
+    aead::{AES_256_GCM, Aad, Nonce, RandomizedNonceKey},
     rand::fill,
 };
-use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
+use base64::prelude::BASE64_STANDARD;
 use serde::{Deserialize, Serialize};
 use std::string;
 use thiserror::Error;
@@ -144,8 +144,8 @@ fn decrypt(
 /// # Panics
 ///
 /// Panics if `T` does not match the required key length for the cipher.
-pub fn generate_random_key<const T: usize>(
-) -> Result<RandomizedNonceKey, aws_lc_rs::error::Unspecified> {
+pub fn generate_random_key<const T: usize>()
+-> Result<RandomizedNonceKey, aws_lc_rs::error::Unspecified> {
     let mut key_bytes = [0u8; T];
     fill(&mut key_bytes)?;
 

api/src/k8s_client.rs

@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use base64::{prelude::BASE64_STANDARD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD};
 use k8s_openapi::api::{
     apps::v1::StatefulSet,
     core::v1::{ConfigMap, Pod, Secret},
@@ -9,8 +9,8 @@ use thiserror::Error;
 use tracing::*;
 
 use kube::{
-    api::{Api, DeleteParams, Patch, PatchParams},
     Client,
+    api::{Api, DeleteParams, Patch, PatchParams},
 };
 
 #[derive(Debug, Error)]

api/src/routes/destinations.rs

@@ -1,9 +1,8 @@
 use actix_web::{
-    delete, get,
-    http::{header::ContentType, StatusCode},
+    HttpRequest, HttpResponse, Responder, ResponseError, delete, get,
+    http::{StatusCode, header::ContentType},
     post,
     web::{Data, Json, Path},
-    HttpRequest, HttpResponse, Responder, ResponseError,
 };
 use config::shared::DestinationConfig;
 use serde::{Deserialize, Serialize};
@@ -14,7 +13,7 @@ use utoipa::ToSchema;
 use crate::db;
 use crate::db::destinations::DestinationsDbError;
 use crate::encryption::EncryptionKey;
-use crate::routes::{extract_tenant_id, ErrorMessage, TenantIdError};
+use crate::routes::{ErrorMessage, TenantIdError, extract_tenant_id};
 
 #[derive(Debug, Error)]
 pub enum DestinationError {

api/src/routes/destinations_pipelines.rs

@@ -1,8 +1,8 @@
 use actix_web::{
-    http::{header::ContentType, StatusCode},
+    HttpRequest, HttpResponse, Responder, ResponseError,
+    http::{StatusCode, header::ContentType},
     post,
     web::{Data, Json, Path},
-    HttpRequest, HttpResponse, Responder, ResponseError,
 };
 use config::shared::DestinationConfig;
 use serde::{Deserialize, Serialize};
@@ -11,14 +11,14 @@ use thiserror::Error;
 use utoipa::ToSchema;
 
 use crate::db;
-use crate::db::destinations::{destination_exists, DestinationsDbError};
+use crate::db::destinations::{DestinationsDbError, destination_exists};
 use crate::db::destinations_pipelines::DestinationPipelinesDbError;
 use crate::db::images::ImagesDbError;
 use crate::db::pipelines::PipelineConfig;
-use crate::db::sources::{source_exists, SourcesDbError};
+use crate::db::sources::{SourcesDbError, source_exists};
 use crate::encryption::EncryptionKey;
 
-use super::{destinations::DestinationError, extract_tenant_id, ErrorMessage, TenantIdError};
+use super::{ErrorMessage, TenantIdError, destinations::DestinationError, extract_tenant_id};
 
 #[derive(Debug, Error)]
 enum DestinationPipelineError {

api/src/routes/health_check.rs

@@ -1,4 +1,4 @@
-use actix_web::{get, HttpResponse, Responder};
+use actix_web::{HttpResponse, Responder, get};
 
 #[utoipa::path(
     tag = "Health",

api/src/routes/images.rs

@@ -1,9 +1,8 @@
 use actix_web::{
-    delete, get,
-    http::{header::ContentType, StatusCode},
+    HttpResponse, Responder, ResponseError, delete, get,
+    http::{StatusCode, header::ContentType},
     post,
     web::{Data, Json, Path},
-    HttpResponse, Responder, ResponseError,
 };
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;

api/src/routes/pipelines.rs

@@ -1,9 +1,8 @@
 use actix_web::{
-    delete, get,
-    http::{header::ContentType, StatusCode},
+    HttpRequest, HttpResponse, Responder, ResponseError, delete, get,
+    http::{StatusCode, header::ContentType},
     post,
     web::{Data, Json, Path},
-    HttpRequest, HttpResponse, Responder, ResponseError,
 };
 use config::shared::{
     DestinationConfig, PgConnectionConfig, PipelineConfig as SharedPipelineConfig,
@@ -16,16 +15,16 @@ use thiserror::Error;
 use utoipa::ToSchema;
 
 use crate::db;
-use crate::db::destinations::{destination_exists, Destination, DestinationsDbError};
+use crate::db::destinations::{Destination, DestinationsDbError, destination_exists};
 use crate::db::images::{Image, ImagesDbError};
 use crate::db::pipelines::{Pipeline, PipelineConfig, PipelinesDbError};
 use crate::db::replicators::{Replicator, ReplicatorsDbError};
-use crate::db::sources::{source_exists, Source, SourceConfig, SourcesDbError};
+use crate::db::sources::{Source, SourceConfig, SourcesDbError, source_exists};
 use crate::encryption::EncryptionKey;
 use crate::k8s_client::{
     HttpK8sClient, K8sClient, K8sError, PodPhase, TRUSTED_ROOT_CERT_CONFIG_MAP_NAME,
 };
-use crate::routes::{extract_tenant_id, ErrorMessage, TenantIdError};
+use crate::routes::{ErrorMessage, TenantIdError, extract_tenant_id};
 use secrecy::ExposeSecret;
 
 #[derive(Debug, Error)]

api/src/routes/sources.rs

@@ -1,13 +1,12 @@
 use crate::db;
 use crate::db::sources::{SourceConfig, SourcesDbError};
 use crate::encryption::EncryptionKey;
-use crate::routes::{extract_tenant_id, ErrorMessage, TenantIdError};
+use crate::routes::{ErrorMessage, TenantIdError, extract_tenant_id};
 use actix_web::{
-    delete, get,
-    http::{header::ContentType, StatusCode},
+    HttpRequest, HttpResponse, Responder, ResponseError, delete, get,
+    http::{StatusCode, header::ContentType},
     post,
     web::{Data, Json, Path},
-    HttpRequest, HttpResponse, Responder, ResponseError,
 };
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;

api/src/routes/sources/publications.rs

@@ -1,9 +1,8 @@
 use actix_web::{
-    delete, get,
-    http::{header::ContentType, StatusCode},
+    HttpRequest, HttpResponse, Responder, ResponseError, delete, get,
+    http::{StatusCode, header::ContentType},
     post,
     web::{Data, Json, Path},
-    HttpRequest, HttpResponse, Responder, ResponseError,
 };
 use config::shared::IntoConnectOptions;
 use serde::{Deserialize, Serialize};
@@ -15,7 +14,7 @@ use crate::db::publications::PublicationsDbError;
 use crate::{
     db::{self, publications::Publication, sources::SourcesDbError, tables::Table},
     encryption::EncryptionKey,
-    routes::{extract_tenant_id, ErrorMessage, TenantIdError},
+    routes::{ErrorMessage, TenantIdError, extract_tenant_id},
 };
 
 #[derive(Debug, Error)]

api/src/routes/sources/tables.rs

@@ -1,8 +1,7 @@
 use actix_web::{
-    get,
-    http::{header::ContentType, StatusCode},
+    HttpRequest, HttpResponse, Responder, ResponseError, get,
+    http::{StatusCode, header::ContentType},
     web::{Data, Json, Path},
-    HttpRequest, HttpResponse, Responder, ResponseError,
 };
 use config::shared::IntoConnectOptions;
 use serde::{Deserialize, Serialize};
@@ -14,7 +13,7 @@ use crate::db::tables::TablesDbError;
 use crate::{
     db::{self, sources::SourcesDbError, tables::Table},
     encryption::EncryptionKey,
-    routes::{extract_tenant_id, ErrorMessage, TenantIdError},
+    routes::{ErrorMessage, TenantIdError, extract_tenant_id},
 };
 
 #[derive(Debug, Error)]

api/src/routes/tenants.rs

@@ -1,9 +1,8 @@
 use actix_web::{
-    delete, get,
-    http::{header::ContentType, StatusCode},
+    HttpResponse, Responder, ResponseError, delete, get,
+    http::{StatusCode, header::ContentType},
     post, put,
     web::{Data, Json, Path},
-    HttpResponse, Responder, ResponseError,
 };
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;

api/src/routes/tenants_sources.rs

@@ -1,8 +1,8 @@
 use actix_web::{
-    http::{header::ContentType, StatusCode},
+    HttpResponse, Responder, ResponseError,
+    http::{StatusCode, header::ContentType},
     post,
     web::{Data, Json},
-    HttpResponse, Responder, ResponseError,
 };
 use serde::{Deserialize, Serialize};
 use sqlx::PgPool;

api/src/span_builder.rs

@@ -1,7 +1,7 @@
 use actix_web::{
+    Error,
     body::MessageBody,
     dev::{ServiceRequest, ServiceResponse},
-    Error,
 };
 use tracing::Span;
 use tracing_actix_web::{DefaultRootSpanBuilder, RootSpanBuilder};