Merge branch 'main' into in-code-documentation

Author: antonengelhardt

.bazelversion

@@ -1 +1 @@
-7.0.2
+7.2.1

.github/workflows/rust.yml

@@ -18,11 +18,11 @@ on:
 
   pull_request:
     branches:
-    - master
+    - main
 
   push:
     branches:
-    - master
+    - main
 
   schedule:
     - cron: '0 0 * * *'
@@ -88,6 +88,55 @@ jobs:
         bazelisk --noworkspace_rc run --noenable_bzlmod //bazel/cargo:crates_vendor
         git diff --exit-code
 
+  msrv:
+    runs-on: ubuntu-latest
+
+    env:
+      RUSTFLAGS: -D warnings
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install dependencies
+      if: ${{ env.ACT }}
+      run: |
+        curl -OL https://static.rust-lang.org/rustup/rustup-init.sh
+        chmod +x ./rustup-init.sh
+        ./rustup-init.sh -y --default-toolchain 1.64.0
+        rm rustup-init.sh
+        echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
+    - name: Update Rust
+      run: |
+        rustup toolchain install 1.64.0 --component clippy --component rustfmt
+        rustup default 1.64.0
+        rustup target add wasm32-unknown-unknown
+        rustup target add wasm32-wasi
+
+    - name: Build (wasm32-unknown-unknown)
+      run: cargo build --release --all-targets --target=wasm32-unknown-unknown
+
+    - 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: Clippy (wasm32-wasi)
+      run: cargo clippy --release --all-targets --target=wasm32-wasi
+
+    - name: Format (rustfmt)
+      run: cargo fmt -- --check
+
+    - name: Format (manifest)
+      run: cargo verify-project
+
+    - name: Package (docs)
+      run: cargo doc --no-deps --target=wasm32-unknown-unknown
+
+    - name: Package (publish)
+      run: cargo publish --dry-run --target=wasm32-unknown-unknown
+
   stable:
     runs-on: ubuntu-latest
 
@@ -100,10 +149,10 @@ jobs:
     - name: Install dependencies
       if: ${{ env.ACT }}
       run: |
-        curl -OL https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init
-        chmod +x ./rustup-init
-        ./rustup-init -y
-        rm rustup-init
+        curl -OL https://static.rust-lang.org/rustup/rustup-init.sh
+        chmod +x ./rustup-init.sh
+        ./rustup-init.sh -y --default-toolchain stable
+        rm rustup-init.sh
         echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
     - name: Update Rust
@@ -148,18 +197,18 @@ jobs:
     - name: Install dependencies
       if: ${{ env.ACT }}
       run: |
-        curl -OL https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init
-        chmod +x ./rustup-init
-        ./rustup-init -y
-        rm rustup-init
+        curl -OL https://static.rust-lang.org/rustup/rustup-init.sh
+        chmod +x ./rustup-init.sh
+        ./rustup-init.sh -y --default-toolchain nightly
+        rm rustup-init.sh
         echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
     - name: Update Rust
       run: |
         rustup toolchain install nightly --component clippy --component rustfmt
-        rustup +nightly target add wasm32-unknown-unknown
-        rustup +nightly target add wasm32-wasi
         rustup default nightly
+        rustup target add wasm32-unknown-unknown
+        rustup target add wasm32-wasi
 
     - name: Build (wasm32-unknown-unknown)
       run: cargo build --release --all-targets --target=wasm32-unknown-unknown
@@ -194,10 +243,10 @@ jobs:
     - name: Install dependencies
       if: ${{ env.ACT }}
       run: |
-        curl -OL https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init
-        chmod +x ./rustup-init
-        ./rustup-init -y
-        rm rustup-init
+        curl -OL https://static.rust-lang.org/rustup/rustup-init.sh
+        chmod +x ./rustup-init.sh
+        ./rustup-init.sh -y
+        rm rustup-init.sh
         echo "$HOME/.cargo/bin" >> $GITHUB_PATH
         export PATH=$PATH:$HOME/.cargo/bin
         cargo install cargo-outdated
@@ -214,10 +263,10 @@ jobs:
     - name: Install dependencies
       if: ${{ env.ACT }}
       run: |
-        curl -OL https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init
-        chmod +x ./rustup-init
-        ./rustup-init -y
-        rm rustup-init
+        curl -OL https://static.rust-lang.org/rustup/rustup-init.sh
+        chmod +x ./rustup-init.sh
+        ./rustup-init.sh -y
+        rm rustup-init.sh
         echo "$HOME/.cargo/bin" >> $GITHUB_PATH
         export PATH=$PATH:$HOME/.cargo/bin
         cargo install cargo-audit
@@ -238,6 +287,7 @@ jobs:
         - 'http_body'
         - 'http_config'
         - 'http_headers'
+        - 'grpc_auth_random'
 
     defaults:
       run:
@@ -252,10 +302,10 @@ jobs:
     - name: Install dependencies
       if: ${{ env.ACT }}
       run: |
-        curl -OL https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init
-        chmod +x ./rustup-init
-        ./rustup-init -y
-        rm rustup-init
+        curl -OL https://static.rust-lang.org/rustup/rustup-init.sh
+        chmod +x ./rustup-init.sh
+        ./rustup-init.sh -y
+        rm rustup-init.sh
         echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
     - name: Update Rust
@@ -286,7 +336,7 @@ jobs:
         docker run --rm \
           -v $(pwd)/envoy.yaml:/envoy.yaml \
           -v $(pwd)/target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins \
-          envoyproxy/envoy:v1.24-latest \
+          envoyproxy/envoy:v1.31-latest \
           --mode validate \
           -c envoy.yaml
 
@@ -301,6 +351,7 @@ jobs:
         - 'http_body'
         - 'http_config'
         - 'http_headers'
+        - 'grpc_auth_random'
 
     defaults:
       run:
@@ -315,10 +366,10 @@ jobs:
     - name: Install dependencies
       if: ${{ env.ACT }}
       run: |
-        curl -OL https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init
-        chmod +x ./rustup-init
-        ./rustup-init -y
-        rm rustup-init
+        curl -OL https://static.rust-lang.org/rustup/rustup-init.sh
+        chmod +x ./rustup-init.sh
+        ./rustup-init.sh -y
+        rm rustup-init.sh
         echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
     - name: Update Rust
@@ -363,6 +414,6 @@ jobs:
         docker run --rm \
           -v $(pwd)/envoy.yaml:/envoy.yaml \
           -v $(pwd)/target/wasm32-wasi/release:/etc/envoy/proxy-wasm-plugins \
-          envoyproxy/envoy:v1.24-latest \
+          envoyproxy/envoy:v1.31-latest \
           --mode validate \
           -c envoy.yaml

CHANGELOG.md

@@ -4,6 +4,28 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.2.2] - 2024-07-21
+
+### Fixed
+
+- Fixed support for nested gRPC callouts.
+  Thanks [@andytesti](https://github.com/andytesti)!
+
+- Fixed panic on unknown `token_id` in `on_grpc_receive_initial_metadata`
+  and `on_grpc_receive_trailing_metadata`.
+  Thanks [@erikness-doordash](https://github.com/erikness-doordash)!
+
+- Fixed panic on unexpected failures in `get_property`.
+  Thanks [@alexsnaps](https://github.com/alexsnaps)!
+
+- Fixed panic on unexpected failures in `call_foreign_function`.
+  Reported by [@geNAZt](https://github.com/geNAZt).
+
+### Added
+
+- Added support for sending error responses with gRPC status codes.
+  Thanks [@juanmolle](https://github.com/juanmolle)!
+
 ## [0.2.1] - 2022-11-22
 
 ### Fixed
@@ -86,6 +108,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Initial release.
 
 
+[0.2.2]: https://github.com/proxy-wasm/proxy-wasm-rust-sdk/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/proxy-wasm/proxy-wasm-rust-sdk/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/proxy-wasm/proxy-wasm-rust-sdk/compare/v0.1.4...v0.2.0
 [0.1.4]: https://github.com/proxy-wasm/proxy-wasm-rust-sdk/compare/v0.1.3...v0.1.4

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "proxy-wasm"
-version = "0.2.1"
+version = "0.2.2"
 authors = ["Piotr Sikora <piotrsikora@google.com>"]
-rust-version = "1.61"
+rust-version = "1.64"
 description = "WebAssembly for Proxies"
 readme = "README.md"
 license = "Apache-2.0"

README.md

@@ -5,14 +5,14 @@
 [![Documentation][docs-badge]][docs-link]
 [![Apache 2.0 License][license-badge]][license-link]
 
-[build-badge]: https://github.com/proxy-wasm/proxy-wasm-rust-sdk/workflows/Rust/badge.svg?branch=master
-[build-link]: https://github.com/proxy-wasm/proxy-wasm-rust-sdk/actions?query=workflow%3ARust+branch%3Amaster
+[build-badge]: https://github.com/proxy-wasm/proxy-wasm-rust-sdk/workflows/Rust/badge.svg?branch=main
+[build-link]: https://github.com/proxy-wasm/proxy-wasm-rust-sdk/actions?query=workflow%3ARust+branch%3Amain
 [crate-badge]: https://img.shields.io/crates/v/proxy-wasm.svg
 [crate-link]: https://crates.io/crates/proxy-wasm
 [docs-badge]: https://docs.rs/proxy-wasm/badge.svg
 [docs-link]: https://docs.rs/proxy-wasm
 [license-badge]: https://img.shields.io/github/license/proxy-wasm/proxy-wasm-rust-sdk
-[license-link]: https://github.com/proxy-wasm/proxy-wasm-rust-sdk/blob/master/LICENSE
+[license-link]: https://github.com/proxy-wasm/proxy-wasm-rust-sdk/blob/main/LICENSE
 
 ## Examples
 
@@ -21,6 +21,7 @@
 - [HTTP Headers](./examples/http_headers/)
 - [HTTP Response body](./examples/http_body/)
 - [HTTP Configuration](./examples/http_config/)
+- [gRPC Auth (random)](./examples/grpc_auth_random/)
 
 ## Articles & blog posts from the community
 
@@ -32,5 +33,5 @@
 When updating dependencies, you need to regenerate Bazel `BUILD` files to match updated `Cargo.toml`:
 
 ```sh
-bazel run //bazel/cargo:crates_vendor -- --repin
+bazel run //bazel/cargo:crates_vendor -- --repin all
 ```