chore: 📦 Remove exp envoy plugins from main branch

sentinel-group · Nov 29, 2022 · 26e3717 · 26e3717
1 parent cbe260a
commit 26e3717
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 276 deletions.
diff --git a/.github/workflows/platforms.yml b/.github/workflows/platforms.yml
@@ -47,18 +47,18 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: check
-          args: --target=${{ matrix.RUSTC_TARGET }} --workspace --exclude sentinel-envoy-module --exclude ebpf-probes --exclude ebpf-userspace
+          args: --target=${{ matrix.RUSTC_TARGET }} 
 
       - name: Unit Tests
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --target=${{ matrix.RUSTC_TARGET }} --workspace --exclude sentinel-envoy-module  --exclude ebpf-probes --exclude ebpf-userspace -- --nocapture
+          args: --target=${{ matrix.RUSTC_TARGET }} -- --nocapture
       - name: Ignored Unit Tests
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --target=${{ matrix.RUSTC_TARGET }} --workspace --exclude sentinel-envoy-module  --exclude ebpf-probes --exclude ebpf-userspace -- --ignored --test-threads=1 --nocapture
+          args: --target=${{ matrix.RUSTC_TARGET }} -- --ignored --test-threads=1 --nocapture
   wasm:
     name: WebAssembly
     runs-on: ubuntu-latest
@@ -81,4 +81,4 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --target=wasm32-unknown-unknown -p sentinel-envoy-module
+          args: --target=wasm32-unknown-unknown
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,6 @@ members = [
 ]
 
 exclude = [
-    "examples/proxy/envoy",
     "examples/ebpf/probes",
     "examples/ebpf/userspace",
     "middleware/tower",

diff --git a/Makefile b/Makefile
@@ -2,13 +2,13 @@ SRC_FILES := $(shell find . -path '*/target' -prune -o -name '*.rs' -print)
 KERNEL_VERSION?=$(shell ls /lib/modules | grep generic | head -1)
 
 check:
-	cargo check --all-features --workspace --exclude sentinel-envoy-module --exclude ebpf-probes --exclude ebpf-userspace
+	cargo check --all-features 
 
 clippy:
-	cargo clippy --all-targets --workspace --exclude sentinel-envoy-module --exclude ebpf-probes --exclude ebpf-userspace
+	cargo clippy --all-targets 
 
 doc: clean
-	cargo doc --lib --no-deps --all-features --document-private-items --workspace --exclude sentinel-envoy-module --exclude ebpf-probes --exclude ebpf-userspace
+	cargo doc --lib --no-deps --all-features --document-private-items 
 
 clean:
 	cargo clean
@@ -19,15 +19,10 @@ fmt:
 unit: unit_single unit_parallel
 
 unit_single:
-	cargo test --workspace --exclude sentinel-envoy-module --exclude ebpf-probes --exclude ebpf-userspace -- --ignored --test-threads=1 --nocapture
+	cargo test -- --ignored --test-threads=1 --nocapture
 
 unit_parallel:
-	cargo test --workspace --exclude sentinel-envoy-module --exclude ebpf-probes --exclude ebpf-userspace -- --nocapture
-
-envoy:
-	cargo build --target wasm32-unknown-unknown --release -p sentinel-envoy-module
-	cp target/wasm32-unknown-unknown/release/sentinel_envoy_module.wasm examples/proxy/envoy/docker/sentinel_envoy_module.wasm
-	cd examples/proxy/envoy && docker-compose up --build
+	cargo test -- --nocapture
 
 ebpf_port:
 	cd examples/ebpf/probes && KERNEL_VERSION=$(KERNEL_VERSION) cargo bpf build port --target-dir=../target
@@ -36,4 +31,4 @@ ebpf_port:
 	sudo examples/ebpf/target/x86_64-unknown-linux-gnu/debug/examples/port
 
 
-.PHONY: clean clippy doc fmt unit unit_single unit_parallel check envoy ebpf
+.PHONY: clean clippy doc fmt unit unit_single unit_parallel check ebpf
diff --git a/examples/proxy/envoy/.gitignore b/examples/proxy/envoy/.gitignore
diff --git a/examples/proxy/envoy/Cargo.toml b/examples/proxy/envoy/Cargo.toml
diff --git a/examples/proxy/envoy/README.md b/examples/proxy/envoy/README.md
diff --git a/examples/proxy/envoy/docker-compose.yaml b/examples/proxy/envoy/docker-compose.yaml
diff --git a/examples/proxy/envoy/docker/.dockerignore b/examples/proxy/envoy/docker/.dockerignore
diff --git a/examples/proxy/envoy/docker/Dockerfile.proxy b/examples/proxy/envoy/docker/Dockerfile.proxy
diff --git a/examples/proxy/envoy/docker/envoy.yaml b/examples/proxy/envoy/docker/envoy.yaml
diff --git a/examples/proxy/envoy/proxy_envoy_test.sh b/examples/proxy/envoy/proxy_envoy_test.sh
diff --git a/examples/proxy/envoy/src/lib.rs b/examples/proxy/envoy/src/lib.rs
diff --git a/sentinel-core/Cargo.toml b/sentinel-core/Cargo.toml
@@ -34,8 +34,6 @@ metric_log = ["directories", "regex"]
 ds_etcdv3 = ["etcd-rs", "futures"]
 ds_consul = ["consul", "base64"]
 ds_k8s = ["kube", "k8s-openapi", "schemars", "futures"]
-# wasm proxy
-proxy_envoy = ["proxy-wasm", "getrandom"]
 
 [dependencies]
 sentinel-macros = { version = "0.1.0", path = "../sentinel-macros", optional = true }
@@ -77,12 +75,6 @@ schemars = { version = "0.8.8", optional = true }
 # they won't be exported by `proxy_wasm` module 
 uuid = { version = "0.8", features = ["serde", "v4"] }
 
-# for envoy wasm proxy
-[target.wasm32-unknown-unknown.dependencies]
-proxy-wasm = { version = "0.1.4", optional = true }
-getrandom = { version = "0.2", features = ["js"], optional = true  }
-
-
 [dev-dependencies]
 mockall = "0.11.0"
 rand = "0.8.4"