review comments

Author: rnro

.github/workflows/matrices/plugin-tests.json

@@ -1 +1 @@
-{"config":[{"name":"Plugin tests (6.0)","swift_version":"6.0","runner":"ubuntu-latest","image":"swift:6.0-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s https://raw.githubusercontent.com/grpc/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh | bash","command_arguments":""},{"name":"Plugin tests (nightly-6.0)","swift_version":"nightly-6.0","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-6.0-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s https://raw.githubusercontent.com/grpc/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh | bash","command_arguments":""},{"name":"Plugin tests (nightly-main)","swift_version":"nightly-main","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-main-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s https://raw.githubusercontent.com/grpc/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh | bash","command_arguments":""}]}
+{"config":[{"name":"Plugin tests (6.0)","swift_version":"6.0","runner":"ubuntu-latest","image":"swift:6.0-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s https://raw.githubusercontent.com/grpc/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh | bash","command_arguments":""},{"name":"Plugin tests (nightly-6.1)","swift_version":"nightly-6.1","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-6.1-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s https://raw.githubusercontent.com/grpc/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh | bash","command_arguments":""},{"name":"Plugin tests (nightly-main)","swift_version":"nightly-main","runner":"ubuntu-latest","image":"swiftlang/swift:nightly-main-jammy","platform":"Linux","setup_command":"apt-get update -y -q && apt-get install -y -q curl protobuf-compiler","command":"curl -s https://raw.githubusercontent.com/grpc/grpc-swift-protobuf/package_plugins/dev/plugin-tests.sh | bash","command_arguments":""}]}

IntegrationTests/PluginTests/test_05_two_definitions/Sources/adopter.swift

@@ -44,7 +44,7 @@ struct PluginAdopter {
     }
   }
 
-  static func doRPC(_ fooService1: Foo_FooService1.Client) async throws {
+  static func doRPC<Transport>(_ fooService1: Foo_FooService1.Client<Transport>) async throws {
     do {
       let reply = try await fooService1.foo(.with { _ in () })
       print("Reply: \(reply.hashValue)")

IntegrationTests/PluginTests/test_06_nested_definitions/Sources/adopter.swift

@@ -44,7 +44,7 @@ struct PluginAdopter {
     }
   }
 
-  static func doRPC(_ fooService1: Foo_FooService1.Client) async throws {
+  static func doRPC<Transport>(_ fooService1: Foo_FooService1.Client<Transport>) async throws {
     do {
       let reply = try await fooService1.foo(.with { _ in () })
       print("Reply: \(reply.hashValue)")

dev/plugin-tests.sh

@@ -19,20 +19,20 @@ log() { printf -- "** %s\n" "$*" >&2; }
 error() { printf -- "** ERROR: %s\n" "$*" >&2; }
 fatal() { error "$@"; exit 1; }
 
-source_dir=$(pwd)
-pluginTests="${source_dir}/IntegrationTests/PluginTests"
+here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" 
+plugin_tests="${here}/../IntegrationTests/PluginTests"
 
-for dir in "$pluginTests"/test_*/ ; do
+for dir in "$plugin_tests"/test_*/ ; do
   if [[ -f "$dir/Package.swift" ]]; then
-    pluginTest=$(basename "$dir")
-    log "Building '$pluginTest' plugin test"
+    plugin_test=$(basename "$dir")
+    log "Building '$plugin_test' plugin test"
 
     if ! build_output=$(swift build --package-path "$dir" 2>&1); then
       # Only print the build output on failure.
       echo "$build_output"
-      fatal "Build failed for '$pluginTest'"
+      fatal "Build failed for '$plugin_test'"
     else
-      log "Build succeeded for '$pluginTest'"
+      log "Build succeeded for '$plugin_test'"
     fi
   fi
 done