From 13230b7c33ab35140f8d3761f4e778902b696477 Mon Sep 17 00:00:00 2001 From: xmakro Date: Tue, 9 Apr 2024 13:14:58 +0100 Subject: [PATCH 1/3] Upgrade crates and new version --- jwt/Cargo.toml | 27 +++++++++++---------- snowflake-api/Cargo.toml | 24 ++++++++++--------- snowflake-api/examples/tracing/Cargo.toml | 29 ++++++++++------------- 3 files changed, 41 insertions(+), 39 deletions(-) diff --git a/jwt/Cargo.toml b/jwt/Cargo.toml index e8043e9..29c016c 100644 --- a/jwt/Cargo.toml +++ b/jwt/Cargo.toml @@ -1,26 +1,29 @@ [package] -name = "snowflake-jwt" -version = "0.3.0" -edition = "2021" +authors = [ + "Andrew Korzhuev ", + "Artem Semenov ", +] +categories = ["cryptography"] description = "Snowflake JWT token generator" -authors = ["Andrew Korzhuev ", "Artem Semenov "] -repository = "https://github.com/mycelial/snowflake-rs" documentation = "http://docs.rs/snowflake-jwt/" +edition = "2021" keywords = ["snowflake", "database", "api", "jwt"] -categories = ["cryptography"] -readme = "README.md" license = "Apache-2.0" +name = "snowflake-jwt" +readme = "README.md" +repository = "https://github.com/mycelial/snowflake-rs" +version = "0.4.0" [dependencies] -thiserror = "1" +base64 = "0.22" +jsonwebtoken = "9" rsa = "0.9" -sha2 = "0.10" -base64 = "0.21" -jsonwebtoken = "8" serde = "1" +sha2 = "0.10" +thiserror = "1" time = "0.3" [dev-dependencies] anyhow = "1" -ureq = { version = "2", features = ["json"] } clap = { version = "4", features = ["derive"] } +ureq = { version = "2", features = ["json"] } diff --git a/snowflake-api/Cargo.toml b/snowflake-api/Cargo.toml index 43ae88e..0ee2799 100644 --- a/snowflake-api/Cargo.toml +++ b/snowflake-api/Cargo.toml @@ -9,19 +9,19 @@ license = "Apache-2.0" name = "snowflake-api" readme = "README.md" repository = "https://github.com/mycelial/snowflake-rs" -version = "0.7.0" +version = "0.8.0" [features] -default = ["cert-auth"] all = ["cert-auth", "polars"] cert-auth = ["dep:snowflake-jwt"] +default = ["cert-auth"] # support for conversion of arrow and json payloads to dataframes polars = ["dep:polars-core", "dep:polars-io"] [dependencies] -arrow = "50" +arrow = "51" async-trait = "0.1" -base64 = "0.21" +base64 = "0.22" bytes = "1" futures = "0.3" log = "0.4" @@ -32,27 +32,29 @@ reqwest = { version = "0.11", default-features = false, features = [ "rustls-tls", ] } reqwest-middleware = "0.2" -reqwest-retry = "0.3" +reqwest-retry = "0.4" serde = { version = "1", features = ["derive"] } serde_json = "1" +snowflake-jwt = { version = "0.3.0", optional = true } thiserror = "1" url = "2" uuid = { version = "1", features = ["v4"] } -snowflake-jwt = { version = "0.3.0", optional = true } # polars-support -polars-io = { version = ">=0.32", features = ["json", "ipc_streaming"], optional = true} -polars-core = { version = ">=0.32", optional = true} +polars-core = { version = ">=0.32", optional = true } +polars-io = { version = ">=0.32", features = [ + "json", + "ipc_streaming", +], optional = true } # put request support +glob = { version = "0.3" } object_store = { version = "0.9", features = ["aws"] } -glob = { version = "0.3"} tokio = { version = "1", features = ["macros", "rt-multi-thread"] } - [dev-dependencies] anyhow = "1" -arrow = { version = "50", features = ["prettyprint"] } +arrow = { version = "51", features = ["prettyprint"] } clap = { version = "4", features = ["derive"] } pretty_env_logger = "0.5" tokio = { version = "1.35", features = ["macros", "rt-multi-thread"] } diff --git a/snowflake-api/examples/tracing/Cargo.toml b/snowflake-api/examples/tracing/Cargo.toml index 01a07ec..fcee777 100644 --- a/snowflake-api/examples/tracing/Cargo.toml +++ b/snowflake-api/examples/tracing/Cargo.toml @@ -1,24 +1,21 @@ [package] +edition = "2021" name = "snowflake-rust-tracing" version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.79" -arrow = { version = "50.0.0", features = ["prettyprint"] } -dotenv = "0.15.0" +anyhow = "1" +arrow = { version = "51", features = ["prettyprint"] } +dotenv = "0.15" snowflake-api = { path = "../../../snowflake-api" } - -tokio = { version = "1.35.1", features = ["full"] } -tracing = "0.1.40" -tracing-subscriber = "0.3" -tracing-opentelemetry = "0.22" -opentelemetry-otlp = "0.14" -opentelemetry = "0.21" -opentelemetry_sdk = { version = "0.21", features = ["rt-tokio"] } +opentelemetry = "0.22" +opentelemetry-otlp = "0.15" +opentelemetry-semantic-conventions = "0.14" +opentelemetry_sdk = { version = "0.22", features = ["rt-tokio"] } +reqwest-middleware = "0.2" reqwest-tracing = { version = "0.4", features = ["opentelemetry_0_21"] } -reqwest-middleware = { version = "*" } -opentelemetry-semantic-conventions = "0.13" +tokio = { version = "1", features = ["full"] } +tracing = "0.1" +tracing-opentelemetry = "0.23" +tracing-subscriber = "0.3" From 5f71b47b446aef1fe9571ef034de6e242d80836e Mon Sep 17 00:00:00 2001 From: xmakro Date: Sat, 13 Apr 2024 00:22:47 +0100 Subject: [PATCH 2/3] Update reqwest --- snowflake-api/Cargo.toml | 8 ++++---- snowflake-api/examples/tracing/Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/snowflake-api/Cargo.toml b/snowflake-api/Cargo.toml index 0ee2799..3afdaa4 100644 --- a/snowflake-api/Cargo.toml +++ b/snowflake-api/Cargo.toml @@ -26,16 +26,16 @@ bytes = "1" futures = "0.3" log = "0.4" regex = "1" -reqwest = { version = "0.11", default-features = false, features = [ +reqwest = { version = "0.12", default-features = false, features = [ "gzip", "json", "rustls-tls", ] } -reqwest-middleware = "0.2" -reqwest-retry = "0.4" +reqwest-middleware = { version = "0.3", features = ["json"] } +reqwest-retry = "0.5" serde = { version = "1", features = ["derive"] } serde_json = "1" -snowflake-jwt = { version = "0.3.0", optional = true } +snowflake-jwt = { version = "0.3", optional = true } thiserror = "1" url = "2" uuid = { version = "1", features = ["v4"] } diff --git a/snowflake-api/examples/tracing/Cargo.toml b/snowflake-api/examples/tracing/Cargo.toml index fcee777..50e0b07 100644 --- a/snowflake-api/examples/tracing/Cargo.toml +++ b/snowflake-api/examples/tracing/Cargo.toml @@ -13,8 +13,8 @@ opentelemetry = "0.22" opentelemetry-otlp = "0.15" opentelemetry-semantic-conventions = "0.14" opentelemetry_sdk = { version = "0.22", features = ["rt-tokio"] } -reqwest-middleware = "0.2" -reqwest-tracing = { version = "0.4", features = ["opentelemetry_0_21"] } +reqwest-middleware = "0.3" +reqwest-tracing = { version = "0.5", features = ["opentelemetry_0_21"] } tokio = { version = "1", features = ["full"] } tracing = "0.1" tracing-opentelemetry = "0.23" From 5616c31294d6e9deebd4b45200f1d57e9691aca1 Mon Sep 17 00:00:00 2001 From: xmakro Date: Sat, 13 Apr 2024 00:26:13 +0100 Subject: [PATCH 3/3] Change snowflake-jwt to minor update --- jwt/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jwt/Cargo.toml b/jwt/Cargo.toml index 29c016c..ca996e2 100644 --- a/jwt/Cargo.toml +++ b/jwt/Cargo.toml @@ -12,7 +12,7 @@ license = "Apache-2.0" name = "snowflake-jwt" readme = "README.md" repository = "https://github.com/mycelial/snowflake-rs" -version = "0.4.0" +version = "0.3.1" [dependencies] base64 = "0.22"