Merge branch 'master' into close_produce

crates/cargo-builder/Cargo.toml

@@ -11,7 +11,6 @@ publish = false
 
 
 [dependencies]
-thiserror = { workspace = true }
 anyhow = { workspace = true }
 derive_builder = { workspace = true }
 cargo_metadata = "0.18.0"

crates/cdk/Cargo.toml

@@ -28,7 +28,6 @@ include_dir = { workspace = true }
 serde = { workspace = true,  features = ["derive"] }
 sysinfo = { workspace = true, default-features = false }
 tempfile = { workspace = true }
-thiserror = { workspace = true }
 toml = { workspace = true, features = ["parse", "display", "preserve_order"] }
 tracing = { workspace = true }
 

crates/fluvio-auth/Cargo.toml

@@ -27,6 +27,5 @@ fluvio-controlplane-metadata = { workspace = true  }
 fluvio-future = { workspace = true, features = ["net", "openssl_tls"] }
 fluvio-protocol = { workspace = true }
 fluvio-socket = { workspace = true }
-fluvio-types = { workspace = true  }
 flv-tls-proxy = { workspace = true }
 

crates/fluvio-cli-common/Cargo.toml

@@ -47,7 +47,4 @@ fluvio-protocol = { workspace = true,  optional = true }
 fluvio-sc-schema = { path = "../fluvio-sc-schema", optional = true }
 fluvio-smartmodule = { path = "../fluvio-smartmodule", optional = true, default-features = false }
 fluvio-smartengine = { path = "../fluvio-smartengine", optional = true, features = ["transformation"] }
-fluvio-future = { workspace = true, features = ["tls"] }
 
-[dev-dependencies]
-fluvio-future = { workspace = true, features = ["fs", "io", "subscriber", "fixture"] }

crates/fluvio-cli/Cargo.toml

@@ -44,11 +44,8 @@ anyhow = { workspace = true }
 bytesize = { workspace = true, features = ['serde'] }
 clap = { workspace = true, features = ["std", "derive", "string", "help", "usage", "env", "error-context"] }
 clap_complete = { workspace = true }
-dirs = { workspace = true }
 indicatif = { workspace = true }
-eyre = { workspace = true }
 sha2 = { workspace = true }
-hex = { workspace = true }
 home = { workspace = true }
 current_platform = { workspace = true }
 comfy-table = { workspace = true }
@@ -63,8 +60,6 @@ futures = { workspace = true }
 futures-util = { workspace = true, features = ["sink"] }
 humantime = { workspace = true }
 mimalloc = { workspace = true }
-static_assertions = { workspace = true }
-sysinfo = { workspace = true }
 serde_yaml = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
@@ -73,7 +68,6 @@ thiserror = { workspace = true }
 tokio = { workspace = true,  features = ["macros"] }
 tracing = { workspace = true }
 which = { workspace = true }
-url = { workspace = true }
 
 # Fluvio dependencies
 k8-config = { workspace = true, optional = true }
@@ -83,7 +77,6 @@ fluvio-cluster = { path = "../fluvio-cluster", default-features = false, feature
 
 fluvio = { workspace = true }
 fluvio-auth = { workspace = true }
-fluvio-socket = { workspace = true }
 fluvio-command = { workspace = true  }
 fluvio-package-index = { workspace = true }
 fluvio-extension-common = { workspace = true,  features = ["target", "installation"] }

crates/fluvio-cluster/Cargo.toml

@@ -37,7 +37,6 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
 futures-util = { workspace = true }
-futures-channel = { workspace = true, features = ["sink"] }
 tokio = { workspace = true, features = ["macros"] }
 once_cell = { workspace = true }
 which = {workspace = true }

crates/fluvio-controlplane-metadata/Cargo.toml

@@ -17,8 +17,6 @@ use_serde = ["serde","semver/serde", "bytesize/serde", "humantime-serde", "serde
 k8 = ["use_serde", "fluvio-stream-model/k8"]
 
 [dependencies]
-async-trait = { workspace = true }
-
 thiserror = { workspace = true }
 base64 = { workspace = true }
 bytes = { workspace = true }
@@ -35,7 +33,6 @@ serde_yaml = { workspace = true, optional = true }
 derive_builder = { workspace = true }
 
 # External Fluvio dependencies
-fluvio-future = { workspace = true }
 flv-util = { workspace = true }
 
 fluvio-types = { workspace = true }
@@ -44,5 +41,4 @@ fluvio-protocol = { workspace = true, features = [ "record", "link", "api"] }
 
 
 [dev-dependencies]
-fluvio-future = { workspace = true, features = ["fixture"] }
 serde_json = { workspace = true }

crates/fluvio-extension-common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fluvio-extension-common"
-version = "0.14.1"
+version = "0.14.2"
 edition = "2021"
 authors = ["Fluvio Contributors <[email protected]>"]
 description = "Fluvio extension common"
@@ -23,7 +23,6 @@ comfy-table = { workspace = true }
 serde = { workspace = true, features = ['derive'] }
 serde_json ={ workspace = true }
 serde_yaml = { workspace = true }
-futures-lite = { workspace = true }
 semver = { workspace = true, features = ["serde"] }
 thiserror = { workspace = true }
 tracing = { workspace = true }

crates/fluvio-hub-util/Cargo.toml

@@ -29,7 +29,6 @@ http = { workspace = true }
 mime = { workspace = true }
 pem = "3.0"
 rand = { workspace = true }
-rand_core = "0.6"
 sha2 = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true, features=["derive"] }
@@ -39,7 +38,6 @@ ssh-key = { version="0.6.1", features=[ "ed25519" ] }
 tar = { workspace = true }
 pathdiff = { version = "0.2.1", default-features = false }
 tempfile = { workspace = true }
-toml = { workspace = true }
 tracing = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
@@ -54,6 +52,3 @@ fluvio-hub-protocol = { path = "../fluvio-hub-protocol" }
 fluvio-types = { workspace = true }
 fluvio-extension-common = { workspace = true,  optional = true }
 
-
-[dev-dependencies]
-tracing-subscriber = { workspace = true,  features = ["env-filter", "fmt"] }

crates/fluvio-run/Cargo.toml

@@ -27,8 +27,6 @@ clap = { workspace = true, features = ["std", "derive", "help", "usage", "error-
 semver = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
-tracing = { workspace = true }
-tracing-subscriber = { workspace = true }
 
 # regardless of TLS, sc and spu always use openssl_tls for now because we need cert API
 fluvio-future = { workspace = true, features = ["subscriber"] }

crates/fluvio-sc-schema/Cargo.toml

@@ -31,7 +31,6 @@ fluvio-controlplane-metadata = {  workspace = true, features = ["smartmodule", "
 fluvio-protocol = { workspace = true,  features = ["link"]}
 fluvio-socket = { workspace = true }
 fluvio-stream-model = { workspace = true, features = ["k8"] }
-fluvio-types = { workspace = true }
 
 [dev-dependencies]
 fluvio-future = { workspace = true, features = ["subscriber"] }

crates/fluvio-sc/Cargo.toml

@@ -26,22 +26,15 @@ adaptive_backoff = { workspace = true }
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 async-lock = { workspace = true }
-async-channel = { workspace = true }
-base64 = { workspace = true }
-cfg-if = { workspace = true }
 clap = { workspace = true,features = ["std", "derive", "env"]}
-event-listener = { workspace = true }
 futures-util = { workspace = true }
 mimalloc = { workspace = true }
 once_cell = { workspace = true }
 rand = { workspace = true }
-regex = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true, features = ['derive'] }
 serde_json = { workspace = true }
-serde_yaml = { workspace = true }
 sysinfo = { workspace = true }
-thiserror = { workspace = true }
 tokio = { workspace = true, features = ["macros"] }
 tracing = { workspace = true }
 
@@ -71,5 +64,4 @@ flv-tls-proxy = { workspace = true }
 [dev-dependencies]
 rand = { workspace = true }
 fluvio-future = { workspace = true, features = ["fixture"] }
-flv-util = { workspace = true, features = ["fixture"] }
 fluvio-stream-model = { workspace = true, features = ["fixture"] }

crates/fluvio-service/Cargo.toml

@@ -16,7 +16,6 @@ path = "src/lib.rs"
 [dependencies]
 tracing = { workspace = true }
 async-trait = { workspace = true }
-tokio = { workspace = true, features = ["macros"] }
 anyhow = { workspace = true }
 
 # Fluvio dependencies
@@ -28,4 +27,4 @@ fluvio-types = { workspace = true, features = ["events"] }
 
 [dev-dependencies]
 fluvio-future = { workspace = true, features = ["fixture"] }
-portpicker = { workspace = true }
+portpicker = { workspace = true }

crates/fluvio-smartengine/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fluvio-smartengine"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2021"
 license = "Apache-2.0"
 authors = ["Fluvio Contributors <[email protected]>"]
@@ -37,5 +37,4 @@ fluvio-protocol = { workspace = true, features = [
 fluvio-smartmodule = { workspace = true, default-features = false }
 
 [dev-dependencies]
-fluvio-types = { workspace = true }
 fluvio-future = { workspace = true, default-features = false, features = ["task"] }

crates/fluvio-socket/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fluvio-socket"
-version = "0.14.9"
+version = "0.14.10"
 edition = "2021"
 authors = ["Fluvio Contributors <[email protected]>"]
 description = "Provide TCP socket wrapper for fluvio protocol"
@@ -29,7 +29,6 @@ tokio-util = { features = ["codec", "compat"], workspace = true }
 async-trait = { workspace = true }
 pin-project = { workspace = true }
 thiserror = { workspace = true }
-anyhow = { workspace = true }
 semver = { workspace = true }
 nix = { workspace = true, features = ["uio"]}
 

crates/fluvio-spu/Cargo.toml

@@ -28,17 +28,13 @@ tracing = { workspace = true }
 bytes = { workspace = true }
 clap = { workspace = true, features = ["std", "derive", "env"]}
 thiserror = { workspace = true }
-nix = { workspace = true, features = ["uio"]}
-toml = { workspace = true }
 futures-util = { workspace = true, features = ["sink"] }
 async-trait = { workspace = true }
 serde = { workspace = true,  features = ['derive'] }
 serde_json = { workspace = true }
-regex = { workspace = true }
 tokio = { workspace = true, features = ["macros"] }
 async-channel = { workspace = true }
 async-lock = { workspace = true }
-event-listener = { workspace = true }
 async-io = { workspace = true }
 adaptive_backoff = { workspace = true }
 once_cell = { workspace = true }

crates/fluvio-storage/Cargo.toml

@@ -17,7 +17,7 @@ required-features = ["cli", "fluvio-future/subscriber"]
 [features]
 default = ["iterators"]
 cli = ["clap"]
-iterators = ["fluvio-compression"]
+iterators = []
 fixture = []
 
 
@@ -52,7 +52,6 @@ fluvio-protocol = { workspace = true }
 fluvio-controlplane-metadata = { workspace = true  }
 fluvio-controlplane = { workspace = true }
 fluvio-spu-schema = { workspace = true, features = [ "file"] }
-fluvio-compression = { workspace = true, features = ["compress"], optional = true }
 
 [dev-dependencies]
 fluvio-future = { workspace = true, features = ["fixture"] }

crates/fluvio-stream-dispatcher/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fluvio-stream-dispatcher"
 edition = "2021"
-version = "0.13.4"
+version = "0.13.5"
 authors = ["Fluvio Contributors <[email protected]>"]
 description = "Fluvio Event Stream access"
 repository = "https://github.com/infinyon/fluvio"
@@ -21,13 +21,11 @@ async-trait = { workspace = true }
 async-lock = { workspace = true }
 async-channel = { workspace = true }
 cfg-if = { workspace = true }
-event-listener = { workspace = true }
 futures-util = { workspace = true, features = ["alloc"] }
 once_cell = { workspace = true }
 serde = { workspace = true,  features = ['derive'] }
 serde_json = { workspace = true, optional = true }
 serde_yaml = { workspace = true, optional = true }
-thiserror = { workspace = true }
 tokio = { workspace = true, features = ["macros"] }
 tracing = { workspace = true }
 tempfile = { workspace = true }

crates/fluvio-test-derive/Cargo.toml

@@ -24,10 +24,5 @@ rand = { workspace = true }
 
 [dev-dependencies]
 trybuild = { workspace = true }
-fluvio = { workspace = true  }
-tokio = { workspace = true,  features = ["macros"] }
 fluvio-future = { workspace = true, features = ["task", "timer", "subscriber", "fixture"] }
-clap = { workspace = true,  features = ["std", "derive", "help", "usage", "error-context"] }
 inventory = { workspace = true }
-tracing = { workspace = true }
-crossbeam-channel = { workspace = true }

crates/fluvio-test-util/Cargo.toml

@@ -10,18 +10,12 @@ publish = false
 
 
 [dependencies]
-bytes = { workspace = true }
 tracing = { workspace = true }
-futures-lite = { workspace = true }
 clap = { workspace = true , features = ["std", "derive", "help", "usage", "error-context"] }
 async-trait = { workspace = true }
-tokio = { workspace = true, features = ["macros"] }
 syn = { workspace = true }
 serde = { workspace = true }
-serde_json = { workspace = true }
 humantime = { workspace = true }
-quote =  { workspace = true }
-proc-macro2 = { workspace = true }
 inventory = { workspace = true }
 comfy-table = { workspace = true }
 once_cell = { workspace = true }
@@ -36,7 +30,6 @@ fluvio-types = { workspace = true }
 fluvio-future = { workspace = true, features = ["task", "timer", "subscriber", "fixture"] }
 fluvio-cluster = { path = "../fluvio-cluster" }
 fluvio-command = { workspace = true  }
-fluvio-controlplane-metadata = { workspace = true, features = ["k8"] }
 
 [lib]
 path = "lib.rs"

crates/fluvio-test/Cargo.toml

@@ -12,8 +12,6 @@ publish = false
 [dependencies]
 async-channel = { workspace = true }
 anyhow = { workspace = true }
-async-trait = { workspace = true }
-bytes = { workspace = true }
 futures-lite = { workspace = true }
 futures = { workspace = true }
 clap = { workspace = true, features = ["std", "derive"] }
@@ -25,19 +23,15 @@ md-5 = "0.10"
 nix = { workspace = true, features = ["process"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-serde_yaml = { workspace = true }
 inventory = { workspace = true }
 tokio = { workspace = true, features = ["macros"] }
 comfy-table = { workspace = true }
 hdrhistogram = { workspace = true }
 crc = "3.0"
 fork = "0.2"
-crossbeam-channel = { workspace = true }
 sysinfo = { workspace = true }
 signal-hook = "0.3.13"
 indicatif = { workspace = true }
-async-std = { workspace = true, features = ["attributes"] }
-uuid = { workspace = true }
 
 tracing = { workspace = true }
 
@@ -52,7 +46,6 @@ fluvio-future = { workspace = true, features = [
     "fixture",
 ] }
 fluvio-command = { version = "0.2.0" }
-fluvio-cluster = { path = "../fluvio-cluster" }
 fluvio-cli = { path = "../fluvio-cli" }
 fluvio-controlplane-metadata = { workspace = true, features = ["k8"] }
 

crates/fluvio-version-manager/Cargo.toml

@@ -22,7 +22,6 @@ comfy-table = { workspace = true }
 current_platform = { workspace = true }
 dialoguer = { workspace = true }
 dirs = { workspace = true }
-hex = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }

crates/fluvio/Cargo.toml

@@ -29,16 +29,12 @@ async-channel = { workspace = true }
 async-lock = { workspace = true }
 async-trait = { workspace = true }
 anyhow = { workspace = true }
-base64 = { workspace = true }
-bytes = { workspace = true }
 cfg-if = { workspace = true }
 derive_builder = { workspace = true }
 event-listener = { workspace = true }
-futures-lite = { workspace = true }
 futures-util = { workspace = true }
 once_cell = { workspace = true }
 serde = { workspace = true, features = ['derive'] }
-serde_json = { workspace = true }
 tokio = { workspace = true, features = ["macros", "sync"] }
 thiserror = { workspace = true }
 semver = { workspace = true }

crates/fluvio/src/admin.rs

@@ -135,7 +135,9 @@ impl FluvioAdmin {
                 metadata,
             })
         } else {
-            Err(anyhow!("WatchApi version not found"))
+            let platform_version = versions.platform_version();
+            let client_version = crate::VERSION.trim();
+            Err(anyhow!("Fluvio Client {client_version} and Cluster {platform_version} versions are not compatible. Please upgrade client to {platform_version}"))
         }
     }