From c9d26e8c50de80b3449eeceef4c29e732ba6177b Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Tue, 9 May 2023 14:33:00 +0100 Subject: k2v-client/Cargo.toml: Make tokio dep match other packages. --- src/k2v-client/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/k2v-client/Cargo.toml') diff --git a/src/k2v-client/Cargo.toml b/src/k2v-client/Cargo.toml index 27e85651..f49d3205 100644 --- a/src/k2v-client/Cargo.toml +++ b/src/k2v-client/Cargo.toml @@ -19,7 +19,7 @@ hyper-rustls = { version = "0.23", default-features = false, features = [ "http1 serde = "1.0" serde_json = "1.0" thiserror = "1.0" -tokio = "1.24" +tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] } # cli deps clap = { version = "4.1", optional = true, features = ["derive", "env"] } -- cgit v1.2.3 From e4f955d672af99d1bf25e6a0bb038d116f8bca0c Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 16 May 2023 18:34:46 +0200 Subject: fix base64 uses --- src/k2v-client/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/k2v-client/Cargo.toml') diff --git a/src/k2v-client/Cargo.toml b/src/k2v-client/Cargo.toml index f49d3205..604099ea 100644 --- a/src/k2v-client/Cargo.toml +++ b/src/k2v-client/Cargo.toml @@ -24,10 +24,11 @@ tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi # cli deps clap = { version = "4.1", optional = true, features = ["derive", "env"] } garage_util = { workspace = true, optional = true } +garage_db = { workspace = true, optional = true } [features] -cli = ["clap", "tokio/fs", "tokio/io-std", "garage_util"] +cli = ["clap", "tokio/fs", "tokio/io-std", "garage_util", "garage_db/sled"] [lib] path = "lib.rs" -- cgit v1.2.3 From 472444ed8ec63200045ff2d366f8b11d1745475f Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 16 May 2023 18:38:31 +0200 Subject: k2v-client 0.0.2 --- src/k2v-client/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/k2v-client/Cargo.toml') diff --git a/src/k2v-client/Cargo.toml b/src/k2v-client/Cargo.toml index 604099ea..293ad8b7 100644 --- a/src/k2v-client/Cargo.toml +++ b/src/k2v-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "k2v-client" -version = "0.1.1" +version = "0.0.2" authors = ["Trinity Pointard ", "Alex Auvolat "] edition = "2018" license = "AGPL-3.0" -- cgit v1.2.3 From a1cec2cd60d64208caa2cbd11d8e6f885e80f630 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 17 May 2023 13:01:37 +0200 Subject: Split format_table into separate crate and reduce k2v-client dependencies --- src/k2v-client/Cargo.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/k2v-client/Cargo.toml') diff --git a/src/k2v-client/Cargo.toml b/src/k2v-client/Cargo.toml index 293ad8b7..4212a00a 100644 --- a/src/k2v-client/Cargo.toml +++ b/src/k2v-client/Cargo.toml @@ -23,12 +23,11 @@ tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi # cli deps clap = { version = "4.1", optional = true, features = ["derive", "env"] } -garage_util = { workspace = true, optional = true } -garage_db = { workspace = true, optional = true } +format_table = { workspace = true, optional = true } [features] -cli = ["clap", "tokio/fs", "tokio/io-std", "garage_util", "garage_db/sled"] +cli = ["clap", "tokio/fs", "tokio/io-std", "format_table"] [lib] path = "lib.rs" -- cgit v1.2.3 From 4420db731020bf7123f2bb80b076da581836f900 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Thu, 18 May 2023 00:07:54 +0200 Subject: add tracing to k2v-client --- src/k2v-client/Cargo.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/k2v-client/Cargo.toml') diff --git a/src/k2v-client/Cargo.toml b/src/k2v-client/Cargo.toml index 4212a00a..79af5242 100644 --- a/src/k2v-client/Cargo.toml +++ b/src/k2v-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "k2v-client" -version = "0.0.2" +version = "0.0.3" authors = ["Trinity Pointard ", "Alex Auvolat "] edition = "2018" license = "AGPL-3.0" @@ -24,10 +24,12 @@ tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi # cli deps clap = { version = "4.1", optional = true, features = ["derive", "env"] } format_table = { workspace = true, optional = true } +tracing = { version = "0.1", optional = true } +tracing-subscriber = { version = "0.3", optional = true, features = ["env-filter"] } [features] -cli = ["clap", "tokio/fs", "tokio/io-std", "format_table"] +cli = ["clap", "tokio/fs", "tokio/io-std", "tracing", "tracing-subscriber", "format_table"] [lib] path = "lib.rs" -- cgit v1.2.3 From 644e8722641c826603f7ee3c2c7b58f31ab88c23 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Thu, 18 May 2023 13:04:17 +0200 Subject: Port k2v-client to aws-sigv4 since rusoto_signature is deprecated --- src/k2v-client/Cargo.toml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/k2v-client/Cargo.toml') diff --git a/src/k2v-client/Cargo.toml b/src/k2v-client/Cargo.toml index 79af5242..886f6f49 100644 --- a/src/k2v-client/Cargo.toml +++ b/src/k2v-client/Cargo.toml @@ -10,13 +10,15 @@ readme = "../../README.md" [dependencies] base64 = "0.21" +sha2 = "0.10" +hex = "0.4" http = "0.2" log = "0.4" -rusoto_core = { version = "0.48.0", default-features = false, features = ["rustls"] } -rusoto_credential = "0.48.0" -rusoto_signature = "0.48.0" -hyper-rustls = { version = "0.23", default-features = false, features = [ "http1", "http2", "tls12" ] } -serde = "1.0" +aws-sigv4 = "0.55" +percent-encoding = "2.2" +hyper = { version = "0.14", default-features = false, features = ["client", "http1", "http2"] } +hyper-rustls = { version = "0.24", features = ["http2"] } +serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" thiserror = "1.0" tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] } -- cgit v1.2.3 From c3d3b837ebeb98e8639659183ae801b3a280de99 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 22 May 2023 10:47:15 +0200 Subject: bump k2v-client to v0.0.4 --- src/k2v-client/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/k2v-client/Cargo.toml') diff --git a/src/k2v-client/Cargo.toml b/src/k2v-client/Cargo.toml index 886f6f49..2ccb9fe5 100644 --- a/src/k2v-client/Cargo.toml +++ b/src/k2v-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "k2v-client" -version = "0.0.3" +version = "0.0.4" authors = ["Trinity Pointard ", "Alex Auvolat "] edition = "2018" license = "AGPL-3.0" -- cgit v1.2.3