From ee57dd922b9c396298473b41e4046c8d00ee77d5 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 16 Jan 2024 16:28:17 +0100 Subject: Bump version to 0.9.1 --- Cargo.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index e3d111c3..be388362 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,14 +18,14 @@ default-members = ["src/garage"] [workspace.dependencies] format_table = { version = "0.1.1", path = "src/format-table" } -garage_api = { version = "0.9.0", path = "src/api" } -garage_block = { version = "0.9.0", path = "src/block" } -garage_db = { version = "0.9.0", path = "src/db", default-features = false } -garage_model = { version = "0.9.0", path = "src/model", default-features = false } -garage_rpc = { version = "0.9.0", path = "src/rpc" } -garage_table = { version = "0.9.0", path = "src/table" } -garage_util = { version = "0.9.0", path = "src/util" } -garage_web = { version = "0.9.0", path = "src/web" } +garage_api = { version = "0.9.1", path = "src/api" } +garage_block = { version = "0.9.1", path = "src/block" } +garage_db = { version = "0.9.1", path = "src/db", default-features = false } +garage_model = { version = "0.9.1", path = "src/model", default-features = false } +garage_rpc = { version = "0.9.1", path = "src/rpc" } +garage_table = { version = "0.9.1", path = "src/table" } +garage_util = { version = "0.9.1", path = "src/util" } +garage_web = { version = "0.9.1", path = "src/web" } k2v-client = { version = "0.0.4", path = "src/k2v-client" } [profile.dev] -- cgit v1.2.3 From fe1af5d98b8e6c87f39f1d94586e61bff100e7d2 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 5 Feb 2024 13:02:02 +0100 Subject: [dep-upgrade-202402] refactor dependencies: move all as workspace deps --- Cargo.toml | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index be388362..0365f3cc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,6 +17,8 @@ members = [ default-members = ["src/garage"] [workspace.dependencies] + +# Internal Garage crates format_table = { version = "0.1.1", path = "src/format-table" } garage_api = { version = "0.9.1", path = "src/api" } garage_block = { version = "0.9.1", path = "src/block" } @@ -28,6 +30,104 @@ garage_util = { version = "0.9.1", path = "src/util" } garage_web = { version = "0.9.1", path = "src/web" } k2v-client = { version = "0.0.4", path = "src/k2v-client" } +# Netapp is a special sister crate +netapp = { version = "0.10", features = ["telemetry"] } + +# External crates from crates.io +arc-swap = "1.0" +async-trait = "0.1.7" +backtrace = "0.3" +base64 = "0.21" +blake2 = "0.10" +bytes = "1.0" +bytesize = "1.1" +chrono = "0.4" +crypto-common = "0.1" +digest = "0.10" +err-derive = "0.3" +gethostname = "0.4" +git-version = "0.3.4" +hex = "0.4" +hexdump = "0.1" +hmac = "0.12" +idna = "0.4" +itertools = "0.10" +lazy_static = "1.4" +md-5 = "0.10" +mktemp = "0.5" +nix = { version = "0.27", default-features = false, features = ["fs"] } +nom = "7.1" +parse_duration = "2.1" +pin-project = "1.0.12" +pnet_datalink = "0.33" +rand = "0.8" +sha2 = "0.10" +sodiumoxide = { version = "0.2.5-0", package = "kuska-sodiumoxide" } +timeago = { version = "0.4", default-features = false } +xxhash-rust = { version = "0.8", default-features = false, features = ["xxh3"] } + +clap = { version = "4.1", features = ["derive", "env"] } +pretty_env_logger = "0.5" +structopt = { version = "0.3", default-features = false } +tracing = "0.1" +tracing-subscriber = { version = "0.3", features = ["env-filter"] } + +heed = { version = "0.11", default-features = false, features = ["lmdb"] } +rusqlite = "0.29.0" +sled = "0.34" + +async-compression = { version = "0.4", features = ["tokio", "zstd"] } +zstd = { version = "0.12", default-features = false } + +quick-xml = { version = "0.26", features = [ "serialize" ] } +rmp-serde = "1.1.2" +serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } +serde_bytes = "0.11" +serde_json = "1.0" +toml = "0.6" + +# newer version requires rust edition 2021 +k8s-openapi = { version = "0.16", features = ["v1_22"] } +kube = { version = "0.75", default-features = false, features = ["runtime", "derive", "client", "rustls-tls"] } +schemars = "0.8" +reqwest = { version = "0.11", default-features = false, features = ["rustls-tls-manual-roots", "json"] } + +form_urlencoded = "1.0.0" +http = "0.2" +httpdate = "1.0" +http-range = "0.1" +hyper = { version = "0.14", features = ["server", "http1", "runtime", "tcp", "stream"] } +hyperlocal = { version = "0.8.0", default-features = false, features = ["server"] } +multer = "2.0" +percent-encoding = "2.2" +roxmltree = "0.18" +url = "2.3" + +futures = "0.3" +futures-util = "0.3" +tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] } +tokio-util = { version = "0.7", features = ["io"] } +tokio-stream = { version = "0.1", features = ["net"] } + +opentelemetry = { version = "0.17", features = [ "rt-tokio", "metrics", "trace" ] } +opentelemetry-prometheus = "0.10" +opentelemetry-otlp = "0.10" +prometheus = "0.13" + +# used by the k2v-client crate only +aws-sigv4 = "0.55" +hyper-rustls = { version = "0.24", features = ["http2"] } +log = "0.4" +thiserror = "1.0" + +# ---- used only as build / dev dependencies ---- +assert-json-diff = "2.0" +rustc_version = "0.4.0" +static_init = "1.0" + +aws-config = "0.55.2" +aws-sdk-s3 = "0.28" + [profile.dev] lto = "off" -- cgit v1.2.3 From c0a7552015ff26ba542970449f1bc3df4ee9b173 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 5 Feb 2024 13:10:56 +0100 Subject: [dep-upgrade-202402] upgrade easy dependencies --- Cargo.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 0365f3cc..9336706a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,8 +50,8 @@ git-version = "0.3.4" hex = "0.4" hexdump = "0.1" hmac = "0.12" -idna = "0.4" -itertools = "0.10" +idna = "0.5" +itertools = "0.12" lazy_static = "1.4" md-5 = "0.10" mktemp = "0.5" @@ -59,7 +59,7 @@ nix = { version = "0.27", default-features = false, features = ["fs"] } nom = "7.1" parse_duration = "2.1" pin-project = "1.0.12" -pnet_datalink = "0.33" +pnet_datalink = "0.34" rand = "0.8" sha2 = "0.10" sodiumoxide = { version = "0.2.5-0", package = "kuska-sodiumoxide" } @@ -73,11 +73,11 @@ tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } heed = { version = "0.11", default-features = false, features = ["lmdb"] } -rusqlite = "0.29.0" +rusqlite = "0.30.0" sled = "0.34" async-compression = { version = "0.4", features = ["tokio", "zstd"] } -zstd = { version = "0.12", default-features = false } +zstd = { version = "0.13", default-features = false } quick-xml = { version = "0.26", features = [ "serialize" ] } rmp-serde = "1.1.2" @@ -98,9 +98,9 @@ httpdate = "1.0" http-range = "0.1" hyper = { version = "0.14", features = ["server", "http1", "runtime", "tcp", "stream"] } hyperlocal = { version = "0.8.0", default-features = false, features = ["server"] } -multer = "2.0" +multer = "3.0" percent-encoding = "2.2" -roxmltree = "0.18" +roxmltree = "0.19" url = "2.3" futures = "0.3" -- cgit v1.2.3 From 6e4229e29c1ee3e0b7f3511f80b6108e3beb1efd Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 5 Feb 2024 14:02:45 +0100 Subject: [dep-upgrade-202402] update aws-sdk dependencies --- Cargo.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 9336706a..d6dc584e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -115,7 +115,7 @@ opentelemetry-otlp = "0.10" prometheus = "0.13" # used by the k2v-client crate only -aws-sigv4 = "0.55" +aws-sigv4 = {version = "1.1", features = ["http0-compat"] } hyper-rustls = { version = "0.24", features = ["http2"] } log = "0.4" thiserror = "1.0" @@ -125,8 +125,9 @@ assert-json-diff = "2.0" rustc_version = "0.4.0" static_init = "1.0" -aws-config = "0.55.2" -aws-sdk-s3 = "0.28" +aws-config = "1.1.4" +aws-sdk-config = "1.13" +aws-sdk-s3 = "1.14" [profile.dev] lto = "off" -- cgit v1.2.3 From 6e69a1fffc715c752a399750c1e26aa46683dbb2 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 5 Feb 2024 14:44:12 +0100 Subject: [dep-upgrade-202402] prepare migration to http/hyper 1.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index d6dc584e..0660b449 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -96,7 +96,7 @@ form_urlencoded = "1.0.0" http = "0.2" httpdate = "1.0" http-range = "0.1" -hyper = { version = "0.14", features = ["server", "http1", "runtime", "tcp", "stream"] } +hyper = { version = "0.14", features = ["server", "http1", "runtime", "tcp", "stream", "backports", "deprecated"] } hyperlocal = { version = "0.8.0", default-features = false, features = ["server"] } multer = "3.0" percent-encoding = "2.2" -- cgit v1.2.3 From 0bb5b77530ad432e4c77f13b395fe74613812337 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 5 Feb 2024 18:49:54 +0100 Subject: [dep-upgrade-202402] wip: port to http/hyper crates v1 --- Cargo.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 0660b449..58b00ee2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -93,11 +93,12 @@ schemars = "0.8" reqwest = { version = "0.11", default-features = false, features = ["rustls-tls-manual-roots", "json"] } form_urlencoded = "1.0.0" -http = "0.2" +http = "1.0" httpdate = "1.0" http-range = "0.1" -hyper = { version = "0.14", features = ["server", "http1", "runtime", "tcp", "stream", "backports", "deprecated"] } -hyperlocal = { version = "0.8.0", default-features = false, features = ["server"] } +http-body-util = "0.1" +hyper = { version = "1.0", features = ["server", "http1"] } +hyper-util = { verion = "0.1", features = [ "full" ]} multer = "3.0" percent-encoding = "2.2" roxmltree = "0.19" -- cgit v1.2.3 From 81ccd4586ebdf707dfd37d4802e0cf475e11e004 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 5 Feb 2024 19:57:35 +0100 Subject: [dep-upgrade-202402] upgrade to http/hyper 1.x for tests --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 58b00ee2..b47f2e33 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -116,8 +116,8 @@ opentelemetry-otlp = "0.10" prometheus = "0.13" # used by the k2v-client crate only -aws-sigv4 = {version = "1.1", features = ["http0-compat"] } -hyper-rustls = { version = "0.24", features = ["http2"] } +aws-sigv4 = {version = "1.1" } +hyper-rustls = { version = "0.26", features = ["http2"] } log = "0.4" thiserror = "1.0" -- cgit v1.2.3 From e524e7a30d4d81c84f1c110017ad972dc5617bf6 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 7 Feb 2024 14:45:52 +0100 Subject: [dep-upgrade-202402] rename BytesBody into ErrorBody for clarity --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index b47f2e33..1daa9f8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,7 +98,7 @@ httpdate = "1.0" http-range = "0.1" http-body-util = "0.1" hyper = { version = "1.0", features = ["server", "http1"] } -hyper-util = { verion = "0.1", features = [ "full" ]} +hyper-util = { version = "0.1", features = [ "full" ] } multer = "3.0" percent-encoding = "2.2" roxmltree = "0.19" -- cgit v1.2.3 From 620664ee9c550636fdbcdf57e428569ac1694603 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 7 Feb 2024 16:11:27 +0000 Subject: Cargo.toml: Enable full LTO in release builds and thin in dev builds. --- Cargo.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 1daa9f8e..baaf5c26 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -131,7 +131,10 @@ aws-sdk-config = "1.13" aws-sdk-s3 = "1.14" [profile.dev] -lto = "off" +lto = "thin" [profile.release] -debug = true +lto = true +codegen-units = 1 +opt-level = "s" +strip = true -- cgit v1.2.3 From 2b92e8d7c6bcfaec7d9b8457d9a7e88aa85ee268 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 7 Feb 2024 19:41:23 +0100 Subject: [lto-nix] enable LTO for release builds using Nix --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index baaf5c26..2c39179d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -131,7 +131,8 @@ aws-sdk-config = "1.13" aws-sdk-s3 = "1.14" [profile.dev] -lto = "thin" +#lto = "thin" # disabled for now, adds 2-4 min to each CI build +lto = "off" [profile.release] lto = true -- cgit v1.2.3 From c2e1e172d4e15cbeb7210b87cfdde027d6aee782 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Thu, 8 Feb 2024 18:49:38 +0100 Subject: [dep-upgrade-202402] update toml, kube and k8s-openapi --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 2c39179d..e0d69c77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,11 +84,11 @@ rmp-serde = "1.1.2" serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } serde_bytes = "0.11" serde_json = "1.0" -toml = "0.6" +toml = { versio = "0.8", default-features = false, features = ["parse"] } # newer version requires rust edition 2021 -k8s-openapi = { version = "0.16", features = ["v1_22"] } -kube = { version = "0.75", default-features = false, features = ["runtime", "derive", "client", "rustls-tls"] } +k8s-openapi = { version = "0.21", features = ["v1_24"] } +kube = { version = "0.88", default-features = false, features = ["runtime", "derive", "client", "rustls-tls"] } schemars = "0.8" reqwest = { version = "0.11", default-features = false, features = ["rustls-tls-manual-roots", "json"] } -- cgit v1.2.3