chore: Reorganize examples and interop crates (#180)

* chore: Reorganize examples and interop crates * fix interop tests
hyperium · Dec 12, 2019 · d9a481b · d9a481b
1 parent f096a23
commit d9a481b
Show file tree

Hide file tree

Showing 69 changed files with 25 additions and 22 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -93,8 +93,8 @@ jobs:
       run: rustup component add rustfmt
     - uses: actions/checkout@master
     - name: Run interop tests
-      run: ./tonic-interop/test.sh
+      run: ./interop/test.sh
       shell: bash
     - name: Run interop tests with Rustls
-      run: ./tonic-interop/test.sh --use_tls tls_rustls
+      run: ./interop/test.sh --use_tls tls_rustls
       shell: bash
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,9 +2,12 @@
 members = [
     "tonic",
     "tonic-build",
-    "tonic-examples",
-    "tonic-interop",
 
+    # Non-published crates
+    "examples",
+    "interop",
+
+    # Tests
     "tests/included_service",
     "tests/same_name",
     "tests/wellknown",

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ contains the tools to build clients and servers from [`protobuf`] definitions.
 
 ## Getting Started
 
-Examples can be found in [`tonic-examples`] and for more complex scenarios [`tonic-interop`]
+Examples can be found in [`examples`] and for more complex scenarios [`interop`]
 may be a good resource as it shows examples of many of the gRPC features.
 
 ### Rust Version
@@ -67,9 +67,9 @@ question. If that doesn't work, try opening an [issue] with the question.
 - [`tonic`](https://github.com/hyperium/tonic/tree/master/tonic): Generic gRPC and HTTP/2 client/server
 implementation.
 - [`tonic-build`](https://github.com/hyperium/tonic/tree/master/tonic-build): [`prost`] based service codegen.
-- [`tonic-examples`](https://github.com/hyperium/tonic/tree/master/tonic-examples): Example gRPC implementations showing off
+- [`examples`](https://github.com/hyperium/tonic/tree/master/examples): Example gRPC implementations showing off
 tls, load balancing and bi-directional streaming.
-- [`tonic-interop`](https://github.com/hyperium/tonic/tree/master/tonic-interop): Interop tests implementation.
+- [`interop`](https://github.com/hyperium/tonic/tree/master/interop): Interop tests implementation.
 
 ## Contributing
 
@@ -97,11 +97,11 @@ terms or conditions.
 [`prost`]: https://github.com/danburkert/prost
 [`protobuf`]: https://developers.google.com/protocol-buffers
 [`rustls`]: https://github.com/ctz/rustls
-[`tonic-examples`]: https://github.com/hyperium/tonic/tree/master/tonic-examples
-[`tonic-interop`]: https://github.com/hyperium/tonic/tree/master/tonic-interop
-[Examples]: https://github.com/hyperium/tonic/tree/master/tonic-examples
+[`tonic-examples`]: https://github.com/hyperium/tonic/tree/master/examples
+[`tonic-interop`]: https://github.com/hyperium/tonic/tree/master/interop
+[Examples]: https://github.com/hyperium/tonic/tree/master/examples
 [Website]: https://github.com/hyperium/tonic
 [Docs]: https://docs.rs/tonic
 [Chat]: https://discord.gg/6yGkFeN
-[routeguide-tutorial]: https://github.com/hyperium/tonic/blob/master/tonic-examples/routeguide-tutorial.md
-[helloworld-tutorial]: https://github.com/hyperium/tonic/blob/master/tonic-examples/helloworld-tutorial.md
+[routeguide-tutorial]: https://github.com/hyperium/tonic/blob/master/examples/routeguide-tutorial.md
+[helloworld-tutorial]: https://github.com/hyperium/tonic/blob/master/examples/helloworld-tutorial.md
diff --git a/tonic-examples/Cargo.toml → examples/Cargo.toml b/tonic-examples/Cargo.toml → examples/Cargo.toml
@@ -15,8 +15,8 @@ name = "helloworld-client"
 path = "src/helloworld/client.rs"
 
 [[bin]]
-name = "helloworld-client-blocking"
-path = "src/helloworld/client-blocking.rs"
+name = "blocking-client"
+path = "src/blocking/client.rs"
 
 [[bin]]
 name = "routeguide-server"

diff --git a/tonic-examples/README.md → examples/README.md b/tonic-examples/README.md → examples/README.md
diff --git a/tonic-examples/build.rs → examples/build.rs b/tonic-examples/build.rs → examples/build.rs
diff --git a/tonic-examples/data/gcp/roots.pem → examples/data/gcp/roots.pem b/tonic-examples/data/gcp/roots.pem → examples/data/gcp/roots.pem
diff --git a/tonic-examples/data/route_guide_db.json → examples/data/route_guide_db.json b/tonic-examples/data/route_guide_db.json → examples/data/route_guide_db.json
diff --git a/tonic-examples/data/tls/ca.pem → examples/data/tls/ca.pem b/tonic-examples/data/tls/ca.pem → examples/data/tls/ca.pem
diff --git a/tonic-examples/data/tls/client1.key → examples/data/tls/client1.key b/tonic-examples/data/tls/client1.key → examples/data/tls/client1.key
diff --git a/tonic-examples/data/tls/client1.pem → examples/data/tls/client1.pem b/tonic-examples/data/tls/client1.pem → examples/data/tls/client1.pem
diff --git a/tonic-examples/data/tls/client2.key → examples/data/tls/client2.key b/tonic-examples/data/tls/client2.key → examples/data/tls/client2.key
diff --git a/tonic-examples/data/tls/client2.pem → examples/data/tls/client2.pem b/tonic-examples/data/tls/client2.pem → examples/data/tls/client2.pem
diff --git a/tonic-examples/data/tls/client_ca.pem → examples/data/tls/client_ca.pem b/tonic-examples/data/tls/client_ca.pem → examples/data/tls/client_ca.pem
diff --git a/tonic-examples/data/tls/server.key → examples/data/tls/server.key b/tonic-examples/data/tls/server.key → examples/data/tls/server.key
diff --git a/tonic-examples/data/tls/server.pem → examples/data/tls/server.pem b/tonic-examples/data/tls/server.pem → examples/data/tls/server.pem
diff --git a/tonic-examples/helloworld-tutorial.md → examples/helloworld-tutorial.md b/tonic-examples/helloworld-tutorial.md → examples/helloworld-tutorial.md
diff --git a/tonic-examples/proto/echo/echo.proto → examples/proto/echo/echo.proto b/tonic-examples/proto/echo/echo.proto → examples/proto/echo/echo.proto
diff --git a/...les/proto/google/pubsub/annotations.proto → ...les/proto/google/pubsub/annotations.proto b/...les/proto/google/pubsub/annotations.proto → ...les/proto/google/pubsub/annotations.proto
diff --git a/...examples/proto/google/pubsub/client.proto → examples/proto/google/pubsub/client.proto b/...examples/proto/google/pubsub/client.proto → examples/proto/google/pubsub/client.proto
diff --git a/...c-examples/proto/google/pubsub/http.proto → examples/proto/google/pubsub/http.proto b/...c-examples/proto/google/pubsub/http.proto → examples/proto/google/pubsub/http.proto
diff --git a/...examples/proto/google/pubsub/pubsub.proto → examples/proto/google/pubsub/pubsub.proto b/...examples/proto/google/pubsub/pubsub.proto → examples/proto/google/pubsub/pubsub.proto
diff --git a/...xamples/proto/helloworld/helloworld.proto → examples/proto/helloworld/helloworld.proto b/...xamples/proto/helloworld/helloworld.proto → examples/proto/helloworld/helloworld.proto
diff --git a/...amples/proto/routeguide/route_guide.proto → examples/proto/routeguide/route_guide.proto b/...amples/proto/routeguide/route_guide.proto → examples/proto/routeguide/route_guide.proto
diff --git a/tonic-examples/routeguide-tutorial.md → examples/routeguide-tutorial.md b/tonic-examples/routeguide-tutorial.md → examples/routeguide-tutorial.md
diff --git a/tonic-examples/src/authentication/client.rs → examples/src/authentication/client.rs b/tonic-examples/src/authentication/client.rs → examples/src/authentication/client.rs
diff --git a/tonic-examples/src/authentication/server.rs → examples/src/authentication/server.rs b/tonic-examples/src/authentication/server.rs → examples/src/authentication/server.rs
diff --git a/...xamples/src/helloworld/client-blocking.rs → examples/src/blocking/client.rs b/...xamples/src/helloworld/client-blocking.rs → examples/src/blocking/client.rs
diff --git a/tonic-examples/src/gcp/README.md → examples/src/gcp/README.md b/tonic-examples/src/gcp/README.md → examples/src/gcp/README.md
diff --git a/tonic-examples/src/gcp/client.rs → examples/src/gcp/client.rs b/tonic-examples/src/gcp/client.rs → examples/src/gcp/client.rs
diff --git a/tonic-examples/src/helloworld/client.rs → examples/src/helloworld/client.rs b/tonic-examples/src/helloworld/client.rs → examples/src/helloworld/client.rs
diff --git a/tonic-examples/src/helloworld/server.rs → examples/src/helloworld/server.rs b/tonic-examples/src/helloworld/server.rs → examples/src/helloworld/server.rs
diff --git a/tonic-examples/src/load_balance/client.rs → examples/src/load_balance/client.rs b/tonic-examples/src/load_balance/client.rs → examples/src/load_balance/client.rs
diff --git a/tonic-examples/src/load_balance/server.rs → examples/src/load_balance/server.rs b/tonic-examples/src/load_balance/server.rs → examples/src/load_balance/server.rs
diff --git a/tonic-examples/src/multiplex/client.rs → examples/src/multiplex/client.rs b/tonic-examples/src/multiplex/client.rs → examples/src/multiplex/client.rs
diff --git a/tonic-examples/src/multiplex/server.rs → examples/src/multiplex/server.rs b/tonic-examples/src/multiplex/server.rs → examples/src/multiplex/server.rs
diff --git a/tonic-examples/src/routeguide/client.rs → examples/src/routeguide/client.rs b/tonic-examples/src/routeguide/client.rs → examples/src/routeguide/client.rs
diff --git a/tonic-examples/src/routeguide/data.rs → examples/src/routeguide/data.rs b/tonic-examples/src/routeguide/data.rs → examples/src/routeguide/data.rs
diff --git a/tonic-examples/src/routeguide/server.rs → examples/src/routeguide/server.rs b/tonic-examples/src/routeguide/server.rs → examples/src/routeguide/server.rs
diff --git a/tonic-examples/src/tls/client.rs → examples/src/tls/client.rs b/tonic-examples/src/tls/client.rs → examples/src/tls/client.rs
diff --git a/tonic-examples/src/tls/server.rs → examples/src/tls/server.rs b/tonic-examples/src/tls/server.rs → examples/src/tls/server.rs
diff --git a/tonic-examples/src/tls_client_auth/client.rs → examples/src/tls_client_auth/client.rs b/tonic-examples/src/tls_client_auth/client.rs → examples/src/tls_client_auth/client.rs
diff --git a/tonic-examples/src/tls_client_auth/server.rs → examples/src/tls_client_auth/server.rs b/tonic-examples/src/tls_client_auth/server.rs → examples/src/tls_client_auth/server.rs
diff --git a/tonic-examples/src/tracing/client.rs → examples/src/tracing/client.rs b/tonic-examples/src/tracing/client.rs → examples/src/tracing/client.rs
diff --git a/tonic-examples/src/tracing/server.rs → examples/src/tracing/server.rs b/tonic-examples/src/tracing/server.rs → examples/src/tracing/server.rs
diff --git a/tonic-interop/Cargo.toml → interop/Cargo.toml b/tonic-interop/Cargo.toml → interop/Cargo.toml
diff --git a/tonic-interop/bin/client_darwin_amd64 → interop/bin/client_darwin_amd64 b/tonic-interop/bin/client_darwin_amd64 → interop/bin/client_darwin_amd64
diff --git a/tonic-interop/bin/client_linux_amd64 → interop/bin/client_linux_amd64 b/tonic-interop/bin/client_linux_amd64 → interop/bin/client_linux_amd64
diff --git a/tonic-interop/bin/client_windows_amd64.exe → interop/bin/client_windows_amd64.exe b/tonic-interop/bin/client_windows_amd64.exe → interop/bin/client_windows_amd64.exe
diff --git a/tonic-interop/bin/server_darwin_amd64 → interop/bin/server_darwin_amd64 b/tonic-interop/bin/server_darwin_amd64 → interop/bin/server_darwin_amd64
diff --git a/tonic-interop/bin/server_linux_amd64 → interop/bin/server_linux_amd64 b/tonic-interop/bin/server_linux_amd64 → interop/bin/server_linux_amd64
diff --git a/tonic-interop/bin/server_windows_amd64.exe → interop/bin/server_windows_amd64.exe b/tonic-interop/bin/server_windows_amd64.exe → interop/bin/server_windows_amd64.exe
diff --git a/tonic-interop/build.rs → interop/build.rs b/tonic-interop/build.rs → interop/build.rs
diff --git a/tonic-interop/data/README.md → interop/data/README.md b/tonic-interop/data/README.md → interop/data/README.md
diff --git a/tonic-interop/data/ca.pem → interop/data/ca.pem b/tonic-interop/data/ca.pem → interop/data/ca.pem
diff --git a/tonic-interop/data/cert-generator/.gitignore → interop/data/cert-generator/.gitignore b/tonic-interop/data/cert-generator/.gitignore → interop/data/cert-generator/.gitignore
diff --git a/tonic-interop/data/cert-generator/ca.tf → interop/data/cert-generator/ca.tf b/tonic-interop/data/cert-generator/ca.tf → interop/data/cert-generator/ca.tf
diff --git a/...terop/data/cert-generator/server_certs.tf → interop/data/cert-generator/server_certs.tf b/...terop/data/cert-generator/server_certs.tf → interop/data/cert-generator/server_certs.tf
diff --git a/tonic-interop/data/server1.key → interop/data/server1.key b/tonic-interop/data/server1.key → interop/data/server1.key
diff --git a/tonic-interop/data/server1.pem → interop/data/server1.pem b/tonic-interop/data/server1.pem → interop/data/server1.pem
diff --git a/tonic-interop/proto/grpc/testing/empty.proto → interop/proto/grpc/testing/empty.proto b/tonic-interop/proto/grpc/testing/empty.proto → interop/proto/grpc/testing/empty.proto
diff --git a/...interop/proto/grpc/testing/messages.proto → interop/proto/grpc/testing/messages.proto b/...interop/proto/grpc/testing/messages.proto → interop/proto/grpc/testing/messages.proto
diff --git a/tonic-interop/proto/grpc/testing/test.proto → interop/proto/grpc/testing/test.proto b/tonic-interop/proto/grpc/testing/test.proto → interop/proto/grpc/testing/test.proto
diff --git a/tonic-interop/src/bin/client.rs → interop/src/bin/client.rs b/tonic-interop/src/bin/client.rs → interop/src/bin/client.rs
@@ -32,7 +32,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .concurrency_limit(30);
 
     if matches.use_tls {
-        let pem = tokio::fs::read("tonic-interop/data/ca.pem").await?;
+        let pem = tokio::fs::read("interop/data/ca.pem").await?;
         let ca = Certificate::from_pem(pem);
         endpoint = endpoint.tls_config(
             ClientTlsConfig::with_rustls()

diff --git a/tonic-interop/src/bin/server.rs → interop/src/bin/server.rs b/tonic-interop/src/bin/server.rs → interop/src/bin/server.rs
@@ -49,8 +49,8 @@ async fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
     });
 
     if matches.use_tls {
-        let cert = tokio::fs::read("tonic-interop/data/server1.pem").await?;
-        let key = tokio::fs::read("tonic-interop/data/server1.key").await?;
+        let cert = tokio::fs::read("interop/data/server1.pem").await?;
+        let key = tokio::fs::read("interop/data/server1.key").await?;
         let identity = Identity::from_pem(cert, key);
 
         builder = builder.tls_config(ServerTlsConfig::with_rustls().identity(identity));

diff --git a/tonic-interop/src/client.rs → interop/src/client.rs b/tonic-interop/src/client.rs → interop/src/client.rs
diff --git a/tonic-interop/src/lib.rs → interop/src/lib.rs b/tonic-interop/src/lib.rs → interop/src/lib.rs
diff --git a/tonic-interop/src/server.rs → interop/src/server.rs b/tonic-interop/src/server.rs → interop/src/server.rs
diff --git a/tonic-interop/test.sh → interop/test.sh b/tonic-interop/test.sh → interop/test.sh
@@ -16,13 +16,13 @@ esac
 
 ARG="${1:-""}"
 
-(cd tonic-interop && cargo build --bins)
+(cd interop && cargo build --bins)
 
-SERVER="tonic-interop/bin/server_${OS}_amd64${EXT}"
+SERVER="interop/bin/server_${OS}_amd64${EXT}"
 
-# TLS_CA="tonic-interop/data/ca.pem"
-TLS_CRT="tonic-interop/data/server1.pem"
-TLS_KEY="tonic-interop/data/server1.key"
+# TLS_CA="interop/data/ca.pem"
+TLS_CRT="interop/data/server1.pem"
+TLS_KEY="interop/data/server1.key"
 
 # run the test server
 ./"${SERVER}" ${ARG} --tls_cert_file $TLS_CRT --tls_key_file $TLS_KEY &