chore: rename datakit_filter to datakit

Kong · Apr 15, 2024 · 02bfa44 · 02bfa44
1 parent 99f6e84
commit 02bfa44
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 39 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,19 +27,15 @@ jobs:
       run: cargo build --release
 
     - run: |
-        if ! test -f target/wasm32-wasi/release/datakit_filter.wasm; then
+        if ! test -f target/wasm32-wasi/release/datakit.wasm; then
           echo "missing output binary"
           exit 1
         fi
 
         mv -v \
-          ./target/wasm32-wasi/release/datakit_filter.wasm \
+          ./target/wasm32-wasi/release/datakit.wasm \
           ./datakit.wasm
 
-        mv -v \
-          ./datakit-filter/datakit_filter.meta.json \
-          ./datakit.meta.json
-
         readonly BODY=./body.md
         touch "$BODY"
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,24 @@
-[workspace]
-members = ["datakit-filter"]
-resolver = "2"
+[package]
+name = "datakit"
+version = "0.1.0"
+authors = ["Hisham Muhammad <[email protected]>"]
+license = "Apache-2.0"
+edition = "2021"
 
-#[workspace.dependencies]
-#datakit = { path = "datakit" }
+[lib]
+path = "src/filter.rs"
+crate-type = ["cdylib"]
+
+[dependencies]
+proxy-wasm = "0.2"
+log = "0.4"
+serde-json-wasm = "0.5.0"
+serde_json = "*"
+serde = { version = "*", features = ["derive"] }
+lazy_static = "*"
+"url" = "2.5.0"
+handlebars = "5.1.0"
+jaq-interpret = "1.2.1"
+jaq-parse = "1.0.2"
+jaq-core = "1.2.1"
+jaq-std = "1.2.1"
diff --git a/datakit-filter/Cargo.toml b/datakit-filter/Cargo.toml
diff --git a/datakit-filter/datakit_filter.meta.json → datakit.meta.json b/datakit-filter/datakit_filter.meta.json → datakit.meta.json
diff --git a/datakit-filter/src/config.rs → src/config.rs b/datakit-filter/src/config.rs → src/config.rs
diff --git a/datakit-filter/src/data.rs → src/data.rs b/datakit-filter/src/data.rs → src/data.rs
diff --git a/datakit-filter/src/debug.rs → src/debug.rs b/datakit-filter/src/debug.rs → src/debug.rs
diff --git a/datakit-filter/src/dependency_graph.rs → src/dependency_graph.rs b/datakit-filter/src/dependency_graph.rs → src/dependency_graph.rs
diff --git a/datakit-filter/src/filter.rs → src/filter.rs b/datakit-filter/src/filter.rs → src/filter.rs
diff --git a/datakit-filter/src/nodes.rs → src/nodes.rs b/datakit-filter/src/nodes.rs → src/nodes.rs
diff --git a/datakit-filter/src/nodes/call.rs → src/nodes/call.rs b/datakit-filter/src/nodes/call.rs → src/nodes/call.rs
diff --git a/datakit-filter/src/nodes/jq.rs → src/nodes/jq.rs b/datakit-filter/src/nodes/jq.rs → src/nodes/jq.rs
diff --git a/datakit-filter/src/nodes/response.rs → src/nodes/response.rs b/datakit-filter/src/nodes/response.rs → src/nodes/response.rs
diff --git a/datakit-filter/src/nodes/template.rs → src/nodes/template.rs b/datakit-filter/src/nodes/template.rs → src/nodes/template.rs
diff --git a/test/config/demo.yml b/test/config/demo.yml
@@ -12,7 +12,7 @@ services:
     strip_path: false
     filter_chains:
     - filters:
-      - name: datakit_filter
+      - name: datakit
         config:
           nodes:
           - type: call

diff --git a/test/demo.sh b/test/demo.sh
@@ -35,7 +35,7 @@ message "Building the filter using cargo..."
 mkdir -p wasm
 
 cp -a ../target/wasm32-wasi/release/*.wasm wasm/
-cp ../*/*.meta.json wasm/
+cp ../*.meta.json wasm/
 
 script_dir=$(dirname $(realpath $0))