From 6d88ed54d5dbb3576ecb7d50bc9adc014f700c39 Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Sun, 27 Oct 2024 13:46:47 -0400 Subject: [PATCH] Use wasm32-wasip1 target. (#277) Note that @rules_rust//rust/platform:wasi still evaluates to wasm32-wasi, and there is no @platforms//os defined for wasip1, so this doesn't change anything for Bazel builds. Signed-off-by: Piotr Sikora --- .github/workflows/rust.yml | 48 +++++++++---------- examples/grpc_auth_random/README.md | 2 +- examples/grpc_auth_random/docker-compose.yaml | 2 +- examples/hello_world/README.md | 2 +- examples/hello_world/docker-compose.yaml | 2 +- examples/http_auth_random/README.md | 2 +- examples/http_auth_random/docker-compose.yaml | 2 +- examples/http_body/README.md | 2 +- examples/http_body/docker-compose.yaml | 2 +- examples/http_config/README.md | 2 +- examples/http_config/docker-compose.yaml | 2 +- examples/http_headers/README.md | 2 +- examples/http_headers/docker-compose.yaml | 2 +- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c1a72a68..da9683f9 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -83,7 +83,7 @@ jobs: - name: Build (wasm32-unknown-unknown) run: bazelisk --noworkspace_rc build --noenable_bzlmod --platforms=@rules_rust//rust/platform:wasm //... - - name: Build (wasm32-wasi) + - name: Build (wasm32-wasip1) run: bazelisk --noworkspace_rc build --noenable_bzlmod --platforms=@rules_rust//rust/platform:wasi //... - name: Format (buildifier) @@ -196,7 +196,7 @@ jobs: run: | rustup toolchain install stable --component clippy --component rustfmt rustup target add wasm32-unknown-unknown - rustup target add wasm32-wasi + rustup target add wasm32-wasip1 - name: Build (wasm32-unknown-unknown) run: cargo build --release --all-targets --target=wasm32-unknown-unknown @@ -204,11 +204,11 @@ jobs: - name: Clippy (wasm32-unknown-unknown) run: cargo clippy --release --all-targets --target=wasm32-unknown-unknown - - name: Build (wasm32-wasi) - run: cargo build --release --all-targets --target=wasm32-wasi + - name: Build (wasm32-wasip1) + run: cargo build --release --all-targets --target=wasm32-wasip1 - - name: Clippy (wasm32-wasi) - run: cargo clippy --release --all-targets --target=wasm32-wasi + - name: Clippy (wasm32-wasip1) + run: cargo clippy --release --all-targets --target=wasm32-wasip1 - name: Format (rustfmt) run: cargo fmt -- --check @@ -259,7 +259,7 @@ jobs: rustup toolchain install nightly --component clippy --component rustfmt rustup default nightly rustup target add wasm32-unknown-unknown - rustup target add wasm32-wasi + rustup target add wasm32-wasip1 - name: Build (wasm32-unknown-unknown) run: cargo build --release --all-targets --target=wasm32-unknown-unknown @@ -267,11 +267,11 @@ jobs: - name: Clippy (wasm32-unknown-unknown) run: cargo clippy --release --all-targets --target=wasm32-unknown-unknown - - name: Build (wasm32-wasi) - run: cargo build --release --all-targets --target=wasm32-wasi + - name: Build (wasm32-wasip1) + run: cargo build --release --all-targets --target=wasm32-wasip1 - - name: Clippy (wasm32-wasi) - run: cargo clippy --release --all-targets --target=wasm32-wasi + - name: Clippy (wasm32-wasip1) + run: cargo clippy --release --all-targets --target=wasm32-wasip1 - name: Format (rustfmt) run: cargo fmt -- --check @@ -402,13 +402,13 @@ jobs: - name: Update Rust run: | rustup toolchain install stable --component clippy --component rustfmt - rustup target add wasm32-wasi + rustup target add wasm32-wasip1 - - name: Build (wasm32-wasi) - run: cargo build --release --target=wasm32-wasi + - name: Build (wasm32-wasip1) + run: cargo build --release --target=wasm32-wasip1 - - name: Clippy (wasm32-wasi) - run: cargo clippy --release --target=wasm32-wasi + - name: Clippy (wasm32-wasip1) + run: cargo clippy --release --target=wasm32-wasip1 - name: Format (rustfmt) run: cargo fmt -- --check @@ -428,7 +428,7 @@ jobs: run: | docker run --rm \ -v $(pwd)/envoy.yaml:/envoy.yaml \ - -v $(pwd)/target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins \ + -v $(pwd)/target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins \ envoyproxy/envoy:v1.31-latest \ --mode validate \ -c envoy.yaml @@ -482,8 +482,8 @@ jobs: - name: Update Rust run: | rustup toolchain install nightly --component clippy --component rustfmt - rustup +nightly target add wasm32-wasi rustup default nightly + rustup target add wasm32-wasip1 - name: Change crate type from library to binary run: | @@ -491,11 +491,11 @@ jobs: grep -v '^crate-type' Cargo.tmp > Cargo.toml mv src/lib.rs src/main.rs - - name: Build (wasm32-wasi) - run: cargo build --release --target=wasm32-wasi + - name: Build (wasm32-wasip1) + run: cargo build --release --target=wasm32-wasip1 - - name: Clippy (wasm32-wasi) - run: cargo clippy --release --target=wasm32-wasi + - name: Clippy (wasm32-wasip1) + run: cargo clippy --release --target=wasm32-wasip1 - name: Format (rustfmt) run: cargo fmt -- --check @@ -515,7 +515,7 @@ jobs: - name: Rename .wasm to match expected filename run: | - cd target/wasm32-wasi/release + cd target/wasm32-wasip1/release for file in $(ls -1 *.wasm); do \ mv $file $(echo $file | sed 's/-/_/g'); \ done @@ -524,7 +524,7 @@ jobs: run: | docker run --rm \ -v $(pwd)/envoy.yaml:/envoy.yaml \ - -v $(pwd)/target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins \ + -v $(pwd)/target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins \ envoyproxy/envoy:v1.31-latest \ --mode validate \ -c envoy.yaml diff --git a/examples/grpc_auth_random/README.md b/examples/grpc_auth_random/README.md index a153bb57..3c0028a7 100644 --- a/examples/grpc_auth_random/README.md +++ b/examples/grpc_auth_random/README.md @@ -5,7 +5,7 @@ Proxy-Wasm plugin that grants access based on a result of gRPC callout. ### Building ```sh -$ cargo build --target wasm32-wasi --release +$ cargo build --target wasm32-wasip1 --release ``` ### Using in Envoy diff --git a/examples/grpc_auth_random/docker-compose.yaml b/examples/grpc_auth_random/docker-compose.yaml index 267aaf50..40a2efb3 100644 --- a/examples/grpc_auth_random/docker-compose.yaml +++ b/examples/grpc_auth_random/docker-compose.yaml @@ -20,7 +20,7 @@ services: - "10000:10000" volumes: - ./envoy.yaml:/etc/envoy/envoy.yaml - - ./target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins + - ./target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins networks: - envoymesh depends_on: diff --git a/examples/hello_world/README.md b/examples/hello_world/README.md index 48cab8b2..f830d714 100644 --- a/examples/hello_world/README.md +++ b/examples/hello_world/README.md @@ -5,7 +5,7 @@ Proxy-Wasm background service plugin that logs time and random numbers. ### Building ```sh -$ cargo build --target wasm32-wasi --release +$ cargo build --target wasm32-wasip1 --release ``` ### Using in Envoy diff --git a/examples/hello_world/docker-compose.yaml b/examples/hello_world/docker-compose.yaml index cbd96355..844dc9b7 100644 --- a/examples/hello_world/docker-compose.yaml +++ b/examples/hello_world/docker-compose.yaml @@ -20,7 +20,7 @@ services: - "10000:10000" volumes: - ./envoy.yaml:/etc/envoy/envoy.yaml - - ./target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins + - ./target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins networks: - envoymesh networks: diff --git a/examples/http_auth_random/README.md b/examples/http_auth_random/README.md index 08ea67ad..d604efa2 100644 --- a/examples/http_auth_random/README.md +++ b/examples/http_auth_random/README.md @@ -5,7 +5,7 @@ Proxy-Wasm plugin that grants access based on a result of HTTP callout. ### Building ```sh -$ cargo build --target wasm32-wasi --release +$ cargo build --target wasm32-wasip1 --release ``` ### Using in Envoy diff --git a/examples/http_auth_random/docker-compose.yaml b/examples/http_auth_random/docker-compose.yaml index 6a188511..1dbb8238 100644 --- a/examples/http_auth_random/docker-compose.yaml +++ b/examples/http_auth_random/docker-compose.yaml @@ -20,7 +20,7 @@ services: - "10000:10000" volumes: - ./envoy.yaml:/etc/envoy/envoy.yaml - - ./target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins + - ./target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins networks: - envoymesh depends_on: diff --git a/examples/http_body/README.md b/examples/http_body/README.md index 87185540..466eaf73 100644 --- a/examples/http_body/README.md +++ b/examples/http_body/README.md @@ -5,7 +5,7 @@ Proxy-Wasm plugin that redacts sensitive HTTP responses. ### Building ```sh -$ cargo build --target wasm32-wasi --release +$ cargo build --target wasm32-wasip1 --release ``` ### Using in Envoy diff --git a/examples/http_body/docker-compose.yaml b/examples/http_body/docker-compose.yaml index cbd96355..844dc9b7 100644 --- a/examples/http_body/docker-compose.yaml +++ b/examples/http_body/docker-compose.yaml @@ -20,7 +20,7 @@ services: - "10000:10000" volumes: - ./envoy.yaml:/etc/envoy/envoy.yaml - - ./target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins + - ./target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins networks: - envoymesh networks: diff --git a/examples/http_config/README.md b/examples/http_config/README.md index e14b55d9..7f49a545 100644 --- a/examples/http_config/README.md +++ b/examples/http_config/README.md @@ -5,7 +5,7 @@ Proxy-Wasm plugin that injects HTTP response header with a value from Envoy conf ### Building ```sh -$ cargo build --target wasm32-wasi --release +$ cargo build --target wasm32-wasip1 --release ``` ### Using in Envoy diff --git a/examples/http_config/docker-compose.yaml b/examples/http_config/docker-compose.yaml index cbd96355..844dc9b7 100644 --- a/examples/http_config/docker-compose.yaml +++ b/examples/http_config/docker-compose.yaml @@ -20,7 +20,7 @@ services: - "10000:10000" volumes: - ./envoy.yaml:/etc/envoy/envoy.yaml - - ./target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins + - ./target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins networks: - envoymesh networks: diff --git a/examples/http_headers/README.md b/examples/http_headers/README.md index 6180cde8..d64590a5 100644 --- a/examples/http_headers/README.md +++ b/examples/http_headers/README.md @@ -5,7 +5,7 @@ Proxy-Wasm plugin that logs HTTP request/response headers. ### Building ```sh -$ cargo build --target wasm32-wasi --release +$ cargo build --target wasm32-wasip1 --release ``` ### Using in Envoy diff --git a/examples/http_headers/docker-compose.yaml b/examples/http_headers/docker-compose.yaml index cbd96355..844dc9b7 100644 --- a/examples/http_headers/docker-compose.yaml +++ b/examples/http_headers/docker-compose.yaml @@ -20,7 +20,7 @@ services: - "10000:10000" volumes: - ./envoy.yaml:/etc/envoy/envoy.yaml - - ./target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins + - ./target/wasm32-wasip1/release:/etc/envoy/proxy-wasm-plugins networks: - envoymesh networks: