diff --git a/README.md b/README.md index 2b53fe0e13..e7efdd2a6c 100644 --- a/README.md +++ b/README.md @@ -240,7 +240,10 @@ Here a a few listed below: - [Elastic Connector](https://github.com/fluvio-connectors/elastic-connector): Send data from Fluvio to Elastic Search ## Community Development Resources -- [Hello World Fluvio Connector](https://github.com/infinyon/connector-hello-source): Sample Fluvio connector template to build your own connector + +More projects and utilities are available in the [Fluvio Community Github Org](https://github.com/fluvio-community/) + +- [Hello World Fluvio Connector](https://github.com/fluvio-community/connector-hello-source): Sample Fluvio connector template to build your own connector - [Gurubase](https://gurubase.io/g/fluvio): Third-party AI/LLM Docs query ### Contributors are awesome diff --git a/crates/cargo-builder/src/cargo.rs b/crates/cargo-builder/src/cargo.rs index d9eb60d2e0..a96727136c 100644 --- a/crates/cargo-builder/src/cargo.rs +++ b/crates/cargo-builder/src/cargo.rs @@ -154,9 +154,9 @@ impl CargoBuilder { #[cfg(test)] mod test { use std::ffi::OsStr; + use crate::WASM_TARGET; use super::*; - const WASM_TARGET: &str = "wasm32-wasi"; #[test] fn test_builder_default() { diff --git a/crates/cargo-builder/src/lib.rs b/crates/cargo-builder/src/lib.rs index c39032dc0d..38fccaa5a4 100644 --- a/crates/cargo-builder/src/lib.rs +++ b/crates/cargo-builder/src/lib.rs @@ -1,2 +1,4 @@ pub mod cargo; pub mod package; + +const WASM_TARGET: &str = "wasm32-wasip1"; diff --git a/crates/cargo-builder/src/package.rs b/crates/cargo-builder/src/package.rs index 5663b04872..9611a127a5 100644 --- a/crates/cargo-builder/src/package.rs +++ b/crates/cargo-builder/src/package.rs @@ -7,6 +7,8 @@ use std::path::{Path, PathBuf}; use anyhow::{anyhow, Context}; use cargo_metadata::{CargoOpt, MetadataCommand, Package}; +use crate::WASM_TARGET; + #[derive(Debug)] pub struct PackageOption { pub release: String, @@ -124,7 +126,7 @@ impl PackageInfo { /// path to package's wasm32-wasi target pub fn target_wasm32_wasi_path(&self) -> anyhow::Result { let mut path = self.target_dir.clone(); - path.push("wasm32-wasi"); + path.push(WASM_TARGET); path.push(&self.profile); path.push(self.target_name()?.replace('-', "_")); path.set_extension("wasm"); @@ -159,6 +161,7 @@ pub fn get_current_project_path() -> anyhow::Result> { #[cfg(test)] mod tests { use super::*; + use crate::WASM_TARGET; #[test] fn test_package_info() { @@ -189,6 +192,6 @@ mod tests { assert!(package_info .target_wasm32_wasi_path() .unwrap() - .ends_with("wasm32-wasi/release-lto/cargo_builder.wasm")); + .ends_with(format!("{WASM_TARGET}/release-lto/cargo_builder.wasm"))); } } diff --git a/crates/fluvio-smartengine/src/engine/fixture.rs b/crates/fluvio-smartengine/src/engine/fixture.rs index de0eb7d961..e81381fb56 100644 --- a/crates/fluvio-smartengine/src/engine/fixture.rs +++ b/crates/fluvio-smartengine/src/engine/fixture.rs @@ -1,6 +1,4 @@ -use std::{ - path::{PathBuf, Path}, -}; +use std::path::{PathBuf, Path}; pub(crate) fn read_wasm_module(module_name: &str) -> Vec { let spu_dir = std::env::var("CARGO_MANIFEST_DIR").expect("target"); @@ -10,7 +8,7 @@ pub(crate) fn read_wasm_module(module_name: &str) -> Vec { .parent() .expect("fluvio") .join(format!( - "smartmodule/examples/target/wasm32-wasi/release-lto/{module_name}.wasm" + "smartmodule/examples/target/wasm32-wasip1/release-lto/{module_name}.wasm" )); read_module_from_path(wasm_path) } diff --git a/crates/fluvio-spu/src/services/public/tests/mod.rs b/crates/fluvio-spu/src/services/public/tests/mod.rs index 59ad37295f..477f8c6e41 100644 --- a/crates/fluvio-spu/src/services/public/tests/mod.rs +++ b/crates/fluvio-spu/src/services/public/tests/mod.rs @@ -94,7 +94,7 @@ fn read_wasm_module(module_name: &str) -> Vec { .parent() .expect("fluvio") .join(format!( - "smartmodule/examples/target/wasm32-wasi/release-lto/{module_name}.wasm" + "smartmodule/examples/target/wasm32-wasip1/release-lto/{module_name}.wasm" )); read_filter_from_path(wasm_path) } diff --git a/crates/smartmodule-development-kit/src/build.rs b/crates/smartmodule-development-kit/src/build.rs index 6f248818cd..3835ea8517 100644 --- a/crates/smartmodule-development-kit/src/build.rs +++ b/crates/smartmodule-development-kit/src/build.rs @@ -11,7 +11,7 @@ use crate::cmd::PackageCmd; use crate::ENV_SMDK_NOWASI; pub(crate) const BUILD_TARGET: &str = "wasm32-unknown-unknown"; -pub(crate) const BUILD_TARGET_WASI: &str = "wasm32-wasi"; +pub(crate) const BUILD_TARGET_WASI: &str = "wasm32-wasip1"; /// Builds the SmartModule in the current working directory into a WASM file #[derive(Debug, Parser)] diff --git a/makefiles/test.mk b/makefiles/test.mk index 015523090c..b41962e2b5 100644 --- a/makefiles/test.mk +++ b/makefiles/test.mk @@ -214,6 +214,9 @@ longevity-test: build-test $(TEST_BIN) longevity --expect-timeout -- $(VERBOSE_FLAG) --runtime-seconds=60 endif +sm-target: + rustup target add wasm32-wasip1 + cli-backward-compatibility-test: ./tests/cli/cli-backward-compatibility.bash @@ -237,7 +240,7 @@ cli-fluvio-mirroring-smoke: cli-fluvio-mirroring-smoke-e2e: bats $(shell ls -1 ./tests/cli/mirroring_smoke_tests/e2e/*.bats | sort -R) -cli-smdk-smoke: +cli-smdk-smoke: sm-target bats $(shell ls -1 ./tests/cli/smdk_smoke_tests/*.bats | sort -R) cli-cdk-smoke: @@ -249,22 +252,22 @@ cli-fvm-smoke: cli-basic-test: bats ./tests/cli/fluvio_smoke_tests/e2e-basic.bats -cli-smartmodule-all-test: +cli-smartmodule-all-test: sm-target bats ./tests/cli/fluvio_smoke_tests/e2e-smartmodule-basic.bats -cli-smartmodule-aggregate-test: +cli-smartmodule-aggregate-test: sm-target bats -f aggregate ./tests/cli/fluvio_smoke_tests/e2e-smartmodule-basic.bats -cli-smartmodule-basic-test: +cli-smartmodule-basic-test: sm-target bats ./tests/cli/fluvio_smoke_tests/smartmodule-basic.bats -cli-producer-smartmodule-test: +cli-producer-smartmodule-test: sm-target bats ./tests/cli/fluvio_smoke_tests/producer-smartmodule.bats stats-test: $(TEST_BIN) stats -- $(VERBOSE_FLAG) --tolerance=5 -cli-smdk-basic-test: +cli-smdk-basic-test: sm-target SMDK_BIN=$(shell readlink -f $(SMDK_BIN)) bats ./tests/cli/smdk_smoke_tests/smdk-basic.bats cli-cdk-basic-test: diff --git a/smartmodule/cargo_template/README.md b/smartmodule/cargo_template/README.md index b05380f41b..328874cb26 100644 --- a/smartmodule/cargo_template/README.md +++ b/smartmodule/cargo_template/README.md @@ -50,5 +50,5 @@ topic to send data to. ```bash $ fluvio topic create smartmodule-test $ cargo build --release -$ fluvio consume smartmodule-test -B --{{smartmodule-type}}="target/wasm32-wasi/release-lto/{{project-name}}" +$ fluvio consume smartmodule-test -B --{{smartmodule-type}}="target/wasm32-wasip1/release-lto/{{project-name}}" ``` diff --git a/smartmodule/cargo_template/rust-toolchain.toml b/smartmodule/cargo_template/rust-toolchain.toml index 688bd594c6..bf946b5a75 100644 --- a/smartmodule/cargo_template/rust-toolchain.toml +++ b/smartmodule/cargo_template/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] channel = "stable" -targets = ["wasm32-unknown-unknown", "wasm32-wasi"] +targets = ["wasm32-unknown-unknown", "wasm32-wasip1"] diff --git a/smartmodule/examples/Cargo.lock b/smartmodule/examples/Cargo.lock index e0dbea52a5..f592b39783 100644 --- a/smartmodule/examples/Cargo.lock +++ b/smartmodule/examples/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "adler" @@ -54,9 +54,9 @@ checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" [[package]] name = "bytes" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cfg-if" @@ -143,9 +143,10 @@ dependencies = [ [[package]] name = "fluvio-compression" -version = "0.3.3" +version = "0.3.4" dependencies = [ "bytes", + "fluvio-types 0.5.2", "serde", "thiserror", ] @@ -199,16 +200,16 @@ dependencies = [ [[package]] name = "fluvio-protocol" -version = "0.11.0" +version = "0.12.0" dependencies = [ "bytes", "cfg-if", "content_inspector", "crc32c", "eyre", - "fluvio-compression 0.3.3", + "fluvio-compression 0.3.4", "fluvio-protocol-derive 0.5.4", - "fluvio-types 0.5.0", + "fluvio-types 0.5.2", "flv-util", "once_cell", "semver", @@ -251,11 +252,11 @@ dependencies = [ [[package]] name = "fluvio-smartmodule" -version = "0.7.4" +version = "0.8.0" dependencies = [ "eyre", - "fluvio-protocol 0.11.0", - "fluvio-smartmodule-derive 0.6.3", + "fluvio-protocol 0.12.0", + "fluvio-smartmodule-derive 0.6.4", "thiserror", "tracing", ] @@ -264,7 +265,7 @@ dependencies = [ name = "fluvio-smartmodule-aggregate" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] @@ -272,14 +273,14 @@ name = "fluvio-smartmodule-aggregate-with-timestamp" version = "0.0.0" dependencies = [ "chrono", - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] name = "fluvio-smartmodule-array-map-array" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", "serde_json", ] @@ -288,7 +289,7 @@ name = "fluvio-smartmodule-array-map-array-with-timestamp" version = "0.0.0" dependencies = [ "chrono", - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", "serde_json", ] @@ -296,7 +297,7 @@ dependencies = [ name = "fluvio-smartmodule-array-map-object" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", "serde_json", ] @@ -313,7 +314,7 @@ dependencies = [ [[package]] name = "fluvio-smartmodule-derive" -version = "0.6.3" +version = "0.6.4" dependencies = [ "proc-macro2", "quote", @@ -324,56 +325,56 @@ dependencies = [ name = "fluvio-smartmodule-filter" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] name = "fluvio-smartmodule-filter-hashset" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] name = "fluvio-smartmodule-filter-init" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] name = "fluvio-smartmodule-filter-lookback" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] name = "fluvio-smartmodule-filter-lookback-with-timestamps" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] name = "fluvio-smartmodule-filter-map" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] name = "fluvio-smartmodule-filter-param" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] name = "fluvio-smartmodule-map" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] @@ -381,7 +382,7 @@ name = "fluvio-smartmodule-map-with-timestamp" version = "0.0.0" dependencies = [ "chrono", - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] @@ -396,7 +397,7 @@ dependencies = [ [[package]] name = "fluvio-types" -version = "0.5.0" +version = "0.5.2" dependencies = [ "serde", "thiserror", @@ -408,7 +409,7 @@ dependencies = [ name = "fluvio-wasm-aggregate-average" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", "serde", "serde_json", ] @@ -417,7 +418,7 @@ dependencies = [ name = "fluvio-wasm-aggregate-json" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", "serde", "serde_json", ] @@ -426,14 +427,14 @@ dependencies = [ name = "fluvio-wasm-aggregate-sum" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] name = "fluvio-wasm-array-map-reddit" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", "serde", "serde_json", ] @@ -442,7 +443,7 @@ dependencies = [ name = "fluvio-wasm-filter-json" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", "serde", "serde_json", ] @@ -451,7 +452,7 @@ dependencies = [ name = "fluvio-wasm-filter-odd" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", "thiserror", ] @@ -459,7 +460,7 @@ dependencies = [ name = "fluvio-wasm-filter-regex" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", "regex", ] @@ -474,14 +475,14 @@ dependencies = [ name = "fluvio-wasm-map-double" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] name = "fluvio-wasm-map-json" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", "serde_json", "serde_yaml", ] @@ -490,7 +491,7 @@ dependencies = [ name = "fluvio-wasm-map-regex" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", "once_cell", "regex", ] @@ -928,7 +929,7 @@ dependencies = [ name = "sm-integer-sum-aggegrate" version = "0.0.0" dependencies = [ - "fluvio-smartmodule 0.7.4", + "fluvio-smartmodule 0.8.0", ] [[package]] diff --git a/smartmodule/examples/Makefile b/smartmodule/examples/Makefile index 5ce2c1b39b..6434e75b36 100644 --- a/smartmodule/examples/Makefile +++ b/smartmodule/examples/Makefile @@ -8,7 +8,7 @@ SUBDIRS := $(filter-out target/., $(wildcard */.)) .PHONY: build $(SUBDIRS) setup: - rustup target add wasm32-wasi + rustup target add wasm32-wasip1 @echo SMDK_BIN ${SMDK_BIN} dirs: diff --git a/smartmodule/examples/array_map_json_array/src/lib.rs b/smartmodule/examples/array_map_json_array/src/lib.rs index 0a2ceba8ee..1a8441aebb 100644 --- a/smartmodule/examples/array_map_json_array/src/lib.rs +++ b/smartmodule/examples/array_map_json_array/src/lib.rs @@ -27,7 +27,7 @@ //! ```text //! $ cd smartmodule/examples //! $ cargo build --release -//! $ fluvio consume array-map-array -B --array-map=target/wasm32-wasi/release/fluvio_wasm_array_map_array.wasm +//! $ fluvio consume array-map-array -B --array-map=target/wasm32-wasip1/release/fluvio_wasm_array_map_array.wasm //! "Apple" //! "Banana" //! "Cranberry" diff --git a/smartmodule/examples/array_map_json_array_with_timestamp/src/lib.rs b/smartmodule/examples/array_map_json_array_with_timestamp/src/lib.rs index 4a909a878a..34a10f38c8 100644 --- a/smartmodule/examples/array_map_json_array_with_timestamp/src/lib.rs +++ b/smartmodule/examples/array_map_json_array_with_timestamp/src/lib.rs @@ -27,7 +27,7 @@ //! ```text //! $ cd smartmodule/examples //! $ cargo build --release -//! $ fluvio consume array-map-array -B --array-map=target/wasm32-wasi/release/fluvio_wasm_array_map_array.wasm +//! $ fluvio consume array-map-array -B --array-map=target/wasm32-wasip1/release/fluvio_wasm_array_map_array.wasm //! "Apple" //! "Banana" //! "Cranberry" diff --git a/smartmodule/examples/array_map_json_object/src/lib.rs b/smartmodule/examples/array_map_json_object/src/lib.rs index 08fff29e32..899760ba61 100644 --- a/smartmodule/examples/array_map_json_object/src/lib.rs +++ b/smartmodule/examples/array_map_json_object/src/lib.rs @@ -45,7 +45,7 @@ //! ```text //! $ cd smartmodule/examples //! $ cargo build --release -//! $ fluvio consume array-map-object -B --key-value --array-map=target/wasm32-wasi/release/fluvio_wasm_array_map_object.wasm +//! $ fluvio consume array-map-object -B --key-value --array-map=target/wasm32-wasip1/release/fluvio_wasm_array_map_object.wasm //! [a] "Apple" //! [b] "Banana" //! [c] "Cranberry" diff --git a/smartmodule/examples/filter_json/src/lib.rs b/smartmodule/examples/filter_json/src/lib.rs index 6ccac5e7db..8acc45f7eb 100644 --- a/smartmodule/examples/filter_json/src/lib.rs +++ b/smartmodule/examples/filter_json/src/lib.rs @@ -37,7 +37,7 @@ //! //! ```text //! $ cargo build --release -p fluvio-smartmodule-filter-json -//! $ fluvio consume application-logs -B --smart-stream=target/wasm32-wasi/release/fluvio-smartmodule-filter-json.wasm +//! $ fluvio consume application-logs -B --smart-stream=target/wasm32-wasip1/release/fluvio-smartmodule-filter-json.wasm //! {"level":"info","message":"Server listening on 0.0.0.0:8000"} //! {"level":"info","message":"Accepted incoming connection"} //! {"level":"warn","message":"Client dropped connection} diff --git a/smartmodule/regex-filter/Cargo.lock b/smartmodule/regex-filter/Cargo.lock index f14184521d..94f334032f 100644 --- a/smartmodule/regex-filter/Cargo.lock +++ b/smartmodule/regex-filter/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cfg-if" @@ -59,16 +59,17 @@ dependencies = [ [[package]] name = "fluvio-compression" -version = "0.3.3" +version = "0.3.4" dependencies = [ "bytes", + "fluvio-types", "serde", "thiserror", ] [[package]] name = "fluvio-protocol" -version = "0.11.0" +version = "0.12.0" dependencies = [ "bytes", "cfg-if", @@ -97,7 +98,7 @@ dependencies = [ [[package]] name = "fluvio-smartmodule" -version = "0.7.4" +version = "0.8.0" dependencies = [ "eyre", "fluvio-protocol", @@ -108,7 +109,7 @@ dependencies = [ [[package]] name = "fluvio-smartmodule-derive" -version = "0.6.3" +version = "0.6.4" dependencies = [ "proc-macro2", "quote", @@ -117,7 +118,7 @@ dependencies = [ [[package]] name = "fluvio-types" -version = "0.5.0" +version = "0.5.2" dependencies = [ "serde", "thiserror", diff --git a/smartmodule/regex-filter/Makefile b/smartmodule/regex-filter/Makefile index 3e82aa2e12..f91b11a9d3 100644 --- a/smartmodule/regex-filter/Makefile +++ b/smartmodule/regex-filter/Makefile @@ -5,11 +5,11 @@ SMDK_OPT ?= default: build setup: - rustup target add wasm32-wasi + rustup target add wasm32-wasip1 build: setup ${SMDK_BIN} build ${SMDK_OPT} build-raw: - cargo build --target wasm32-wasi + cargo build --target wasm32-wasip1 diff --git a/smartmodule/regex-filter/src/lib.rs b/smartmodule/regex-filter/src/lib.rs index 48297e8df2..19fa3e1077 100644 --- a/smartmodule/regex-filter/src/lib.rs +++ b/smartmodule/regex-filter/src/lib.rs @@ -2,7 +2,6 @@ use std::sync::OnceLock; use regex::Regex; - use fluvio_smartmodule::{ smartmodule, SmartModuleRecord, Result, eyre, dataplane::smartmodule::{SmartModuleExtraParams, SmartModuleInitError}, diff --git a/tests/cli/fluvio_smoke_tests/e2e-smartmodule-basic.bats b/tests/cli/fluvio_smoke_tests/e2e-smartmodule-basic.bats index b9986ab2be..d837b3f626 100644 --- a/tests/cli/fluvio_smoke_tests/e2e-smartmodule-basic.bats +++ b/tests/cli/fluvio_smoke_tests/e2e-smartmodule-basic.bats @@ -13,7 +13,7 @@ load "$TEST_HELPER_DIR"/bats-assert/load.bash setup_file() { # Compile the smartmodule examples # pushd "$BATS_TEST_DIRNAME/../../.." && make build_smartmodules && popd - SMARTMODULE_BUILD_DIR="$BATS_TEST_DIRNAME/../../../smartmodule/examples/target/wasm32-wasi/release-lto" + SMARTMODULE_BUILD_DIR="$BATS_TEST_DIRNAME/../../../smartmodule/examples/target/wasm32-wasip1/release-lto" export SMARTMODULE_BUILD_DIR } diff --git a/tests/cli/fluvio_smoke_tests/producer-smartmodule.bats b/tests/cli/fluvio_smoke_tests/producer-smartmodule.bats index f9d7735003..0c235e6389 100644 --- a/tests/cli/fluvio_smoke_tests/producer-smartmodule.bats +++ b/tests/cli/fluvio_smoke_tests/producer-smartmodule.bats @@ -13,7 +13,7 @@ load "$TEST_HELPER_DIR"/bats-assert/load.bash setup_file() { # Compile the smartmodule examples # pushd "$BATS_TEST_DIRNAME/../../.." && make build_smartmodules && popd - SMARTMODULE_BUILD_DIR="$BATS_TEST_DIRNAME/../../../smartmodule/examples/target/wasm32-wasi/release-lto" + SMARTMODULE_BUILD_DIR="$BATS_TEST_DIRNAME/../../../smartmodule/examples/target/wasm32-wasip1/release-lto" export SMARTMODULE_BUILD_DIR } diff --git a/tests/cli/fluvio_smoke_tests/topic-basic.bats b/tests/cli/fluvio_smoke_tests/topic-basic.bats index 9a44328662..4e336369f5 100644 --- a/tests/cli/fluvio_smoke_tests/topic-basic.bats +++ b/tests/cli/fluvio_smoke_tests/topic-basic.bats @@ -49,7 +49,7 @@ deduplication: uses: $DEDUP_FILTER_NAME EOF - run timeout 15s "$FLUVIO_BIN" sm create --wasm-file smartmodule/examples/target/wasm32-wasi/release-lto/fluvio_smartmodule_filter.wasm "$DEDUP_FILTER_NAME" + run timeout 15s "$FLUVIO_BIN" sm create --wasm-file smartmodule/examples/target/wasm32-wasip1/release-lto/fluvio_smartmodule_filter.wasm "$DEDUP_FILTER_NAME" assert_success } diff --git a/tests/cli/smdk_smoke_tests/smdk-basic.bats b/tests/cli/smdk_smoke_tests/smdk-basic.bats index a1f3ab6bf1..1e6fade240 100644 --- a/tests/cli/smdk_smoke_tests/smdk-basic.bats +++ b/tests/cli/smdk_smoke_tests/smdk-basic.bats @@ -43,7 +43,7 @@ smdk_via_stdin() { } ### Using crates.io dependency for `fluvio-smartmodule` - +# bats test_tags=tag:clean @test "Clean" { LABEL=clean SMDK_SM_TYPE=filter @@ -51,7 +51,7 @@ smdk_via_stdin() { SM_CRATE_PATH_FLAG= SM_PACKAGE_NAME=$LABEL-$SMDK_SM_TYPE-$PROJECT_NAME_PREFIX SMDK_SM_PUBLIC=false - + cd $TEST_DIR sed -i -e $'/members/a\\\n "'$SM_PACKAGE_NAME'",' Cargo.toml @@ -65,24 +65,24 @@ smdk_via_stdin() { --sm-public $SMDK_SM_PUBLIC \ --silent \ $SM_PACKAGE_NAME - assert_success + assert_success + - # Build cd $SM_PACKAGE_NAME run $SMDK_BIN build refute_output --partial "could not compile" - + # Verify if target exists in the parent folder [ -d "../target" ] - + # Clean run $SMDK_BIN clean assert_success # Verify if target was removed from the parent folder - [ ! -d "../target" ] + [ ! -d "../target" ] } @test "Package" {