From 72077c434ce4361119c4db01384c20b4ddf58c8a Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Mon, 17 Apr 2023 20:48:09 +0300
Subject: [PATCH 01/25] make rustls default, move to reqwest from surf

---
 Cargo.lock                                    | 942 +++++-------------
 Cargo.toml                                    |  20 +-
 crates/cdk/Cargo.toml                         |   2 +-
 crates/fluvio-auth/Cargo.toml                 |   2 +-
 crates/fluvio-benchmark/Cargo.toml            |   7 +-
 crates/fluvio-channel-cli/Cargo.toml          |   2 +-
 crates/fluvio-cli-common/Cargo.toml           |   2 +-
 crates/fluvio-cli/Cargo.toml                  |   5 +-
 crates/fluvio-cli/src/client/hub/mod.rs       |  14 +-
 crates/fluvio-cli/src/install/plugins.rs      |  20 +-
 crates/fluvio-cluster/Cargo.toml              |   2 +-
 crates/fluvio-connector-common/Cargo.toml     |   2 +-
 .../fluvio-controlplane-metadata/Cargo.toml   |   2 +-
 crates/fluvio-hub-util/Cargo.toml             |  14 +-
 crates/fluvio-hub-util/src/hubaccess.rs       |  58 +-
 crates/fluvio-hub-util/src/lib.rs             |   1 -
 crates/fluvio-hub-util/src/utils.rs           |  60 +-
 crates/fluvio-protocol/Cargo.toml             |   9 +-
 crates/fluvio-run/Cargo.toml                  |   3 +-
 crates/fluvio-sc-schema/Cargo.toml            |   2 +-
 crates/fluvio-sc/Cargo.toml                   |   8 +-
 crates/fluvio-service/Cargo.toml              |   4 +-
 crates/fluvio-smartengine/Cargo.toml          |   2 +-
 crates/fluvio-socket/Cargo.toml               |   9 +-
 crates/fluvio-spu-schema/Cargo.toml           |   4 +-
 crates/fluvio-spu/Cargo.toml                  |   8 +-
 crates/fluvio-storage/Cargo.toml              |   6 +-
 crates/fluvio-stream-dispatcher/Cargo.toml    |   4 +-
 crates/fluvio-stream-model/Cargo.toml         |   2 +-
 crates/fluvio-test-derive/Cargo.toml          |   2 +-
 crates/fluvio-test-util/Cargo.toml            |   2 +-
 crates/fluvio-test/Cargo.toml                 |   8 +-
 crates/fluvio-types/Cargo.toml                |   2 +-
 crates/fluvio/Cargo.toml                      |  20 +-
 crates/smartmodule-development-kit/Cargo.toml |   2 +-
 release-tools/check-crate-version/Cargo.toml  |   2 +-
 36 files changed, 381 insertions(+), 873 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 77b9b2f486..94bf2ebb3d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -36,60 +36,6 @@ dependencies = [
  "futures 0.3.28",
 ]
 
-[[package]]
-name = "aead"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "aes"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561"
-dependencies = [
- "aes-soft",
- "aesni",
- "cipher",
-]
-
-[[package]]
-name = "aes-gcm"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da"
-dependencies = [
- "aead",
- "aes",
- "cipher",
- "ctr",
- "ghash",
- "subtle",
-]
-
-[[package]]
-name = "aes-soft"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072"
-dependencies = [
- "cipher",
- "opaque-debug",
-]
-
-[[package]]
-name = "aesni"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce"
-dependencies = [
- "cipher",
- "opaque-debug",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.3"
@@ -142,11 +88,54 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
+[[package]]
+name = "anstream"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
 [[package]]
 name = "anstyle"
-version = "0.3.5"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2"
+checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.48.0",
+]
 
 [[package]]
 name = "anyhow"
@@ -169,12 +158,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
 [[package]]
 name = "as-slice"
 version = "0.2.1"
@@ -193,7 +176,7 @@ dependencies = [
  "asn1-rs-derive",
  "asn1-rs-impl",
  "displaydoc",
- "nom 7.1.3",
+ "nom",
  "num-traits",
  "rusticata-macros",
  "thiserror",
@@ -225,14 +208,14 @@ dependencies = [
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.10"
+version = "2.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0b2340f55d9661d76793b2bfc2eb0e62689bd79d067a95707ea762afd5e9dd"
+checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151"
 dependencies = [
  "anstyle",
  "bstr",
  "doc-comment",
- "predicates 3.0.2",
+ "predicates 3.0.3",
  "predicates-core",
  "predicates-tree",
  "wait-timeout",
@@ -260,13 +243,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "async-dup"
-version = "1.2.2"
+name = "async-compression"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c"
+checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a"
 dependencies = [
- "futures-io",
- "simple-mutex",
+ "flate2",
+ "futures-core",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
 ]
 
 [[package]]
@@ -311,22 +297,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "async-h1"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8101020758a4fc3a7c326cb42aa99e9fa77cbfb76987c128ad956406fe1f70a7"
-dependencies = [
- "async-channel",
- "async-dup",
- "async-std",
- "futures-core",
- "http-types",
- "httparse",
- "log",
- "pin-project",
-]
-
 [[package]]
 name = "async-io"
 version = "1.13.0"
@@ -414,8 +384,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93b21a03b7c21702a0110f9f8d228763a533570deb376119042dabf33c37a01a"
 dependencies = [
  "futures-io",
- "rustls 0.20.8",
- "webpki 0.22.0",
+ "rustls",
+ "webpki",
 ]
 
 [[package]]
@@ -462,19 +432,6 @@ version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
 
-[[package]]
-name = "async-tls"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d85a97c4a0ecce878efd3f945f119c78a646d8975340bca0398f9bb05c30cc52"
-dependencies = [
- "futures-core",
- "futures-io",
- "rustls 0.18.1",
- "webpki 0.21.4",
- "webpki-roots 0.20.0",
-]
-
 [[package]]
 name = "async-trait"
 version = "0.1.68"
@@ -483,7 +440,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -535,18 +492,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base-x"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
-
-[[package]]
-name = "base64"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -716,9 +661,9 @@ dependencies = [
 
 [[package]]
 name = "cap-fs-ext"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1457e61dc1debd079b92ccb668abc833caf0408b39bec33a04ca31e4e40e337d"
+checksum = "80754c33c036aa2b682c4c2f6d10f43c5a9b68527e89169706027ce285b0ea30"
 dependencies = [
  "cap-primitives",
  "cap-std",
@@ -728,9 +673,9 @@ dependencies = [
 
 [[package]]
 name = "cap-primitives"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f23f547a7c8d13ce96e2286dfc57e55fa33862f46683d1455dd82a0fc14d49a"
+checksum = "6e1b2aadbde9f86e045e309df5d707600254d45eda76df251a7b840f81681d72"
 dependencies = [
  "ambient-authority",
  "fs-set-times 0.19.1",
@@ -745,9 +690,9 @@ dependencies = [
 
 [[package]]
 name = "cap-rand"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ce2f47106bd45fefff9aaeed5cd12500c1760068f6cfce7eee1a6081801962"
+checksum = "e4213970e64bba7b90bd25158955f024221dd45c0751cfd0c42f2745e9b177c1"
 dependencies = [
  "ambient-authority",
  "rand 0.8.5",
@@ -755,9 +700,9 @@ dependencies = [
 
 [[package]]
 name = "cap-std"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cac9349c92ae84e961efac52afe8a8ed55ee4b3ae267f64358ac41de404eb10"
+checksum = "a60db4439f80165589d00673a086e9e106e224944dd09cdf5553cedfbc90fe5c"
 dependencies = [
  "cap-primitives",
  "io-extras",
@@ -767,9 +712,9 @@ dependencies = [
 
 [[package]]
 name = "cap-time-ext"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a09fea46580f67fb8f6ba12ba5fe49a7efdeba5381d2f058d4920488edeb918"
+checksum = "4afa389ffcd0c66daca4497d1a9992d18b985eff6b747ee8b4c86c2beae1f708"
 dependencies = [
  "cap-primitives",
  "once_cell",
@@ -789,14 +734,16 @@ dependencies = [
 
 [[package]]
 name = "cargo-generate"
-version = "0.18.1"
-source = "git+https://github.com/cargo-generate/cargo-generate.git?rev=241a598f1031f2df52f96e03fd3a96a5229883cc#241a598f1031f2df52f96e03fd3a96a5229883cc"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a02c0984fe2a3b3d1e84a4b8ab862786f83daf58338689afdc948787002b42f9"
 dependencies = [
  "anyhow",
- "clap 4.1.14",
+ "clap 4.2.2",
  "console",
  "dialoguer",
- "dirs 4.0.0",
+ "dirs 5.0.0",
+ "env_logger",
  "git2",
  "gix-config",
  "heck",
@@ -807,6 +754,7 @@ dependencies = [
  "liquid-core",
  "liquid-derive",
  "liquid-lib",
+ "log",
  "names",
  "paste",
  "path-absolutize",
@@ -901,7 +849,7 @@ dependencies = [
  "anyhow",
  "cargo-builder",
  "cargo-generate",
- "clap 4.1.14",
+ "clap 4.2.2",
  "comfy-table",
  "current_platform",
  "fluvio",
@@ -928,7 +876,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 name = "check-crate-version"
 version = "0.0.0"
 dependencies = [
- "clap 4.1.14",
+ "clap 4.2.2",
  "flate2",
  "reqwest",
  "semver 1.0.17",
@@ -993,15 +941,6 @@ dependencies = [
  "half",
 ]
 
-[[package]]
-name = "cipher"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "clap"
 version = "3.2.23"
@@ -1016,9 +955,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.1.14"
+version = "4.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "906f7fe1da4185b7a282b2bc90172a496f9def1aca4545fe7526810741591e14"
+checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1027,15 +966,15 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.1.14"
+version = "4.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "351f9ad9688141ed83dfd8f5fb998a06225ef444b48ff4dc43de6d409b7fd10b"
+checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6"
 dependencies = [
+ "anstream",
+ "anstyle",
  "bitflags",
  "clap_lex 0.4.1",
- "is-terminal",
  "strsim",
- "termcolor",
  "terminal_size",
 ]
 
@@ -1045,19 +984,19 @@ version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd"
 dependencies = [
- "clap 4.1.14",
+ "clap 4.2.2",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.1.14"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81d7dc0031c3a59a04fc2ba395c8e2dd463cba1859275f065d225f6122221b45"
+checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -1112,6 +1051,12 @@ dependencies = [
  "tracing-error",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
 [[package]]
 name = "colored"
 version = "2.0.0"
@@ -1144,17 +1089,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "config"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3"
-dependencies = [
- "lazy_static",
- "nom 5.1.2",
- "serde",
-]
-
 [[package]]
 name = "console"
 version = "0.15.5"
@@ -1206,12 +1140,6 @@ dependencies = [
  "tiny-keccak",
 ]
 
-[[package]]
-name = "const_fn"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
-
 [[package]]
 name = "const_format"
 version = "0.2.30"
@@ -1260,23 +1188,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "cookie"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951"
-dependencies = [
- "aes-gcm",
- "base64 0.13.1",
- "hkdf",
- "hmac",
- "percent-encoding",
- "rand 0.8.5",
- "sha2 0.9.9",
- "time 0.2.27",
- "version_check",
-]
-
 [[package]]
 name = "core-foundation"
 version = "0.9.3"
@@ -1311,12 +1222,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "cpuid-bool"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
-
 [[package]]
 name = "cranelift-bforest"
 version = "0.94.0"
@@ -1536,16 +1441,6 @@ dependencies = [
  "scopeguard",
 ]
 
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.15"
@@ -1613,16 +1508,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "ctor"
 version = "0.1.26"
@@ -1640,16 +1525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b"
 dependencies = [
  "quote",
- "syn 2.0.13",
-]
-
-[[package]]
-name = "ctr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f"
-dependencies = [
- "cipher",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -1744,7 +1620,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -1761,7 +1637,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -1799,39 +1675,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "dashmap"
-version = "5.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
-dependencies = [
- "cfg-if",
- "hashbrown 0.12.3",
- "lock_api",
- "once_cell",
- "parking_lot_core 0.9.7",
-]
-
 [[package]]
 name = "data-encoding"
 version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
 
-[[package]]
-name = "deadpool"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d126179d86aee4556e54f5f3c6bf6d9884e7cc52cef82f77ee6f90a7747616d"
-dependencies = [
- "async-trait",
- "config",
- "crossbeam-queue",
- "num_cpus",
- "serde",
- "tokio",
-]
-
 [[package]]
 name = "der"
 version = "0.5.1"
@@ -1849,7 +1698,7 @@ checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
 dependencies = [
  "asn1-rs",
  "displaydoc",
- "nom 7.1.3",
+ "nom",
  "num-bigint",
  "num-traits",
  "rusticata-macros",
@@ -1999,12 +1848,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "discard"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
-
 [[package]]
 name = "displaydoc"
 version = "0.2.3"
@@ -2242,7 +2085,7 @@ checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "windows-sys 0.48.0",
 ]
 
@@ -2295,6 +2138,7 @@ dependencies = [
  "futures-util",
  "once_cell",
  "pin-project-lite",
+ "reqwest",
  "semver 1.0.17",
  "serde",
  "serde_json",
@@ -2333,7 +2177,7 @@ dependencies = [
  "async-channel",
  "bincode",
  "chrono",
- "clap 4.1.14",
+ "clap 4.2.2",
  "derive_builder",
  "fluvio",
  "fluvio-cli-common",
@@ -2355,7 +2199,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "cfg-if",
- "clap 4.1.14",
+ "clap 4.2.2",
  "dirs 5.0.0",
  "fluvio-types",
  "semver 1.0.17",
@@ -2372,7 +2216,7 @@ dependencies = [
  "anyhow",
  "assert_cmd",
  "cfg-if",
- "clap 4.1.14",
+ "clap 4.2.2",
  "colored",
  "dirs 5.0.0",
  "fluvio-channel",
@@ -2394,7 +2238,7 @@ dependencies = [
  "async-trait",
  "atty",
  "bytesize",
- "clap 4.1.14",
+ "clap 4.2.2",
  "clap_complete",
  "colored",
  "comfy-table",
@@ -2432,6 +2276,7 @@ dependencies = [
  "k8-client",
  "k8-config",
  "k8-types",
+ "reqwest",
  "semver 1.0.17",
  "serde",
  "serde_json",
@@ -2478,7 +2323,7 @@ dependencies = [
  "async-trait",
  "bytesize",
  "chrono",
- "clap 4.1.14",
+ "clap 4.2.2",
  "color-eyre",
  "colored",
  "comfy-table",
@@ -2647,7 +2492,7 @@ version = "0.12.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "clap 4.1.14",
+ "clap 4.2.2",
  "comfy-table",
  "fluvio",
  "fluvio-package-index",
@@ -2736,17 +2581,16 @@ dependencies = [
  "fluvio-hub-protocol",
  "fluvio-types",
  "hex",
- "http-client",
  "pathdiff",
  "pem",
  "rand 0.8.5",
  "rand_core 0.6.4",
+ "reqwest",
  "serde",
  "serde_json",
  "serde_yaml 0.8.26",
  "sha2 0.10.6",
  "ssh-key",
- "surf",
  "tar",
  "tempfile",
  "thiserror",
@@ -2811,7 +2655,7 @@ dependencies = [
 name = "fluvio-run"
 version = "0.0.0"
 dependencies = [
- "clap 4.1.14",
+ "clap 4.2.2",
  "fluvio-extension-common",
  "fluvio-future",
  "fluvio-sc",
@@ -2833,7 +2677,7 @@ dependencies = [
  "async-trait",
  "base64 0.21.0",
  "cfg-if",
- "clap 4.1.14",
+ "clap 4.2.2",
  "event-listener",
  "fluvio-auth",
  "fluvio-controlplane",
@@ -2978,7 +2822,7 @@ dependencies = [
  "async-trait",
  "bytes 1.4.0",
  "cfg-if",
- "clap 4.1.14",
+ "clap 4.2.2",
  "derive_builder",
  "event-listener",
  "flate2",
@@ -3042,7 +2886,7 @@ dependencies = [
  "async-trait",
  "blocking",
  "bytes 1.4.0",
- "clap 4.1.14",
+ "clap 4.2.2",
  "derive_builder",
  "fluvio-controlplane-metadata",
  "fluvio-future",
@@ -3109,7 +2953,7 @@ dependencies = [
  "async-std",
  "async-trait",
  "bytes 1.4.0",
- "clap 4.1.14",
+ "clap 4.2.2",
  "comfy-table",
  "crc",
  "crossbeam-channel",
@@ -3158,7 +3002,7 @@ dependencies = [
 name = "fluvio-test-derive"
 version = "0.0.0"
 dependencies = [
- "clap 4.1.14",
+ "clap 4.2.2",
  "crossbeam-channel",
  "fluvio",
  "fluvio-future",
@@ -3193,7 +3037,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "bytes 1.4.0",
- "clap 4.1.14",
+ "clap 4.2.2",
  "comfy-table",
  "dyn-clone",
  "fluvio",
@@ -3355,9 +3199,9 @@ dependencies = [
 
 [[package]]
 name = "fs_at"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37047c0d530b3aefc64e4c4d7c6b1e23030c65973661b70e12c826f426f3f675"
+checksum = "70d4dbfdbb6c5ae7206c4ce9bd10da5f621719873517591b531e237393a3c3d1"
 dependencies = [
  "aligned",
  "cfg-if",
@@ -3445,7 +3289,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -3521,16 +3365,6 @@ dependencies = [
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
-[[package]]
-name = "ghash"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375"
-dependencies = [
- "opaque-debug",
- "polyval",
-]
-
 [[package]]
 name = "ghost"
 version = "0.1.9"
@@ -3539,7 +3373,7 @@ checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -3555,9 +3389,9 @@ dependencies = [
 
 [[package]]
 name = "git2"
-version = "0.16.1"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc"
+checksum = "8b7905cdfe33d31a88bb2e8419ddd054451f5432d1da9eaf2ac7804ee1ea12d5"
 dependencies = [
  "bitflags",
  "libc",
@@ -3570,23 +3404,23 @@ dependencies = [
 
 [[package]]
 name = "gix-actor"
-version = "0.17.2"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "381153ea93b9d8a5c6894a5c734b2e9c15d623063adfd2bda4342ecf90f9a5f8"
+checksum = "dc22b0cdc52237667c301dd7cdc6ead8f8f73c9f824e9942c8ebd6b764f6c0bf"
 dependencies = [
  "bstr",
  "btoi",
  "gix-date",
  "itoa",
- "nom 7.1.3",
- "quick-error",
+ "nom",
+ "thiserror",
 ]
 
 [[package]]
 name = "gix-config"
-version = "0.16.3"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3f91bda4599d9d434e256fd8778fd0f368f7ae5c2015a55934899ac5b70ca99"
+checksum = "7fbad5ce54a8fc997acc50febd89ec80fa6e97cb7f8d0654cb229936407489d8"
 dependencies = [
  "bstr",
  "gix-config-value",
@@ -3595,8 +3429,9 @@ dependencies = [
  "gix-path",
  "gix-ref",
  "gix-sec",
+ "log",
  "memchr",
- "nom 7.1.3",
+ "nom",
  "once_cell",
  "smallvec",
  "thiserror",
@@ -3630,9 +3465,9 @@ dependencies = [
 
 [[package]]
 name = "gix-features"
-version = "0.26.5"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3402b831ea4bb3af36369d61dbf250eb0e1a8577d3cb77b9719c11a82485bfe9"
+checksum = "0b76f9a80f6dd7be66442ae86e1f534effad9546676a392acc95e269d0c21c22"
 dependencies = [
  "gix-hash",
  "libc",
@@ -3652,9 +3487,9 @@ dependencies = [
 
 [[package]]
 name = "gix-hash"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0c5a9f4d621d4f4ea046bb331df5c746ca735b8cae5b234cc2be70ee4dbef0"
+checksum = "2a258595457bc192d1f1c59d0d168a1e34e2be9b97a614e14995416185de41a7"
 dependencies = [
  "hex",
  "thiserror",
@@ -3662,20 +3497,20 @@ dependencies = [
 
 [[package]]
 name = "gix-lock"
-version = "3.0.2"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5fe84f09afadec78a7227d80f58cb5412d216dbae4b7fa060b619c0ce62b55d"
+checksum = "41b80172055c5d8017a48ddac5cc7a95421c00211047db0165c97853c4f05194"
 dependencies = [
  "fastrand",
  "gix-tempfile",
- "quick-error",
+ "thiserror",
 ]
 
 [[package]]
 name = "gix-object"
-version = "0.26.4"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edce7170ebcf6fc1487304631556f8bc2b70c8bcbf997a2d73634688bcc92f4e"
+checksum = "8df068db9180ee935fbb70504848369e270bdcb576b05c0faa8b9fd3b86fc017"
 dependencies = [
  "bstr",
  "btoi",
@@ -3685,7 +3520,7 @@ dependencies = [
  "gix-validate",
  "hex",
  "itoa",
- "nom 7.1.3",
+ "nom",
  "smallvec",
  "thiserror",
 ]
@@ -3702,9 +3537,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ref"
-version = "0.24.1"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93e85abee11aa093f24da7336bf0a8ad598f15da396b28cf1270ab1091137d35"
+checksum = "e4e909396ed3b176823991ccc391c276ae2a015e54edaafa3566d35123cfac9d"
 dependencies = [
  "gix-actor",
  "gix-features",
@@ -3715,7 +3550,7 @@ dependencies = [
  "gix-tempfile",
  "gix-validate",
  "memmap2",
- "nom 7.1.3",
+ "nom",
  "thiserror",
 ]
 
@@ -3734,15 +3569,13 @@ dependencies = [
 
 [[package]]
 name = "gix-tempfile"
-version = "3.0.2"
+version = "5.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48590cb5de0b8feadee42466a90028877ba67b9fd894c5493b4b64f5e3217c17"
+checksum = "c2ceb30a610e3f5f2d5f9a5114689fde507ba9417705a8cf3429604275b2153c"
 dependencies = [
- "dashmap",
  "libc",
  "once_cell",
- "signal-hook",
- "signal-hook-registry",
+ "parking_lot 0.12.1",
  "tempfile",
 ]
 
@@ -3789,9 +3622,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d"
+checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f"
 dependencies = [
  "bytes 1.4.0",
  "fnv",
@@ -3851,7 +3684,7 @@ dependencies = [
  "byteorder",
  "crossbeam-channel",
  "flate2",
- "nom 7.1.3",
+ "nom",
  "num-traits",
 ]
 
@@ -3891,26 +3724,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "hkdf"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f"
-dependencies = [
- "digest 0.9.0",
- "hmac",
-]
-
-[[package]]
-name = "hmac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
-dependencies = [
- "crypto-mac",
- "digest 0.9.0",
-]
-
 [[package]]
 name = "home"
 version = "0.5.4"
@@ -3948,47 +3761,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "http-client"
-version = "6.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1947510dc91e2bf586ea5ffb412caad7673264e14bb39fb9078da114a94ce1a5"
-dependencies = [
- "async-h1",
- "async-std",
- "async-tls",
- "async-trait",
- "cfg-if",
- "dashmap",
- "deadpool",
- "futures 0.3.28",
- "http-types",
- "log",
- "rustls 0.18.1",
-]
-
-[[package]]
-name = "http-types"
-version = "2.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad"
-dependencies = [
- "anyhow",
- "async-channel",
- "async-std",
- "base64 0.13.1",
- "cookie",
- "futures-lite",
- "infer",
- "pin-project-lite",
- "rand 0.7.3",
- "serde",
- "serde_json",
- "serde_qs 0.8.5",
- "serde_urlencoded",
- "url",
-]
-
 [[package]]
 name = "httparse"
 version = "1.8.0"
@@ -4019,9 +3791,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.25"
+version = "0.14.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899"
+checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
 dependencies = [
  "bytes 1.4.0",
  "futures-channel",
@@ -4049,7 +3821,7 @@ checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
 dependencies = [
  "http",
  "hyper",
- "rustls 0.20.8",
+ "rustls",
  "tokio",
  "tokio-rustls",
 ]
@@ -4178,12 +3950,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "infer"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
-
 [[package]]
 name = "inflections"
 version = "1.1.1"
@@ -4374,7 +4140,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "serde_qs 0.10.1",
+ "serde_qs",
  "tokio",
  "tracing",
 ]
@@ -4491,19 +4257,6 @@ dependencies = [
  "semver 1.0.17",
 ]
 
-[[package]]
-name = "lexical-core"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
-dependencies = [
- "arrayvec",
- "bitflags",
- "cfg-if",
- "ryu",
- "static_assertions",
-]
-
 [[package]]
 name = "lib-cargo-crate"
 version = "0.1.8"
@@ -4527,9 +4280,9 @@ checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.14.2+1.5.1"
+version = "0.15.1+1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4"
+checksum = "fb4577bde8cdfc7d6a2a4bcb7b049598597de33ffd337276e9c7db6cd4a2cee7"
 dependencies = [
  "cc",
  "libc",
@@ -4547,9 +4300,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
 
 [[package]]
 name = "libssh2-sys"
-version = "0.2.23"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
+checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
 dependencies = [
  "cc",
  "libc",
@@ -4801,16 +4554,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "mime_guess"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime",
- "unicase",
-]
-
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -4908,17 +4651,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "nom"
-version = "5.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
-dependencies = [
- "lexical-core",
- "memchr",
- "version_check",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -5111,7 +4843,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -5215,7 +4947,7 @@ dependencies = [
  "cfg-if",
  "instant",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "smallvec",
  "winapi",
 ]
@@ -5228,7 +4960,7 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "smallvec",
  "windows-sys 0.45.0",
 ]
@@ -5317,7 +5049,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -5423,17 +5155,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "polyval"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd"
-dependencies = [
- "cpuid-bool",
- "opaque-debug",
- "universal-hash",
-]
-
 [[package]]
 name = "portable-atomic"
 version = "0.3.19"
@@ -5471,9 +5192,9 @@ dependencies = [
 
 [[package]]
 name = "predicates"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c575290b64d24745b6c57a12a31465f0a66f3a4799686a6921526a33b0797965"
+checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9"
 dependencies = [
  "anstyle",
  "difflib",
@@ -5602,12 +5323,6 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b45c49fc4f91f35bae654f85ebb3a44d60ac64f11b3166ffa609def390c732d8"
 
-[[package]]
-name = "quick-error"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
-
 [[package]]
 name = "quote"
 version = "1.0.26"
@@ -5735,6 +5450,15 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.3"
@@ -5742,7 +5466,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
  "getrandom 0.2.9",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "thiserror",
 ]
 
@@ -5806,6 +5530,7 @@ version = "0.11.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
 dependencies = [
+ "async-compression",
  "base64 0.21.0",
  "bytes 1.4.0",
  "encoding_rs",
@@ -5825,7 +5550,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.20.8",
+ "rustls",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -5833,20 +5558,21 @@ dependencies = [
  "tokio",
  "tokio-native-tls",
  "tokio-rustls",
+ "tokio-util",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots 0.22.6",
+ "webpki-roots",
  "winreg",
 ]
 
 [[package]]
 name = "rhai"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ff176e72a35d975ea0759b1bed69e30ad5cf47580b2e5d00449e8623b5a37dc"
+checksum = "fd29fa1f740be6dc91982013957e08c3c4232d7efcfe19e12da87d50bad47758"
 dependencies = [
  "ahash",
  "bitflags",
@@ -5885,18 +5611,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b"
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc_version"
@@ -5922,7 +5639,7 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
 dependencies = [
- "nom 7.1.3",
+ "nom",
 ]
 
 [[package]]
@@ -5955,19 +5672,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
-dependencies = [
- "base64 0.12.3",
- "log",
- "ring",
- "sct 0.6.1",
- "webpki 0.21.4",
-]
-
 [[package]]
 name = "rustls"
 version = "0.20.8"
@@ -5976,8 +5680,8 @@ checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
 dependencies = [
  "log",
  "ring",
- "sct 0.7.0",
- "webpki 0.22.0",
+ "sct",
+ "webpki",
 ]
 
 [[package]]
@@ -6056,16 +5760,6 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "sct"
 version = "0.7.0"
@@ -6109,22 +5803,13 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser 0.7.0",
-]
-
 [[package]]
 name = "semver"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
 dependencies = [
- "semver-parser 0.10.2",
+ "semver-parser",
 ]
 
 [[package]]
@@ -6136,12 +5821,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
 [[package]]
 name = "semver-parser"
 version = "0.10.2"
@@ -6165,9 +5844,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.159"
+version = "1.0.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
+checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
 dependencies = [
  "serde_derive",
 ]
@@ -6183,20 +5862,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.159"
+version = "1.0.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
+checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.95"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
 dependencies = [
  "itoa",
  "ryu",
@@ -6212,17 +5891,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_qs"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6"
-dependencies = [
- "percent-encoding",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "serde_qs"
 version = "0.10.1"
@@ -6292,15 +5960,6 @@ dependencies = [
  "unsafe-libyaml",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
-dependencies = [
- "sha1_smol",
-]
-
 [[package]]
 name = "sha1_smol"
 version = "1.0.0"
@@ -6414,15 +6073,6 @@ dependencies = [
  "wide",
 ]
 
-[[package]]
-name = "simple-mutex"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6"
-dependencies = [
- "event-listener",
-]
-
 [[package]]
 name = "sink-test-connector"
 version = "0.0.0"
@@ -6493,7 +6143,7 @@ dependencies = [
  "bytes 1.4.0",
  "cargo-builder",
  "cargo-generate",
- "clap 4.1.14",
+ "clap 4.2.2",
  "dirs 5.0.0",
  "enum-display",
  "fluvio",
@@ -6569,15 +6219,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
-[[package]]
-name = "standback"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
-dependencies = [
- "version_check",
-]
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -6597,55 +6238,6 @@ dependencies = [
  "rand 0.8.5",
 ]
 
-[[package]]
-name = "stdweb"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
-dependencies = [
- "discard",
- "rustc_version 0.2.3",
- "stdweb-derive",
- "stdweb-internal-macros",
- "stdweb-internal-runtime",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "stdweb-derive"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "stdweb-internal-macros"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
-dependencies = [
- "base-x",
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "serde_json",
- "sha1",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "stdweb-internal-runtime"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -6673,33 +6265,9 @@ dependencies = [
 
 [[package]]
 name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "surf"
-version = "2.3.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718b1ae6b50351982dedff021db0def601677f2120938b070eadb10ba4038dd7"
-dependencies = [
- "async-std",
- "async-trait",
- "cfg-if",
- "encoding_rs",
- "futures-util",
- "getrandom 0.2.9",
- "http-client",
- "http-types",
- "log",
- "mime_guess",
- "once_cell",
- "pin-project-lite",
- "rustls 0.18.1",
- "serde",
- "serde_json",
- "web-sys",
-]
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "syn"
@@ -6714,9 +6282,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.13"
+version = "2.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6785,15 +6353,15 @@ checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5"
 
 [[package]]
 name = "tempfile"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
+checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall",
- "rustix 0.36.12",
- "windows-sys 0.42.0",
+ "redox_syscall 0.3.5",
+ "rustix 0.37.11",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -6844,7 +6412,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -6868,21 +6436,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "time"
-version = "0.2.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
-dependencies = [
- "const_fn",
- "libc",
- "standback",
- "stdweb",
- "time-macros 0.1.1",
- "version_check",
- "winapi",
-]
-
 [[package]]
 name = "time"
 version = "0.3.20"
@@ -6894,7 +6447,7 @@ dependencies = [
  "num_threads",
  "serde",
  "time-core",
- "time-macros 0.2.8",
+ "time-macros",
 ]
 
 [[package]]
@@ -6903,16 +6456,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
 
-[[package]]
-name = "time-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
-dependencies = [
- "proc-macro-hack",
- "time-macros-impl",
-]
-
 [[package]]
 name = "time-macros"
 version = "0.2.8"
@@ -6922,19 +6465,6 @@ dependencies = [
  "time-core",
 ]
 
-[[package]]
-name = "time-macros-impl"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "standback",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -7005,7 +6535,7 @@ checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -7024,9 +6554,9 @@ version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
 dependencies = [
- "rustls 0.20.8",
+ "rustls",
  "tokio",
- "webpki 0.22.0",
+ "webpki",
 ]
 
 [[package]]
@@ -7308,16 +6838,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
-[[package]]
-name = "universal-hash"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "unsafe-libyaml"
 version = "0.2.8"
@@ -7348,6 +6868,12 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
 [[package]]
 name = "uuid"
 version = "1.3.1"
@@ -7857,9 +7383,9 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "55.0.0"
+version = "56.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4984d3e1406571f4930ba5cf79bd70f75f41d0e87e17506e0bd19b0e5d085f05"
+checksum = "6b54185c051d7bbe23757d50fe575880a2426a2f06d2e9f6a10fd9a4a42920c0"
 dependencies = [
  "leb128",
  "memchr",
@@ -7869,11 +7395,11 @@ dependencies = [
 
 [[package]]
 name = "wat"
-version = "1.0.61"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af2b53f4da14db05d32e70e9c617abdf6620c575bd5dd972b7400037b4df2091"
+checksum = "56681922808216ab86d96bb750f70d500b5a7800e41564290fd46bb773581299"
 dependencies = [
- "wast 55.0.0",
+ "wast 56.0.0",
 ]
 
 [[package]]
@@ -7886,16 +7412,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "webpki"
 version = "0.22.0"
@@ -7906,22 +7422,13 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
-dependencies = [
- "webpki 0.21.4",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
 dependencies = [
- "webpki 0.22.0",
+ "webpki",
 ]
 
 [[package]]
@@ -8275,7 +7782,7 @@ dependencies = [
  "data-encoding",
  "der-parser",
  "lazy_static",
- "nom 7.1.3",
+ "nom",
  "oid-registry",
  "rusticata-macros",
  "thiserror",
@@ -8292,7 +7799,7 @@ dependencies = [
  "data-encoding",
  "der-parser",
  "lazy_static",
- "nom 7.1.3",
+ "nom",
  "oid-registry",
  "rusticata-macros",
  "thiserror",
@@ -8340,7 +7847,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]
 
 [[package]]
@@ -8372,3 +7879,8 @@ dependencies = [
  "libc",
  "pkg-config",
 ]
+
+[[patch.unused]]
+name = "cargo-generate"
+version = "0.18.1"
+source = "git+https://github.com/cargo-generate/cargo-generate.git?rev=241a598f1031f2df52f96e03fd3a96a5229883cc#241a598f1031f2df52f96e03fd3a96a5229883cc"
diff --git a/Cargo.toml b/Cargo.toml
index 5762203ca3..45a138c10f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -97,13 +97,31 @@ colored = "2.0.0"
 semver = "1.0.3"
 url = "2.1.1"
 which = "4.1.0"
+reqwest = { version = "0.11", default-features = false, features = ["json", "gzip"] }
 
 # fluvio dep
 k8-client = { version = "10.0.0" }
 k8-types = { version = "0.8.0" }
 k8-config = { version = "2.0.0"}
 k8-metadata-client = { version = "5.1.0" }
-fluvio-future = { version = "0.4.0" }
+fluvio-future = { version = "0.4", default-features = false, features = [
+    "task",
+    "subscriber",
+    "fixture",
+    "io",
+    "sync",
+    "future",
+    "net",
+    "rust_tls",
+    "timer",
+    "fs",
+    "zero_copy",
+    "mmap",
+    "retry",
+    "doomsday",
+    "native2_tls",
+    "openssl_tls",
+] }
 flv-util = { version = "0.5.0" }
 fluvio-helm = { version = "0.4.1"}
 fluvio-command = { version = "0.2.0"}
diff --git a/crates/cdk/Cargo.toml b/crates/cdk/Cargo.toml
index 81a6d74fe4..de101fccc3 100644
--- a/crates/cdk/Cargo.toml
+++ b/crates/cdk/Cargo.toml
@@ -35,5 +35,5 @@ current_platform = { version = "0.2" }
 fluvio = { path = "../fluvio"}
 fluvio-connector-deployer = { path = "../fluvio-connector-deployer"}
 fluvio-connector-package = { path = "../fluvio-connector-package", features = ["toml"]}
-fluvio-future = { workspace = true, features = ["subscriber"]}
+fluvio-future = { workspace = true }
 fluvio-hub-util = { path = "../fluvio-hub-util" }
diff --git a/crates/fluvio-auth/Cargo.toml b/crates/fluvio-auth/Cargo.toml
index 8cb1c644ce..3e15385d1e 100644
--- a/crates/fluvio-auth/Cargo.toml
+++ b/crates/fluvio-auth/Cargo.toml
@@ -22,7 +22,7 @@ tracing = { workspace = true }
 x509-parser = "0.15.0"
 
 fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata" }
-fluvio-future = { version = "0.4.0", features = ["net", "openssl_tls"] }
+fluvio-future = { version = "0.4.0" }
 fluvio-protocol = { path = "../fluvio-protocol" }
 fluvio-socket = { path = "../fluvio-socket" }
 fluvio-types = { path = "../fluvio-types" }
diff --git a/crates/fluvio-benchmark/Cargo.toml b/crates/fluvio-benchmark/Cargo.toml
index 36079aab8f..23e33d6d31 100644
--- a/crates/fluvio-benchmark/Cargo.toml
+++ b/crates/fluvio-benchmark/Cargo.toml
@@ -27,9 +27,4 @@ anyhow = { workspace = true }
 
 fluvio = { path = "../fluvio" }
 fluvio-cli-common = { path = "../fluvio-cli-common"}
-fluvio-future = { version = "0.4.3", features = [
-    'task',
-    'future',
-    'sync',
-    'subscriber',
-] }
+fluvio-future = { workspace = true }
diff --git a/crates/fluvio-channel-cli/Cargo.toml b/crates/fluvio-channel-cli/Cargo.toml
index c0c75168d1..5711b2ae77 100644
--- a/crates/fluvio-channel-cli/Cargo.toml
+++ b/crates/fluvio-channel-cli/Cargo.toml
@@ -30,7 +30,7 @@ anyhow = { workspace = true }
 
 fluvio-cli-common = { path = "../fluvio-cli-common" }
 fluvio-channel = { path = "../fluvio-channel" }
-fluvio-future = { version = "0.4.0", features = ["task", "subscriber", "native2_tls"], optional = true }
+fluvio-future = { workspace = true, optional = true }
 fluvio-types = { path = "../fluvio-types", default-features = false, optional = true }
 fluvio-package-index = { path = "../fluvio-package-index" }
 
diff --git a/crates/fluvio-cli-common/Cargo.toml b/crates/fluvio-cli-common/Cargo.toml
index a9b09c4944..8b79a3e961 100644
--- a/crates/fluvio-cli-common/Cargo.toml
+++ b/crates/fluvio-cli-common/Cargo.toml
@@ -36,4 +36,4 @@ fluvio = { path = "../fluvio", default-features = false, optional = true }
 fluvio-protocol = { path = "../fluvio-protocol", optional = true }
 
 [dev-dependencies]
-fluvio-future = { version = "0.4.0", features = ["fs", "io", "subscriber", "native2_tls", "fixture"] }
+fluvio-future = { workspace = true }
diff --git a/crates/fluvio-cli/Cargo.toml b/crates/fluvio-cli/Cargo.toml
index 7c1909755c..537d24cf28 100644
--- a/crates/fluvio-cli/Cargo.toml
+++ b/crates/fluvio-cli/Cargo.toml
@@ -74,6 +74,7 @@ tokio = { version = "1.3.0", features = ["macros"] }
 async-net = "1.7.0"
 anyhow = { workspace = true }
 current_platform = "0.2"
+reqwest = { workspace = true }
 
 # Fluvio dependencies
 k8-config = { workspace = true, optional = true }
@@ -96,10 +97,10 @@ fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata", featu
 
 # Optional Fluvio dependencies
 fluvio-types = { path = "../fluvio-types", optional = true }
-fluvio-future = { version = "0.4.0", features = ["fs", "io", "subscriber", "native2_tls"], optional = true }
+fluvio-future = { workspace = true, optional = true }
 fluvio-sc-schema = { path = "../fluvio-sc-schema", features = ["use_serde"], optional = true }
 fluvio-spu-schema = { path = "../fluvio-spu-schema", optional = true }
 
 
 [dev-dependencies]
-fluvio-future = { version = "0.4.0", features = ["fixture"] }
+fluvio-future = { workspace = true }
diff --git a/crates/fluvio-cli/src/client/hub/mod.rs b/crates/fluvio-cli/src/client/hub/mod.rs
index 6f31df0e45..be95d35852 100644
--- a/crates/fluvio-cli/src/client/hub/mod.rs
+++ b/crates/fluvio-cli/src/client/hub/mod.rs
@@ -81,7 +81,7 @@ pub(crate) async fn get_pkg_list(
     endpoint: &str,
     remote: &Option<String>,
 ) -> Result<PackageListMeta> {
-    use hubutil::http;
+    use reqwest::{Client as HttpClient, header};
 
     let access = get_hub_access(remote)?;
 
@@ -89,12 +89,18 @@ pub(crate) async fn get_pkg_list(
         CliError::HubError("rejected access credentials, try 'fluvio cloud login'".into())
     })?;
     let url = format!("{}/{endpoint}", &access.remote);
-    let mut res = http::get(&url)
-        .header("Authorization", &action_token)
+
+    let client = HttpClient::default();
+
+    let res = client
+        .get(&url)
+        .header(header::AUTHORIZATION, &action_token)
+        .send()
         .await
         .map_err(|e| CliError::HubError(format!("list api access error {e}")))?;
+
     let pl: PackageListMeta = res
-        .body_json()
+        .json()
         .await
         .map_err(|e| CliError::HubError(format!("list api data parse error {e}")))?;
     Ok(pl)
diff --git a/crates/fluvio-cli/src/install/plugins.rs b/crates/fluvio-cli/src/install/plugins.rs
index 90cf858ff4..a0a0549b8a 100644
--- a/crates/fluvio-cli/src/install/plugins.rs
+++ b/crates/fluvio-cli/src/install/plugins.rs
@@ -2,6 +2,7 @@ use clap::Parser;
 use tracing::debug;
 use anyhow::Result;
 use current_platform::CURRENT_PLATFORM;
+use reqwest::{Client as HttpClient, header, StatusCode};
 
 use fluvio_cli_common::error::{HttpError, PackageNotFound};
 use fluvio_cli_common::install::{
@@ -12,8 +13,7 @@ use fluvio_cli_common::install::{
 use fluvio_index::{PackageId, HttpAgent, MaybeVersion};
 use fluvio_channel::{LATEST_CHANNEL_NAME, FLUVIO_RELEASE_CHANNEL};
 use fluvio_hub_util as hubutil;
-use hubutil::{http, HubAccess, INFINYON_HUB_REMOTE, FLUVIO_HUB_PROFILE_ENV};
-use hubutil::http::StatusCode;
+use hubutil::{HubAccess, INFINYON_HUB_REMOTE, FLUVIO_HUB_PROFILE_ENV};
 
 use crate::error::CliError;
 use crate::install::update::{
@@ -256,16 +256,20 @@ impl InstallOpt {
             systuple = self.get_target(),
         );
         debug!("Downloading binary from hub: {binurl}");
-        let mut resp = http::get(binurl)
-            .header("Authorization", actiontoken)
+
+        let client = HttpClient::default();
+        let resp = client
+            .get(binurl)
+            .header(header::AUTHORIZATION, &actiontoken)
+            .send()
             .await
             .map_err(|_| HttpError::InvalidInput("authorization error".into()))?;
 
         match resp.status() {
-            StatusCode::Ok => {}
+            StatusCode::OK => {}
             code => {
                 let body_err_message = resp
-                    .body_string()
+                    .text()
                     .await
                     .unwrap_or_else(|_err| "couldn't fetch error message".to_string());
                 let msg = format!("Status({code}) {body_err_message}");
@@ -273,9 +277,9 @@ impl InstallOpt {
             }
         }
         let data = resp
-            .body_bytes()
+            .bytes()
             .await
             .map_err(|_| crate::CliError::HubError("Data unpack failure".into()))?;
-        Ok(data)
+        Ok(data.into())
     }
 }
diff --git a/crates/fluvio-cluster/Cargo.toml b/crates/fluvio-cluster/Cargo.toml
index 54b40b0858..144d94b597 100644
--- a/crates/fluvio-cluster/Cargo.toml
+++ b/crates/fluvio-cluster/Cargo.toml
@@ -81,4 +81,4 @@ fluvio-types = { path = "../fluvio-types" }
 fluvio-channel = { path = "../fluvio-channel" }
 
 [dev-dependencies]
-fluvio-future = { workspace = true, features = ["task", "fixture"] }
+fluvio-future = { workspace = true }
diff --git a/crates/fluvio-connector-common/Cargo.toml b/crates/fluvio-connector-common/Cargo.toml
index 2c2380f2c8..3e49e74acf 100644
--- a/crates/fluvio-connector-common/Cargo.toml
+++ b/crates/fluvio-connector-common/Cargo.toml
@@ -14,7 +14,7 @@ derive = ["fluvio-connector-derive"]
 [dependencies]
 anyhow = { workspace = true }
 tracing = { workspace = true }
-fluvio-future = { workspace = true, features = ["subscriber"] }
+fluvio-future = { workspace = true }
 futures = { version = "0.3", default-features = false }
 async-trait = { version = "0.1", default-features = false}
 async-net = { version = "1.7", default-features = false }
diff --git a/crates/fluvio-controlplane-metadata/Cargo.toml b/crates/fluvio-controlplane-metadata/Cargo.toml
index c6c5b2832e..e4ea957dbd 100644
--- a/crates/fluvio-controlplane-metadata/Cargo.toml
+++ b/crates/fluvio-controlplane-metadata/Cargo.toml
@@ -41,4 +41,4 @@ fluvio-protocol = { path = "../fluvio-protocol", version = "0.9", features = [
 
 [dev-dependencies]
 serde_yaml = "0.9.4"
-fluvio-future = { version = "0.4.0", features = ["fixture"] }
+fluvio-future = { workspace = true }
diff --git a/crates/fluvio-hub-util/Cargo.toml b/crates/fluvio-hub-util/Cargo.toml
index 8f8b55a882..77bd016f6b 100644
--- a/crates/fluvio-hub-util/Cargo.toml
+++ b/crates/fluvio-hub-util/Cargo.toml
@@ -30,21 +30,11 @@ toml = { workspace = true }
 tracing = { workspace = true }
 thiserror = { workspace = true }
 wasmparser = { workspace = true }
+reqwest = { workspace = true }
 
-fluvio-future = { workspace = true, features = ["task"]}
+fluvio-future = { workspace = true }
 fluvio-hub-protocol = { path = "../fluvio-hub-protocol" }
 fluvio-types = { path = "../fluvio-types" }
 
-# feature control
-[dependencies.surf]
-version = "2.3.2"
-features = ["h1-client-rustls", "encoding"]
-default-features = false
-
-[dependencies.http-client]
-version = "6.5.3"
-features = ["h1_client", "rustls"]
-default-features = false
-
 [dev-dependencies]
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/crates/fluvio-hub-util/src/hubaccess.rs b/crates/fluvio-hub-util/src/hubaccess.rs
index 94ab70763d..fdeb3dca59 100644
--- a/crates/fluvio-hub-util/src/hubaccess.rs
+++ b/crates/fluvio-hub-util/src/hubaccess.rs
@@ -2,9 +2,8 @@ use std::path::{Path, PathBuf};
 
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha512};
-use surf::http::mime;
-use surf::StatusCode;
 use tracing::{debug, info};
+use reqwest::{Client as HttpClient, StatusCode, header};
 
 use fluvio_future::task::run_block_on;
 use fluvio_hub_protocol::{Result, HubError};
@@ -60,30 +59,30 @@ impl HubAccess {
             hubid: hubid.to_string(),
             pubkey: self.pubkey.clone(),
         };
-        let msg_json = serde_json::to_string(&msg)?;
         let host = &self.remote;
         let api_url = format!("{host}/{HUB_API_HUBID}");
         debug!("Sending Action token {action_token}");
-        let req = surf::put(api_url)
-            .content_type(mime::JSON)
-            .body_bytes(msg_json)
-            .header("Authorization", &action_token);
-        let res = req
+        let client = HttpClient::default();
+        let res = client
+            .put(&api_url)
+            .header(header::AUTHORIZATION, &action_token)
+            .json(&msg)
+            .send()
             .await
             .map_err(|e| HubError::HubAccess(format!("Failed to connect {e}")))?;
         let status = res.status();
         match status {
-            StatusCode::Created => {
+            StatusCode::CREATED => {
                 println!("hub: hubid {hubid} created");
             }
-            StatusCode::Ok => {
+            StatusCode::OK => {
                 println!("hub: hubid {hubid} is set");
             }
-            StatusCode::Forbidden => {
+            StatusCode::FORBIDDEN => {
                 let msg = format!("hub: hubid {hubid} already taken");
                 return Err(HubError::HubAccess(msg));
             }
-            StatusCode::Unauthorized => {
+            StatusCode::UNAUTHORIZED => {
                 let msg = "hub: authorization error, try 'fluvio cloud login'".to_string();
                 return Err(HubError::HubAccess(msg));
             }
@@ -127,35 +126,36 @@ impl HubAccess {
         self.make_action_token(action, read_infinyon_token()?).await
     }
 
-    async fn make_action_token(&self, action: &str, authn_token: String) -> Result<String> {
+    async fn make_action_token(&self, action: &str, auth_token: String) -> Result<String> {
         let host = &self.remote;
         let api_url = format!("{host}/{HUB_API_ACT}");
         let mat = MsgActionToken {
             act: String::from(action),
         };
-        let msg_action_token = serde_json::to_string(&mat)
-            .map_err(|_e| HubError::HubAccess("Failed access setup".to_string()))?;
-        let req = surf::get(api_url)
-            .content_type(mime::JSON)
-            .body_bytes(msg_action_token)
-            .header("Authorization", &authn_token);
-        let mut res = req
+        let client = HttpClient::default();
+
+        let res = client
+            .get(&api_url)
+            .header(header::AUTHORIZATION, &auth_token)
+            .json(&mat)
+            .send()
             .await
             .map_err(|e| HubError::HubAccess(format!("Failed to connect {e}")))?;
         let status_code = res.status();
         match status_code {
-            StatusCode::Ok => {
-                let action_token = res.body_string().await.map_err(|e| {
-                    debug!("err {e} {res:?}");
+            StatusCode::OK => {
+                let action_token = res.text().await.map_err(|_| {
+                    let msg = format!("Status({status_code}). couldn't fetch error message");
+                    debug!("{msg}");
                     HubError::HubAccess("Failed to parse reply".to_string())
                 })?;
                 Ok(action_token)
             }
-            StatusCode::Unauthorized => Err(HubError::HubAccess(
+            StatusCode::UNAUTHORIZED => Err(HubError::HubAccess(
                 "Unauthorized, please log in with 'fluvio cloud login'".into(),
             )),
             _ => {
-                let msg = format!("Unknown error: {}", res.status());
+                let msg = format!("Unknown error: {}", status_code);
                 Err(HubError::HubAccess(msg))
             }
         }
@@ -307,10 +307,10 @@ fn get_hubref() -> Option<String> {
         return None; // use default
     }
     let hubref_url = format!("{fcremote}/api/v1/hubref");
-    let reply: std::result::Result<String, surf::Error> = run_block_on(async {
-        let req = surf::get(hubref_url);
-        let mut res = req.await?;
-        let reply: ReplyHubref = res.body_json().await?;
+    let reply: std::result::Result<String, reqwest::Error> = run_block_on(async {
+        let req = reqwest::get(hubref_url);
+        let res = req.await?;
+        let reply: ReplyHubref = res.json().await?;
         // fluvio profile switch does not switch the cloud login
         // so hub remote can be pointed to the cloud login different that the profile
         // this will only be printed when using a nonstd hub
diff --git a/crates/fluvio-hub-util/src/lib.rs b/crates/fluvio-hub-util/src/lib.rs
index 923cca9371..af67c36982 100644
--- a/crates/fluvio-hub-util/src/lib.rs
+++ b/crates/fluvio-hub-util/src/lib.rs
@@ -11,7 +11,6 @@ pub use hubaccess::*;
 pub use package::*;
 pub use package_meta_ext::*;
 pub use utils::*;
-pub use surf as http;
 
 pub use fluvio_hub_protocol::*;
 pub use fluvio_hub_protocol::constants::*;
diff --git a/crates/fluvio-hub-util/src/utils.rs b/crates/fluvio-hub-util/src/utils.rs
index b14ec3ad14..19cd371196 100644
--- a/crates/fluvio-hub-util/src/utils.rs
+++ b/crates/fluvio-hub-util/src/utils.rs
@@ -1,8 +1,7 @@
 use std::path::Path;
 
 use serde::{Deserialize, Serialize};
-use surf::http::mime;
-use surf::StatusCode;
+use reqwest::{Client as HttpClient, StatusCode, header};
 use tracing::{debug, info};
 
 use fluvio_hub_protocol::{PackageMeta, Result, HubError};
@@ -85,16 +84,20 @@ pub async fn get_package(pkgurl: &str, access: &HubAccess) -> Result<Vec<u8>> {
 }
 
 pub async fn get_package_with_token(pkgurl: &str, actiontoken: &str) -> Result<Vec<u8>> {
-    let mut resp = surf::get(pkgurl)
-        .header("Authorization", actiontoken)
+    let client = HttpClient::default();
+
+    let resp = client
+        .get(pkgurl)
+        .header(header::AUTHORIZATION, actiontoken)
+        .send()
         .await
         .map_err(|_| HubError::PackageDownload("authorization error".into()))?;
 
     match resp.status() {
-        StatusCode::Ok => {}
+        StatusCode::OK => {}
         code => {
             let body_err_message = resp
-                .body_string()
+                .text()
                 .await
                 .unwrap_or_else(|_err| "couldn't fetch error message".to_string());
             let msg = format!("Status({code}) {body_err_message}");
@@ -106,29 +109,35 @@ pub async fn get_package_with_token(pkgurl: &str, actiontoken: &str) -> Result<V
     // todo: validate package signing by hub
 
     let data = resp
-        .body_bytes()
+        .bytes()
         .await
         .map_err(|_| HubError::PackageDownload("Data unpack failure".into()))?;
-    Ok(data)
+    Ok(data.into())
 }
 
 // deprecated, but keep for reference for a bit
 pub async fn get_package_noauth(pkgurl: &str) -> Result<Vec<u8>> {
     //todo use auth
-    let mut resp = surf::get(pkgurl)
+
+    let client = HttpClient::default();
+
+    let resp = client
+        .get(pkgurl)
+        .send()
         .await
         .map_err(|_| HubError::PackageDownload("".into()))?;
+
     match resp.status() {
-        StatusCode::Ok => {}
+        StatusCode::OK => {}
         _ => {
             return Err(HubError::PackageDownload("".into()));
         }
     }
     let data = resp
-        .body_bytes()
+        .bytes()
         .await
         .map_err(|_| HubError::PackageDownload("Data unpack failure".into()))?;
-    Ok(data)
+    Ok(data.into())
 }
 
 /// non validating function to make canonical filenames from
@@ -182,29 +191,32 @@ async fn push_package_api(put_url: &str, pkgpath: &str, access: &HubAccess) -> R
 
     let pkg_bytes = std::fs::read(pkgpath)?;
     let actiontoken = access.get_publish_token().await?;
-    let req = surf::put(put_url)
-        .content_type(mime::BYTE_STREAM)
-        .body_bytes(pkg_bytes)
-        .header("Authorization", &actiontoken);
-    let mut res = req
+
+    let client = HttpClient::default();
+
+    let res = client
+        .put(put_url)
+        .header(header::CONTENT_TYPE, "application/octet-stream")
+        .body(pkg_bytes)
+        .header(header::AUTHORIZATION, &actiontoken)
+        .send()
         .await
         .map_err(|e| HubError::HubAccess(format!("Failed to connect {e}")))?;
 
     match res.status() {
-        surf::http::StatusCode::Ok => {
+        StatusCode::OK => {
             println!("Package uploaded!");
             Ok(())
         }
-        surf::http::StatusCode::Unauthorized => {
-            Err(HubError::HubAccess("Unauthorized, please log in".into()))
-        }
+        StatusCode::UNAUTHORIZED => Err(HubError::HubAccess("Unauthorized, please log in".into())),
         _ => {
-            debug!("push result: {} \n{res:?}", res.status());
+            let status = res.status();
+            debug!("push result: {} \n{res:?}", status);
             let bodymsg = res
-                .body_string()
+                .text()
                 .await
                 .map_err(|_e| HubError::HubAccess("Failed to download err body".into()))?;
-            let msg = format!("error status code({}) {}", res.status(), bodymsg);
+            let msg = format!("error status code({}) {}", status, bodymsg);
             Err(HubError::HubAccess(msg))
         }
     }
diff --git a/crates/fluvio-protocol/Cargo.toml b/crates/fluvio-protocol/Cargo.toml
index eb8bc44ead..10780468ed 100644
--- a/crates/fluvio-protocol/Cargo.toml
+++ b/crates/fluvio-protocol/Cargo.toml
@@ -42,7 +42,7 @@ derive_builder = { version = "0.12.0" , optional = true }
 eyre = { version = "0.6", default-features = false, optional = true }
 
 fluvio-protocol-derive = { version = "0.5.0", path = "../fluvio-protocol-derive", optional = true }
-fluvio-future = { version = "0.4.0", optional = true }
+fluvio-future = { workspace = true, optional = true }
 flv-util = { version = "0.5.0", optional = true }
 fluvio-compression = { version = "0.2", path = "../fluvio-compression", optional = true}
 fluvio-types = { version = "0.4.0", path = "../fluvio-types", optional = true }
@@ -51,10 +51,5 @@ fluvio-types = { version = "0.4.0", path = "../fluvio-types", optional = true }
 criterion = "0.4.0"
 trybuild = "1.0.64"
 fluvio-protocol = { path = ".", features = ["derive", "api"] }
-fluvio-future = { version = "0.4.0", features = [
-    "fixture",
-    "subscriber",
-    "timer",
-    "net",
-] }
+fluvio-future = { workspace = true }
 futures = { version = "0.3.1" }
diff --git a/crates/fluvio-run/Cargo.toml b/crates/fluvio-run/Cargo.toml
index 71a11f5414..534e2e8891 100644
--- a/crates/fluvio-run/Cargo.toml
+++ b/crates/fluvio-run/Cargo.toml
@@ -28,8 +28,7 @@ thiserror = "1.0.20"
 semver = "1.0.0"
 serde_json = "1.0.64"
 
-# regardless of TLS, sc and spu always use openssl_tls for now because we need cert API
-fluvio-future = { version = "0.4.0", features = ["subscriber"] }
+fluvio-future = { workspace = true }
 fluvio-sc = { path = "../fluvio-sc" }
 fluvio-spu = { path = "../fluvio-spu" }
 fluvio-extension-common = { path = "../fluvio-extension-common" }
diff --git a/crates/fluvio-sc-schema/Cargo.toml b/crates/fluvio-sc-schema/Cargo.toml
index 5873ff038e..0f249ca1be 100644
--- a/crates/fluvio-sc-schema/Cargo.toml
+++ b/crates/fluvio-sc-schema/Cargo.toml
@@ -29,4 +29,4 @@ fluvio-protocol = { path = "../fluvio-protocol", version = "0.9.0", features = [
 fluvio-socket = { path = "../fluvio-socket", version = "0.14.0"}
 
 [dev-dependencies]
-fluvio-future = { version = "0.4.0", features = ["subscriber"] }
+fluvio-future = { workspace = true }
diff --git a/crates/fluvio-sc/Cargo.toml b/crates/fluvio-sc/Cargo.toml
index f841285ccf..ee4e95ec5e 100644
--- a/crates/fluvio-sc/Cargo.toml
+++ b/crates/fluvio-sc/Cargo.toml
@@ -44,11 +44,7 @@ anyhow = { version = "1.0.38" }
 
 # Fluvio dependencies
 fluvio-auth = { path = "../fluvio-auth" }
-fluvio-future = { version = "0.4.0", features = [
-    "subscriber",
-    "openssl_tls",
-    "zero_copy",
-] }
+fluvio-future = { workspace = true }
 fluvio-types = { path = "../fluvio-types", features = [
     "events",
 ] }
@@ -70,6 +66,6 @@ flv-tls-proxy = { version = "0.6.0" }
 
 [dev-dependencies]
 rand = "0.8.4"
-fluvio-future = { version = "0.4.0", features = ["fixture"] }
+fluvio-future = { workspace = true }
 flv-util = { version = "0.5.0", features = ["fixture"] }
 fluvio-stream-model = { path = "../fluvio-stream-model", features = ["fixture"] }
\ No newline at end of file
diff --git a/crates/fluvio-service/Cargo.toml b/crates/fluvio-service/Cargo.toml
index 0020d7d55f..e90b819a4b 100644
--- a/crates/fluvio-service/Cargo.toml
+++ b/crates/fluvio-service/Cargo.toml
@@ -22,11 +22,11 @@ anyhow = { workspace = true }
 
 # Fluvio dependencies
 futures-util = { version = "0.3.5" }
-fluvio-future = { version = "0.4.0" }
+fluvio-future = { workspace = true }
 fluvio-socket = { path = "../fluvio-socket" }
 fluvio-protocol = { path = "../fluvio-protocol", features = ["derive", "api", "codec"] }
 fluvio-types = { features = ["events"], path = "../fluvio-types" }
 
 [dev-dependencies]
-fluvio-future = { version = "0.4.0", features = ["fixture"] }
+fluvio-future = { workspace = true }
 portpicker = "0.1.1"
\ No newline at end of file
diff --git a/crates/fluvio-smartengine/Cargo.toml b/crates/fluvio-smartengine/Cargo.toml
index 50f412e71c..cfc504e39e 100644
--- a/crates/fluvio-smartengine/Cargo.toml
+++ b/crates/fluvio-smartengine/Cargo.toml
@@ -31,7 +31,7 @@ serde_yaml = { version = "0.9", default-features = false, optional = true }
 cfg-if = "1.0.0"
 derive_builder = { workspace = true }
 
-fluvio-future = { version = "0.4.0", default-features = false }
+fluvio-future = { workspace = true }
 fluvio-protocol = { path = "../fluvio-protocol", version = "0.9.0", features = [
     "record",
 ] }
diff --git a/crates/fluvio-socket/Cargo.toml b/crates/fluvio-socket/Cargo.toml
index b4d48a3810..6879113c3a 100644
--- a/crates/fluvio-socket/Cargo.toml
+++ b/crates/fluvio-socket/Cargo.toml
@@ -32,7 +32,7 @@ thiserror = "1.0.20"
 semver = "1.0.0"
 
 # Fluvio dependencies
-fluvio-future = { version = "0.4.0", features = ["net", "task", "retry"] }
+fluvio-future = { workspace = true }
 fluvio-protocol = { path = "../fluvio-protocol", version = "0.9", features = [
     "derive",
     "api",
@@ -41,12 +41,7 @@ fluvio-protocol = { path = "../fluvio-protocol", version = "0.9", features = [
 ] }
 
 [dev-dependencies]
-fluvio-future = { version = "0.4.0", features = [
-    "fixture",
-    "fs",
-    "zero_copy",
-    "native2_tls",
-] }
+fluvio-future = { workspace = true }
 portpicker = "0.1.1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
diff --git a/crates/fluvio-spu-schema/Cargo.toml b/crates/fluvio-spu-schema/Cargo.toml
index 8581e3530e..3c337914d3 100644
--- a/crates/fluvio-spu-schema/Cargo.toml
+++ b/crates/fluvio-spu-schema/Cargo.toml
@@ -25,7 +25,7 @@ educe = { version = "0.4.19", features = ["Debug"] }
 flate2 = { version = "1.0.20" }
 
 fluvio-types = { version = "0.4.0", path = "../fluvio-types" }
-fluvio-future = { version = "0.4.0", optional = true }
+fluvio-future = { workspace = true, optional = true }
 # Fluvio dependencies
 fluvio-protocol = { path = "../fluvio-protocol", version = "0.9.0", features = [
     "api",
@@ -37,5 +37,5 @@ fluvio-smartmodule = { path = "../fluvio-smartmodule", version = "0.5.0", defaul
 [dev-dependencies]
 futures-util = { version = "0.3.4" }
 fluvio-socket = { path = "../fluvio-socket", features = ["file"] }
-fluvio-future = { version = "0.4.0", features = ["fixture", "fs"] }
+fluvio-future = { workspace = true }
 flv-util = { version = "0.5.2", features = ["fixture"] }
diff --git a/crates/fluvio-spu/Cargo.toml b/crates/fluvio-spu/Cargo.toml
index b407af1f20..ecd1846a32 100644
--- a/crates/fluvio-spu/Cargo.toml
+++ b/crates/fluvio-spu/Cargo.toml
@@ -63,11 +63,7 @@ fluvio-socket = { path = "../fluvio-socket", features = [
 fluvio-service = { path = "../fluvio-service" }
 flv-tls-proxy = { version = "0.6.0" }
 flv-util = { version = "0.5.0" }
-fluvio-future = { workspace = true,features = [
-    "subscriber",
-    "openssl_tls",
-    "zero_copy",
-] }
+fluvio-future = { workspace = true }
 fluvio-smartengine = { path = "../fluvio-smartengine"}
 fluvio-smartmodule = { path = "../fluvio-smartmodule",  default-features = false }
 
@@ -79,6 +75,6 @@ flate2 = "1.0.22"
 portpicker = "0.1.1"
 
 flv-util = { version = "0.5.2", features = ["fixture"] }
-fluvio-future = { workspace = true,features = ["fixture", "subscriber"] }
+fluvio-future = { workspace = true }
 fluvio-protocol = { path = "../fluvio-protocol", features = ["fixture"] }
 
diff --git a/crates/fluvio-storage/Cargo.toml b/crates/fluvio-storage/Cargo.toml
index 642a34968b..4bdf48d85a 100644
--- a/crates/fluvio-storage/Cargo.toml
+++ b/crates/fluvio-storage/Cargo.toml
@@ -12,7 +12,7 @@ publish = false
 name = "storage-cli"
 path = "src/bin/cli.rs"
 doc = false
-required-features = ["cli", "fluvio-future/subscriber"]
+required-features = ["cli"]
 
 [features]
 cli = ["clap"]
@@ -43,7 +43,7 @@ blocking = "1.1.0"
 fluvio-types = { path = "../fluvio-types", features = [
     "events",
 ], version = "0.4.0" }
-fluvio-future = { version = "0.4.0", features = ["fs", "mmap", "zero_copy"] }
+fluvio-future = { workspace = true }
 fluvio-protocol = { path = "../fluvio-protocol" }
 fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata" }
 fluvio-spu-schema = { path = "../fluvio-spu-schema", features = [
@@ -51,7 +51,7 @@ fluvio-spu-schema = { path = "../fluvio-spu-schema", features = [
 ] }
 
 [dev-dependencies]
-fluvio-future = { version = "0.4.0", features = ["fixture"] }
+fluvio-future = { workspace = true }
 flv-util = { version = "0.5.2", features = ["fixture"] }
 fluvio-socket = { path = "../fluvio-socket", features = ["file"] }
 fluvio-storage = { path = ".", features = ["fixture"] }
diff --git a/crates/fluvio-stream-dispatcher/Cargo.toml b/crates/fluvio-stream-dispatcher/Cargo.toml
index 1ce8df002c..0a033795b5 100644
--- a/crates/fluvio-stream-dispatcher/Cargo.toml
+++ b/crates/fluvio-stream-dispatcher/Cargo.toml
@@ -30,7 +30,7 @@ fluvio-stream-model = { features = [
 ], version = "0.9.0", path = "../fluvio-stream-model" }
 k8-metadata-client = { workspace = true }
 k8-types = { workspace = true }
-fluvio-future = { version = "0.4.0", features = ["task", "timer"] }
+fluvio-future = { workspace = true }
 
 [dev-dependencies]
-fluvio-future = { version = "0.4.0", features = ["fixture"] }
+fluvio-future = { workspace = true }
diff --git a/crates/fluvio-stream-model/Cargo.toml b/crates/fluvio-stream-model/Cargo.toml
index 78f26a1f89..842729376a 100644
--- a/crates/fluvio-stream-model/Cargo.toml
+++ b/crates/fluvio-stream-model/Cargo.toml
@@ -29,7 +29,7 @@ k8-types = { workspace = true, optional = true }
 [dev-dependencies]
 
 tokio = { version = "1.3.0", features = ["macros"] }
-fluvio-future = { version = "0.4.0", features = ["fixture"] }
+fluvio-future = { workspace = true }
 fluvio-stream-model = { path = ".", features = ["fixture"] }
 async-std = { version = "1.8.0", default-features = false, features = [
     "attributes",
diff --git a/crates/fluvio-test-derive/Cargo.toml b/crates/fluvio-test-derive/Cargo.toml
index bbf26cf040..e186e61402 100644
--- a/crates/fluvio-test-derive/Cargo.toml
+++ b/crates/fluvio-test-derive/Cargo.toml
@@ -26,7 +26,7 @@ rand = "0.8.4"
 trybuild = { git = "https://github.com/infinyon/trybuild", branch = "check_option" }
 fluvio = { path = "../fluvio" }
 tokio = { version = "1.4", features = ["macros"] }
-fluvio-future = { version = "0.4.0", features = ["task", "timer", "subscriber", "fixture"] }
+fluvio-future = { workspace = true }
 clap = { version = "4.0.9", features = ["std", "derive", "help", "usage", "error-context"], default-features = false }
 inventory = "0.3"
 tracing = "0.1"
diff --git a/crates/fluvio-test-util/Cargo.toml b/crates/fluvio-test-util/Cargo.toml
index 07d3948335..51e972df72 100644
--- a/crates/fluvio-test-util/Cargo.toml
+++ b/crates/fluvio-test-util/Cargo.toml
@@ -33,7 +33,7 @@ anyhow = { workspace = true }
 
 fluvio = { path = "../fluvio" }
 fluvio-types = { path = "../fluvio-types" }
-fluvio-future = { version = "0.4.0", features = ["task", "timer", "subscriber", "fixture"] }
+fluvio-future = { workspace = true }
 fluvio-cluster = { path = "../fluvio-cluster" }
 fluvio-command = { version = "0.2.0" }
 fluvio-controlplane-metadata = { features = ["k8"], path = "../fluvio-controlplane-metadata" }
diff --git a/crates/fluvio-test/Cargo.toml b/crates/fluvio-test/Cargo.toml
index 0cb58b4562..92907986b6 100644
--- a/crates/fluvio-test/Cargo.toml
+++ b/crates/fluvio-test/Cargo.toml
@@ -47,13 +47,7 @@ anyhow = { workspace = true }
 # Fluvio dependencies
 fluvio = { path = "../fluvio" }
 fluvio-types = { path = "../fluvio-types" }
-fluvio-future = { workspace = true, features = [
-    "io",
-    "task",
-    "timer",
-    "subscriber",
-    "fixture",
-] }
+fluvio-future = { workspace = true }
 fluvio-command = { version = "0.2.0" }
 fluvio-cluster = { path = "../fluvio-cluster" }
 fluvio-cli = { path = "../fluvio-cli" }
diff --git a/crates/fluvio-types/Cargo.toml b/crates/fluvio-types/Cargo.toml
index 92a0bea2a7..4ea503c547 100644
--- a/crates/fluvio-types/Cargo.toml
+++ b/crates/fluvio-types/Cargo.toml
@@ -16,5 +16,5 @@ event-listener = { version = "2.5.1", optional = true }
 thiserror = "1"
 
 [dev-dependencies]
-fluvio-future = { version = "0.4.0", features = ["fixture", "subscriber"] }
+fluvio-future = { workspace = true }
 tokio = { version = "1.3.0", features = ["macros"] }
diff --git a/crates/fluvio/Cargo.toml b/crates/fluvio/Cargo.toml
index a92148fcc1..c279256365 100644
--- a/crates/fluvio/Cargo.toml
+++ b/crates/fluvio/Cargo.toml
@@ -14,11 +14,11 @@ name = "fluvio"
 path = "src/lib.rs"
 
 [features]
-default = ["openssl"]
+default = ["rustls"]
 admin = ["fluvio-sc-schema/use_serde"]
 smartengine = ["fluvio-smartengine"]
-openssl = ["fluvio-future/openssl_tls"]
-rustls = ["fluvio-future/rust_tls"]
+openssl = ["fluvio-future/openssl_tls", "reqwest/default-tls"]
+rustls = ["fluvio-future/rust_tls", "reqwest/rustls-tls"]
 unstable = []
 
 [dependencies]
@@ -42,15 +42,11 @@ pin-project-lite = "0.2"
 siphasher = "0.3.5"
 cfg-if = "1.0.0"
 async-trait = "0.1.51"
-anyhow = "1.0.38" 
+anyhow = "1.0.38"
+reqwest = { workspace = true }
 
 # Fluvio dependencies
-fluvio-future = { version = "0.4.4", features = [
-    "task",
-    "task_unstable",
-    "retry",
-    "sync"
-] }
+fluvio-future = { workspace = true }
 fluvio-types = { version = "0.4.0", features = [
     "events",
 ], path = "../fluvio-types" }
@@ -80,8 +76,8 @@ fluvio-spu-schema = { version = "0.13.0", path = "../fluvio-spu-schema" }
 chrono = {version =  "0.4", features = ["wasmbind", "clock"]}
 
 [dev-dependencies]
-async-std = { version = "1.6.4", default-features = false }
-fluvio-future = { version = "0.4.4", features = ["io", "fixture"] }
+async-std = { version = "1.6.4", default-features = false, features = ["tokio1"] }
+fluvio-future = { workspace = true }
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 wasm-bindgen-test = "0.3.24"
diff --git a/crates/smartmodule-development-kit/Cargo.toml b/crates/smartmodule-development-kit/Cargo.toml
index 06ffdb7cf5..ea41798d71 100644
--- a/crates/smartmodule-development-kit/Cargo.toml
+++ b/crates/smartmodule-development-kit/Cargo.toml
@@ -31,7 +31,7 @@ lib-cargo-crate = "0.1.6"
 fluvio = { path = "../fluvio", default-features = false }
 fluvio-hub-util = { path = "../fluvio-hub-util" }
 fluvio-protocol = { path = "../fluvio-protocol", features=["record","api"] }
-fluvio-future = { workspace = true, features = ["subscriber"]}
+fluvio-future = { workspace = true }
 fluvio-smartengine = { path = "../fluvio-smartengine", features = ["transformation"] }
 fluvio-extension-common = { path = "../fluvio-extension-common", features = ["target"] }
 fluvio-smartmodule = { path = "../fluvio-smartmodule",  default-features = false }
diff --git a/release-tools/check-crate-version/Cargo.toml b/release-tools/check-crate-version/Cargo.toml
index 15ba94f060..f80dcbf865 100644
--- a/release-tools/check-crate-version/Cargo.toml
+++ b/release-tools/check-crate-version/Cargo.toml
@@ -11,7 +11,7 @@ license = "Apache-2.0"
 toml-diff = { path = "toml-diff" }
 clap = { workspace = true,features = ["derive", "env"] }
 flate2 = "1.0.24"
-reqwest = { version = "0.11.11", features = ["json"] }
+reqwest = { workspace = true }
 semver = "1.0.13"
 serde = { version = "1.0.144", features = ["serde_derive"] }
 serde_json = "1.0.85"

From fabef5f5a8133c84beb46db292bf6da9562ab3bf Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Mon, 17 Apr 2023 22:01:34 +0300
Subject: [PATCH 02/25] always include async-std/tokio01 if using reqwest

---
 Cargo.lock                        | 2 ++
 crates/fluvio-cli/Cargo.toml      | 2 ++
 crates/fluvio-hub-util/Cargo.toml | 2 ++
 crates/fluvio/Cargo.toml          | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 94bf2ebb3d..372680404c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2235,6 +2235,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "async-net",
+ "async-std",
  "async-trait",
  "atty",
  "bytesize",
@@ -2572,6 +2573,7 @@ dependencies = [
 name = "fluvio-hub-util"
 version = "0.0.0"
 dependencies = [
+ "async-std",
  "cargo_toml",
  "const_format",
  "dirs 5.0.0",
diff --git a/crates/fluvio-cli/Cargo.toml b/crates/fluvio-cli/Cargo.toml
index 537d24cf28..f41d80d592 100644
--- a/crates/fluvio-cli/Cargo.toml
+++ b/crates/fluvio-cli/Cargo.toml
@@ -75,6 +75,8 @@ async-net = "1.7.0"
 anyhow = { workspace = true }
 current_platform = "0.2"
 reqwest = { workspace = true }
+# added to make sure reqwest works
+async-std = { version = "1.6.4", default-features = false, features = ["tokio1"] }
 
 # Fluvio dependencies
 k8-config = { workspace = true, optional = true }
diff --git a/crates/fluvio-hub-util/Cargo.toml b/crates/fluvio-hub-util/Cargo.toml
index 77bd016f6b..ee4eaa26a1 100644
--- a/crates/fluvio-hub-util/Cargo.toml
+++ b/crates/fluvio-hub-util/Cargo.toml
@@ -31,6 +31,8 @@ tracing = { workspace = true }
 thiserror = { workspace = true }
 wasmparser = { workspace = true }
 reqwest = { workspace = true }
+# added to make sure reqwest works
+async-std = { version = "1.6.4", default-features = false, features = ["tokio1"] }
 
 fluvio-future = { workspace = true }
 fluvio-hub-protocol = { path = "../fluvio-hub-protocol" }
diff --git a/crates/fluvio/Cargo.toml b/crates/fluvio/Cargo.toml
index c279256365..37985bd830 100644
--- a/crates/fluvio/Cargo.toml
+++ b/crates/fluvio/Cargo.toml
@@ -44,6 +44,8 @@ cfg-if = "1.0.0"
 async-trait = "0.1.51"
 anyhow = "1.0.38"
 reqwest = { workspace = true }
+# added to make sure reqwest works
+async-std = { version = "1.6.4", default-features = false, features = ["tokio1"] }
 
 # Fluvio dependencies
 fluvio-future = { workspace = true }

From 6bf2afbff1a4c06bbfe989f2143a4d814e89ef9b Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 14:11:34 +0300
Subject: [PATCH 03/25] move features from workspace to individual crates

---
 Cargo.lock                                    | 16 --------------
 Cargo.toml                                    | 21 ++-----------------
 crates/cdk/Cargo.toml                         |  2 +-
 crates/fluvio-auth/Cargo.toml                 |  2 +-
 crates/fluvio-benchmark/Cargo.toml            |  7 ++++++-
 crates/fluvio-channel-cli/Cargo.toml          |  2 +-
 crates/fluvio-cli-common/Cargo.toml           |  2 +-
 crates/fluvio-cli/Cargo.toml                  |  4 ++--
 crates/fluvio-cluster/Cargo.toml              |  2 +-
 crates/fluvio-connector-common/Cargo.toml     |  2 +-
 .../fluvio-controlplane-metadata/Cargo.toml   |  2 +-
 crates/fluvio-hub-util/Cargo.toml             |  4 ++--
 crates/fluvio-protocol/Cargo.toml             |  7 ++++++-
 crates/fluvio-run/Cargo.toml                  |  2 +-
 crates/fluvio-sc-schema/Cargo.toml            |  2 +-
 crates/fluvio-sc/Cargo.toml                   |  8 +++++--
 crates/fluvio-service/Cargo.toml              |  2 +-
 crates/fluvio-socket/Cargo.toml               |  9 ++++++--
 crates/fluvio-spu-schema/Cargo.toml           |  2 +-
 crates/fluvio-spu/Cargo.toml                  |  8 +++++--
 crates/fluvio-storage/Cargo.toml              |  6 +++---
 crates/fluvio-stream-dispatcher/Cargo.toml    |  4 ++--
 crates/fluvio-stream-model/Cargo.toml         |  2 +-
 crates/fluvio-test-derive/Cargo.toml          |  2 +-
 crates/fluvio-test-util/Cargo.toml            |  2 +-
 crates/fluvio-test/Cargo.toml                 |  8 ++++++-
 crates/fluvio-types/Cargo.toml                |  2 +-
 crates/fluvio/Cargo.toml                      | 16 +++++++-------
 crates/smartmodule-development-kit/Cargo.toml |  2 +-
 release-tools/check-crate-version/Cargo.toml  |  2 +-
 30 files changed, 73 insertions(+), 79 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 372680404c..f85b3f9758 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -335,18 +335,6 @@ dependencies = [
  "event-listener",
 ]
 
-[[package]]
-name = "async-native-tls"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe"
-dependencies = [
- "futures-util",
- "native-tls",
- "thiserror",
- "url",
-]
-
 [[package]]
 name = "async-net"
 version = "1.7.0"
@@ -2116,7 +2104,6 @@ dependencies = [
  "async-channel",
  "async-lock",
  "async-rwlock",
- "async-std",
  "async-trait",
  "base64 0.21.0",
  "bytes 1.4.0",
@@ -2138,7 +2125,6 @@ dependencies = [
  "futures-util",
  "once_cell",
  "pin-project-lite",
- "reqwest",
  "semver 1.0.17",
  "serde",
  "serde_json",
@@ -2514,7 +2500,6 @@ checksum = "37174044230084d1cfd7c02f194c5ec127bb8bc17c76f0cd74e943f2fe86ec34"
 dependencies = [
  "async-fs",
  "async-io",
- "async-native-tls",
  "async-net",
  "async-rustls",
  "async-std",
@@ -2526,7 +2511,6 @@ dependencies = [
  "futures-util",
  "log",
  "memmap",
- "native-tls",
  "nix",
  "openssl",
  "openssl-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 45a138c10f..d82a93982a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -97,31 +97,14 @@ colored = "2.0.0"
 semver = "1.0.3"
 url = "2.1.1"
 which = "4.1.0"
-reqwest = { version = "0.11", default-features = false, features = ["json", "gzip"] }
+reqwest = "0.11"
 
 # fluvio dep
 k8-client = { version = "10.0.0" }
 k8-types = { version = "0.8.0" }
 k8-config = { version = "2.0.0"}
 k8-metadata-client = { version = "5.1.0" }
-fluvio-future = { version = "0.4", default-features = false, features = [
-    "task",
-    "subscriber",
-    "fixture",
-    "io",
-    "sync",
-    "future",
-    "net",
-    "rust_tls",
-    "timer",
-    "fs",
-    "zero_copy",
-    "mmap",
-    "retry",
-    "doomsday",
-    "native2_tls",
-    "openssl_tls",
-] }
+fluvio-future = { version =  "0.4.0" }
 flv-util = { version = "0.5.0" }
 fluvio-helm = { version = "0.4.1"}
 fluvio-command = { version = "0.2.0"}
diff --git a/crates/cdk/Cargo.toml b/crates/cdk/Cargo.toml
index de101fccc3..81a6d74fe4 100644
--- a/crates/cdk/Cargo.toml
+++ b/crates/cdk/Cargo.toml
@@ -35,5 +35,5 @@ current_platform = { version = "0.2" }
 fluvio = { path = "../fluvio"}
 fluvio-connector-deployer = { path = "../fluvio-connector-deployer"}
 fluvio-connector-package = { path = "../fluvio-connector-package", features = ["toml"]}
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["subscriber"]}
 fluvio-hub-util = { path = "../fluvio-hub-util" }
diff --git a/crates/fluvio-auth/Cargo.toml b/crates/fluvio-auth/Cargo.toml
index 3e15385d1e..1a8bebf00d 100644
--- a/crates/fluvio-auth/Cargo.toml
+++ b/crates/fluvio-auth/Cargo.toml
@@ -22,7 +22,7 @@ tracing = { workspace = true }
 x509-parser = "0.15.0"
 
 fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata" }
-fluvio-future = { version = "0.4.0" }
+fluvio-future = { workspace = true, features = ["net", "rust_tls"] }
 fluvio-protocol = { path = "../fluvio-protocol" }
 fluvio-socket = { path = "../fluvio-socket" }
 fluvio-types = { path = "../fluvio-types" }
diff --git a/crates/fluvio-benchmark/Cargo.toml b/crates/fluvio-benchmark/Cargo.toml
index 23e33d6d31..b3d448a8a4 100644
--- a/crates/fluvio-benchmark/Cargo.toml
+++ b/crates/fluvio-benchmark/Cargo.toml
@@ -27,4 +27,9 @@ anyhow = { workspace = true }
 
 fluvio = { path = "../fluvio" }
 fluvio-cli-common = { path = "../fluvio-cli-common"}
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = [
+    'task',
+    'future',
+    'sync',
+    'subscriber',
+] }
diff --git a/crates/fluvio-channel-cli/Cargo.toml b/crates/fluvio-channel-cli/Cargo.toml
index 5711b2ae77..48f88f6a3b 100644
--- a/crates/fluvio-channel-cli/Cargo.toml
+++ b/crates/fluvio-channel-cli/Cargo.toml
@@ -30,7 +30,7 @@ anyhow = { workspace = true }
 
 fluvio-cli-common = { path = "../fluvio-cli-common" }
 fluvio-channel = { path = "../fluvio-channel" }
-fluvio-future = { workspace = true, optional = true }
+fluvio-future = { workspace = true, features = ["task", "subscriber", "rust_tls"], optional = true }
 fluvio-types = { path = "../fluvio-types", default-features = false, optional = true }
 fluvio-package-index = { path = "../fluvio-package-index" }
 
diff --git a/crates/fluvio-cli-common/Cargo.toml b/crates/fluvio-cli-common/Cargo.toml
index 8b79a3e961..0560334339 100644
--- a/crates/fluvio-cli-common/Cargo.toml
+++ b/crates/fluvio-cli-common/Cargo.toml
@@ -36,4 +36,4 @@ fluvio = { path = "../fluvio", default-features = false, optional = true }
 fluvio-protocol = { path = "../fluvio-protocol", optional = true }
 
 [dev-dependencies]
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "rust_tls", "fixture"] }
diff --git a/crates/fluvio-cli/Cargo.toml b/crates/fluvio-cli/Cargo.toml
index f41d80d592..7102a6ccfc 100644
--- a/crates/fluvio-cli/Cargo.toml
+++ b/crates/fluvio-cli/Cargo.toml
@@ -74,7 +74,7 @@ tokio = { version = "1.3.0", features = ["macros"] }
 async-net = "1.7.0"
 anyhow = { workspace = true }
 current_platform = "0.2"
-reqwest = { workspace = true }
+reqwest = { workspace = true, default-features = false, features = ["json", "gzip", "rustls-tls"] }
 # added to make sure reqwest works
 async-std = { version = "1.6.4", default-features = false, features = ["tokio1"] }
 
@@ -99,7 +99,7 @@ fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata", featu
 
 # Optional Fluvio dependencies
 fluvio-types = { path = "../fluvio-types", optional = true }
-fluvio-future = { workspace = true, optional = true }
+fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "rust_tls"], optional = true }
 fluvio-sc-schema = { path = "../fluvio-sc-schema", features = ["use_serde"], optional = true }
 fluvio-spu-schema = { path = "../fluvio-spu-schema", optional = true }
 
diff --git a/crates/fluvio-cluster/Cargo.toml b/crates/fluvio-cluster/Cargo.toml
index 144d94b597..54b40b0858 100644
--- a/crates/fluvio-cluster/Cargo.toml
+++ b/crates/fluvio-cluster/Cargo.toml
@@ -81,4 +81,4 @@ fluvio-types = { path = "../fluvio-types" }
 fluvio-channel = { path = "../fluvio-channel" }
 
 [dev-dependencies]
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["task", "fixture"] }
diff --git a/crates/fluvio-connector-common/Cargo.toml b/crates/fluvio-connector-common/Cargo.toml
index 3e49e74acf..2c2380f2c8 100644
--- a/crates/fluvio-connector-common/Cargo.toml
+++ b/crates/fluvio-connector-common/Cargo.toml
@@ -14,7 +14,7 @@ derive = ["fluvio-connector-derive"]
 [dependencies]
 anyhow = { workspace = true }
 tracing = { workspace = true }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["subscriber"] }
 futures = { version = "0.3", default-features = false }
 async-trait = { version = "0.1", default-features = false}
 async-net = { version = "1.7", default-features = false }
diff --git a/crates/fluvio-controlplane-metadata/Cargo.toml b/crates/fluvio-controlplane-metadata/Cargo.toml
index e4ea957dbd..7a8c3220c5 100644
--- a/crates/fluvio-controlplane-metadata/Cargo.toml
+++ b/crates/fluvio-controlplane-metadata/Cargo.toml
@@ -41,4 +41,4 @@ fluvio-protocol = { path = "../fluvio-protocol", version = "0.9", features = [
 
 [dev-dependencies]
 serde_yaml = "0.9.4"
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["fixture"] }
diff --git a/crates/fluvio-hub-util/Cargo.toml b/crates/fluvio-hub-util/Cargo.toml
index ee4eaa26a1..f5de22c1bc 100644
--- a/crates/fluvio-hub-util/Cargo.toml
+++ b/crates/fluvio-hub-util/Cargo.toml
@@ -30,11 +30,11 @@ toml = { workspace = true }
 tracing = { workspace = true }
 thiserror = { workspace = true }
 wasmparser = { workspace = true }
-reqwest = { workspace = true }
+reqwest = { workspace = true, default-features = false, features = ["json", "gzip", "rustls-tls"] }
 # added to make sure reqwest works
 async-std = { version = "1.6.4", default-features = false, features = ["tokio1"] }
 
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["task"] }
 fluvio-hub-protocol = { path = "../fluvio-hub-protocol" }
 fluvio-types = { path = "../fluvio-types" }
 
diff --git a/crates/fluvio-protocol/Cargo.toml b/crates/fluvio-protocol/Cargo.toml
index 10780468ed..0411fe07f7 100644
--- a/crates/fluvio-protocol/Cargo.toml
+++ b/crates/fluvio-protocol/Cargo.toml
@@ -51,5 +51,10 @@ fluvio-types = { version = "0.4.0", path = "../fluvio-types", optional = true }
 criterion = "0.4.0"
 trybuild = "1.0.64"
 fluvio-protocol = { path = ".", features = ["derive", "api"] }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = [
+    "fixture",
+    "subscriber",
+    "timer",
+    "net",
+] }
 futures = { version = "0.3.1" }
diff --git a/crates/fluvio-run/Cargo.toml b/crates/fluvio-run/Cargo.toml
index 534e2e8891..8ae0ef427f 100644
--- a/crates/fluvio-run/Cargo.toml
+++ b/crates/fluvio-run/Cargo.toml
@@ -28,7 +28,7 @@ thiserror = "1.0.20"
 semver = "1.0.0"
 serde_json = "1.0.64"
 
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["subscriber"] }
 fluvio-sc = { path = "../fluvio-sc" }
 fluvio-spu = { path = "../fluvio-spu" }
 fluvio-extension-common = { path = "../fluvio-extension-common" }
diff --git a/crates/fluvio-sc-schema/Cargo.toml b/crates/fluvio-sc-schema/Cargo.toml
index 0f249ca1be..3adf308c6f 100644
--- a/crates/fluvio-sc-schema/Cargo.toml
+++ b/crates/fluvio-sc-schema/Cargo.toml
@@ -29,4 +29,4 @@ fluvio-protocol = { path = "../fluvio-protocol", version = "0.9.0", features = [
 fluvio-socket = { path = "../fluvio-socket", version = "0.14.0"}
 
 [dev-dependencies]
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["subscriber"] }
diff --git a/crates/fluvio-sc/Cargo.toml b/crates/fluvio-sc/Cargo.toml
index ee4e95ec5e..c8085409cb 100644
--- a/crates/fluvio-sc/Cargo.toml
+++ b/crates/fluvio-sc/Cargo.toml
@@ -44,7 +44,11 @@ anyhow = { version = "1.0.38" }
 
 # Fluvio dependencies
 fluvio-auth = { path = "../fluvio-auth" }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = [
+    "subscriber",
+    "openssl_tls",
+    "zero_copy",
+] }
 fluvio-types = { path = "../fluvio-types", features = [
     "events",
 ] }
@@ -66,6 +70,6 @@ flv-tls-proxy = { version = "0.6.0" }
 
 [dev-dependencies]
 rand = "0.8.4"
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["fixture"] }
 flv-util = { version = "0.5.0", features = ["fixture"] }
 fluvio-stream-model = { path = "../fluvio-stream-model", features = ["fixture"] }
\ No newline at end of file
diff --git a/crates/fluvio-service/Cargo.toml b/crates/fluvio-service/Cargo.toml
index e90b819a4b..ccdfe1deb8 100644
--- a/crates/fluvio-service/Cargo.toml
+++ b/crates/fluvio-service/Cargo.toml
@@ -28,5 +28,5 @@ fluvio-protocol = { path = "../fluvio-protocol", features = ["derive", "api", "c
 fluvio-types = { features = ["events"], path = "../fluvio-types" }
 
 [dev-dependencies]
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["fixture"] }
 portpicker = "0.1.1"
\ No newline at end of file
diff --git a/crates/fluvio-socket/Cargo.toml b/crates/fluvio-socket/Cargo.toml
index 6879113c3a..22aab62deb 100644
--- a/crates/fluvio-socket/Cargo.toml
+++ b/crates/fluvio-socket/Cargo.toml
@@ -32,7 +32,7 @@ thiserror = "1.0.20"
 semver = "1.0.0"
 
 # Fluvio dependencies
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["net", "task", "retry"] }
 fluvio-protocol = { path = "../fluvio-protocol", version = "0.9", features = [
     "derive",
     "api",
@@ -41,7 +41,12 @@ fluvio-protocol = { path = "../fluvio-protocol", version = "0.9", features = [
 ] }
 
 [dev-dependencies]
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = [
+    "fixture",
+    "fs",
+    "zero_copy",
+    "rust_tls",
+] }
 portpicker = "0.1.1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
diff --git a/crates/fluvio-spu-schema/Cargo.toml b/crates/fluvio-spu-schema/Cargo.toml
index 3c337914d3..a11217b4fc 100644
--- a/crates/fluvio-spu-schema/Cargo.toml
+++ b/crates/fluvio-spu-schema/Cargo.toml
@@ -37,5 +37,5 @@ fluvio-smartmodule = { path = "../fluvio-smartmodule", version = "0.5.0", defaul
 [dev-dependencies]
 futures-util = { version = "0.3.4" }
 fluvio-socket = { path = "../fluvio-socket", features = ["file"] }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["fixture", "fs"] }
 flv-util = { version = "0.5.2", features = ["fixture"] }
diff --git a/crates/fluvio-spu/Cargo.toml b/crates/fluvio-spu/Cargo.toml
index ecd1846a32..21bd592997 100644
--- a/crates/fluvio-spu/Cargo.toml
+++ b/crates/fluvio-spu/Cargo.toml
@@ -63,7 +63,11 @@ fluvio-socket = { path = "../fluvio-socket", features = [
 fluvio-service = { path = "../fluvio-service" }
 flv-tls-proxy = { version = "0.6.0" }
 flv-util = { version = "0.5.0" }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = [
+    "subscriber",
+    "rust_tls",
+    "zero_copy",
+] }
 fluvio-smartengine = { path = "../fluvio-smartengine"}
 fluvio-smartmodule = { path = "../fluvio-smartmodule",  default-features = false }
 
@@ -75,6 +79,6 @@ flate2 = "1.0.22"
 portpicker = "0.1.1"
 
 flv-util = { version = "0.5.2", features = ["fixture"] }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["fixture", "subscriber"] }
 fluvio-protocol = { path = "../fluvio-protocol", features = ["fixture"] }
 
diff --git a/crates/fluvio-storage/Cargo.toml b/crates/fluvio-storage/Cargo.toml
index 4bdf48d85a..511b9b1183 100644
--- a/crates/fluvio-storage/Cargo.toml
+++ b/crates/fluvio-storage/Cargo.toml
@@ -12,7 +12,7 @@ publish = false
 name = "storage-cli"
 path = "src/bin/cli.rs"
 doc = false
-required-features = ["cli"]
+required-features = ["cli", "fluvio-future/subscriber"]
 
 [features]
 cli = ["clap"]
@@ -43,7 +43,7 @@ blocking = "1.1.0"
 fluvio-types = { path = "../fluvio-types", features = [
     "events",
 ], version = "0.4.0" }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["fs", "mmap", "zero_copy"]  }
 fluvio-protocol = { path = "../fluvio-protocol" }
 fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata" }
 fluvio-spu-schema = { path = "../fluvio-spu-schema", features = [
@@ -51,7 +51,7 @@ fluvio-spu-schema = { path = "../fluvio-spu-schema", features = [
 ] }
 
 [dev-dependencies]
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["fixture"] }
 flv-util = { version = "0.5.2", features = ["fixture"] }
 fluvio-socket = { path = "../fluvio-socket", features = ["file"] }
 fluvio-storage = { path = ".", features = ["fixture"] }
diff --git a/crates/fluvio-stream-dispatcher/Cargo.toml b/crates/fluvio-stream-dispatcher/Cargo.toml
index 0a033795b5..2bd7d9f1ad 100644
--- a/crates/fluvio-stream-dispatcher/Cargo.toml
+++ b/crates/fluvio-stream-dispatcher/Cargo.toml
@@ -30,7 +30,7 @@ fluvio-stream-model = { features = [
 ], version = "0.9.0", path = "../fluvio-stream-model" }
 k8-metadata-client = { workspace = true }
 k8-types = { workspace = true }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["task", "timer"] }
 
 [dev-dependencies]
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["fixture"] }
diff --git a/crates/fluvio-stream-model/Cargo.toml b/crates/fluvio-stream-model/Cargo.toml
index 842729376a..119c93a111 100644
--- a/crates/fluvio-stream-model/Cargo.toml
+++ b/crates/fluvio-stream-model/Cargo.toml
@@ -29,7 +29,7 @@ k8-types = { workspace = true, optional = true }
 [dev-dependencies]
 
 tokio = { version = "1.3.0", features = ["macros"] }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["fixture"] }
 fluvio-stream-model = { path = ".", features = ["fixture"] }
 async-std = { version = "1.8.0", default-features = false, features = [
     "attributes",
diff --git a/crates/fluvio-test-derive/Cargo.toml b/crates/fluvio-test-derive/Cargo.toml
index e186e61402..04f0daa0e2 100644
--- a/crates/fluvio-test-derive/Cargo.toml
+++ b/crates/fluvio-test-derive/Cargo.toml
@@ -26,7 +26,7 @@ rand = "0.8.4"
 trybuild = { git = "https://github.com/infinyon/trybuild", branch = "check_option" }
 fluvio = { path = "../fluvio" }
 tokio = { version = "1.4", features = ["macros"] }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["task", "timer", "subscriber", "fixture"] }
 clap = { version = "4.0.9", features = ["std", "derive", "help", "usage", "error-context"], default-features = false }
 inventory = "0.3"
 tracing = "0.1"
diff --git a/crates/fluvio-test-util/Cargo.toml b/crates/fluvio-test-util/Cargo.toml
index 51e972df72..5a3d068dcc 100644
--- a/crates/fluvio-test-util/Cargo.toml
+++ b/crates/fluvio-test-util/Cargo.toml
@@ -33,7 +33,7 @@ anyhow = { workspace = true }
 
 fluvio = { path = "../fluvio" }
 fluvio-types = { path = "../fluvio-types" }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["task", "timer", "subscriber", "fixture"] }
 fluvio-cluster = { path = "../fluvio-cluster" }
 fluvio-command = { version = "0.2.0" }
 fluvio-controlplane-metadata = { features = ["k8"], path = "../fluvio-controlplane-metadata" }
diff --git a/crates/fluvio-test/Cargo.toml b/crates/fluvio-test/Cargo.toml
index 92907986b6..0cb58b4562 100644
--- a/crates/fluvio-test/Cargo.toml
+++ b/crates/fluvio-test/Cargo.toml
@@ -47,7 +47,13 @@ anyhow = { workspace = true }
 # Fluvio dependencies
 fluvio = { path = "../fluvio" }
 fluvio-types = { path = "../fluvio-types" }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = [
+    "io",
+    "task",
+    "timer",
+    "subscriber",
+    "fixture",
+] }
 fluvio-command = { version = "0.2.0" }
 fluvio-cluster = { path = "../fluvio-cluster" }
 fluvio-cli = { path = "../fluvio-cli" }
diff --git a/crates/fluvio-types/Cargo.toml b/crates/fluvio-types/Cargo.toml
index 4ea503c547..39672c78b4 100644
--- a/crates/fluvio-types/Cargo.toml
+++ b/crates/fluvio-types/Cargo.toml
@@ -16,5 +16,5 @@ event-listener = { version = "2.5.1", optional = true }
 thiserror = "1"
 
 [dev-dependencies]
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["fixture", "subscriber"] }
 tokio = { version = "1.3.0", features = ["macros"] }
diff --git a/crates/fluvio/Cargo.toml b/crates/fluvio/Cargo.toml
index 37985bd830..4b5f9dd895 100644
--- a/crates/fluvio/Cargo.toml
+++ b/crates/fluvio/Cargo.toml
@@ -14,11 +14,8 @@ name = "fluvio"
 path = "src/lib.rs"
 
 [features]
-default = ["rustls"]
 admin = ["fluvio-sc-schema/use_serde"]
 smartengine = ["fluvio-smartengine"]
-openssl = ["fluvio-future/openssl_tls", "reqwest/default-tls"]
-rustls = ["fluvio-future/rust_tls", "reqwest/rustls-tls"]
 unstable = []
 
 [dependencies]
@@ -43,12 +40,14 @@ siphasher = "0.3.5"
 cfg-if = "1.0.0"
 async-trait = "0.1.51"
 anyhow = "1.0.38"
-reqwest = { workspace = true }
-# added to make sure reqwest works
-async-std = { version = "1.6.4", default-features = false, features = ["tokio1"] }
 
 # Fluvio dependencies
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = [
+    "task",
+    "task_unstable",
+    "retry",
+    "sync"
+] }
 fluvio-types = { version = "0.4.0", features = [
     "events",
 ], path = "../fluvio-types" }
@@ -78,8 +77,7 @@ fluvio-spu-schema = { version = "0.13.0", path = "../fluvio-spu-schema" }
 chrono = {version =  "0.4", features = ["wasmbind", "clock"]}
 
 [dev-dependencies]
-async-std = { version = "1.6.4", default-features = false, features = ["tokio1"] }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["io", "fixture"] }
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 wasm-bindgen-test = "0.3.24"
diff --git a/crates/smartmodule-development-kit/Cargo.toml b/crates/smartmodule-development-kit/Cargo.toml
index ea41798d71..8ca7b300a1 100644
--- a/crates/smartmodule-development-kit/Cargo.toml
+++ b/crates/smartmodule-development-kit/Cargo.toml
@@ -31,7 +31,7 @@ lib-cargo-crate = "0.1.6"
 fluvio = { path = "../fluvio", default-features = false }
 fluvio-hub-util = { path = "../fluvio-hub-util" }
 fluvio-protocol = { path = "../fluvio-protocol", features=["record","api"] }
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["subscriber"] }
 fluvio-smartengine = { path = "../fluvio-smartengine", features = ["transformation"] }
 fluvio-extension-common = { path = "../fluvio-extension-common", features = ["target"] }
 fluvio-smartmodule = { path = "../fluvio-smartmodule",  default-features = false }
diff --git a/release-tools/check-crate-version/Cargo.toml b/release-tools/check-crate-version/Cargo.toml
index f80dcbf865..6a61bf466e 100644
--- a/release-tools/check-crate-version/Cargo.toml
+++ b/release-tools/check-crate-version/Cargo.toml
@@ -11,7 +11,7 @@ license = "Apache-2.0"
 toml-diff = { path = "toml-diff" }
 clap = { workspace = true,features = ["derive", "env"] }
 flate2 = "1.0.24"
-reqwest = { workspace = true }
+reqwest = { workspace = true, default-features = false, features = ["json", "gzip", "rustls-tls"] }
 semver = "1.0.13"
 serde = { version = "1.0.144", features = ["serde_derive"] }
 serde_json = "1.0.85"

From d9168ab80ac2330f9a311e72a713f1eacb784295 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 19:05:09 +0300
Subject: [PATCH 04/25] add async-std to fluvio dev deps

---
 crates/fluvio/Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/fluvio/Cargo.toml b/crates/fluvio/Cargo.toml
index 4b5f9dd895..b6ba8ea979 100644
--- a/crates/fluvio/Cargo.toml
+++ b/crates/fluvio/Cargo.toml
@@ -77,6 +77,7 @@ fluvio-spu-schema = { version = "0.13.0", path = "../fluvio-spu-schema" }
 chrono = {version =  "0.4", features = ["wasmbind", "clock"]}
 
 [dev-dependencies]
+async-std = { version = "1.6.4", default-features = false }
 fluvio-future = { workspace = true, features = ["io", "fixture"] }
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]

From 2c5bdfba4b59d3d97881e1855e3e19f9774f303e Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 19:14:14 +0300
Subject: [PATCH 05/25] save

---
 Cargo.lock                           | 15 ++++++++-------
 crates/fluvio-channel-cli/Cargo.toml |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3c1f76eb44..1e04e33efc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1564,9 +1564,9 @@ checksum = "a74858bcfe44b22016cb49337d7b6f04618c58e5dbfdef61b06b8c434324a0bc"
 
 [[package]]
 name = "curve25519-dalek"
-version = "3.2.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0"
+checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
 dependencies = [
  "byteorder",
  "digest 0.9.0",
@@ -2104,6 +2104,7 @@ dependencies = [
  "async-channel",
  "async-lock",
  "async-rwlock",
+ "async-std",
  "async-trait",
  "base64 0.21.0",
  "bytes 1.4.0",
@@ -2729,7 +2730,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio-smartengine"
-version = "0.7.2"
+version = "0.7.3"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -6251,9 +6252,9 @@ dependencies = [
 
 [[package]]
 name = "subtle"
-version = "2.5.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
@@ -7818,9 +7819,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
 
 [[package]]
 name = "zeroize"
-version = "1.3.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
+checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 dependencies = [
  "zeroize_derive",
 ]
diff --git a/crates/fluvio-channel-cli/Cargo.toml b/crates/fluvio-channel-cli/Cargo.toml
index 48f88f6a3b..aeed0cb85d 100644
--- a/crates/fluvio-channel-cli/Cargo.toml
+++ b/crates/fluvio-channel-cli/Cargo.toml
@@ -30,7 +30,7 @@ anyhow = { workspace = true }
 
 fluvio-cli-common = { path = "../fluvio-cli-common" }
 fluvio-channel = { path = "../fluvio-channel" }
-fluvio-future = { workspace = true, features = ["task", "subscriber", "rust_tls"], optional = true }
+fluvio-future = { workspace = true, features = ["task", "subscriber", "native2_tls"], optional = true }
 fluvio-types = { path = "../fluvio-types", default-features = false, optional = true }
 fluvio-package-index = { path = "../fluvio-package-index" }
 

From 1293dc73a11ef73fa4873009b0f4a81025527f1f Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 19:17:07 +0300
Subject: [PATCH 06/25] save

---
 Cargo.lock                          | 14 ++++++++++++++
 crates/fluvio-auth/Cargo.toml       |  2 +-
 crates/fluvio-cli-common/Cargo.toml |  2 +-
 crates/fluvio-cli/Cargo.toml        |  4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1e04e33efc..c85bb63c70 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -335,6 +335,18 @@ dependencies = [
  "event-listener",
 ]
 
+[[package]]
+name = "async-native-tls"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe"
+dependencies = [
+ "futures-util",
+ "native-tls",
+ "thiserror",
+ "url",
+]
+
 [[package]]
 name = "async-net"
 version = "1.7.0"
@@ -2501,6 +2513,7 @@ checksum = "37174044230084d1cfd7c02f194c5ec127bb8bc17c76f0cd74e943f2fe86ec34"
 dependencies = [
  "async-fs",
  "async-io",
+ "async-native-tls",
  "async-net",
  "async-rustls",
  "async-std",
@@ -2512,6 +2525,7 @@ dependencies = [
  "futures-util",
  "log",
  "memmap",
+ "native-tls",
  "nix",
  "openssl",
  "openssl-sys",
diff --git a/crates/fluvio-auth/Cargo.toml b/crates/fluvio-auth/Cargo.toml
index 1a8bebf00d..0b31d06f73 100644
--- a/crates/fluvio-auth/Cargo.toml
+++ b/crates/fluvio-auth/Cargo.toml
@@ -22,7 +22,7 @@ tracing = { workspace = true }
 x509-parser = "0.15.0"
 
 fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata" }
-fluvio-future = { workspace = true, features = ["net", "rust_tls"] }
+fluvio-future = { workspace = true, features = ["net", "openssl_tls"] }
 fluvio-protocol = { path = "../fluvio-protocol" }
 fluvio-socket = { path = "../fluvio-socket" }
 fluvio-types = { path = "../fluvio-types" }
diff --git a/crates/fluvio-cli-common/Cargo.toml b/crates/fluvio-cli-common/Cargo.toml
index 0560334339..3155f78ff2 100644
--- a/crates/fluvio-cli-common/Cargo.toml
+++ b/crates/fluvio-cli-common/Cargo.toml
@@ -36,4 +36,4 @@ fluvio = { path = "../fluvio", default-features = false, optional = true }
 fluvio-protocol = { path = "../fluvio-protocol", optional = true }
 
 [dev-dependencies]
-fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "rust_tls", "fixture"] }
+fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "native2_tls", "fixture"] }
diff --git a/crates/fluvio-cli/Cargo.toml b/crates/fluvio-cli/Cargo.toml
index 7102a6ccfc..9f3353bc91 100644
--- a/crates/fluvio-cli/Cargo.toml
+++ b/crates/fluvio-cli/Cargo.toml
@@ -99,10 +99,10 @@ fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata", featu
 
 # Optional Fluvio dependencies
 fluvio-types = { path = "../fluvio-types", optional = true }
-fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "rust_tls"], optional = true }
+fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "native2_tls"], optional = true }
 fluvio-sc-schema = { path = "../fluvio-sc-schema", features = ["use_serde"], optional = true }
 fluvio-spu-schema = { path = "../fluvio-spu-schema", optional = true }
 
 
 [dev-dependencies]
-fluvio-future = { workspace = true }
+fluvio-future = { workspace = true, features = ["fixture"] }

From 8088145ac4dca507bd0a293b4ff07d2bcbf56ff3 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 19:20:22 +0300
Subject: [PATCH 07/25] bump versions

---
 crates/fluvio-controlplane-metadata/Cargo.toml | 2 +-
 crates/fluvio-protocol/Cargo.toml              | 2 +-
 crates/fluvio-sc-schema/Cargo.toml             | 2 +-
 crates/fluvio-socket/Cargo.toml                | 2 +-
 crates/fluvio-spu-schema/Cargo.toml            | 2 +-
 crates/fluvio-stream-dispatcher/Cargo.toml     | 2 +-
 crates/fluvio-stream-model/Cargo.toml          | 2 +-
 crates/fluvio-types/Cargo.toml                 | 2 +-
 crates/fluvio/Cargo.toml                       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/crates/fluvio-controlplane-metadata/Cargo.toml b/crates/fluvio-controlplane-metadata/Cargo.toml
index 7a8c3220c5..f419be1bd6 100644
--- a/crates/fluvio-controlplane-metadata/Cargo.toml
+++ b/crates/fluvio-controlplane-metadata/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "fluvio-controlplane-metadata"
 edition = "2021"
-version = "0.22.0"
+version = "0.22.1"
 authors = ["Fluvio Contributors <team@fluvio.io>"]
 description = "Metadata definition for Fluvio control plane"
 repository = "https://github.com/infinyon/fluvio"
diff --git a/crates/fluvio-protocol/Cargo.toml b/crates/fluvio-protocol/Cargo.toml
index 0411fe07f7..7bad985167 100644
--- a/crates/fluvio-protocol/Cargo.toml
+++ b/crates/fluvio-protocol/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "fluvio-protocol"
 edition = "2021"
-version = "0.9.1"
+version = "0.9.2"
 authors = ["Fluvio Contributors <team@fluvio.io>"]
 description = "Fluvio streaming protocol"
 repository = "https://github.com/infinyon/fluvio"
diff --git a/crates/fluvio-sc-schema/Cargo.toml b/crates/fluvio-sc-schema/Cargo.toml
index 3adf308c6f..0a6c978952 100644
--- a/crates/fluvio-sc-schema/Cargo.toml
+++ b/crates/fluvio-sc-schema/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fluvio-sc-schema"
-version = "0.18.0"
+version = "0.18.1"
 edition = "2021"
 authors = ["Fluvio Contributors <team@fluvio.io>"]
 description = "Fluvio API for SC"
diff --git a/crates/fluvio-socket/Cargo.toml b/crates/fluvio-socket/Cargo.toml
index 22aab62deb..9074c5cefd 100644
--- a/crates/fluvio-socket/Cargo.toml
+++ b/crates/fluvio-socket/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fluvio-socket"
-version = "0.14.0"
+version = "0.14.1"
 edition = "2021"
 authors = ["Fluvio Contributors <team@fluvio.io>"]
 description = "Provide TCP socket wrapper for fluvio protocol"
diff --git a/crates/fluvio-spu-schema/Cargo.toml b/crates/fluvio-spu-schema/Cargo.toml
index a11217b4fc..f500e7425f 100644
--- a/crates/fluvio-spu-schema/Cargo.toml
+++ b/crates/fluvio-spu-schema/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fluvio-spu-schema"
-version = "0.13.1"
+version = "0.13.2"
 edition = "2021"
 authors = ["Fluvio Contributors <team@fluvio.io>"]
 description = "Fluvio API for SPU"
diff --git a/crates/fluvio-stream-dispatcher/Cargo.toml b/crates/fluvio-stream-dispatcher/Cargo.toml
index 2bd7d9f1ad..49765b4f43 100644
--- a/crates/fluvio-stream-dispatcher/Cargo.toml
+++ b/crates/fluvio-stream-dispatcher/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "fluvio-stream-dispatcher"
 edition = "2021"
-version = "0.10.0"
+version = "0.10.1"
 authors = ["Fluvio Contributors <team@fluvio.io>"]
 description = "Fluvio Event Stream access"
 repository = "https://github.com/infinyon/fluvio"
diff --git a/crates/fluvio-stream-model/Cargo.toml b/crates/fluvio-stream-model/Cargo.toml
index 119c93a111..95e35184f8 100644
--- a/crates/fluvio-stream-model/Cargo.toml
+++ b/crates/fluvio-stream-model/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "fluvio-stream-model"
 edition = "2021"
-version = "0.9.0"
+version = "0.9.1"
 authors = ["Fluvio Contributors <team@fluvio.io>"]
 description = "Fluvio Event Stream Model"
 repository = "https://github.com/infinyon/fluvio"
diff --git a/crates/fluvio-types/Cargo.toml b/crates/fluvio-types/Cargo.toml
index 39672c78b4..6334d9e34f 100644
--- a/crates/fluvio-types/Cargo.toml
+++ b/crates/fluvio-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fluvio-types"
-version = "0.4.1"
+version = "0.4.2"
 authors = ["Fluvio Contributors <team@fluvio.io>"]
 edition = "2021"
 description = "Fluvio common types and objects"
diff --git a/crates/fluvio/Cargo.toml b/crates/fluvio/Cargo.toml
index b6ba8ea979..846274541e 100644
--- a/crates/fluvio/Cargo.toml
+++ b/crates/fluvio/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fluvio"
-version = "0.18.1"
+version = "0.19.0"
 edition = "2021"
 license = "Apache-2.0"
 authors = ["Fluvio Contributors <team@fluvio.io>"]

From 68cee4c5caa615e81c455f8d3a0ab8d81846d771 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 19:24:40 +0300
Subject: [PATCH 08/25] update lock

---
 Cargo.lock                                | 646 ++--------------------
 crates/fluvio-extension-common/Cargo.toml |   2 +-
 2 files changed, 48 insertions(+), 600 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5f97194631..62273d19a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -36,60 +36,6 @@ dependencies = [
  "futures 0.3.28",
 ]
 
-[[package]]
-name = "aead"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "aes"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561"
-dependencies = [
- "aes-soft",
- "aesni",
- "cipher",
-]
-
-[[package]]
-name = "aes-gcm"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da"
-dependencies = [
- "aead",
- "aes",
- "cipher",
- "ctr",
- "ghash",
- "subtle",
-]
-
-[[package]]
-name = "aes-soft"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072"
-dependencies = [
- "cipher",
- "opaque-debug",
-]
-
-[[package]]
-name = "aesni"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce"
-dependencies = [
- "cipher",
- "opaque-debug",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.3"
@@ -212,12 +158,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
 [[package]]
 name = "as-slice"
 version = "0.2.1"
@@ -236,7 +176,7 @@ dependencies = [
  "asn1-rs-derive",
  "asn1-rs-impl",
  "displaydoc",
- "nom 7.1.3",
+ "nom",
  "num-traits",
  "rusticata-macros",
  "thiserror",
@@ -303,13 +243,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "async-dup"
-version = "1.2.2"
+name = "async-compression"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c"
+checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a"
 dependencies = [
- "futures-io",
- "simple-mutex",
+ "flate2",
+ "futures-core",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
 ]
 
 [[package]]
@@ -354,22 +297,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "async-h1"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8101020758a4fc3a7c326cb42aa99e9fa77cbfb76987c128ad956406fe1f70a7"
-dependencies = [
- "async-channel",
- "async-dup",
- "async-std",
- "futures-core",
- "http-types",
- "httparse",
- "log",
- "pin-project",
-]
-
 [[package]]
 name = "async-io"
 version = "1.13.0"
@@ -457,8 +384,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93b21a03b7c21702a0110f9f8d228763a533570deb376119042dabf33c37a01a"
 dependencies = [
  "futures-io",
- "rustls 0.20.8",
- "webpki 0.22.0",
+ "rustls",
+ "webpki",
 ]
 
 [[package]]
@@ -505,19 +432,6 @@ version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
 
-[[package]]
-name = "async-tls"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d85a97c4a0ecce878efd3f945f119c78a646d8975340bca0398f9bb05c30cc52"
-dependencies = [
- "futures-core",
- "futures-io",
- "rustls 0.18.1",
- "webpki 0.21.4",
- "webpki-roots 0.20.0",
-]
-
 [[package]]
 name = "async-trait"
 version = "0.1.68"
@@ -578,24 +492,12 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base-x"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
-
 [[package]]
 name = "base16ct"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
 
-[[package]]
-name = "base64"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -1045,15 +947,6 @@ dependencies = [
  "half",
 ]
 
-[[package]]
-name = "cipher"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "clap"
 version = "3.2.23"
@@ -1202,17 +1095,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "config"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3"
-dependencies = [
- "lazy_static",
- "nom 5.1.2",
- "serde",
-]
-
 [[package]]
 name = "console"
 version = "0.15.5"
@@ -1264,12 +1146,6 @@ dependencies = [
  "tiny-keccak",
 ]
 
-[[package]]
-name = "const_fn"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
-
 [[package]]
 name = "const_format"
 version = "0.2.30"
@@ -1318,23 +1194,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "cookie"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951"
-dependencies = [
- "aes-gcm",
- "base64 0.13.1",
- "hkdf",
- "hmac 0.10.1",
- "percent-encoding",
- "rand 0.8.5",
- "sha2 0.9.9",
- "time 0.2.27",
- "version_check",
-]
-
 [[package]]
 name = "core-foundation"
 version = "0.9.3"
@@ -1369,12 +1228,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "cpuid-bool"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
-
 [[package]]
 name = "cranelift-bforest"
 version = "0.94.0"
@@ -1594,16 +1447,6 @@ dependencies = [
  "scopeguard",
 ]
 
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.15"
@@ -1683,16 +1526,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "ctor"
 version = "0.1.26"
@@ -1713,15 +1546,6 @@ dependencies = [
  "syn 2.0.15",
 ]
 
-[[package]]
-name = "ctr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f"
-dependencies = [
- "cipher",
-]
-
 [[package]]
 name = "ctrlc"
 version = "3.2.5"
@@ -1869,39 +1693,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "dashmap"
-version = "5.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
-dependencies = [
- "cfg-if",
- "hashbrown 0.12.3",
- "lock_api",
- "once_cell",
- "parking_lot_core 0.9.7",
-]
-
 [[package]]
 name = "data-encoding"
 version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
 
-[[package]]
-name = "deadpool"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d126179d86aee4556e54f5f3c6bf6d9884e7cc52cef82f77ee6f90a7747616d"
-dependencies = [
- "async-trait",
- "config",
- "crossbeam-queue",
- "num_cpus",
- "serde",
- "tokio",
-]
-
 [[package]]
 name = "der"
 version = "0.6.1"
@@ -1921,7 +1718,7 @@ checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
 dependencies = [
  "asn1-rs",
  "displaydoc",
- "nom 7.1.3",
+ "nom",
  "num-bigint",
  "num-traits",
  "rusticata-macros",
@@ -2073,12 +1870,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "discard"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
-
 [[package]]
 name = "displaydoc"
 version = "0.2.3"
@@ -2382,7 +2173,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio"
-version = "0.18.1"
+version = "0.19.0"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -2506,6 +2297,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "async-net",
+ "async-std",
  "async-trait",
  "atty",
  "bytesize",
@@ -2547,6 +2339,7 @@ dependencies = [
  "k8-client",
  "k8-config",
  "k8-types",
+ "reqwest",
  "semver 1.0.17",
  "serde",
  "serde_json",
@@ -2736,7 +2529,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio-controlplane-metadata"
-version = "0.22.0"
+version = "0.22.1"
 dependencies = [
  "async-trait",
  "base64 0.21.0",
@@ -2842,6 +2635,7 @@ dependencies = [
 name = "fluvio-hub-util"
 version = "0.0.0"
 dependencies = [
+ "async-std",
  "cargo_toml",
  "const_format",
  "dirs 5.0.0",
@@ -2851,17 +2645,16 @@ dependencies = [
  "fluvio-hub-protocol",
  "fluvio-types",
  "hex",
- "http-client",
  "pathdiff",
  "pem",
  "rand 0.8.5",
  "rand_core 0.6.4",
+ "reqwest",
  "serde",
  "serde_json",
  "serde_yaml 0.8.26",
  "sha2 0.10.6",
  "ssh-key",
- "surf",
  "tar",
  "tempfile",
  "thiserror",
@@ -2887,7 +2680,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio-protocol"
-version = "0.9.1"
+version = "0.9.2"
 dependencies = [
  "bytes 1.4.0",
  "content_inspector",
@@ -2980,7 +2773,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio-sc-schema"
-version = "0.18.0"
+version = "0.18.1"
 dependencies = [
  "fluvio-controlplane-metadata",
  "fluvio-future",
@@ -3056,7 +2849,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio-socket"
-version = "0.14.0"
+version = "0.14.1"
 dependencies = [
  "async-channel",
  "async-lock",
@@ -3129,7 +2922,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio-spu-schema"
-version = "0.13.1"
+version = "0.13.2"
 dependencies = [
  "bytes 1.4.0",
  "educe",
@@ -3180,7 +2973,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio-stream-dispatcher"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "async-channel",
  "async-rwlock",
@@ -3201,7 +2994,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio-stream-model"
-version = "0.9.0"
+version = "0.9.1"
 dependencies = [
  "async-rwlock",
  "async-std",
@@ -3335,7 +3128,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio-types"
-version = "0.4.1"
+version = "0.4.2"
 dependencies = [
  "event-listener",
  "fluvio-future",
@@ -3636,16 +3429,6 @@ dependencies = [
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
-[[package]]
-name = "ghash"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375"
-dependencies = [
- "opaque-debug",
- "polyval",
-]
-
 [[package]]
 name = "ghost"
 version = "0.1.9"
@@ -3693,7 +3476,7 @@ dependencies = [
  "btoi",
  "gix-date",
  "itoa",
- "nom 7.1.3",
+ "nom",
  "thiserror",
 ]
 
@@ -3712,7 +3495,7 @@ dependencies = [
  "gix-sec",
  "log",
  "memchr",
- "nom 7.1.3",
+ "nom",
  "once_cell",
  "smallvec",
  "thiserror",
@@ -3801,7 +3584,7 @@ dependencies = [
  "gix-validate",
  "hex",
  "itoa",
- "nom 7.1.3",
+ "nom",
  "smallvec",
  "thiserror",
 ]
@@ -3831,7 +3614,7 @@ dependencies = [
  "gix-tempfile",
  "gix-validate",
  "memmap2",
- "nom 7.1.3",
+ "nom",
  "thiserror",
 ]
 
@@ -3976,7 +3759,7 @@ dependencies = [
  "byteorder",
  "crossbeam-channel",
  "flate2",
- "nom 7.1.3",
+ "nom",
  "num-traits",
 ]
 
@@ -4016,26 +3799,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "hkdf"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f"
-dependencies = [
- "digest 0.9.0",
- "hmac 0.10.1",
-]
-
-[[package]]
-name = "hmac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
-dependencies = [
- "crypto-mac",
- "digest 0.9.0",
-]
-
 [[package]]
 name = "hmac"
 version = "0.12.1"
@@ -4082,47 +3845,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "http-client"
-version = "6.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1947510dc91e2bf586ea5ffb412caad7673264e14bb39fb9078da114a94ce1a5"
-dependencies = [
- "async-h1",
- "async-std",
- "async-tls",
- "async-trait",
- "cfg-if",
- "dashmap",
- "deadpool",
- "futures 0.3.28",
- "http-types",
- "log",
- "rustls 0.18.1",
-]
-
-[[package]]
-name = "http-types"
-version = "2.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad"
-dependencies = [
- "anyhow",
- "async-channel",
- "async-std",
- "base64 0.13.1",
- "cookie",
- "futures-lite",
- "infer",
- "pin-project-lite",
- "rand 0.7.3",
- "serde",
- "serde_json",
- "serde_qs 0.8.5",
- "serde_urlencoded",
- "url",
-]
-
 [[package]]
 name = "httparse"
 version = "1.8.0"
@@ -4183,7 +3905,7 @@ checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
 dependencies = [
  "http",
  "hyper",
- "rustls 0.20.8",
+ "rustls",
  "tokio",
  "tokio-rustls",
 ]
@@ -4312,12 +4034,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "infer"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
-
 [[package]]
 name = "inflections"
 version = "1.1.1"
@@ -4508,7 +4224,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "serde_qs 0.10.1",
+ "serde_qs",
  "tokio",
  "tracing",
 ]
@@ -4628,19 +4344,6 @@ dependencies = [
  "semver 1.0.17",
 ]
 
-[[package]]
-name = "lexical-core"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
-dependencies = [
- "arrayvec",
- "bitflags",
- "cfg-if",
- "ryu",
- "static_assertions",
-]
-
 [[package]]
 name = "lib-cargo-crate"
 version = "0.1.8"
@@ -4938,16 +4641,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "mime_guess"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime",
- "unicase",
-]
-
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -5045,17 +4738,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "nom"
-version = "5.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
-dependencies = [
- "lexical-core",
- "memchr",
- "version_check",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -5632,17 +5314,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "polyval"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd"
-dependencies = [
- "cpuid-bool",
- "opaque-debug",
- "universal-hash",
-]
-
 [[package]]
 name = "portable-atomic"
 version = "0.3.19"
@@ -6018,6 +5689,7 @@ version = "0.11.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
 dependencies = [
+ "async-compression",
  "base64 0.21.0",
  "bytes 1.4.0",
  "encoding_rs",
@@ -6037,7 +5709,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.20.8",
+ "rustls",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -6045,12 +5717,13 @@ dependencies = [
  "tokio",
  "tokio-native-tls",
  "tokio-rustls",
+ "tokio-util",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots 0.22.6",
+ "webpki-roots",
  "winreg",
 ]
 
@@ -6061,7 +5734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
 dependencies = [
  "crypto-bigint",
- "hmac 0.12.1",
+ "hmac",
  "zeroize",
 ]
 
@@ -6133,15 +5806,6 @@ version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
 [[package]]
 name = "rustc_version"
 version = "0.3.3"
@@ -6166,7 +5830,7 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
 dependencies = [
- "nom 7.1.3",
+ "nom",
 ]
 
 [[package]]
@@ -6199,19 +5863,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
-dependencies = [
- "base64 0.12.3",
- "log",
- "ring",
- "sct 0.6.1",
- "webpki 0.21.4",
-]
-
 [[package]]
 name = "rustls"
 version = "0.20.8"
@@ -6220,8 +5871,8 @@ checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
 dependencies = [
  "log",
  "ring",
- "sct 0.7.0",
- "webpki 0.22.0",
+ "sct",
+ "webpki",
 ]
 
 [[package]]
@@ -6300,16 +5951,6 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
 
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "sct"
 version = "0.7.0"
@@ -6357,22 +5998,13 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser 0.7.0",
-]
-
 [[package]]
 name = "semver"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
 dependencies = [
- "semver-parser 0.10.2",
+ "semver-parser",
 ]
 
 [[package]]
@@ -6384,12 +6016,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
 [[package]]
 name = "semver-parser"
 version = "0.10.2"
@@ -6460,17 +6086,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_qs"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6"
-dependencies = [
- "percent-encoding",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "serde_qs"
 version = "0.10.1"
@@ -6540,15 +6155,6 @@ dependencies = [
  "unsafe-libyaml",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
-dependencies = [
- "sha1_smol",
-]
-
 [[package]]
 name = "sha1_smol"
 version = "1.0.0"
@@ -6666,15 +6272,6 @@ dependencies = [
  "wide",
 ]
 
-[[package]]
-name = "simple-mutex"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6"
-dependencies = [
- "event-listener",
-]
-
 [[package]]
 name = "sink-test-connector"
 version = "0.0.0"
@@ -6844,15 +6441,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
-[[package]]
-name = "standback"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
-dependencies = [
- "version_check",
-]
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -6872,55 +6460,6 @@ dependencies = [
  "rand 0.8.5",
 ]
 
-[[package]]
-name = "stdweb"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
-dependencies = [
- "discard",
- "rustc_version 0.2.3",
- "stdweb-derive",
- "stdweb-internal-macros",
- "stdweb-internal-runtime",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "stdweb-derive"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "stdweb-internal-macros"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
-dependencies = [
- "base-x",
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "serde_json",
- "sha1",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "stdweb-internal-runtime"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -6952,30 +6491,6 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
-[[package]]
-name = "surf"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718b1ae6b50351982dedff021db0def601677f2120938b070eadb10ba4038dd7"
-dependencies = [
- "async-std",
- "async-trait",
- "cfg-if",
- "encoding_rs",
- "futures-util",
- "getrandom 0.2.9",
- "http-client",
- "http-types",
- "log",
- "mime_guess",
- "once_cell",
- "pin-project-lite",
- "rustls 0.18.1",
- "serde",
- "serde_json",
- "web-sys",
-]
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -7143,21 +6658,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "time"
-version = "0.2.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
-dependencies = [
- "const_fn",
- "libc",
- "standback",
- "stdweb",
- "time-macros 0.1.1",
- "version_check",
- "winapi",
-]
-
 [[package]]
 name = "time"
 version = "0.3.20"
@@ -7169,7 +6669,7 @@ dependencies = [
  "num_threads",
  "serde",
  "time-core",
- "time-macros 0.2.8",
+ "time-macros",
 ]
 
 [[package]]
@@ -7178,16 +6678,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
 
-[[package]]
-name = "time-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
-dependencies = [
- "proc-macro-hack",
- "time-macros-impl",
-]
-
 [[package]]
 name = "time-macros"
 version = "0.2.8"
@@ -7197,19 +6687,6 @@ dependencies = [
  "time-core",
 ]
 
-[[package]]
-name = "time-macros-impl"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "standback",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -7299,9 +6776,9 @@ version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
 dependencies = [
- "rustls 0.20.8",
+ "rustls",
  "tokio",
- "webpki 0.22.0",
+ "webpki",
 ]
 
 [[package]]
@@ -7583,16 +7060,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
-[[package]]
-name = "universal-hash"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "unsafe-libyaml"
 version = "0.2.8"
@@ -8167,16 +7634,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "webpki"
 version = "0.22.0"
@@ -8187,22 +7644,13 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
-dependencies = [
- "webpki 0.21.4",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
 dependencies = [
- "webpki 0.22.0",
+ "webpki",
 ]
 
 [[package]]
@@ -8556,7 +8004,7 @@ dependencies = [
  "data-encoding",
  "der-parser",
  "lazy_static",
- "nom 7.1.3",
+ "nom",
  "oid-registry",
  "rusticata-macros",
  "thiserror",
@@ -8573,7 +8021,7 @@ dependencies = [
  "data-encoding",
  "der-parser",
  "lazy_static",
- "nom 7.1.3",
+ "nom",
  "oid-registry",
  "rusticata-macros",
  "thiserror",
diff --git a/crates/fluvio-extension-common/Cargo.toml b/crates/fluvio-extension-common/Cargo.toml
index 92ccb720f2..3349fdd72d 100644
--- a/crates/fluvio-extension-common/Cargo.toml
+++ b/crates/fluvio-extension-common/Cargo.toml
@@ -27,5 +27,5 @@ thiserror = "1.0.20"
 semver = { version = "1.0.0", features = ["serde"] }
 anyhow = { workspace = true}
 
-fluvio = { version = "0.18", path = "../fluvio", optional = true }
+fluvio = { version = "0.19", path = "../fluvio", optional = true }
 fluvio-package-index = { version = "0.7.0", path = "../fluvio-package-index" }

From c400386fa18bf4ac0a4dbc0487c6118272f8c905 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 19:29:14 +0300
Subject: [PATCH 09/25] bump fluvio-extension-common version

---
 crates/fluvio-extension-common/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/fluvio-extension-common/Cargo.toml b/crates/fluvio-extension-common/Cargo.toml
index 3349fdd72d..5185dad16a 100644
--- a/crates/fluvio-extension-common/Cargo.toml
+++ b/crates/fluvio-extension-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fluvio-extension-common"
-version = "0.12.0"
+version = "0.12.1"
 edition = "2021"
 authors = ["Fluvio Contributors <team@fluvio.io>"]
 description = "Fluvio extension common"

From 7e6170061fd79e74b2fae6850fb34aa5af87a9c0 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 19:42:20 +0300
Subject: [PATCH 10/25] save

---
 Cargo.lock                      | 15 +--------------
 crates/fluvio-socket/Cargo.toml |  2 +-
 crates/fluvio-spu/Cargo.toml    |  2 +-
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 62273d19a5..42db94be00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -377,17 +377,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "async-rustls"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93b21a03b7c21702a0110f9f8d228763a533570deb376119042dabf33c37a01a"
-dependencies = [
- "futures-io",
- "rustls",
- "webpki",
-]
-
 [[package]]
 name = "async-rwlock"
 version = "1.3.0"
@@ -2551,7 +2540,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio-extension-common"
-version = "0.12.0"
+version = "0.12.1"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2578,7 +2567,6 @@ dependencies = [
  "async-io",
  "async-native-tls",
  "async-net",
- "async-rustls",
  "async-std",
  "async-trait",
  "cfg-if",
@@ -2594,7 +2582,6 @@ dependencies = [
  "openssl-sys",
  "pin-project",
  "pin-utils",
- "rustls-pemfile",
  "thiserror",
  "tracing",
  "tracing-subscriber",
diff --git a/crates/fluvio-socket/Cargo.toml b/crates/fluvio-socket/Cargo.toml
index 9074c5cefd..3952bae69d 100644
--- a/crates/fluvio-socket/Cargo.toml
+++ b/crates/fluvio-socket/Cargo.toml
@@ -45,7 +45,7 @@ fluvio-future = { workspace = true, features = [
     "fixture",
     "fs",
     "zero_copy",
-    "rust_tls",
+    "native2_tls",
 ] }
 portpicker = "0.1.1"
 
diff --git a/crates/fluvio-spu/Cargo.toml b/crates/fluvio-spu/Cargo.toml
index 21bd592997..94f21f36e8 100644
--- a/crates/fluvio-spu/Cargo.toml
+++ b/crates/fluvio-spu/Cargo.toml
@@ -65,7 +65,7 @@ flv-tls-proxy = { version = "0.6.0" }
 flv-util = { version = "0.5.0" }
 fluvio-future = { workspace = true, features = [
     "subscriber",
-    "rust_tls",
+    "openssl_tls",
     "zero_copy",
 ] }
 fluvio-smartengine = { path = "../fluvio-smartengine"}

From 4b4684f0b89e8951e718401c7b5a9a1b6cff0103 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 19:59:02 +0300
Subject: [PATCH 11/25] save

---
 Cargo.lock                                    | 6 +++---
 crates/smartmodule-development-kit/Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 42db94be00..8d5888f480 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4424,9 +4424,9 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
+checksum = "3f508063cc7bb32987c71511216bd5a32be15bccb6a80b52df8b9d7f01fc3aa2"
 
 [[package]]
 name = "liquid"
@@ -5845,7 +5845,7 @@ dependencies = [
  "io-lifetimes",
  "itoa",
  "libc",
- "linux-raw-sys 0.3.1",
+ "linux-raw-sys 0.3.2",
  "once_cell",
  "windows-sys 0.48.0",
 ]
diff --git a/crates/smartmodule-development-kit/Cargo.toml b/crates/smartmodule-development-kit/Cargo.toml
index 8ca7b300a1..88583bef92 100644
--- a/crates/smartmodule-development-kit/Cargo.toml
+++ b/crates/smartmodule-development-kit/Cargo.toml
@@ -31,7 +31,7 @@ lib-cargo-crate = "0.1.6"
 fluvio = { path = "../fluvio", default-features = false }
 fluvio-hub-util = { path = "../fluvio-hub-util" }
 fluvio-protocol = { path = "../fluvio-protocol", features=["record","api"] }
-fluvio-future = { workspace = true, features = ["subscriber"] }
+fluvio-future = { workspace = true, features = ["subscriber", "openssl_tls"] }
 fluvio-smartengine = { path = "../fluvio-smartengine", features = ["transformation"] }
 fluvio-extension-common = { path = "../fluvio-extension-common", features = ["target"] }
 fluvio-smartmodule = { path = "../fluvio-smartmodule",  default-features = false }

From 91ba07c6c2987f526c4e1fb5778533714cb8390d Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 20:06:42 +0300
Subject: [PATCH 12/25] save

---
 crates/smartmodule-development-kit/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/smartmodule-development-kit/Cargo.toml b/crates/smartmodule-development-kit/Cargo.toml
index 88583bef92..8ca7b300a1 100644
--- a/crates/smartmodule-development-kit/Cargo.toml
+++ b/crates/smartmodule-development-kit/Cargo.toml
@@ -31,7 +31,7 @@ lib-cargo-crate = "0.1.6"
 fluvio = { path = "../fluvio", default-features = false }
 fluvio-hub-util = { path = "../fluvio-hub-util" }
 fluvio-protocol = { path = "../fluvio-protocol", features=["record","api"] }
-fluvio-future = { workspace = true, features = ["subscriber", "openssl_tls"] }
+fluvio-future = { workspace = true, features = ["subscriber"] }
 fluvio-smartengine = { path = "../fluvio-smartengine", features = ["transformation"] }
 fluvio-extension-common = { path = "../fluvio-extension-common", features = ["target"] }
 fluvio-smartmodule = { path = "../fluvio-smartmodule",  default-features = false }

From 6725c4659356cbaa8ebfb38802cbb7f78caa3d6a Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 20:15:14 +0300
Subject: [PATCH 13/25] save

---
 crates/fluvio-extension-common/Cargo.toml | 4 ++--
 crates/fluvio/Cargo.toml                  | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/crates/fluvio-extension-common/Cargo.toml b/crates/fluvio-extension-common/Cargo.toml
index 5185dad16a..92ccb720f2 100644
--- a/crates/fluvio-extension-common/Cargo.toml
+++ b/crates/fluvio-extension-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fluvio-extension-common"
-version = "0.12.1"
+version = "0.12.0"
 edition = "2021"
 authors = ["Fluvio Contributors <team@fluvio.io>"]
 description = "Fluvio extension common"
@@ -27,5 +27,5 @@ thiserror = "1.0.20"
 semver = { version = "1.0.0", features = ["serde"] }
 anyhow = { workspace = true}
 
-fluvio = { version = "0.19", path = "../fluvio", optional = true }
+fluvio = { version = "0.18", path = "../fluvio", optional = true }
 fluvio-package-index = { version = "0.7.0", path = "../fluvio-package-index" }
diff --git a/crates/fluvio/Cargo.toml b/crates/fluvio/Cargo.toml
index 846274541e..f13649add6 100644
--- a/crates/fluvio/Cargo.toml
+++ b/crates/fluvio/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fluvio"
-version = "0.19.0"
+version = "0.18.1"
 edition = "2021"
 license = "Apache-2.0"
 authors = ["Fluvio Contributors <team@fluvio.io>"]
@@ -14,8 +14,11 @@ name = "fluvio"
 path = "src/lib.rs"
 
 [features]
+default = ["rustls"]
 admin = ["fluvio-sc-schema/use_serde"]
 smartengine = ["fluvio-smartengine"]
+openssl = ["fluvio-future/openssl_tls"]
+rustls = ["fluvio-future/rust_tls"]
 unstable = []
 
 [dependencies]

From 3436736e2cad392e239596906102bf14f4a0ab58 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 20:15:32 +0300
Subject: [PATCH 14/25] update lock

---
 Cargo.lock | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8d5888f480..026bced2e1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -377,6 +377,17 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "async-rustls"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93b21a03b7c21702a0110f9f8d228763a533570deb376119042dabf33c37a01a"
+dependencies = [
+ "futures-io",
+ "rustls",
+ "webpki",
+]
+
 [[package]]
 name = "async-rwlock"
 version = "1.3.0"
@@ -2162,7 +2173,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio"
-version = "0.19.0"
+version = "0.18.1"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -2540,7 +2551,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio-extension-common"
-version = "0.12.1"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2567,6 +2578,7 @@ dependencies = [
  "async-io",
  "async-native-tls",
  "async-net",
+ "async-rustls",
  "async-std",
  "async-trait",
  "cfg-if",
@@ -2582,6 +2594,7 @@ dependencies = [
  "openssl-sys",
  "pin-project",
  "pin-utils",
+ "rustls-pemfile",
  "thiserror",
  "tracing",
  "tracing-subscriber",

From e9d9c5e08574ab5bfcb3fcafd7e453583d373228 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 20:18:17 +0300
Subject: [PATCH 15/25] bump fluvio ver

---
 crates/fluvio/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/fluvio/Cargo.toml b/crates/fluvio/Cargo.toml
index f13649add6..ad065209ef 100644
--- a/crates/fluvio/Cargo.toml
+++ b/crates/fluvio/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fluvio"
-version = "0.18.1"
+version = "0.18.2"
 edition = "2021"
 license = "Apache-2.0"
 authors = ["Fluvio Contributors <team@fluvio.io>"]

From fb3dcf3971ad3cc75285898ae3f2b0deb6e643f5 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 20:30:35 +0300
Subject: [PATCH 16/25] remove default-features from reqwest

---
 Cargo.lock | 28 +---------------------------
 Cargo.toml |  2 +-
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 026bced2e1..a109c7af33 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2173,7 +2173,7 @@ dependencies = [
 
 [[package]]
 name = "fluvio"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -3910,19 +3910,6 @@ dependencies = [
  "tokio-rustls",
 ]
 
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes 1.4.0",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
 [[package]]
 name = "iana-time-zone"
 version = "0.1.56"
@@ -5700,12 +5687,10 @@ dependencies = [
  "http-body",
  "hyper",
  "hyper-rustls",
- "hyper-tls",
  "ipnet",
  "js-sys",
  "log",
  "mime",
- "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
@@ -5715,7 +5700,6 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "tokio",
- "tokio-native-tls",
  "tokio-rustls",
  "tokio-util",
  "tower-service",
@@ -6760,16 +6744,6 @@ dependencies = [
  "syn 2.0.15",
 ]
 
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.23.4"
diff --git a/Cargo.toml b/Cargo.toml
index d82a93982a..f06f7a34a7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -97,7 +97,7 @@ colored = "2.0.0"
 semver = "1.0.3"
 url = "2.1.1"
 which = "4.1.0"
-reqwest = "0.11"
+reqwest = { version = "0.11", default-features = false }
 
 # fluvio dep
 k8-client = { version = "10.0.0" }

From 8fb6d4b7b88eae0e0e30c78b1ddd4408ebd8c60b Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 20:35:09 +0300
Subject: [PATCH 17/25] don't use fluvio-futures from workspace

---
 Cargo.toml                                     | 1 -
 crates/cdk/Cargo.toml                          | 2 +-
 crates/fluvio-auth/Cargo.toml                  | 2 +-
 crates/fluvio-benchmark/Cargo.toml             | 2 +-
 crates/fluvio-channel-cli/Cargo.toml           | 2 +-
 crates/fluvio-cli-common/Cargo.toml            | 2 +-
 crates/fluvio-cli/Cargo.toml                   | 4 ++--
 crates/fluvio-cluster/Cargo.toml               | 4 ++--
 crates/fluvio-connector-common/Cargo.toml      | 2 +-
 crates/fluvio-controlplane-metadata/Cargo.toml | 4 ++--
 crates/fluvio-hub-util/Cargo.toml              | 2 +-
 crates/fluvio-protocol/Cargo.toml              | 4 ++--
 crates/fluvio-run/Cargo.toml                   | 2 +-
 crates/fluvio-sc-schema/Cargo.toml             | 2 +-
 crates/fluvio-sc/Cargo.toml                    | 4 ++--
 crates/fluvio-service/Cargo.toml               | 4 ++--
 crates/fluvio-smartengine/Cargo.toml           | 2 +-
 crates/fluvio-socket/Cargo.toml                | 4 ++--
 crates/fluvio-spu-schema/Cargo.toml            | 4 ++--
 crates/fluvio-spu/Cargo.toml                   | 4 ++--
 crates/fluvio-storage/Cargo.toml               | 4 ++--
 crates/fluvio-stream-dispatcher/Cargo.toml     | 4 ++--
 crates/fluvio-stream-model/Cargo.toml          | 2 +-
 crates/fluvio-test-derive/Cargo.toml           | 2 +-
 crates/fluvio-test-util/Cargo.toml             | 2 +-
 crates/fluvio-test/Cargo.toml                  | 2 +-
 crates/fluvio-types/Cargo.toml                 | 2 +-
 crates/fluvio/Cargo.toml                       | 4 ++--
 crates/smartmodule-development-kit/Cargo.toml  | 2 +-
 29 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f06f7a34a7..f39133ac06 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,7 +104,6 @@ k8-client = { version = "10.0.0" }
 k8-types = { version = "0.8.0" }
 k8-config = { version = "2.0.0"}
 k8-metadata-client = { version = "5.1.0" }
-fluvio-future = { version =  "0.4.0" }
 flv-util = { version = "0.5.0" }
 fluvio-helm = { version = "0.4.1"}
 fluvio-command = { version = "0.2.0"}
diff --git a/crates/cdk/Cargo.toml b/crates/cdk/Cargo.toml
index 81a6d74fe4..f2668e9688 100644
--- a/crates/cdk/Cargo.toml
+++ b/crates/cdk/Cargo.toml
@@ -35,5 +35,5 @@ current_platform = { version = "0.2" }
 fluvio = { path = "../fluvio"}
 fluvio-connector-deployer = { path = "../fluvio-connector-deployer"}
 fluvio-connector-package = { path = "../fluvio-connector-package", features = ["toml"]}
-fluvio-future = { workspace = true, features = ["subscriber"]}
+fluvio-future = { version = "0.4", features = ["subscriber"]}
 fluvio-hub-util = { path = "../fluvio-hub-util" }
diff --git a/crates/fluvio-auth/Cargo.toml b/crates/fluvio-auth/Cargo.toml
index 0b31d06f73..97ced5d987 100644
--- a/crates/fluvio-auth/Cargo.toml
+++ b/crates/fluvio-auth/Cargo.toml
@@ -22,7 +22,7 @@ tracing = { workspace = true }
 x509-parser = "0.15.0"
 
 fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata" }
-fluvio-future = { workspace = true, features = ["net", "openssl_tls"] }
+fluvio-future = { version = "0.4", features = ["net", "openssl_tls"] }
 fluvio-protocol = { path = "../fluvio-protocol" }
 fluvio-socket = { path = "../fluvio-socket" }
 fluvio-types = { path = "../fluvio-types" }
diff --git a/crates/fluvio-benchmark/Cargo.toml b/crates/fluvio-benchmark/Cargo.toml
index b3d448a8a4..e6dbc129fa 100644
--- a/crates/fluvio-benchmark/Cargo.toml
+++ b/crates/fluvio-benchmark/Cargo.toml
@@ -27,7 +27,7 @@ anyhow = { workspace = true }
 
 fluvio = { path = "../fluvio" }
 fluvio-cli-common = { path = "../fluvio-cli-common"}
-fluvio-future = { workspace = true, features = [
+fluvio-future = { version = "0.4", features = [
     'task',
     'future',
     'sync',
diff --git a/crates/fluvio-channel-cli/Cargo.toml b/crates/fluvio-channel-cli/Cargo.toml
index aeed0cb85d..7d43181dbf 100644
--- a/crates/fluvio-channel-cli/Cargo.toml
+++ b/crates/fluvio-channel-cli/Cargo.toml
@@ -30,7 +30,7 @@ anyhow = { workspace = true }
 
 fluvio-cli-common = { path = "../fluvio-cli-common" }
 fluvio-channel = { path = "../fluvio-channel" }
-fluvio-future = { workspace = true, features = ["task", "subscriber", "native2_tls"], optional = true }
+fluvio-future = { version = "0.4", features = ["task", "subscriber", "native2_tls"], optional = true }
 fluvio-types = { path = "../fluvio-types", default-features = false, optional = true }
 fluvio-package-index = { path = "../fluvio-package-index" }
 
diff --git a/crates/fluvio-cli-common/Cargo.toml b/crates/fluvio-cli-common/Cargo.toml
index 3155f78ff2..d7e80b3a76 100644
--- a/crates/fluvio-cli-common/Cargo.toml
+++ b/crates/fluvio-cli-common/Cargo.toml
@@ -36,4 +36,4 @@ fluvio = { path = "../fluvio", default-features = false, optional = true }
 fluvio-protocol = { path = "../fluvio-protocol", optional = true }
 
 [dev-dependencies]
-fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "native2_tls", "fixture"] }
+fluvio-future = { version = "0.4", features = ["fs", "io", "subscriber", "native2_tls", "fixture"] }
diff --git a/crates/fluvio-cli/Cargo.toml b/crates/fluvio-cli/Cargo.toml
index 9f3353bc91..786c5a29c9 100644
--- a/crates/fluvio-cli/Cargo.toml
+++ b/crates/fluvio-cli/Cargo.toml
@@ -99,10 +99,10 @@ fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata", featu
 
 # Optional Fluvio dependencies
 fluvio-types = { path = "../fluvio-types", optional = true }
-fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "native2_tls"], optional = true }
+fluvio-future = { version = "0.4", features = ["fs", "io", "subscriber", "native2_tls"], optional = true }
 fluvio-sc-schema = { path = "../fluvio-sc-schema", features = ["use_serde"], optional = true }
 fluvio-spu-schema = { path = "../fluvio-spu-schema", optional = true }
 
 
 [dev-dependencies]
-fluvio-future = { workspace = true, features = ["fixture"] }
+fluvio-future = { version = "0.4", features = ["fixture"] }
diff --git a/crates/fluvio-cluster/Cargo.toml b/crates/fluvio-cluster/Cargo.toml
index 54b40b0858..79342ca870 100644
--- a/crates/fluvio-cluster/Cargo.toml
+++ b/crates/fluvio-cluster/Cargo.toml
@@ -69,7 +69,7 @@ k8-client = { workspace = true }
 k8-metadata-client = { workspace = true }
 k8-types = { workspace = true, features = ["app"] }
 fluvio-command = { workspace = true }
-fluvio-future = { workspace = true }
+fluvio-future = { version = "0.4" }
 
 fluvio = { path = "../fluvio", default-features = false }
 fluvio-extension-common = { path = "../fluvio-extension-common", optional = true }
@@ -81,4 +81,4 @@ fluvio-types = { path = "../fluvio-types" }
 fluvio-channel = { path = "../fluvio-channel" }
 
 [dev-dependencies]
-fluvio-future = { workspace = true, features = ["task", "fixture"] }
+fluvio-future = { version = "0.4", features = ["task", "fixture"] }
diff --git a/crates/fluvio-connector-common/Cargo.toml b/crates/fluvio-connector-common/Cargo.toml
index 2c2380f2c8..9b6709135b 100644
--- a/crates/fluvio-connector-common/Cargo.toml
+++ b/crates/fluvio-connector-common/Cargo.toml
@@ -14,7 +14,7 @@ derive = ["fluvio-connector-derive"]
 [dependencies]
 anyhow = { workspace = true }
 tracing = { workspace = true }
-fluvio-future = { workspace = true, features = ["subscriber"] }
+fluvio-future = { version = "0.4", features = ["subscriber"] }
 futures = { version = "0.3", default-features = false }
 async-trait = { version = "0.1", default-features = false}
 async-net = { version = "1.7", default-features = false }
diff --git a/crates/fluvio-controlplane-metadata/Cargo.toml b/crates/fluvio-controlplane-metadata/Cargo.toml
index f419be1bd6..67639ab16a 100644
--- a/crates/fluvio-controlplane-metadata/Cargo.toml
+++ b/crates/fluvio-controlplane-metadata/Cargo.toml
@@ -29,7 +29,7 @@ toml = { workspace = true, optional = true }
 lenient_semver = "0.4.2"
 
 # External Fluvio dependencies
-fluvio-future = { workspace = true }
+fluvio-future = { version = "0.4" }
 flv-util = { workspace = true }
 
 fluvio-types = { version = "0.4.0", path = "../fluvio-types" }
@@ -41,4 +41,4 @@ fluvio-protocol = { path = "../fluvio-protocol", version = "0.9", features = [
 
 [dev-dependencies]
 serde_yaml = "0.9.4"
-fluvio-future = { workspace = true, features = ["fixture"] }
+fluvio-future = { version = "0.4", features = ["fixture"] }
diff --git a/crates/fluvio-hub-util/Cargo.toml b/crates/fluvio-hub-util/Cargo.toml
index 7a51582da3..eb96cfdf00 100644
--- a/crates/fluvio-hub-util/Cargo.toml
+++ b/crates/fluvio-hub-util/Cargo.toml
@@ -34,7 +34,7 @@ reqwest = { workspace = true, default-features = false, features = ["json", "gzi
 # added to make sure reqwest works
 async-std = { version = "1.6.4", default-features = false, features = ["tokio1"] }
 
-fluvio-future = { workspace = true, features = ["task"] }
+fluvio-future = { version = "0.4", features = ["task"] }
 fluvio-hub-protocol = { path = "../fluvio-hub-protocol" }
 fluvio-types = { path = "../fluvio-types" }
 
diff --git a/crates/fluvio-protocol/Cargo.toml b/crates/fluvio-protocol/Cargo.toml
index 7bad985167..a776238411 100644
--- a/crates/fluvio-protocol/Cargo.toml
+++ b/crates/fluvio-protocol/Cargo.toml
@@ -42,7 +42,7 @@ derive_builder = { version = "0.12.0" , optional = true }
 eyre = { version = "0.6", default-features = false, optional = true }
 
 fluvio-protocol-derive = { version = "0.5.0", path = "../fluvio-protocol-derive", optional = true }
-fluvio-future = { workspace = true, optional = true }
+fluvio-future = { version = "0.4", optional = true }
 flv-util = { version = "0.5.0", optional = true }
 fluvio-compression = { version = "0.2", path = "../fluvio-compression", optional = true}
 fluvio-types = { version = "0.4.0", path = "../fluvio-types", optional = true }
@@ -51,7 +51,7 @@ fluvio-types = { version = "0.4.0", path = "../fluvio-types", optional = true }
 criterion = "0.4.0"
 trybuild = "1.0.64"
 fluvio-protocol = { path = ".", features = ["derive", "api"] }
-fluvio-future = { workspace = true, features = [
+fluvio-future = { version = "0.4", features = [
     "fixture",
     "subscriber",
     "timer",
diff --git a/crates/fluvio-run/Cargo.toml b/crates/fluvio-run/Cargo.toml
index 8ae0ef427f..4eb793f506 100644
--- a/crates/fluvio-run/Cargo.toml
+++ b/crates/fluvio-run/Cargo.toml
@@ -28,7 +28,7 @@ thiserror = "1.0.20"
 semver = "1.0.0"
 serde_json = "1.0.64"
 
-fluvio-future = { workspace = true, features = ["subscriber"] }
+fluvio-future = { version = "0.4", features = ["subscriber"] }
 fluvio-sc = { path = "../fluvio-sc" }
 fluvio-spu = { path = "../fluvio-spu" }
 fluvio-extension-common = { path = "../fluvio-extension-common" }
diff --git a/crates/fluvio-sc-schema/Cargo.toml b/crates/fluvio-sc-schema/Cargo.toml
index 0a6c978952..87be85f969 100644
--- a/crates/fluvio-sc-schema/Cargo.toml
+++ b/crates/fluvio-sc-schema/Cargo.toml
@@ -29,4 +29,4 @@ fluvio-protocol = { path = "../fluvio-protocol", version = "0.9.0", features = [
 fluvio-socket = { path = "../fluvio-socket", version = "0.14.0"}
 
 [dev-dependencies]
-fluvio-future = { workspace = true, features = ["subscriber"] }
+fluvio-future = { version = "0.4", features = ["subscriber"] }
diff --git a/crates/fluvio-sc/Cargo.toml b/crates/fluvio-sc/Cargo.toml
index c8085409cb..eef8c35e25 100644
--- a/crates/fluvio-sc/Cargo.toml
+++ b/crates/fluvio-sc/Cargo.toml
@@ -44,7 +44,7 @@ anyhow = { version = "1.0.38" }
 
 # Fluvio dependencies
 fluvio-auth = { path = "../fluvio-auth" }
-fluvio-future = { workspace = true, features = [
+fluvio-future = { version = "0.4", features = [
     "subscriber",
     "openssl_tls",
     "zero_copy",
@@ -70,6 +70,6 @@ flv-tls-proxy = { version = "0.6.0" }
 
 [dev-dependencies]
 rand = "0.8.4"
-fluvio-future = { workspace = true, features = ["fixture"] }
+fluvio-future = { version = "0.4", features = ["fixture"] }
 flv-util = { version = "0.5.0", features = ["fixture"] }
 fluvio-stream-model = { path = "../fluvio-stream-model", features = ["fixture"] }
\ No newline at end of file
diff --git a/crates/fluvio-service/Cargo.toml b/crates/fluvio-service/Cargo.toml
index ccdfe1deb8..bc2eb620fb 100644
--- a/crates/fluvio-service/Cargo.toml
+++ b/crates/fluvio-service/Cargo.toml
@@ -22,11 +22,11 @@ anyhow = { workspace = true }
 
 # Fluvio dependencies
 futures-util = { version = "0.3.5" }
-fluvio-future = { workspace = true }
+fluvio-future = { version = "0.4" }
 fluvio-socket = { path = "../fluvio-socket" }
 fluvio-protocol = { path = "../fluvio-protocol", features = ["derive", "api", "codec"] }
 fluvio-types = { features = ["events"], path = "../fluvio-types" }
 
 [dev-dependencies]
-fluvio-future = { workspace = true, features = ["fixture"] }
+fluvio-future = { version = "0.4", features = ["fixture"] }
 portpicker = "0.1.1"
\ No newline at end of file
diff --git a/crates/fluvio-smartengine/Cargo.toml b/crates/fluvio-smartengine/Cargo.toml
index ea530ef259..2703e4bd50 100644
--- a/crates/fluvio-smartengine/Cargo.toml
+++ b/crates/fluvio-smartengine/Cargo.toml
@@ -31,7 +31,7 @@ serde_yaml = { version = "0.9", default-features = false, optional = true }
 cfg-if = "1.0.0"
 derive_builder = { workspace = true }
 
-fluvio-future = { workspace = true }
+fluvio-future = { version = "0.4" }
 fluvio-protocol = { path = "../fluvio-protocol", version = "0.9.0", features = [
     "record",
 ] }
diff --git a/crates/fluvio-socket/Cargo.toml b/crates/fluvio-socket/Cargo.toml
index 3952bae69d..20b7d8ebf8 100644
--- a/crates/fluvio-socket/Cargo.toml
+++ b/crates/fluvio-socket/Cargo.toml
@@ -32,7 +32,7 @@ thiserror = "1.0.20"
 semver = "1.0.0"
 
 # Fluvio dependencies
-fluvio-future = { workspace = true, features = ["net", "task", "retry"] }
+fluvio-future = { version = "0.4", features = ["net", "task", "retry"] }
 fluvio-protocol = { path = "../fluvio-protocol", version = "0.9", features = [
     "derive",
     "api",
@@ -41,7 +41,7 @@ fluvio-protocol = { path = "../fluvio-protocol", version = "0.9", features = [
 ] }
 
 [dev-dependencies]
-fluvio-future = { workspace = true, features = [
+fluvio-future = { version = "0.4", features = [
     "fixture",
     "fs",
     "zero_copy",
diff --git a/crates/fluvio-spu-schema/Cargo.toml b/crates/fluvio-spu-schema/Cargo.toml
index f500e7425f..a4dd6e6710 100644
--- a/crates/fluvio-spu-schema/Cargo.toml
+++ b/crates/fluvio-spu-schema/Cargo.toml
@@ -25,7 +25,7 @@ educe = { version = "0.4.19", features = ["Debug"] }
 flate2 = { version = "1.0.20" }
 
 fluvio-types = { version = "0.4.0", path = "../fluvio-types" }
-fluvio-future = { workspace = true, optional = true }
+fluvio-future = { version = "0.4", optional = true }
 # Fluvio dependencies
 fluvio-protocol = { path = "../fluvio-protocol", version = "0.9.0", features = [
     "api",
@@ -37,5 +37,5 @@ fluvio-smartmodule = { path = "../fluvio-smartmodule", version = "0.5.0", defaul
 [dev-dependencies]
 futures-util = { version = "0.3.4" }
 fluvio-socket = { path = "../fluvio-socket", features = ["file"] }
-fluvio-future = { workspace = true, features = ["fixture", "fs"] }
+fluvio-future = { version = "0.4", features = ["fixture", "fs"] }
 flv-util = { version = "0.5.2", features = ["fixture"] }
diff --git a/crates/fluvio-spu/Cargo.toml b/crates/fluvio-spu/Cargo.toml
index 94f21f36e8..613e57886b 100644
--- a/crates/fluvio-spu/Cargo.toml
+++ b/crates/fluvio-spu/Cargo.toml
@@ -63,7 +63,7 @@ fluvio-socket = { path = "../fluvio-socket", features = [
 fluvio-service = { path = "../fluvio-service" }
 flv-tls-proxy = { version = "0.6.0" }
 flv-util = { version = "0.5.0" }
-fluvio-future = { workspace = true, features = [
+fluvio-future = { version = "0.4", features = [
     "subscriber",
     "openssl_tls",
     "zero_copy",
@@ -79,6 +79,6 @@ flate2 = "1.0.22"
 portpicker = "0.1.1"
 
 flv-util = { version = "0.5.2", features = ["fixture"] }
-fluvio-future = { workspace = true, features = ["fixture", "subscriber"] }
+fluvio-future = { version = "0.4", features = ["fixture", "subscriber"] }
 fluvio-protocol = { path = "../fluvio-protocol", features = ["fixture"] }
 
diff --git a/crates/fluvio-storage/Cargo.toml b/crates/fluvio-storage/Cargo.toml
index 511b9b1183..8f11a493ef 100644
--- a/crates/fluvio-storage/Cargo.toml
+++ b/crates/fluvio-storage/Cargo.toml
@@ -43,7 +43,7 @@ blocking = "1.1.0"
 fluvio-types = { path = "../fluvio-types", features = [
     "events",
 ], version = "0.4.0" }
-fluvio-future = { workspace = true, features = ["fs", "mmap", "zero_copy"]  }
+fluvio-future = { version = "0.4", features = ["fs", "mmap", "zero_copy"]  }
 fluvio-protocol = { path = "../fluvio-protocol" }
 fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata" }
 fluvio-spu-schema = { path = "../fluvio-spu-schema", features = [
@@ -51,7 +51,7 @@ fluvio-spu-schema = { path = "../fluvio-spu-schema", features = [
 ] }
 
 [dev-dependencies]
-fluvio-future = { workspace = true, features = ["fixture"] }
+fluvio-future = { version = "0.4", features = ["fixture"] }
 flv-util = { version = "0.5.2", features = ["fixture"] }
 fluvio-socket = { path = "../fluvio-socket", features = ["file"] }
 fluvio-storage = { path = ".", features = ["fixture"] }
diff --git a/crates/fluvio-stream-dispatcher/Cargo.toml b/crates/fluvio-stream-dispatcher/Cargo.toml
index 49765b4f43..86ab3ecbc2 100644
--- a/crates/fluvio-stream-dispatcher/Cargo.toml
+++ b/crates/fluvio-stream-dispatcher/Cargo.toml
@@ -30,7 +30,7 @@ fluvio-stream-model = { features = [
 ], version = "0.9.0", path = "../fluvio-stream-model" }
 k8-metadata-client = { workspace = true }
 k8-types = { workspace = true }
-fluvio-future = { workspace = true, features = ["task", "timer"] }
+fluvio-future = { version = "0.4", features = ["task", "timer"] }
 
 [dev-dependencies]
-fluvio-future = { workspace = true, features = ["fixture"] }
+fluvio-future = { version = "0.4", features = ["fixture"] }
diff --git a/crates/fluvio-stream-model/Cargo.toml b/crates/fluvio-stream-model/Cargo.toml
index 95e35184f8..7bc472e28b 100644
--- a/crates/fluvio-stream-model/Cargo.toml
+++ b/crates/fluvio-stream-model/Cargo.toml
@@ -29,7 +29,7 @@ k8-types = { workspace = true, optional = true }
 [dev-dependencies]
 
 tokio = { version = "1.3.0", features = ["macros"] }
-fluvio-future = { workspace = true, features = ["fixture"] }
+fluvio-future = { version = "0.4", features = ["fixture"] }
 fluvio-stream-model = { path = ".", features = ["fixture"] }
 async-std = { version = "1.8.0", default-features = false, features = [
     "attributes",
diff --git a/crates/fluvio-test-derive/Cargo.toml b/crates/fluvio-test-derive/Cargo.toml
index 04f0daa0e2..7c361fd139 100644
--- a/crates/fluvio-test-derive/Cargo.toml
+++ b/crates/fluvio-test-derive/Cargo.toml
@@ -26,7 +26,7 @@ rand = "0.8.4"
 trybuild = { git = "https://github.com/infinyon/trybuild", branch = "check_option" }
 fluvio = { path = "../fluvio" }
 tokio = { version = "1.4", features = ["macros"] }
-fluvio-future = { workspace = true, features = ["task", "timer", "subscriber", "fixture"] }
+fluvio-future = { version = "0.4", features = ["task", "timer", "subscriber", "fixture"] }
 clap = { version = "4.0.9", features = ["std", "derive", "help", "usage", "error-context"], default-features = false }
 inventory = "0.3"
 tracing = "0.1"
diff --git a/crates/fluvio-test-util/Cargo.toml b/crates/fluvio-test-util/Cargo.toml
index 5a3d068dcc..9c587cdb69 100644
--- a/crates/fluvio-test-util/Cargo.toml
+++ b/crates/fluvio-test-util/Cargo.toml
@@ -33,7 +33,7 @@ anyhow = { workspace = true }
 
 fluvio = { path = "../fluvio" }
 fluvio-types = { path = "../fluvio-types" }
-fluvio-future = { workspace = true, features = ["task", "timer", "subscriber", "fixture"] }
+fluvio-future = { version = "0.4", features = ["task", "timer", "subscriber", "fixture"] }
 fluvio-cluster = { path = "../fluvio-cluster" }
 fluvio-command = { version = "0.2.0" }
 fluvio-controlplane-metadata = { features = ["k8"], path = "../fluvio-controlplane-metadata" }
diff --git a/crates/fluvio-test/Cargo.toml b/crates/fluvio-test/Cargo.toml
index 0cb58b4562..b9ae9102ed 100644
--- a/crates/fluvio-test/Cargo.toml
+++ b/crates/fluvio-test/Cargo.toml
@@ -47,7 +47,7 @@ anyhow = { workspace = true }
 # Fluvio dependencies
 fluvio = { path = "../fluvio" }
 fluvio-types = { path = "../fluvio-types" }
-fluvio-future = { workspace = true, features = [
+fluvio-future = { version = "0.4", features = [
     "io",
     "task",
     "timer",
diff --git a/crates/fluvio-types/Cargo.toml b/crates/fluvio-types/Cargo.toml
index 6334d9e34f..77a59a84c4 100644
--- a/crates/fluvio-types/Cargo.toml
+++ b/crates/fluvio-types/Cargo.toml
@@ -16,5 +16,5 @@ event-listener = { version = "2.5.1", optional = true }
 thiserror = "1"
 
 [dev-dependencies]
-fluvio-future = { workspace = true, features = ["fixture", "subscriber"] }
+fluvio-future = { version = "0.4", features = ["fixture", "subscriber"] }
 tokio = { version = "1.3.0", features = ["macros"] }
diff --git a/crates/fluvio/Cargo.toml b/crates/fluvio/Cargo.toml
index ad065209ef..464b5e06b6 100644
--- a/crates/fluvio/Cargo.toml
+++ b/crates/fluvio/Cargo.toml
@@ -45,7 +45,7 @@ async-trait = "0.1.51"
 anyhow = "1.0.38"
 
 # Fluvio dependencies
-fluvio-future = { workspace = true, features = [
+fluvio-future = { version = "0.4", features = [
     "task",
     "task_unstable",
     "retry",
@@ -81,7 +81,7 @@ chrono = {version =  "0.4", features = ["wasmbind", "clock"]}
 
 [dev-dependencies]
 async-std = { version = "1.6.4", default-features = false }
-fluvio-future = { workspace = true, features = ["io", "fixture"] }
+fluvio-future = { version = "0.4", features = ["io", "fixture"] }
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 wasm-bindgen-test = "0.3.24"
diff --git a/crates/smartmodule-development-kit/Cargo.toml b/crates/smartmodule-development-kit/Cargo.toml
index 8ca7b300a1..71dc6884a6 100644
--- a/crates/smartmodule-development-kit/Cargo.toml
+++ b/crates/smartmodule-development-kit/Cargo.toml
@@ -31,7 +31,7 @@ lib-cargo-crate = "0.1.6"
 fluvio = { path = "../fluvio", default-features = false }
 fluvio-hub-util = { path = "../fluvio-hub-util" }
 fluvio-protocol = { path = "../fluvio-protocol", features=["record","api"] }
-fluvio-future = { workspace = true, features = ["subscriber"] }
+fluvio-future = { version = "0.4", features = ["subscriber"] }
 fluvio-smartengine = { path = "../fluvio-smartengine", features = ["transformation"] }
 fluvio-extension-common = { path = "../fluvio-extension-common", features = ["target"] }
 fluvio-smartmodule = { path = "../fluvio-smartmodule",  default-features = false }

From 908745bc0f427e5893ff9c1816820d91607cbe97 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 20:40:59 +0300
Subject: [PATCH 18/25] Revert "don't use fluvio-futures from workspace"

This reverts commit 8fb6d4b7b88eae0e0e30c78b1ddd4408ebd8c60b.
---
 Cargo.toml                                     | 1 +
 crates/cdk/Cargo.toml                          | 2 +-
 crates/fluvio-auth/Cargo.toml                  | 2 +-
 crates/fluvio-benchmark/Cargo.toml             | 2 +-
 crates/fluvio-channel-cli/Cargo.toml           | 2 +-
 crates/fluvio-cli-common/Cargo.toml            | 2 +-
 crates/fluvio-cli/Cargo.toml                   | 4 ++--
 crates/fluvio-cluster/Cargo.toml               | 4 ++--
 crates/fluvio-connector-common/Cargo.toml      | 2 +-
 crates/fluvio-controlplane-metadata/Cargo.toml | 4 ++--
 crates/fluvio-hub-util/Cargo.toml              | 2 +-
 crates/fluvio-protocol/Cargo.toml              | 4 ++--
 crates/fluvio-run/Cargo.toml                   | 2 +-
 crates/fluvio-sc-schema/Cargo.toml             | 2 +-
 crates/fluvio-sc/Cargo.toml                    | 4 ++--
 crates/fluvio-service/Cargo.toml               | 4 ++--
 crates/fluvio-smartengine/Cargo.toml           | 2 +-
 crates/fluvio-socket/Cargo.toml                | 4 ++--
 crates/fluvio-spu-schema/Cargo.toml            | 4 ++--
 crates/fluvio-spu/Cargo.toml                   | 4 ++--
 crates/fluvio-storage/Cargo.toml               | 4 ++--
 crates/fluvio-stream-dispatcher/Cargo.toml     | 4 ++--
 crates/fluvio-stream-model/Cargo.toml          | 2 +-
 crates/fluvio-test-derive/Cargo.toml           | 2 +-
 crates/fluvio-test-util/Cargo.toml             | 2 +-
 crates/fluvio-test/Cargo.toml                  | 2 +-
 crates/fluvio-types/Cargo.toml                 | 2 +-
 crates/fluvio/Cargo.toml                       | 4 ++--
 crates/smartmodule-development-kit/Cargo.toml  | 2 +-
 29 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f39133ac06..f06f7a34a7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,6 +104,7 @@ k8-client = { version = "10.0.0" }
 k8-types = { version = "0.8.0" }
 k8-config = { version = "2.0.0"}
 k8-metadata-client = { version = "5.1.0" }
+fluvio-future = { version =  "0.4.0" }
 flv-util = { version = "0.5.0" }
 fluvio-helm = { version = "0.4.1"}
 fluvio-command = { version = "0.2.0"}
diff --git a/crates/cdk/Cargo.toml b/crates/cdk/Cargo.toml
index f2668e9688..81a6d74fe4 100644
--- a/crates/cdk/Cargo.toml
+++ b/crates/cdk/Cargo.toml
@@ -35,5 +35,5 @@ current_platform = { version = "0.2" }
 fluvio = { path = "../fluvio"}
 fluvio-connector-deployer = { path = "../fluvio-connector-deployer"}
 fluvio-connector-package = { path = "../fluvio-connector-package", features = ["toml"]}
-fluvio-future = { version = "0.4", features = ["subscriber"]}
+fluvio-future = { workspace = true, features = ["subscriber"]}
 fluvio-hub-util = { path = "../fluvio-hub-util" }
diff --git a/crates/fluvio-auth/Cargo.toml b/crates/fluvio-auth/Cargo.toml
index 97ced5d987..0b31d06f73 100644
--- a/crates/fluvio-auth/Cargo.toml
+++ b/crates/fluvio-auth/Cargo.toml
@@ -22,7 +22,7 @@ tracing = { workspace = true }
 x509-parser = "0.15.0"
 
 fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata" }
-fluvio-future = { version = "0.4", features = ["net", "openssl_tls"] }
+fluvio-future = { workspace = true, features = ["net", "openssl_tls"] }
 fluvio-protocol = { path = "../fluvio-protocol" }
 fluvio-socket = { path = "../fluvio-socket" }
 fluvio-types = { path = "../fluvio-types" }
diff --git a/crates/fluvio-benchmark/Cargo.toml b/crates/fluvio-benchmark/Cargo.toml
index e6dbc129fa..b3d448a8a4 100644
--- a/crates/fluvio-benchmark/Cargo.toml
+++ b/crates/fluvio-benchmark/Cargo.toml
@@ -27,7 +27,7 @@ anyhow = { workspace = true }
 
 fluvio = { path = "../fluvio" }
 fluvio-cli-common = { path = "../fluvio-cli-common"}
-fluvio-future = { version = "0.4", features = [
+fluvio-future = { workspace = true, features = [
     'task',
     'future',
     'sync',
diff --git a/crates/fluvio-channel-cli/Cargo.toml b/crates/fluvio-channel-cli/Cargo.toml
index 7d43181dbf..aeed0cb85d 100644
--- a/crates/fluvio-channel-cli/Cargo.toml
+++ b/crates/fluvio-channel-cli/Cargo.toml
@@ -30,7 +30,7 @@ anyhow = { workspace = true }
 
 fluvio-cli-common = { path = "../fluvio-cli-common" }
 fluvio-channel = { path = "../fluvio-channel" }
-fluvio-future = { version = "0.4", features = ["task", "subscriber", "native2_tls"], optional = true }
+fluvio-future = { workspace = true, features = ["task", "subscriber", "native2_tls"], optional = true }
 fluvio-types = { path = "../fluvio-types", default-features = false, optional = true }
 fluvio-package-index = { path = "../fluvio-package-index" }
 
diff --git a/crates/fluvio-cli-common/Cargo.toml b/crates/fluvio-cli-common/Cargo.toml
index d7e80b3a76..3155f78ff2 100644
--- a/crates/fluvio-cli-common/Cargo.toml
+++ b/crates/fluvio-cli-common/Cargo.toml
@@ -36,4 +36,4 @@ fluvio = { path = "../fluvio", default-features = false, optional = true }
 fluvio-protocol = { path = "../fluvio-protocol", optional = true }
 
 [dev-dependencies]
-fluvio-future = { version = "0.4", features = ["fs", "io", "subscriber", "native2_tls", "fixture"] }
+fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "native2_tls", "fixture"] }
diff --git a/crates/fluvio-cli/Cargo.toml b/crates/fluvio-cli/Cargo.toml
index 786c5a29c9..9f3353bc91 100644
--- a/crates/fluvio-cli/Cargo.toml
+++ b/crates/fluvio-cli/Cargo.toml
@@ -99,10 +99,10 @@ fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata", featu
 
 # Optional Fluvio dependencies
 fluvio-types = { path = "../fluvio-types", optional = true }
-fluvio-future = { version = "0.4", features = ["fs", "io", "subscriber", "native2_tls"], optional = true }
+fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "native2_tls"], optional = true }
 fluvio-sc-schema = { path = "../fluvio-sc-schema", features = ["use_serde"], optional = true }
 fluvio-spu-schema = { path = "../fluvio-spu-schema", optional = true }
 
 
 [dev-dependencies]
-fluvio-future = { version = "0.4", features = ["fixture"] }
+fluvio-future = { workspace = true, features = ["fixture"] }
diff --git a/crates/fluvio-cluster/Cargo.toml b/crates/fluvio-cluster/Cargo.toml
index 79342ca870..54b40b0858 100644
--- a/crates/fluvio-cluster/Cargo.toml
+++ b/crates/fluvio-cluster/Cargo.toml
@@ -69,7 +69,7 @@ k8-client = { workspace = true }
 k8-metadata-client = { workspace = true }
 k8-types = { workspace = true, features = ["app"] }
 fluvio-command = { workspace = true }
-fluvio-future = { version = "0.4" }
+fluvio-future = { workspace = true }
 
 fluvio = { path = "../fluvio", default-features = false }
 fluvio-extension-common = { path = "../fluvio-extension-common", optional = true }
@@ -81,4 +81,4 @@ fluvio-types = { path = "../fluvio-types" }
 fluvio-channel = { path = "../fluvio-channel" }
 
 [dev-dependencies]
-fluvio-future = { version = "0.4", features = ["task", "fixture"] }
+fluvio-future = { workspace = true, features = ["task", "fixture"] }
diff --git a/crates/fluvio-connector-common/Cargo.toml b/crates/fluvio-connector-common/Cargo.toml
index 9b6709135b..2c2380f2c8 100644
--- a/crates/fluvio-connector-common/Cargo.toml
+++ b/crates/fluvio-connector-common/Cargo.toml
@@ -14,7 +14,7 @@ derive = ["fluvio-connector-derive"]
 [dependencies]
 anyhow = { workspace = true }
 tracing = { workspace = true }
-fluvio-future = { version = "0.4", features = ["subscriber"] }
+fluvio-future = { workspace = true, features = ["subscriber"] }
 futures = { version = "0.3", default-features = false }
 async-trait = { version = "0.1", default-features = false}
 async-net = { version = "1.7", default-features = false }
diff --git a/crates/fluvio-controlplane-metadata/Cargo.toml b/crates/fluvio-controlplane-metadata/Cargo.toml
index 67639ab16a..f419be1bd6 100644
--- a/crates/fluvio-controlplane-metadata/Cargo.toml
+++ b/crates/fluvio-controlplane-metadata/Cargo.toml
@@ -29,7 +29,7 @@ toml = { workspace = true, optional = true }
 lenient_semver = "0.4.2"
 
 # External Fluvio dependencies
-fluvio-future = { version = "0.4" }
+fluvio-future = { workspace = true }
 flv-util = { workspace = true }
 
 fluvio-types = { version = "0.4.0", path = "../fluvio-types" }
@@ -41,4 +41,4 @@ fluvio-protocol = { path = "../fluvio-protocol", version = "0.9", features = [
 
 [dev-dependencies]
 serde_yaml = "0.9.4"
-fluvio-future = { version = "0.4", features = ["fixture"] }
+fluvio-future = { workspace = true, features = ["fixture"] }
diff --git a/crates/fluvio-hub-util/Cargo.toml b/crates/fluvio-hub-util/Cargo.toml
index eb96cfdf00..7a51582da3 100644
--- a/crates/fluvio-hub-util/Cargo.toml
+++ b/crates/fluvio-hub-util/Cargo.toml
@@ -34,7 +34,7 @@ reqwest = { workspace = true, default-features = false, features = ["json", "gzi
 # added to make sure reqwest works
 async-std = { version = "1.6.4", default-features = false, features = ["tokio1"] }
 
-fluvio-future = { version = "0.4", features = ["task"] }
+fluvio-future = { workspace = true, features = ["task"] }
 fluvio-hub-protocol = { path = "../fluvio-hub-protocol" }
 fluvio-types = { path = "../fluvio-types" }
 
diff --git a/crates/fluvio-protocol/Cargo.toml b/crates/fluvio-protocol/Cargo.toml
index a776238411..7bad985167 100644
--- a/crates/fluvio-protocol/Cargo.toml
+++ b/crates/fluvio-protocol/Cargo.toml
@@ -42,7 +42,7 @@ derive_builder = { version = "0.12.0" , optional = true }
 eyre = { version = "0.6", default-features = false, optional = true }
 
 fluvio-protocol-derive = { version = "0.5.0", path = "../fluvio-protocol-derive", optional = true }
-fluvio-future = { version = "0.4", optional = true }
+fluvio-future = { workspace = true, optional = true }
 flv-util = { version = "0.5.0", optional = true }
 fluvio-compression = { version = "0.2", path = "../fluvio-compression", optional = true}
 fluvio-types = { version = "0.4.0", path = "../fluvio-types", optional = true }
@@ -51,7 +51,7 @@ fluvio-types = { version = "0.4.0", path = "../fluvio-types", optional = true }
 criterion = "0.4.0"
 trybuild = "1.0.64"
 fluvio-protocol = { path = ".", features = ["derive", "api"] }
-fluvio-future = { version = "0.4", features = [
+fluvio-future = { workspace = true, features = [
     "fixture",
     "subscriber",
     "timer",
diff --git a/crates/fluvio-run/Cargo.toml b/crates/fluvio-run/Cargo.toml
index 4eb793f506..8ae0ef427f 100644
--- a/crates/fluvio-run/Cargo.toml
+++ b/crates/fluvio-run/Cargo.toml
@@ -28,7 +28,7 @@ thiserror = "1.0.20"
 semver = "1.0.0"
 serde_json = "1.0.64"
 
-fluvio-future = { version = "0.4", features = ["subscriber"] }
+fluvio-future = { workspace = true, features = ["subscriber"] }
 fluvio-sc = { path = "../fluvio-sc" }
 fluvio-spu = { path = "../fluvio-spu" }
 fluvio-extension-common = { path = "../fluvio-extension-common" }
diff --git a/crates/fluvio-sc-schema/Cargo.toml b/crates/fluvio-sc-schema/Cargo.toml
index 87be85f969..0a6c978952 100644
--- a/crates/fluvio-sc-schema/Cargo.toml
+++ b/crates/fluvio-sc-schema/Cargo.toml
@@ -29,4 +29,4 @@ fluvio-protocol = { path = "../fluvio-protocol", version = "0.9.0", features = [
 fluvio-socket = { path = "../fluvio-socket", version = "0.14.0"}
 
 [dev-dependencies]
-fluvio-future = { version = "0.4", features = ["subscriber"] }
+fluvio-future = { workspace = true, features = ["subscriber"] }
diff --git a/crates/fluvio-sc/Cargo.toml b/crates/fluvio-sc/Cargo.toml
index eef8c35e25..c8085409cb 100644
--- a/crates/fluvio-sc/Cargo.toml
+++ b/crates/fluvio-sc/Cargo.toml
@@ -44,7 +44,7 @@ anyhow = { version = "1.0.38" }
 
 # Fluvio dependencies
 fluvio-auth = { path = "../fluvio-auth" }
-fluvio-future = { version = "0.4", features = [
+fluvio-future = { workspace = true, features = [
     "subscriber",
     "openssl_tls",
     "zero_copy",
@@ -70,6 +70,6 @@ flv-tls-proxy = { version = "0.6.0" }
 
 [dev-dependencies]
 rand = "0.8.4"
-fluvio-future = { version = "0.4", features = ["fixture"] }
+fluvio-future = { workspace = true, features = ["fixture"] }
 flv-util = { version = "0.5.0", features = ["fixture"] }
 fluvio-stream-model = { path = "../fluvio-stream-model", features = ["fixture"] }
\ No newline at end of file
diff --git a/crates/fluvio-service/Cargo.toml b/crates/fluvio-service/Cargo.toml
index bc2eb620fb..ccdfe1deb8 100644
--- a/crates/fluvio-service/Cargo.toml
+++ b/crates/fluvio-service/Cargo.toml
@@ -22,11 +22,11 @@ anyhow = { workspace = true }
 
 # Fluvio dependencies
 futures-util = { version = "0.3.5" }
-fluvio-future = { version = "0.4" }
+fluvio-future = { workspace = true }
 fluvio-socket = { path = "../fluvio-socket" }
 fluvio-protocol = { path = "../fluvio-protocol", features = ["derive", "api", "codec"] }
 fluvio-types = { features = ["events"], path = "../fluvio-types" }
 
 [dev-dependencies]
-fluvio-future = { version = "0.4", features = ["fixture"] }
+fluvio-future = { workspace = true, features = ["fixture"] }
 portpicker = "0.1.1"
\ No newline at end of file
diff --git a/crates/fluvio-smartengine/Cargo.toml b/crates/fluvio-smartengine/Cargo.toml
index 2703e4bd50..ea530ef259 100644
--- a/crates/fluvio-smartengine/Cargo.toml
+++ b/crates/fluvio-smartengine/Cargo.toml
@@ -31,7 +31,7 @@ serde_yaml = { version = "0.9", default-features = false, optional = true }
 cfg-if = "1.0.0"
 derive_builder = { workspace = true }
 
-fluvio-future = { version = "0.4" }
+fluvio-future = { workspace = true }
 fluvio-protocol = { path = "../fluvio-protocol", version = "0.9.0", features = [
     "record",
 ] }
diff --git a/crates/fluvio-socket/Cargo.toml b/crates/fluvio-socket/Cargo.toml
index 20b7d8ebf8..3952bae69d 100644
--- a/crates/fluvio-socket/Cargo.toml
+++ b/crates/fluvio-socket/Cargo.toml
@@ -32,7 +32,7 @@ thiserror = "1.0.20"
 semver = "1.0.0"
 
 # Fluvio dependencies
-fluvio-future = { version = "0.4", features = ["net", "task", "retry"] }
+fluvio-future = { workspace = true, features = ["net", "task", "retry"] }
 fluvio-protocol = { path = "../fluvio-protocol", version = "0.9", features = [
     "derive",
     "api",
@@ -41,7 +41,7 @@ fluvio-protocol = { path = "../fluvio-protocol", version = "0.9", features = [
 ] }
 
 [dev-dependencies]
-fluvio-future = { version = "0.4", features = [
+fluvio-future = { workspace = true, features = [
     "fixture",
     "fs",
     "zero_copy",
diff --git a/crates/fluvio-spu-schema/Cargo.toml b/crates/fluvio-spu-schema/Cargo.toml
index a4dd6e6710..f500e7425f 100644
--- a/crates/fluvio-spu-schema/Cargo.toml
+++ b/crates/fluvio-spu-schema/Cargo.toml
@@ -25,7 +25,7 @@ educe = { version = "0.4.19", features = ["Debug"] }
 flate2 = { version = "1.0.20" }
 
 fluvio-types = { version = "0.4.0", path = "../fluvio-types" }
-fluvio-future = { version = "0.4", optional = true }
+fluvio-future = { workspace = true, optional = true }
 # Fluvio dependencies
 fluvio-protocol = { path = "../fluvio-protocol", version = "0.9.0", features = [
     "api",
@@ -37,5 +37,5 @@ fluvio-smartmodule = { path = "../fluvio-smartmodule", version = "0.5.0", defaul
 [dev-dependencies]
 futures-util = { version = "0.3.4" }
 fluvio-socket = { path = "../fluvio-socket", features = ["file"] }
-fluvio-future = { version = "0.4", features = ["fixture", "fs"] }
+fluvio-future = { workspace = true, features = ["fixture", "fs"] }
 flv-util = { version = "0.5.2", features = ["fixture"] }
diff --git a/crates/fluvio-spu/Cargo.toml b/crates/fluvio-spu/Cargo.toml
index 613e57886b..94f21f36e8 100644
--- a/crates/fluvio-spu/Cargo.toml
+++ b/crates/fluvio-spu/Cargo.toml
@@ -63,7 +63,7 @@ fluvio-socket = { path = "../fluvio-socket", features = [
 fluvio-service = { path = "../fluvio-service" }
 flv-tls-proxy = { version = "0.6.0" }
 flv-util = { version = "0.5.0" }
-fluvio-future = { version = "0.4", features = [
+fluvio-future = { workspace = true, features = [
     "subscriber",
     "openssl_tls",
     "zero_copy",
@@ -79,6 +79,6 @@ flate2 = "1.0.22"
 portpicker = "0.1.1"
 
 flv-util = { version = "0.5.2", features = ["fixture"] }
-fluvio-future = { version = "0.4", features = ["fixture", "subscriber"] }
+fluvio-future = { workspace = true, features = ["fixture", "subscriber"] }
 fluvio-protocol = { path = "../fluvio-protocol", features = ["fixture"] }
 
diff --git a/crates/fluvio-storage/Cargo.toml b/crates/fluvio-storage/Cargo.toml
index 8f11a493ef..511b9b1183 100644
--- a/crates/fluvio-storage/Cargo.toml
+++ b/crates/fluvio-storage/Cargo.toml
@@ -43,7 +43,7 @@ blocking = "1.1.0"
 fluvio-types = { path = "../fluvio-types", features = [
     "events",
 ], version = "0.4.0" }
-fluvio-future = { version = "0.4", features = ["fs", "mmap", "zero_copy"]  }
+fluvio-future = { workspace = true, features = ["fs", "mmap", "zero_copy"]  }
 fluvio-protocol = { path = "../fluvio-protocol" }
 fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata" }
 fluvio-spu-schema = { path = "../fluvio-spu-schema", features = [
@@ -51,7 +51,7 @@ fluvio-spu-schema = { path = "../fluvio-spu-schema", features = [
 ] }
 
 [dev-dependencies]
-fluvio-future = { version = "0.4", features = ["fixture"] }
+fluvio-future = { workspace = true, features = ["fixture"] }
 flv-util = { version = "0.5.2", features = ["fixture"] }
 fluvio-socket = { path = "../fluvio-socket", features = ["file"] }
 fluvio-storage = { path = ".", features = ["fixture"] }
diff --git a/crates/fluvio-stream-dispatcher/Cargo.toml b/crates/fluvio-stream-dispatcher/Cargo.toml
index 86ab3ecbc2..49765b4f43 100644
--- a/crates/fluvio-stream-dispatcher/Cargo.toml
+++ b/crates/fluvio-stream-dispatcher/Cargo.toml
@@ -30,7 +30,7 @@ fluvio-stream-model = { features = [
 ], version = "0.9.0", path = "../fluvio-stream-model" }
 k8-metadata-client = { workspace = true }
 k8-types = { workspace = true }
-fluvio-future = { version = "0.4", features = ["task", "timer"] }
+fluvio-future = { workspace = true, features = ["task", "timer"] }
 
 [dev-dependencies]
-fluvio-future = { version = "0.4", features = ["fixture"] }
+fluvio-future = { workspace = true, features = ["fixture"] }
diff --git a/crates/fluvio-stream-model/Cargo.toml b/crates/fluvio-stream-model/Cargo.toml
index 7bc472e28b..95e35184f8 100644
--- a/crates/fluvio-stream-model/Cargo.toml
+++ b/crates/fluvio-stream-model/Cargo.toml
@@ -29,7 +29,7 @@ k8-types = { workspace = true, optional = true }
 [dev-dependencies]
 
 tokio = { version = "1.3.0", features = ["macros"] }
-fluvio-future = { version = "0.4", features = ["fixture"] }
+fluvio-future = { workspace = true, features = ["fixture"] }
 fluvio-stream-model = { path = ".", features = ["fixture"] }
 async-std = { version = "1.8.0", default-features = false, features = [
     "attributes",
diff --git a/crates/fluvio-test-derive/Cargo.toml b/crates/fluvio-test-derive/Cargo.toml
index 7c361fd139..04f0daa0e2 100644
--- a/crates/fluvio-test-derive/Cargo.toml
+++ b/crates/fluvio-test-derive/Cargo.toml
@@ -26,7 +26,7 @@ rand = "0.8.4"
 trybuild = { git = "https://github.com/infinyon/trybuild", branch = "check_option" }
 fluvio = { path = "../fluvio" }
 tokio = { version = "1.4", features = ["macros"] }
-fluvio-future = { version = "0.4", features = ["task", "timer", "subscriber", "fixture"] }
+fluvio-future = { workspace = true, features = ["task", "timer", "subscriber", "fixture"] }
 clap = { version = "4.0.9", features = ["std", "derive", "help", "usage", "error-context"], default-features = false }
 inventory = "0.3"
 tracing = "0.1"
diff --git a/crates/fluvio-test-util/Cargo.toml b/crates/fluvio-test-util/Cargo.toml
index 9c587cdb69..5a3d068dcc 100644
--- a/crates/fluvio-test-util/Cargo.toml
+++ b/crates/fluvio-test-util/Cargo.toml
@@ -33,7 +33,7 @@ anyhow = { workspace = true }
 
 fluvio = { path = "../fluvio" }
 fluvio-types = { path = "../fluvio-types" }
-fluvio-future = { version = "0.4", features = ["task", "timer", "subscriber", "fixture"] }
+fluvio-future = { workspace = true, features = ["task", "timer", "subscriber", "fixture"] }
 fluvio-cluster = { path = "../fluvio-cluster" }
 fluvio-command = { version = "0.2.0" }
 fluvio-controlplane-metadata = { features = ["k8"], path = "../fluvio-controlplane-metadata" }
diff --git a/crates/fluvio-test/Cargo.toml b/crates/fluvio-test/Cargo.toml
index b9ae9102ed..0cb58b4562 100644
--- a/crates/fluvio-test/Cargo.toml
+++ b/crates/fluvio-test/Cargo.toml
@@ -47,7 +47,7 @@ anyhow = { workspace = true }
 # Fluvio dependencies
 fluvio = { path = "../fluvio" }
 fluvio-types = { path = "../fluvio-types" }
-fluvio-future = { version = "0.4", features = [
+fluvio-future = { workspace = true, features = [
     "io",
     "task",
     "timer",
diff --git a/crates/fluvio-types/Cargo.toml b/crates/fluvio-types/Cargo.toml
index 77a59a84c4..6334d9e34f 100644
--- a/crates/fluvio-types/Cargo.toml
+++ b/crates/fluvio-types/Cargo.toml
@@ -16,5 +16,5 @@ event-listener = { version = "2.5.1", optional = true }
 thiserror = "1"
 
 [dev-dependencies]
-fluvio-future = { version = "0.4", features = ["fixture", "subscriber"] }
+fluvio-future = { workspace = true, features = ["fixture", "subscriber"] }
 tokio = { version = "1.3.0", features = ["macros"] }
diff --git a/crates/fluvio/Cargo.toml b/crates/fluvio/Cargo.toml
index 464b5e06b6..ad065209ef 100644
--- a/crates/fluvio/Cargo.toml
+++ b/crates/fluvio/Cargo.toml
@@ -45,7 +45,7 @@ async-trait = "0.1.51"
 anyhow = "1.0.38"
 
 # Fluvio dependencies
-fluvio-future = { version = "0.4", features = [
+fluvio-future = { workspace = true, features = [
     "task",
     "task_unstable",
     "retry",
@@ -81,7 +81,7 @@ chrono = {version =  "0.4", features = ["wasmbind", "clock"]}
 
 [dev-dependencies]
 async-std = { version = "1.6.4", default-features = false }
-fluvio-future = { version = "0.4", features = ["io", "fixture"] }
+fluvio-future = { workspace = true, features = ["io", "fixture"] }
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 wasm-bindgen-test = "0.3.24"
diff --git a/crates/smartmodule-development-kit/Cargo.toml b/crates/smartmodule-development-kit/Cargo.toml
index 71dc6884a6..8ca7b300a1 100644
--- a/crates/smartmodule-development-kit/Cargo.toml
+++ b/crates/smartmodule-development-kit/Cargo.toml
@@ -31,7 +31,7 @@ lib-cargo-crate = "0.1.6"
 fluvio = { path = "../fluvio", default-features = false }
 fluvio-hub-util = { path = "../fluvio-hub-util" }
 fluvio-protocol = { path = "../fluvio-protocol", features=["record","api"] }
-fluvio-future = { version = "0.4", features = ["subscriber"] }
+fluvio-future = { workspace = true, features = ["subscriber"] }
 fluvio-smartengine = { path = "../fluvio-smartengine", features = ["transformation"] }
 fluvio-extension-common = { path = "../fluvio-extension-common", features = ["target"] }
 fluvio-smartmodule = { path = "../fluvio-smartmodule",  default-features = false }

From 810c73bd1b6cf0b35cb586ee5ddf0c00b54a30c8 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 23:16:52 +0300
Subject: [PATCH 19/25] bump fluvio future

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index f06f7a34a7..557faa28a5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,7 +104,7 @@ k8-client = { version = "10.0.0" }
 k8-types = { version = "0.8.0" }
 k8-config = { version = "2.0.0"}
 k8-metadata-client = { version = "5.1.0" }
-fluvio-future = { version =  "0.4.0" }
+fluvio-future = { version =  "0.5" }
 flv-util = { version = "0.5.0" }
 fluvio-helm = { version = "0.4.1"}
 fluvio-command = { version = "0.2.0"}

From 0c767c91fd6c6e96b32701ce0f6bc5f1fad93e5b Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 23:49:32 +0300
Subject: [PATCH 20/25] move flv-tls-proxy to workspace deps

---
 Cargo.lock                    | 117 ++++++++++++++++++++--------------
 Cargo.toml                    |   1 +
 crates/fluvio-auth/Cargo.toml |   2 +-
 crates/fluvio-sc/Cargo.toml   |   2 +-
 crates/fluvio-spu/Cargo.toml  |   2 +-
 5 files changed, 74 insertions(+), 50 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 247cdb93c5..bf801f0db9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -311,7 +311,7 @@ dependencies = [
  "log",
  "parking",
  "polling",
- "rustix 0.37.11",
+ "rustix 0.37.12",
  "slab",
  "socket2",
  "waker-fn",
@@ -372,7 +372,7 @@ dependencies = [
  "cfg-if",
  "event-listener",
  "futures-lite",
- "rustix 0.37.11",
+ "rustix 0.37.12",
  "signal-hook",
  "windows-sys 0.48.0",
 ]
@@ -689,7 +689,7 @@ dependencies = [
  "io-lifetimes",
  "ipnet",
  "maybe-owned",
- "rustix 0.37.11",
+ "rustix 0.37.12",
  "windows-sys 0.48.0",
  "winx",
 ]
@@ -713,7 +713,7 @@ dependencies = [
  "cap-primitives",
  "io-extras",
  "io-lifetimes",
- "rustix 0.37.11",
+ "rustix 0.37.12",
 ]
 
 [[package]]
@@ -724,7 +724,7 @@ checksum = "4afa389ffcd0c66daca4497d1a9992d18b985eff6b747ee8b4c86c2beae1f708"
 dependencies = [
  "cap-primitives",
  "once_cell",
- "rustix 0.37.11",
+ "rustix 0.37.12",
  "winx",
 ]
 
@@ -861,7 +861,7 @@ dependencies = [
  "fluvio",
  "fluvio-connector-deployer",
  "fluvio-connector-package",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-hub-util",
  "include_dir",
  "serde",
@@ -2116,7 +2116,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642"
 dependencies = [
  "cfg-if",
- "rustix 0.37.11",
+ "rustix 0.37.12",
  "windows-sys 0.48.0",
 ]
 
@@ -2189,7 +2189,7 @@ dependencies = [
  "dirs 5.0.0",
  "event-listener",
  "fluvio-compression",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-protocol",
  "fluvio-sc-schema",
  "fluvio-smartengine",
@@ -2218,7 +2218,7 @@ version = "0.0.0"
 dependencies = [
  "async-trait",
  "fluvio-controlplane-metadata",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-protocol",
  "fluvio-socket",
  "fluvio-types",
@@ -2243,7 +2243,7 @@ dependencies = [
  "derive_builder",
  "fluvio",
  "fluvio-cli-common",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "futures-util",
  "hdrhistogram",
  "madato",
@@ -2283,7 +2283,7 @@ dependencies = [
  "dirs 5.0.0",
  "fluvio-channel",
  "fluvio-cli-common",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-package-index",
  "fluvio-types",
  "predicates 2.1.5",
@@ -2319,7 +2319,7 @@ dependencies = [
  "fluvio-command",
  "fluvio-controlplane-metadata",
  "fluvio-extension-common",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-hub-util",
  "fluvio-package-index",
  "fluvio-protocol",
@@ -2361,7 +2361,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "fluvio",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-package-index",
  "fluvio-protocol",
  "fluvio-types",
@@ -2399,7 +2399,7 @@ dependencies = [
  "fluvio-command",
  "fluvio-controlplane-metadata",
  "fluvio-extension-common",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-helm",
  "fluvio-sc-schema",
  "fluvio-types",
@@ -2461,7 +2461,7 @@ dependencies = [
  "fluvio",
  "fluvio-connector-derive",
  "fluvio-connector-package",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-sc-schema",
  "fluvio-smartengine",
  "futures 0.3.28",
@@ -2535,7 +2535,7 @@ dependencies = [
  "base64 0.21.0",
  "bytes 1.4.0",
  "flate2",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-protocol",
  "fluvio-stream-model",
  "fluvio-types",
@@ -2573,6 +2573,29 @@ name = "fluvio-future"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37174044230084d1cfd7c02f194c5ec127bb8bc17c76f0cd74e943f2fe86ec34"
+dependencies = [
+ "async-io",
+ "async-net",
+ "async-std",
+ "async-trait",
+ "cfg-if",
+ "fluvio-wasm-timer",
+ "futures-lite",
+ "futures-util",
+ "log",
+ "openssl",
+ "openssl-sys",
+ "pin-project",
+ "thiserror",
+ "tracing",
+ "ws_stream_wasm",
+]
+
+[[package]]
+name = "fluvio-future"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8186006d0ce6a5a65b200f53139ad151c568644a47dd122f3d0a683c74c4fad5"
 dependencies = [
  "async-fs",
  "async-io",
@@ -2587,7 +2610,7 @@ dependencies = [
  "futures-lite",
  "futures-util",
  "log",
- "memmap",
+ "memmap2",
  "native-tls",
  "nix",
  "openssl",
@@ -2641,7 +2664,7 @@ dependencies = [
  "dirs 5.0.0",
  "ed25519-dalek",
  "flate2",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-hub-protocol",
  "fluvio-types",
  "hex",
@@ -2689,7 +2712,7 @@ dependencies = [
  "derive_builder",
  "eyre",
  "fluvio-compression",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-protocol",
  "fluvio-protocol-derive",
  "fluvio-types",
@@ -2721,7 +2744,7 @@ version = "0.0.0"
 dependencies = [
  "clap 4.2.2",
  "fluvio-extension-common",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-sc",
  "fluvio-spu",
  "semver 1.0.17",
@@ -2746,7 +2769,7 @@ dependencies = [
  "fluvio-auth",
  "fluvio-controlplane",
  "fluvio-controlplane-metadata",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-protocol",
  "fluvio-sc-schema",
  "fluvio-service",
@@ -2776,7 +2799,7 @@ name = "fluvio-sc-schema"
 version = "0.18.1"
 dependencies = [
  "fluvio-controlplane-metadata",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-protocol",
  "fluvio-socket",
  "fluvio-types",
@@ -2794,7 +2817,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-protocol",
  "fluvio-socket",
  "fluvio-types",
@@ -2812,7 +2835,7 @@ dependencies = [
  "anyhow",
  "cfg-if",
  "derive_builder",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-protocol",
  "fluvio-smartmodule",
  "fluvio-types",
@@ -2859,7 +2882,7 @@ dependencies = [
  "bytes 1.4.0",
  "cfg-if",
  "event-listener",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-protocol",
  "futures-util",
  "once_cell",
@@ -2894,7 +2917,7 @@ dependencies = [
  "fluvio-compression",
  "fluvio-controlplane",
  "fluvio-controlplane-metadata",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-protocol",
  "fluvio-service",
  "fluvio-smartengine",
@@ -2927,7 +2950,7 @@ dependencies = [
  "bytes 1.4.0",
  "educe",
  "flate2",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-protocol",
  "fluvio-smartmodule",
  "fluvio-socket",
@@ -2953,7 +2976,7 @@ dependencies = [
  "clap 4.2.2",
  "derive_builder",
  "fluvio-controlplane-metadata",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-protocol",
  "fluvio-socket",
  "fluvio-spu-schema",
@@ -2979,7 +3002,7 @@ dependencies = [
  "async-rwlock",
  "async-trait",
  "event-listener",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-stream-model",
  "fluvio-types",
  "futures-lite",
@@ -2999,7 +3022,7 @@ dependencies = [
  "async-rwlock",
  "async-std",
  "event-listener",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-stream-model",
  "k8-types",
  "once_cell",
@@ -3027,7 +3050,7 @@ dependencies = [
  "fluvio-cluster",
  "fluvio-command",
  "fluvio-controlplane-metadata",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-protocol",
  "fluvio-test-case-derive",
  "fluvio-test-derive 0.0.0",
@@ -3069,7 +3092,7 @@ dependencies = [
  "clap 4.2.2",
  "crossbeam-channel",
  "fluvio",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-test-util",
  "inflections",
  "inventory",
@@ -3108,7 +3131,7 @@ dependencies = [
  "fluvio-cluster",
  "fluvio-command",
  "fluvio-controlplane-metadata",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-types",
  "futures-lite",
  "hdrhistogram",
@@ -3131,7 +3154,7 @@ name = "fluvio-types"
 version = "0.4.2"
 dependencies = [
  "event-listener",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "thiserror",
  "tokio",
  "tracing",
@@ -3172,14 +3195,14 @@ dependencies = [
 
 [[package]]
 name = "flv-tls-proxy"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f4ce092ccd15314ac22e1f1ac34e31e1aa99d8cfdb2fc8de912cf117f751108"
+checksum = "b27a60f82edd03c090cd66888d6fe5ca247538d53a54ea1ec9329ec3089b9e68"
 dependencies = [
  "async-trait",
  "cfg-if",
  "event-listener",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "futures-lite",
  "futures-util",
  "log",
@@ -3257,7 +3280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7833d0f115a013d51c55950a3b09d30e4b057be9961b709acb9b5b17a1108861"
 dependencies = [
  "io-lifetimes",
- "rustix 0.37.11",
+ "rustix 0.37.12",
  "windows-sys 0.48.0",
 ]
 
@@ -4093,7 +4116,7 @@ checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
 dependencies = [
  "hermit-abi 0.3.1",
  "io-lifetimes",
- "rustix 0.37.11",
+ "rustix 0.37.12",
  "windows-sys 0.48.0",
 ]
 
@@ -4199,7 +4222,7 @@ dependencies = [
  "base64 0.13.1",
  "bytes 1.4.0",
  "cfg-if",
- "fluvio-future",
+ "fluvio-future 0.4.5",
  "futures-util",
  "http",
  "hyper",
@@ -4582,7 +4605,7 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e"
 dependencies = [
- "rustix 0.37.11",
+ "rustix 0.37.12",
 ]
 
 [[package]]
@@ -5833,9 +5856,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.11"
+version = "0.37.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
+checksum = "722529a737f5a942fdbac3a46cee213053196737c5eaa3386d52e85b786f2659"
 dependencies = [
  "bitflags",
  "errno",
@@ -6333,7 +6356,7 @@ dependencies = [
  "fluvio-cli-common",
  "fluvio-controlplane-metadata",
  "fluvio-extension-common",
- "fluvio-future",
+ "fluvio-future 0.5.0",
  "fluvio-hub-util",
  "fluvio-protocol",
  "fluvio-sc-schema",
@@ -6535,7 +6558,7 @@ dependencies = [
  "cap-std",
  "fd-lock",
  "io-lifetimes",
- "rustix 0.37.11",
+ "rustix 0.37.12",
  "windows-sys 0.48.0",
  "winx",
 ]
@@ -6566,7 +6589,7 @@ dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix 0.37.11",
+ "rustix 0.37.12",
  "windows-sys 0.45.0",
 ]
 
@@ -6585,7 +6608,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
 dependencies = [
- "rustix 0.37.11",
+ "rustix 0.37.12",
  "windows-sys 0.48.0",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 15bfaa6d87..65bd8bc0ce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -109,6 +109,7 @@ fluvio-future = { version =  "0.5" }
 flv-util = { version = "0.5.0" }
 fluvio-helm = { version = "0.4.1"}
 fluvio-command = { version = "0.2.0"}
+flv-tls-proxy = { version = "0.7" }
 
 # Used to make eyre faster on debug builds
 # See https://github.com/yaahc/color-eyre#improving-perf-on-debug-builds
diff --git a/crates/fluvio-auth/Cargo.toml b/crates/fluvio-auth/Cargo.toml
index 0b31d06f73..2d165cc562 100644
--- a/crates/fluvio-auth/Cargo.toml
+++ b/crates/fluvio-auth/Cargo.toml
@@ -26,5 +26,5 @@ fluvio-future = { workspace = true, features = ["net", "openssl_tls"] }
 fluvio-protocol = { path = "../fluvio-protocol" }
 fluvio-socket = { path = "../fluvio-socket" }
 fluvio-types = { path = "../fluvio-types" }
-flv-tls-proxy = { version = "0.6.0" }
+flv-tls-proxy = { workspace = true }
 futures-util = { version = "0.3.5" }
diff --git a/crates/fluvio-sc/Cargo.toml b/crates/fluvio-sc/Cargo.toml
index c8085409cb..9f7ff751e5 100644
--- a/crates/fluvio-sc/Cargo.toml
+++ b/crates/fluvio-sc/Cargo.toml
@@ -66,7 +66,7 @@ k8-types = { workspace = true, features = ["app"] }
 fluvio-protocol = { path = "../fluvio-protocol" }
 fluvio-socket = { path = "../fluvio-socket" }
 fluvio-service = { path = "../fluvio-service" }
-flv-tls-proxy = { version = "0.6.0" }
+flv-tls-proxy = { workspace = true }
 
 [dev-dependencies]
 rand = "0.8.4"
diff --git a/crates/fluvio-spu/Cargo.toml b/crates/fluvio-spu/Cargo.toml
index 94f21f36e8..aa05eab153 100644
--- a/crates/fluvio-spu/Cargo.toml
+++ b/crates/fluvio-spu/Cargo.toml
@@ -61,7 +61,7 @@ fluvio-socket = { path = "../fluvio-socket", features = [
     "file",
 ] }
 fluvio-service = { path = "../fluvio-service" }
-flv-tls-proxy = { version = "0.6.0" }
+flv-tls-proxy = { workspace = true }
 flv-util = { version = "0.5.0" }
 fluvio-future = { workspace = true, features = [
     "subscriber",

From ba88787c52e2e7dfd7f1c95c0de92fe41d8d0f25 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Tue, 18 Apr 2023 23:56:30 +0300
Subject: [PATCH 21/25] save

---
 crates/fluvio-cli/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/fluvio-cli/Cargo.toml b/crates/fluvio-cli/Cargo.toml
index 305d2621a5..1f3b119550 100644
--- a/crates/fluvio-cli/Cargo.toml
+++ b/crates/fluvio-cli/Cargo.toml
@@ -99,7 +99,7 @@ fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata", featu
 
 # Optional Fluvio dependencies
 fluvio-types = { path = "../fluvio-types", optional = true }
-fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "native2_tls"], optional = true }
+fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "native2_tls", "openssl_tls"], optional = true }
 fluvio-sc-schema = { path = "../fluvio-sc-schema", features = ["use_serde"], optional = true }
 fluvio-spu-schema = { path = "../fluvio-spu-schema", optional = true }
 

From 4fbf961732ca81cb02bbb56f79bf5ac131d236c1 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Wed, 19 Apr 2023 00:00:10 +0300
Subject: [PATCH 22/25] save

---
 crates/fluvio/src/config/tls.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/fluvio/src/config/tls.rs b/crates/fluvio/src/config/tls.rs
index 2f9a1d72be..ef9e46f8e8 100644
--- a/crates/fluvio/src/config/tls.rs
+++ b/crates/fluvio/src/config/tls.rs
@@ -197,7 +197,7 @@ cfg_if::cfg_if! {
                         info!("Using anonymous TLS");
                         let builder = TlsConnector::builder()
                                 .map_err(|err| IoError::new(IoErrorKind::InvalidData, err))?
-                                .with_hostname_vertification_disabled()
+                                .with_hostname_verification_disabled()
                                 .map_err(|err| IoError::new(IoErrorKind::InvalidData, err))?;
 
                         let connector: TlsAnonymousConnector = builder.build().into();

From c538deab585ae932819eabbcf9f95db9dd86552a Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Wed, 19 Apr 2023 00:22:24 +0300
Subject: [PATCH 23/25] use rustls more

---
 Cargo.lock                           | 65 ----------------------------
 crates/fluvio-auth/Cargo.toml        |  2 +-
 crates/fluvio-channel-cli/Cargo.toml |  2 +-
 crates/fluvio-cli-common/Cargo.toml  |  2 +-
 crates/fluvio-cli/Cargo.toml         |  2 +-
 crates/fluvio-sc/Cargo.toml          |  2 +-
 crates/fluvio-socket/Cargo.toml      |  2 +-
 crates/fluvio-spu/Cargo.toml         |  2 +-
 8 files changed, 7 insertions(+), 72 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bf801f0db9..c02485ec00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -335,18 +335,6 @@ dependencies = [
  "event-listener",
 ]
 
-[[package]]
-name = "async-native-tls"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe"
-dependencies = [
- "futures-util",
- "native-tls",
- "thiserror",
- "url",
-]
-
 [[package]]
 name = "async-net"
 version = "1.7.0"
@@ -1194,16 +1182,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.4"
@@ -2599,7 +2577,6 @@ checksum = "8186006d0ce6a5a65b200f53139ad151c568644a47dd122f3d0a683c74c4fad5"
 dependencies = [
  "async-fs",
  "async-io",
- "async-native-tls",
  "async-net",
  "async-rustls",
  "async-std",
@@ -2611,7 +2588,6 @@ dependencies = [
  "futures-util",
  "log",
  "memmap2",
- "native-tls",
  "nix",
  "openssl",
  "openssl-sys",
@@ -4716,24 +4692,6 @@ dependencies = [
  "rand 0.8.5",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
 [[package]]
 name = "nix"
 version = "0.26.2"
@@ -5982,29 +5940,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "security-framework"
-version = "2.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "semver"
 version = "0.11.0"
diff --git a/crates/fluvio-auth/Cargo.toml b/crates/fluvio-auth/Cargo.toml
index 2d165cc562..9dd48a6595 100644
--- a/crates/fluvio-auth/Cargo.toml
+++ b/crates/fluvio-auth/Cargo.toml
@@ -22,7 +22,7 @@ tracing = { workspace = true }
 x509-parser = "0.15.0"
 
 fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata" }
-fluvio-future = { workspace = true, features = ["net", "openssl_tls"] }
+fluvio-future = { workspace = true, features = ["net", "rust_tls"] }
 fluvio-protocol = { path = "../fluvio-protocol" }
 fluvio-socket = { path = "../fluvio-socket" }
 fluvio-types = { path = "../fluvio-types" }
diff --git a/crates/fluvio-channel-cli/Cargo.toml b/crates/fluvio-channel-cli/Cargo.toml
index aeed0cb85d..48f88f6a3b 100644
--- a/crates/fluvio-channel-cli/Cargo.toml
+++ b/crates/fluvio-channel-cli/Cargo.toml
@@ -30,7 +30,7 @@ anyhow = { workspace = true }
 
 fluvio-cli-common = { path = "../fluvio-cli-common" }
 fluvio-channel = { path = "../fluvio-channel" }
-fluvio-future = { workspace = true, features = ["task", "subscriber", "native2_tls"], optional = true }
+fluvio-future = { workspace = true, features = ["task", "subscriber", "rust_tls"], optional = true }
 fluvio-types = { path = "../fluvio-types", default-features = false, optional = true }
 fluvio-package-index = { path = "../fluvio-package-index" }
 
diff --git a/crates/fluvio-cli-common/Cargo.toml b/crates/fluvio-cli-common/Cargo.toml
index 3155f78ff2..0560334339 100644
--- a/crates/fluvio-cli-common/Cargo.toml
+++ b/crates/fluvio-cli-common/Cargo.toml
@@ -36,4 +36,4 @@ fluvio = { path = "../fluvio", default-features = false, optional = true }
 fluvio-protocol = { path = "../fluvio-protocol", optional = true }
 
 [dev-dependencies]
-fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "native2_tls", "fixture"] }
+fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "rust_tls", "fixture"] }
diff --git a/crates/fluvio-cli/Cargo.toml b/crates/fluvio-cli/Cargo.toml
index 1f3b119550..b46462549b 100644
--- a/crates/fluvio-cli/Cargo.toml
+++ b/crates/fluvio-cli/Cargo.toml
@@ -99,7 +99,7 @@ fluvio-controlplane-metadata = { path = "../fluvio-controlplane-metadata", featu
 
 # Optional Fluvio dependencies
 fluvio-types = { path = "../fluvio-types", optional = true }
-fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "native2_tls", "openssl_tls"], optional = true }
+fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "rust_tls"], optional = true }
 fluvio-sc-schema = { path = "../fluvio-sc-schema", features = ["use_serde"], optional = true }
 fluvio-spu-schema = { path = "../fluvio-spu-schema", optional = true }
 
diff --git a/crates/fluvio-sc/Cargo.toml b/crates/fluvio-sc/Cargo.toml
index 9f7ff751e5..bb10c81a2e 100644
--- a/crates/fluvio-sc/Cargo.toml
+++ b/crates/fluvio-sc/Cargo.toml
@@ -46,7 +46,7 @@ anyhow = { version = "1.0.38" }
 fluvio-auth = { path = "../fluvio-auth" }
 fluvio-future = { workspace = true, features = [
     "subscriber",
-    "openssl_tls",
+    "rust_tls",
     "zero_copy",
 ] }
 fluvio-types = { path = "../fluvio-types", features = [
diff --git a/crates/fluvio-socket/Cargo.toml b/crates/fluvio-socket/Cargo.toml
index 3952bae69d..9074c5cefd 100644
--- a/crates/fluvio-socket/Cargo.toml
+++ b/crates/fluvio-socket/Cargo.toml
@@ -45,7 +45,7 @@ fluvio-future = { workspace = true, features = [
     "fixture",
     "fs",
     "zero_copy",
-    "native2_tls",
+    "rust_tls",
 ] }
 portpicker = "0.1.1"
 
diff --git a/crates/fluvio-spu/Cargo.toml b/crates/fluvio-spu/Cargo.toml
index aa05eab153..938430b5d9 100644
--- a/crates/fluvio-spu/Cargo.toml
+++ b/crates/fluvio-spu/Cargo.toml
@@ -65,7 +65,7 @@ flv-tls-proxy = { workspace = true }
 flv-util = { version = "0.5.0" }
 fluvio-future = { workspace = true, features = [
     "subscriber",
-    "openssl_tls",
+    "rust_tls",
     "zero_copy",
 ] }
 fluvio-smartengine = { path = "../fluvio-smartengine"}

From 4c02bfc3f4c879cc90a4846bcefa9575a178e7f2 Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Wed, 19 Apr 2023 00:29:21 +0300
Subject: [PATCH 24/25] save

---
 crates/fluvio-cli/src/error.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/fluvio-cli/src/error.rs b/crates/fluvio-cli/src/error.rs
index 11a141b9a7..3a37d06852 100644
--- a/crates/fluvio-cli/src/error.rs
+++ b/crates/fluvio-cli/src/error.rs
@@ -51,7 +51,7 @@ pub enum CliError {
     PackageError(String),
 
     #[error(transparent)]
-    TlsError(#[from] fluvio_future::openssl::TlsError),
+    TlsError(#[from] fluvio_future::tls::TlsError),
 
     #[error("Invalid argument: {0}")]
     InvalidArg(String),

From 4814a13e33a25860b21c6583f883231233de866c Mon Sep 17 00:00:00 2001
From: Ozgur Akkurt <oezgurmakkurt@gmail.com>
Date: Wed, 19 Apr 2023 00:43:08 +0300
Subject: [PATCH 25/25] save

---
 Cargo.lock                      | 65 +++++++++++++++++++++++++++++++++
 crates/fluvio-socket/Cargo.toml |  1 +
 2 files changed, 66 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index c02485ec00..bf801f0db9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -335,6 +335,18 @@ dependencies = [
  "event-listener",
 ]
 
+[[package]]
+name = "async-native-tls"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe"
+dependencies = [
+ "futures-util",
+ "native-tls",
+ "thiserror",
+ "url",
+]
+
 [[package]]
 name = "async-net"
 version = "1.7.0"
@@ -1182,6 +1194,16 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.4"
@@ -2577,6 +2599,7 @@ checksum = "8186006d0ce6a5a65b200f53139ad151c568644a47dd122f3d0a683c74c4fad5"
 dependencies = [
  "async-fs",
  "async-io",
+ "async-native-tls",
  "async-net",
  "async-rustls",
  "async-std",
@@ -2588,6 +2611,7 @@ dependencies = [
  "futures-util",
  "log",
  "memmap2",
+ "native-tls",
  "nix",
  "openssl",
  "openssl-sys",
@@ -4692,6 +4716,24 @@ dependencies = [
  "rand 0.8.5",
 ]
 
+[[package]]
+name = "native-tls"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
 [[package]]
 name = "nix"
 version = "0.26.2"
@@ -5940,6 +5982,29 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "security-framework"
+version = "2.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "semver"
 version = "0.11.0"
diff --git a/crates/fluvio-socket/Cargo.toml b/crates/fluvio-socket/Cargo.toml
index 9074c5cefd..d44b96f6f1 100644
--- a/crates/fluvio-socket/Cargo.toml
+++ b/crates/fluvio-socket/Cargo.toml
@@ -46,6 +46,7 @@ fluvio-future = { workspace = true, features = [
     "fs",
     "zero_copy",
     "rust_tls",
+    "native2_tls",
 ] }
 portpicker = "0.1.1"