chore(rust): upgrade sqlx to 0.8.3

build-trust · Jan 6, 2025 · 6a4d371 · 6a4d371
1 parent 8697c4e
commit 6a4d371
Show file tree

Hide file tree

Showing 19 changed files with 561 additions and 588 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/NOTICE.md b/NOTICE.md
@@ -185,7 +185,7 @@ This file contains attributions for any 3rd-party open source code used in this
 | embedded-dma | MIT, Apache-2.0 | https://crates.io/crates/embedded-dma |
 | embedded-hal | MIT, Apache-2.0 | https://crates.io/crates/embedded-hal |
 | embedded-storage | MIT, Apache-2.0 | https://crates.io/crates/embedded-storage |
-| encode_unicode | MIT, Apache-2.0 | https://crates.io/crates/encode_unicode |
+| encode_unicode | Apache-2.0, MIT | https://crates.io/crates/encode_unicode |
 | endian-type | MIT | https://crates.io/crates/endian-type |
 | enumflags2 | MIT, Apache-2.0 | https://crates.io/crates/enumflags2 |
 | enumflags2_derive | MIT, Apache-2.0 | https://crates.io/crates/enumflags2_derive |
@@ -487,14 +487,12 @@ This file contains attributions for any 3rd-party open source code used in this
 | size-of-derive | MIT, Apache-2.0 | https://crates.io/crates/size-of-derive |
 | slab | MIT | https://crates.io/crates/slab |
 | smallvec | MIT, Apache-2.0 | https://crates.io/crates/smallvec |
-| smawk | MIT | https://crates.io/crates/smawk |
 | smithay-client-toolkit | MIT | https://crates.io/crates/smithay-client-toolkit |
 | smithay-clipboard | MIT | https://crates.io/crates/smithay-clipboard |
 | snap | BSD-3-Clause | https://crates.io/crates/snap |
 | socket2 | MIT, Apache-2.0 | https://crates.io/crates/socket2 |
 | spin | MIT | https://crates.io/crates/spin |
 | spki | Apache-2.0, MIT | https://crates.io/crates/spki |
-| sqlformat | MIT, Apache-2.0 | https://crates.io/crates/sqlformat |
 | sqlx | MIT, Apache-2.0 | https://crates.io/crates/sqlx |
 | sqlx-core | MIT, Apache-2.0 | https://crates.io/crates/sqlx-core |
 | sqlx-macros | MIT, Apache-2.0 | https://crates.io/crates/sqlx-macros |
@@ -568,13 +566,12 @@ This file contains attributions for any 3rd-party open source code used in this
 | tungstenite | MIT, Apache-2.0 | https://crates.io/crates/tungstenite |
 | typenum | MIT, Apache-2.0 | https://crates.io/crates/typenum |
 | unicode-bidi | MIT, Apache-2.0 | https://crates.io/crates/unicode-bidi |
-| unicode-ident | MIT, Apache-2.0, Unicode-DFS-2016 | https://crates.io/crates/unicode-ident |
+| unicode-ident | MIT, Apache-2.0, Unicode-3.0 | https://crates.io/crates/unicode-ident |
 | unicode-linebreak | Apache-2.0 | https://crates.io/crates/unicode-linebreak |
 | unicode-normalization | MIT, Apache-2.0 | https://crates.io/crates/unicode-normalization |
 | unicode-properties | MIT, Apache-2.0 | https://crates.io/crates/unicode-properties |
 | unicode-segmentation | MIT, Apache-2.0 | https://crates.io/crates/unicode-segmentation |
 | unicode-width | MIT, Apache-2.0 | https://crates.io/crates/unicode-width |
-| unicode_categories | MIT, Apache-2.0 | https://crates.io/crates/unicode_categories |
 | universal-hash | MIT, Apache-2.0 | https://crates.io/crates/universal-hash |
 | unsafe-libyaml | MIT | https://crates.io/crates/unsafe-libyaml |
 | unsigned-varint | MIT | https://crates.io/crates/unsigned-varint |
@@ -587,7 +584,6 @@ This file contains attributions for any 3rd-party open source code used in this
 | utf8_iter | Apache-2.0, MIT | https://crates.io/crates/utf8_iter |
 | utf8parse | Apache-2.0, MIT | https://crates.io/crates/utf8parse |
 | uuid | Apache-2.0, MIT | https://crates.io/crates/uuid |
-| valuable | MIT | https://crates.io/crates/valuable |
 | value-bag | Apache-2.0, MIT | https://crates.io/crates/value-bag |
 | vcell | MIT, Apache-2.0 | https://crates.io/crates/vcell |
 | vcpkg | MIT, Apache-2.0 | https://crates.io/crates/vcpkg |

diff --git a/implementations/rust/ockam/ockam_abac/Cargo.toml b/implementations/rust/ockam/ockam_abac/Cargo.toml
@@ -26,6 +26,7 @@ std = [
   "either/use_std",
   "once_cell/std",
   "sqlx",
+  "sqlx-core",
   "regex",
   "tokio",
   "wast",
@@ -50,7 +51,8 @@ ockam_executor = { version = "0.91.0", path = "../ockam_executor", default-featu
 regex = { version = "1.10.6", default-features = false, optional = true }
 rustyline = { version = "14.0.0", optional = true }
 rustyline-derive = { version = "0.10.0", optional = true }
-sqlx = { version = "0.8.2", optional = true, default-features = false }
+sqlx = { version = "0.8.3", optional = true, default-features = false }
+sqlx-core = { version = "0.8.3", optional = true, default-features = false }
 str-buf = "3.0.3"
 tokio = { version = "1.41", default-features = false, optional = true, features = ["sync", "time", "rt", "rt-multi-thread", "macros"] }
 tracing = { version = "0.1", default-features = false, features = ["attributes"] }

diff --git a/implementations/rust/ockam/ockam_abac/src/policy/storage/resource_repository_sql.rs b/implementations/rust/ockam/ockam_abac/src/policy/storage/resource_repository_sql.rs
@@ -1,8 +1,8 @@
 use core::str::FromStr;
 use sqlx::encode::IsNull;
 use sqlx::error::BoxDynError;
-use sqlx::postgres::any::AnyArgumentBuffer;
 use sqlx::*;
+use sqlx_core::any::AnyArgumentBuffer;
 use std::sync::Arc;
 use tracing::debug;
 

diff --git a/...entations/rust/ockam/ockam_abac/src/policy/storage/resource_type_policy_repository_sql.rs b/...entations/rust/ockam/ockam_abac/src/policy/storage/resource_type_policy_repository_sql.rs
@@ -1,8 +1,8 @@
 use core::str::FromStr;
 use sqlx::encode::IsNull;
 use sqlx::error::BoxDynError;
-use sqlx::postgres::any::AnyArgumentBuffer;
 use sqlx::*;
+use sqlx_core::any::AnyArgumentBuffer;
 use std::sync::Arc;
 use tracing::debug;
 

diff --git a/implementations/rust/ockam/ockam_api/Cargo.toml b/implementations/rust/ockam/ockam_api/Cargo.toml
@@ -95,7 +95,8 @@ reqwest = { version = "0.12", default-features = false, features = ["json", "rus
 serde = { version = "1.0.204", features = ["derive"] }
 serde_json = "1.0.133"
 sha2 = "0.10.8"
-sqlx = { version = "0.8.2", default-features = false }
+sqlx = { version = "0.8.3", default-features = false }
+sqlx-core = { version = "0.8.3", default-features = false }
 strip-ansi-escapes = "0.2"
 strum = { version = "0.26.3", default-features = false, features = ["derive"] }
 syntect = { version = "5.2.0", default-features = false, features = ["default-syntaxes", "regex-onig"] }

diff --git a/...st/ockam/ockam_api/src/authenticator/storage/authority_enrollment_token_repository_sql.rs b/...st/ockam/ockam_api/src/authenticator/storage/authority_enrollment_token_repository_sql.rs
@@ -1,8 +1,8 @@
 use ockam::identity::TimestampInSeconds;
 use sqlx::encode::IsNull;
 use sqlx::error::BoxDynError;
-use sqlx::postgres::any::AnyArgumentBuffer;
 use sqlx::*;
+use sqlx_core::any::AnyArgumentBuffer;
 use std::sync::Arc;
 
 use crate::authenticator::one_time_code::OneTimeCode;

diff --git a/implementations/rust/ockam/ockam_api/src/cli_state/storage/nodes_repository_sql.rs b/implementations/rust/ockam/ockam_api/src/cli_state/storage/nodes_repository_sql.rs
@@ -4,8 +4,8 @@ use ockam_core::async_trait;
 use sqlx::any::AnyRow;
 use sqlx::encode::IsNull;
 use sqlx::error::BoxDynError;
-use sqlx::postgres::any::AnyArgumentBuffer;
 use sqlx::*;
+use sqlx_core::any::AnyArgumentBuffer;
 use std::str::FromStr;
 use std::sync::Arc;
 

diff --git a/implementations/rust/ockam/ockam_api/src/cli_state/storage/projects_repository_sql.rs b/implementations/rust/ockam/ockam_api/src/cli_state/storage/projects_repository_sql.rs
@@ -14,8 +14,8 @@ use ockam_node::database::{Boolean, FromSqlxError, Nullable, SqlxDatabase, ToVoi
 use sqlx::any::AnyRow;
 use sqlx::encode::IsNull;
 use sqlx::error::BoxDynError;
-use sqlx::postgres::any::AnyArgumentBuffer;
 use sqlx::*;
+use sqlx_core::any::AnyArgumentBuffer;
 use std::str::FromStr;
 use std::sync::Arc;
 

diff --git a/implementations/rust/ockam/ockam_app_lib/Cargo.toml b/implementations/rust/ockam/ockam_app_lib/Cargo.toml
@@ -44,7 +44,7 @@ ockam_multiaddr = { path = "../ockam_multiaddr", version = "0.67.0", features =
 ockam_node = { path = "../ockam_node", version = "^0.135.0" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-sqlx = { version = "0.8.2", default-features = false }
+sqlx = { version = "0.8.3", default-features = false }
 thiserror = "1.0"
 tokio = { version = "1.41.0", features = ["full"] }
 tracing = { version = "0.1", default-features = false }

diff --git a/implementations/rust/ockam/ockam_identity/Cargo.toml b/implementations/rust/ockam/ockam_identity/Cargo.toml
@@ -68,7 +68,7 @@ alloc = [
   "serde_bare/alloc",
 ]
 
-storage = ["ockam_vault/storage", "sqlx", "tokio-retry"]
+storage = ["ockam_vault/storage", "sqlx", "sqlx-core", "tokio-retry"]
 aws-lc = ["ockam_vault?/aws-lc"]
 rust-crypto = ["ockam_vault?/rust-crypto"]
 
@@ -89,7 +89,8 @@ serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_bare = { version = "0.5.0", default-features = false, features = ["alloc"] }
 serde_json = { version = "1.0", optional = true }
 sha2 = { version = "0.10", default-features = false }
-sqlx = { version = "0.8.2", optional = true, default-features = false }
+sqlx = { version = "0.8.3", optional = true, default-features = false }
+sqlx-core = { version = "0.8.3", optional = true, default-features = false }
 static_assertions = "1.1.0"
 tokio-retry = { version = "0.3.0", default-features = false, optional = true }
 tracing = { version = "0.1", default-features = false }

diff --git a/...tations/rust/ockam/ockam_identity/src/identities/storage/change_history_repository_sql.rs b/...tations/rust/ockam/ockam_identity/src/identities/storage/change_history_repository_sql.rs
@@ -2,9 +2,9 @@ use core::str::FromStr;
 use sqlx::any::AnyArguments;
 use sqlx::encode::IsNull;
 use sqlx::error::BoxDynError;
-use sqlx::postgres::any::AnyArgumentBuffer;
 use sqlx::query::Query;
 use sqlx::*;
+use sqlx_core::any::AnyArgumentBuffer;
 use std::sync::Arc;
 use tracing::debug;
 

diff --git a/...ementations/rust/ockam/ockam_identity/src/identities/storage/credential_repository_sql.rs b/...ementations/rust/ockam/ockam_identity/src/identities/storage/credential_repository_sql.rs
@@ -1,7 +1,7 @@
 use sqlx::encode::IsNull;
 use sqlx::error::BoxDynError;
-use sqlx::postgres::any::AnyArgumentBuffer;
 use sqlx::*;
+use sqlx_core::any::AnyArgumentBuffer;
 use std::sync::Arc;
 use tracing::debug;
 

diff --git a/...ns/rust/ockam/ockam_identity/src/identities/storage/identity_attributes_repository_sql.rs b/...ns/rust/ockam/ockam_identity/src/identities/storage/identity_attributes_repository_sql.rs
@@ -1,8 +1,8 @@
 use core::str::FromStr;
 use sqlx::encode::IsNull;
 use sqlx::error::BoxDynError;
-use sqlx::postgres::any::AnyArgumentBuffer;
 use sqlx::*;
+use sqlx_core::any::AnyArgumentBuffer;
 use std::sync::Arc;
 use tracing::debug;
 

diff --git a/...tations/rust/ockam/ockam_identity/src/purpose_keys/storage/purpose_keys_repository_sql.rs b/...tations/rust/ockam/ockam_identity/src/purpose_keys/storage/purpose_keys_repository_sql.rs
@@ -1,8 +1,8 @@
 use core::str::FromStr;
 use sqlx::encode::IsNull;
 use sqlx::error::BoxDynError;
-use sqlx::postgres::any::AnyArgumentBuffer;
 use sqlx::*;
+use sqlx_core::any::AnyArgumentBuffer;
 use std::sync::Arc;
 use tracing::debug;
 

diff --git a/implementations/rust/ockam/ockam_node/Cargo.toml b/implementations/rust/ockam/ockam_node/Cargo.toml
@@ -101,8 +101,8 @@ opentelemetry = { version = "0.26.0", features = ["logs", "metrics", "trace"], o
 regex = { version = "1.10.6", default-features = false, optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1", optional = true }
-sqlx = { version = "0.8.2", optional = true, default-features = false, features = ["postgres", "sqlite", "any", "migrate", "runtime-tokio", "derive"] }
-sqlx-core = { version = "0.8.2", optional = true, default-features = false }
+sqlx = { version = "0.8.3", optional = true, default-features = false, features = ["postgres", "sqlite", "any", "migrate", "runtime-tokio", "derive"] }
+sqlx-core = { version = "0.8.3", optional = true, default-features = false }
 sqlx-postgres = { version = "0.8.2", optional = true, default-features = false }
 sqlx-sqlite = { version = "0.8.2", optional = true, default-features = false }
 tempfile = { version = "3.10.1", optional = true }

diff --git a/implementations/rust/ockam/ockam_node/src/storage/database/sqlx_from_row_types.rs b/implementations/rust/ockam/ockam_node/src/storage/database/sqlx_from_row_types.rs
@@ -1,5 +1,5 @@
+use sqlx::any::AnyTypeInfoKind;
 use sqlx::error::BoxDynError;
-use sqlx::postgres::any::AnyTypeInfoKind;
 use sqlx::{Any, Database, Decode, Type, Value, ValueRef};
 use sqlx_core::any::AnyValueRef;
 

diff --git a/implementations/rust/ockam/ockam_vault/Cargo.toml b/implementations/rust/ockam/ockam_vault/Cargo.toml
@@ -69,7 +69,7 @@ alloc = [
   "p256/pem",
 ]
 
-storage = ["ockam_node/storage", "sqlx"]
+storage = ["ockam_node/storage", "sqlx", "sqlx-core"]
 
 [dependencies]
 aes-gcm = { version = "0.10", default-features = false, features = ["aes", "zeroize"], optional = true }
@@ -88,7 +88,8 @@ p256 = { version = "0.13.2", default-features = false }
 rand_pcg = { version = "0.3.1", default-features = false, optional = true }
 serde = { version = "1", default-features = false, features = ["derive"] }
 sha2 = { version = "0.10", default-features = false }
-sqlx = { version = "0.8.2", optional = true, default-features = false }
+sqlx = { version = "0.8.3", optional = true, default-features = false }
+sqlx-core = { version = "0.8.3", optional = true, default-features = false }
 static_assertions = "1.1.0"
 tracing = { version = "0.1", default-features = false }
 x25519-dalek = { version = "2.0.1", default-features = false, features = ["precomputed-tables", "static_secrets", "zeroize"] }

diff --git a/implementations/rust/ockam/ockam_vault/src/storage/secrets_repository_sql.rs b/implementations/rust/ockam/ockam_vault/src/storage/secrets_repository_sql.rs
@@ -1,7 +1,7 @@
 use sqlx::encode::IsNull;
 use sqlx::error::BoxDynError;
-use sqlx::postgres::any::AnyArgumentBuffer;
 use sqlx::*;
+use sqlx_core::any::AnyArgumentBuffer;
 use std::sync::Arc;
 use tracing::debug;
 use zeroize::{Zeroize, ZeroizeOnDrop};