.github/workflows/CI.yml

@@ -6,135 +6,129 @@ on:
     - master
   pull_request: {}
 
-jobs:
-  check:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
-        rust: [stable]
+env:
+  PROTOC_VERSION: 3.23.4
+  RUSTFLAGS: "-D warnings"
 
-    env:
-      RUSTFLAGS: "-D warnings"
+jobs:
 
+  rustfmt:
+    runs-on: ubuntu-latest
     steps:
+    - uses: actions/checkout@v3
     - uses: hecrj/setup-rust-action@v1
       with:
-        rust-version: ${{ matrix.rust }}
         components: rustfmt
-    - uses: actions/checkout@v3
-    - name: Install cargo-hack
-      uses: baptiste0928/cargo-install@v1
-      with:
-        crate: cargo-hack
-    - name: Install cargo-machete
-      uses: baptiste0928/cargo-install@v1
-      with:
-        crate: cargo-machete
-    - name: Install Protoc
-      uses: arduino/setup-protoc@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-    - uses: Swatinem/rust-cache@v2
-    - name: Check fmt
-      run: cargo fmt -- --check
-    - name: Check unused dependencies
-      run: cargo machete
-    - name: Check features
-      run: cargo hack check --all --ignore-private --each-feature --no-dev-deps
-    - name: Check all targets
-      run: cargo check --all --all-targets --all-features
+    - run: cargo fmt --all --check
 
-  check-docs:
-    name: check docs
+  deny-check:
+    name: cargo-deny check
     runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: EmbarkStudios/cargo-deny-action@v1
 
-    env:
-      RUSTFLAGS: "-D warnings"
-
+  codegen:
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Install Protoc
-      uses: arduino/setup-protoc@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
     - uses: hecrj/setup-rust-action@v1
+    - name: Install protoc
+      uses: taiki-e/install-action@v2
       with:
-        rust-version: "1.60"
+        tool: protoc@${{ env.PROTOC_VERSION }}
     - uses: Swatinem/rust-cache@v2
-    - name: cargo doc
-      run: cargo doc --workspace --no-deps --exclude examples
+    - run: cargo run --package codegen
+    - run: git diff --exit-code
 
-  deny-check:
-    name: cargo-deny check
-    runs-on: ubuntu-latest
+  udeps:
+    name: Check unused dependencies
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+        include:
+        - os: windows-latest
+          option: --exclude-features uds
     steps:
     - uses: actions/checkout@v3
-    - uses: EmbarkStudios/cargo-deny-action@v1
+    - uses: dtolnay/rust-toolchain@nightly
+    - uses: taiki-e/install-action@cargo-hack
+    - uses: taiki-e/install-action@cargo-udeps
+    - name: Install protoc
+      uses: taiki-e/install-action@v2
+      with:
+        tool: protoc@${{ env.PROTOC_VERSION }}
+    - uses: Swatinem/rust-cache@v2
+    - run: cargo hack udeps --workspace --each-feature ${{ matrix.option }}
+
+  check:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+    steps:
+    - uses: actions/checkout@v3
+    - uses: hecrj/setup-rust-action@v1
+    - uses: taiki-e/install-action@cargo-hack
+    - name: Install protoc
+      uses: taiki-e/install-action@v2
+      with:
+        tool: protoc@${{ env.PROTOC_VERSION }}
+    - uses: Swatinem/rust-cache@v2
+    - name: Check features
+      run: cargo hack check --workspace --ignore-private --each-feature --no-dev-deps
+    - name: Check all targets
+      run: cargo check --workspace --all-targets --all-features
 
   msrv:
     name: Check MSRV
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
+    - uses: actions/checkout@v3
     - uses: hecrj/setup-rust-action@v1
       with:
-        rust-version: "1.60"
-    - name: Install Protoc
-      uses: arduino/setup-protoc@v1
+        rust-version: "1.64"    # msrv
+    - name: Install protoc
+      uses: taiki-e/install-action@v2
       with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Check
-      run: cargo check --all --all-targets --all-features
+        tool: protoc@${{ env.PROTOC_VERSION }}
+    - uses: Swatinem/rust-cache@v2
+    - run: cargo check --workspace --all-targets --all-features
+    - run: cargo doc --no-deps --package tonic --package tonic-build --package tonic-health --package tonic-reflection --package tonic-types --package tonic-web
+      env:
+        RUSTDOCFLAGS: "-D warnings"
 
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        rust: [stable]
-
-    env:
-      RUSTFLAGS: "-D warnings"
-      # run a lot of quickcheck iterations
-      QUICKCHECK_TESTS: 1000
-
     steps:
+    - uses: actions/checkout@v3
     - uses: hecrj/setup-rust-action@v1
+    - name: Install protoc
+      uses: taiki-e/install-action@v2
       with:
-        rust-version: ${{ matrix.rust }}
-        components: rustfmt
-    - name: Install Protoc
-      uses: arduino/setup-protoc@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        tool: protoc@${{ env.PROTOC_VERSION }}
     - uses: Swatinem/rust-cache@v2
-    - uses: actions/checkout@v3
-    - name: Run tests
-      run: cargo test --all --all-features
+    - run: cargo test --workspace --all-features
+      env:
+        QUICKCHECK_TESTS: 1000  # run a lot of quickcheck iterations
 
   interop:
     name: Interop Tests
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        rust: [stable]
-
-    env:
-      RUSTFLAGS: "-D warnings"
-
     steps:
-    - uses: hecrj/setup-rust-action@v1
-      with:
-        rust-version: ${{ matrix.rust }}
-        components: rustfmt
     - uses: actions/checkout@v3
-    - name: Install Protoc
-      uses: arduino/setup-protoc@v1
+    - uses: hecrj/setup-rust-action@v1
+    - name: Install protoc
+      uses: taiki-e/install-action@v2
       with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        tool: protoc@${{ env.PROTOC_VERSION }}
     - uses: Swatinem/rust-cache@v2
     - name: Run interop tests
       run: ./interop/test.sh

CHANGELOG.md

@@ -1,3 +1,29 @@
+# [v0.10.0](https://github.com/hyperium/tonic/compare/v0.9.2...v0.10) (2023-09-01)
+
+### Breaking Changes
+
+- Update to `prost` 0.12
+- MSRV bumped to 1.64
+
+
+### Bug Fixes
+
+* **codegen:** Use stream type from codegen mod ([#1446](https://github.com/hyperium/tonic/issues/1446)) ([60d776b](https://github.com/hyperium/tonic/commit/60d776b019854b6a6881d69823a36dcc18b1b4ce))
+* **examples:** Use https scheme when using tls ([#1466](https://github.com/hyperium/tonic/issues/1466)) ([388b177](https://github.com/hyperium/tonic/commit/388b177d99e7b0a2c8d5eab1dee65c4dbb671db4))
+* **tls:** Don't use tls w/ `http` scheme ([#1454](https://github.com/hyperium/tonic/issues/1454)) ([95e81f5](https://github.com/hyperium/tonic/commit/95e81f51fbbc32a5cf2b94ac0d7005d56b44a8d3))
+
+
+### Features
+
+* **build:** Add optional default unimplemented stubs ([#1344](https://github.com/hyperium/tonic/issues/1344)) ([aff1daf](https://github.com/hyperium/tonic/commit/aff1daf65d9a0d55b92719318eba2b5a4769c4e1))
+* **core:** amortize many ready messages into fewer, larger buffers ([#1423](https://github.com/hyperium/tonic/issues/1423)) ([76eedc1](https://github.com/hyperium/tonic/commit/76eedc13d0dd891892301afa38c3dd8ae6646edf))
+* **types:** add ability to extract rich error details from `google.rpc.Status` ([#1430](https://github.com/hyperium/tonic/issues/1430)) ([5fd635a](https://github.com/hyperium/tonic/commit/5fd635a30568ff629c4197c603c45b6b94750e88))
+* **transport:** Add `Router::into_router` ([#1442](https://github.com/hyperium/tonic/issues/1442)) ([ea06a1b](https://github.com/hyperium/tonic/commit/ea06a1bb30bc325c7f6d7763fe48bf8b88c1c3ed))
+* **transport:** Expose TcpConnectInfo fields ([#1449](https://github.com/hyperium/tonic/issues/1449)) ([74b079c](https://github.com/hyperium/tonic/commit/74b079ce752311fbe760d748804d801c385a5e7a))
+* **web:** Add `GrpcWebClientService` ([#1472](https://github.com/hyperium/tonic/issues/1472)) ([dc29c17](https://github.com/hyperium/tonic/commit/dc29c17ae3ef729024e1f80c66566b09d7a01051))
+* **transport:** Support for adding services dynamically
+
+
 # [v0.9.2](https://github.com/hyperium/tonic/compare/v0.9.1...v0.9.2) (2023-04-17)
 
 ### Features

CONTRIBUTING.md

@@ -210,18 +210,11 @@ example would explicitly use `Timeout::new`. For example:
 
 When making changes to `tonic-build` that affects the generated code you will
 need to ensure that each of the sub crates gets updated as well. Each of the sub
-crates like, for example `tonic-health`, generate their gRPC code via a
-`bootstrap.rs` test.
-
-The bootstrap tests work by generating the code and then checking git if there
-is any uncommitted generated code (there is a difference between the proto files
-and the committed generated code). At this point the test will fail telling you
-to commit the new code. When the new code is committed, running the test suite
-again will cause it to pass as the generated code doesn't create a diff for git
-and thus its up to date.
+crates like, for example `tonic-health`, generate their gRPC code via `codegen`
+crate.
 
 ```
-cargo test --all
+cargo run --package codegen
 ```
 
 ### Commits

Cargo.toml

@@ -7,6 +7,7 @@ members = [
   "tonic-reflection",
   "tonic-web", # Non-published crates
   "examples",
+  "codegen",
   "interop", # Tests
   "tests/disable_comments",
   "tests/included_service",
@@ -23,5 +24,8 @@ members = [
   "tests/compression",
   "tonic-web/tests/integration",
   "tests/service_named_result",
+  "tests/use_arc_self",
+  "tests/default_stubs",
 ]
 resolver = "2"
+

README.md

@@ -45,7 +45,7 @@ For IntelliJ IDEA users, please refer to [this](https://github.com/intellij-rust
 
 ### Rust Version
 
-`tonic`'s MSRV is `1.60`.
+`tonic`'s MSRV is `1.64`.
 
 ```bash
 $ rustup update

codegen/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "codegen"
+authors = ["Lucio Franco <luciofranco14@gmail.com>"]
+license = "MIT"
+edition = "2021"
+publish = false
+version = "0.1.0"
+
+[dependencies]
+tempfile = "3.8.0"
+tonic-build = {path = "../tonic-build", default-features = false, features = ["prost", "cleanup-markdown"]}

codegen/src/main.rs

@@ -0,0 +1,95 @@
+use std::path::PathBuf;
+
+fn main() {
+    // tonic-health
+    codegen(
+        &PathBuf::from(std::env!("CARGO_MANIFEST_DIR"))
+            .parent()
+            .unwrap()
+            .join("tonic-health"),
+        &["proto/health.proto"],
+        &["proto"],
+        &PathBuf::from("src/generated"),
+        &PathBuf::from("src/generated/grpc_health_v1.bin"),
+        true,
+        true,
+    );
+
+    // tonic-reflection
+    codegen(
+        &PathBuf::from(std::env!("CARGO_MANIFEST_DIR"))
+            .parent()
+            .unwrap()
+            .join("tonic-reflection"),
+        &["proto/reflection.proto"],
+        &["proto"],
+        &PathBuf::from("src/generated"),
+        &PathBuf::from("src/generated/reflection_v1alpha1.bin"),
+        true,
+        true,
+    );
+
+    // tonic-types
+    codegen(
+        &PathBuf::from(std::env!("CARGO_MANIFEST_DIR"))
+            .parent()
+            .unwrap()
+            .join("tonic-types"),
+        &["proto/status.proto", "proto/error_details.proto"],
+        &["proto"],
+        &PathBuf::from("src/generated"),
+        &PathBuf::from("src/generated/types.bin"),
+        false,
+        false,
+    );
+}
+
+fn codegen(
+    root_dir: &PathBuf,
+    iface_files: &[&str],
+    include_dirs: &[&str],
+    out_dir: &PathBuf,
+    file_descriptor_set_path: &PathBuf,
+    build_client: bool,
+    build_server: bool,
+) {
+    let tempdir = tempfile::Builder::new()
+        .prefix("tonic-codegen-")
+        .tempdir()
+        .unwrap();
+
+    let iface_files: Vec<PathBuf> = iface_files
+        .into_iter()
+        .map(|&path| root_dir.join(path))
+        .collect();
+
+    let include_dirs: Vec<PathBuf> = include_dirs
+        .into_iter()
+        .map(|&path| root_dir.join(path))
+        .collect();
+    let out_dir = root_dir.join(out_dir);
+    let file_descriptor_set_path = root_dir.join(file_descriptor_set_path);
+
+    tonic_build::configure()
+        .build_client(build_client)
+        .build_server(build_server)
+        .out_dir(&tempdir)
+        .file_descriptor_set_path(file_descriptor_set_path)
+        .compile(&iface_files, &include_dirs)
+        .unwrap();
+
+    for path in std::fs::read_dir(tempdir.path()).unwrap() {
+        let path = path.unwrap().path();
+        let to = out_dir.join(
+            path.file_name()
+                .unwrap()
+                .to_str()
+                .unwrap()
+                .strip_suffix(".rs")
+                .unwrap()
+                .replace('.', "_")
+                + ".rs",
+        );
+        std::fs::copy(&path, &to).unwrap();
+    }
+}