Update examples

glbrntt · glbrntt · commit 706519cfe007 · 2025-01-17T13:51:48.000Z
Motivation:

We changed a few API across the packages so the examples need to be
brought up-to-date.

Modifications:

- Update generated code
- Update dependencies
- Fix warnings

Result:

Examples are up-to-date
diff --git a/Examples/echo/Package.swift b/Examples/echo/Package.swift
@@ -21,9 +21,9 @@ let package = Package(
   name: "echo",
   platforms: [.macOS("15.0")],
   dependencies: [
-    .package(url: "https://github.com/grpc/grpc-swift.git", exact: "2.0.0-beta.2"),
-    .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", exact: "1.0.0-beta.2"),
-    .package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", exact: "1.0.0-beta.2"),
+    .package(url: "https://github.com/grpc/grpc-swift.git", branch: "main"),
+    .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", branch: "main"),
+    .package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", branch: "main"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.5.0"),
   ],
   targets: [
diff --git a/Examples/echo/Sources/Generated/echo.grpc.swift b/Examples/echo/Sources/Generated/echo.grpc.swift
@@ -991,4 +991,4 @@ extension Echo_Echo.ClientProtocol {
             onResponse: handleResponse
         )
     }
-}
+}
diff --git a/Examples/echo/Sources/Subcommands/Collect.swift b/Examples/echo/Sources/Subcommands/Collect.swift
@@ -27,18 +27,12 @@ struct Collect: AsyncParsableCommand {
   var arguments: ClientArguments
 
   func run() async throws {
-    let client = GRPCClient(
-      transport: try .http2NIOPosix(
+    try await withGRPCClient(
+      transport: .http2NIOPosix(
         target: self.arguments.target,
         transportSecurity: .plaintext
       )
-    )
-
-    try await withThrowingDiscardingTaskGroup { group in
-      group.addTask {
-        try await client.run()
-      }
-
+    ) { client in
       let echo = Echo_Echo.Client(wrapping: client)
 
       for _ in 0 ..< self.arguments.repetitions {
@@ -50,8 +44,6 @@ struct Collect: AsyncParsableCommand {
         }
         print("collect ← \(message.text)")
       }
-
-      client.beginGracefulShutdown()
     }
   }
 }
diff --git a/Examples/echo/Sources/Subcommands/Expand.swift b/Examples/echo/Sources/Subcommands/Expand.swift
@@ -27,18 +27,12 @@ struct Expand: AsyncParsableCommand {
   var arguments: ClientArguments
 
   func run() async throws {
-    let client = GRPCClient(
-      transport: try .http2NIOPosix(
+    try await withGRPCClient(
+      transport: .http2NIOPosix(
         target: self.arguments.target,
         transportSecurity: .plaintext
       )
-    )
-
-    try await withThrowingDiscardingTaskGroup { group in
-      group.addTask {
-        try await client.run()
-      }
-
+    ) { client in
       let echo = Echo_Echo.Client(wrapping: client)
 
       for _ in 0 ..< self.arguments.repetitions {
@@ -50,8 +44,6 @@ struct Expand: AsyncParsableCommand {
           }
         }
       }
-
-      client.beginGracefulShutdown()
     }
   }
 }
diff --git a/Examples/echo/Sources/Subcommands/Get.swift b/Examples/echo/Sources/Subcommands/Get.swift
@@ -25,18 +25,12 @@ struct Get: AsyncParsableCommand {
   var arguments: ClientArguments
 
   func run() async throws {
-    let client = GRPCClient(
-      transport: try .http2NIOPosix(
+    try await withGRPCClient(
+      transport: .http2NIOPosix(
         target: self.arguments.target,
         transportSecurity: .plaintext
       )
-    )
-
-    try await withThrowingDiscardingTaskGroup { group in
-      group.addTask {
-        try await client.run()
-      }
-
+    ) { client in
       let echo = Echo_Echo.Client(wrapping: client)
 
       for _ in 0 ..< self.arguments.repetitions {
@@ -45,8 +39,6 @@ struct Get: AsyncParsableCommand {
         let response = try await echo.get(message)
         print("get ← \(response.text)")
       }
-
-      client.beginGracefulShutdown()
     }
   }
 }
diff --git a/Examples/echo/Sources/Subcommands/Update.swift b/Examples/echo/Sources/Subcommands/Update.swift
@@ -27,18 +27,12 @@ struct Update: AsyncParsableCommand {
   var arguments: ClientArguments
 
   func run() async throws {
-    let client = GRPCClient(
-      transport: try .http2NIOPosix(
+    try await withGRPCClient(
+      transport: .http2NIOPosix(
         target: self.arguments.target,
         transportSecurity: .plaintext
       )
-    )
-
-    try await withThrowingDiscardingTaskGroup { group in
-      group.addTask {
-        try await client.run()
-      }
-
+    ) { client in
       let echo = Echo_Echo.Client(wrapping: client)
 
       for _ in 0 ..< self.arguments.repetitions {
@@ -53,8 +47,6 @@ struct Update: AsyncParsableCommand {
           }
         }
       }
-
-      client.beginGracefulShutdown()
     }
   }
 }
diff --git a/Examples/error-details/Package.swift b/Examples/error-details/Package.swift
@@ -21,8 +21,8 @@ let package = Package(
   name: "error-details",
   platforms: [.macOS(.v15)],
   dependencies: [
-    .package(url: "https://github.com/grpc/grpc-swift.git", exact: "2.0.0-beta.2"),
-    .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", exact: "1.0.0-beta.2"),
+    .package(url: "https://github.com/grpc/grpc-swift.git", branch: "main"),
+    .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", branch: "main"),
   ],
   targets: [
     .executableTarget(
diff --git a/Examples/error-details/Sources/DetailedErrorExample.swift b/Examples/error-details/Sources/DetailedErrorExample.swift
@@ -29,7 +29,7 @@ struct DetailedErrorExample {
     }
   }
 
-  static func doRPC(_ greeter: Helloworld_Greeter.Client) async throws {
+  static func doRPC(_ greeter: Helloworld_Greeter.Client<some ClientTransport>) async throws {
     do {
       let reply = try await greeter.sayHello(.with { $0.name = "(ignored)" })
       print("Unexpected reply: \(reply.message)")
diff --git a/Examples/hello-world/Package.swift b/Examples/hello-world/Package.swift
@@ -21,9 +21,9 @@ let package = Package(
   name: "hello-world",
   platforms: [.macOS("15.0")],
   dependencies: [
-    .package(url: "https://github.com/grpc/grpc-swift.git", exact: "2.0.0-beta.2"),
-    .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", exact: "1.0.0-beta.2"),
-    .package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", exact: "1.0.0-beta.2"),
+    .package(url: "https://github.com/grpc/grpc-swift.git", branch: "main"),
+    .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", branch: "main"),
+    .package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", branch: "main"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.5.0"),
   ],
   targets: [
diff --git a/Examples/hello-world/Sources/Subcommands/Greet.swift b/Examples/hello-world/Sources/Subcommands/Greet.swift
@@ -29,22 +29,12 @@ struct Greet: AsyncParsableCommand {
   var name: String = ""
 
   func run() async throws {
-    try await withThrowingDiscardingTaskGroup { group in
-      let client = GRPCClient(
-        transport: try .http2NIOPosix(
-          target: .ipv4(host: "127.0.0.1", port: self.port),
-          transportSecurity: .plaintext
-        )
+    try await withGRPCClient(
+      transport: .http2NIOPosix(
+        target: .ipv4(host: "127.0.0.1", port: self.port),
+        transportSecurity: .plaintext
       )
-
-      group.addTask {
-        try await client.run()
-      }
-
-      defer {
-        client.beginGracefulShutdown()
-      }
-
+    ) { client in
       let greeter = Helloworld_Greeter.Client(wrapping: client)
       let reply = try await greeter.sayHello(.with { $0.name = self.name })
       print(reply.message)
diff --git a/Examples/reflection-server/Package.swift b/Examples/reflection-server/Package.swift
@@ -21,10 +21,10 @@ let package = Package(
   name: "reflection-server",
   platforms: [.macOS(.v15)],
   dependencies: [
-    .package(url: "https://github.com/grpc/grpc-swift.git", exact: "2.0.0-beta.2"),
-    .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", exact: "1.0.0-beta.2"),
-    .package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", exact: "1.0.0-beta.2"),
-    .package(url: "https://github.com/grpc/grpc-swift-extras.git", exact: "1.0.0-beta.2"),
+    .package(url: "https://github.com/grpc/grpc-swift.git", branch: "main"),
+    .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", branch: "main"),
+    .package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", branch: "main"),
+    .package(url: "https://github.com/grpc/grpc-swift-extras.git", branch: "main"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.5.0"),
   ],
   targets: [
diff --git a/Examples/route-guide/Package.swift b/Examples/route-guide/Package.swift
@@ -21,9 +21,9 @@ let package = Package(
   name: "route-guide",
   platforms: [.macOS("15.0")],
   dependencies: [
-    .package(url: "https://github.com/grpc/grpc-swift.git", exact: "2.0.0-beta.2"),
-    .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", exact: "1.0.0-beta.2"),
-    .package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", exact: "1.0.0-beta.2"),
+    .package(url: "https://github.com/grpc/grpc-swift.git", branch: "main"),
+    .package(url: "https://github.com/grpc/grpc-swift-protobuf.git", branch: "main"),
+    .package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", branch: "main"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.5.0"),
   ],
   targets: [
diff --git a/Examples/route-guide/Sources/Subcommands/GetFeature.swift b/Examples/route-guide/Sources/Subcommands/GetFeature.swift
@@ -37,17 +37,12 @@ struct GetFeature: AsyncParsableCommand {
   var longitude: Int32 = -746_143_763
 
   func run() async throws {
-    let transport = try HTTP2ClientTransport.Posix(
-      target: .ipv4(host: "127.0.0.1", port: self.port),
-      transportSecurity: .plaintext
-    )
-    let client = GRPCClient(transport: transport)
-
-    try await withThrowingDiscardingTaskGroup { group in
-      group.addTask {
-        try await client.run()
-      }
-
+    try await withGRPCClient(
+      transport: .http2NIOPosix(
+        target: .ipv4(host: "127.0.0.1", port: self.port),
+        transportSecurity: .plaintext
+      )
+    ) { client in
       let routeGuide = Routeguide_RouteGuide.Client(wrapping: client)
 
       let point = Routeguide_Point.with {
@@ -62,8 +57,6 @@ struct GetFeature: AsyncParsableCommand {
       } else {
         print("Found '\(feature.name)' at (\(self.latitude), \(self.longitude))")
       }
-
-      client.beginGracefulShutdown()
     }
   }
 }
diff --git a/Examples/route-guide/Sources/Subcommands/ListFeatures.swift b/Examples/route-guide/Sources/Subcommands/ListFeatures.swift
@@ -51,17 +51,12 @@ struct ListFeatures: AsyncParsableCommand {
   var maxLongitude: Int32 = -730_000_000
 
   func run() async throws {
-    let transport = try HTTP2ClientTransport.Posix(
-      target: .ipv4(host: "127.0.0.1", port: self.port),
-      transportSecurity: .plaintext
-    )
-    let client = GRPCClient(transport: transport)
-
-    try await withThrowingDiscardingTaskGroup { group in
-      group.addTask {
-        try await client.run()
-      }
-
+    try await withGRPCClient(
+      transport: .http2NIOPosix(
+        target: .ipv4(host: "127.0.0.1", port: self.port),
+        transportSecurity: .plaintext
+      )
+    ) { client in
       let routeGuide = Routeguide_RouteGuide.Client(wrapping: client)
       let boundingRectangle = Routeguide_Rectangle.with {
         $0.lo.latitude = self.minLatitude
@@ -78,9 +73,6 @@ struct ListFeatures: AsyncParsableCommand {
           print("(\(count)) \(feature.name) at (\(lat), \(lon))")
         }
       }
-
-      client.beginGracefulShutdown()
     }
-
   }
 }
diff --git a/Examples/route-guide/Sources/Subcommands/RecordRoute.swift b/Examples/route-guide/Sources/Subcommands/RecordRoute.swift
@@ -30,17 +30,12 @@ struct RecordRoute: AsyncParsableCommand {
   var points: Int = 10
 
   func run() async throws {
-    let transport = try HTTP2ClientTransport.Posix(
-      target: .ipv4(host: "127.0.0.1", port: self.port),
-      transportSecurity: .plaintext
-    )
-    let client = GRPCClient(transport: transport)
-
-    try await withThrowingDiscardingTaskGroup { group in
-      group.addTask {
-        try await client.run()
-      }
-
+    try await withGRPCClient(
+      transport: .http2NIOPosix(
+        target: .ipv4(host: "127.0.0.1", port: self.port),
+        transportSecurity: .plaintext
+      )
+    ) { client in
       let routeGuide = Routeguide_RouteGuide.Client(wrapping: client)
 
       // Get all features.
@@ -67,8 +62,6 @@ struct RecordRoute: AsyncParsableCommand {
         a distance \(summary.distance) metres.
         """
       print(text)
-
-      client.beginGracefulShutdown()
     }
   }
 }
diff --git a/Examples/route-guide/Sources/Subcommands/RouteChat.swift b/Examples/route-guide/Sources/Subcommands/RouteChat.swift
@@ -30,17 +30,12 @@ struct RouteChat: AsyncParsableCommand {
   var port: Int = 31415
 
   func run() async throws {
-    let transport = try HTTP2ClientTransport.Posix(
-      target: .ipv4(host: "127.0.0.1", port: self.port),
-      transportSecurity: .plaintext
-    )
-    let client = GRPCClient(transport: transport)
-
-    try await withThrowingDiscardingTaskGroup { group in
-      group.addTask {
-        try await client.run()
-      }
-
+    try await withGRPCClient(
+      transport: .http2NIOPosix(
+        target: .ipv4(host: "127.0.0.1", port: self.port),
+        transportSecurity: .plaintext
+      )
+    ) { client in
       let routeGuide = Routeguide_RouteGuide.Client(wrapping: client)
 
       try await routeGuide.routeChat { writer in
@@ -67,8 +62,6 @@ struct RouteChat: AsyncParsableCommand {
           print("Received note: '\(note.message) at (\(lat), \(lon))'")
         }
       }
-
-      client.beginGracefulShutdown()
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -991,4 +991,4 @@ extension Echo_Echo.ClientProtocol {`
`991`	`991`	`onResponse: handleResponse`
`992`	`992`	`)`
`993`	`993`	`}`
`994`		`-}`
	`994`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -27,18 +27,12 @@ struct Collect: AsyncParsableCommand {`
`27`	`27`	`var arguments: ClientArguments`
`28`	`28`
`29`	`29`	`func run() async throws {`
`30`		`- let client = GRPCClient(`
`31`		`- transport: try .http2NIOPosix(`
	`30`	`+ try await withGRPCClient(`
	`31`	`+ transport: .http2NIOPosix(`
`32`	`32`	`target: self.arguments.target,`
`33`	`33`	`transportSecurity: .plaintext`
`34`	`34`	`)`
`35`		`- )`
`36`		`-`
`37`		`- try await withThrowingDiscardingTaskGroup { group in`
`38`		`- group.addTask {`
`39`		`- try await client.run()`
`40`		`- }`
`41`		`-`
	`35`	`+ ) { client in`
`42`	`36`	`let echo = Echo_Echo.Client(wrapping: client)`
`43`	`37`
`44`	`38`	`for _ in 0 ..< self.arguments.repetitions {`
`@@ -50,8 +44,6 @@ struct Collect: AsyncParsableCommand {`
`50`	`44`	`}`
`51`	`45`	`print("collect ← \(message.text)")`
`52`	`46`	`}`
`53`		`-`
`54`		`- client.beginGracefulShutdown()`
`55`	`47`	`}`
`56`	`48`	`}`
`57`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,18 +27,12 @@ struct Expand: AsyncParsableCommand {`
`27`	`27`	`var arguments: ClientArguments`
`28`	`28`
`29`	`29`	`func run() async throws {`
`30`		`- let client = GRPCClient(`
`31`		`- transport: try .http2NIOPosix(`
	`30`	`+ try await withGRPCClient(`
	`31`	`+ transport: .http2NIOPosix(`
`32`	`32`	`target: self.arguments.target,`
`33`	`33`	`transportSecurity: .plaintext`
`34`	`34`	`)`
`35`		`- )`
`36`		`-`
`37`		`- try await withThrowingDiscardingTaskGroup { group in`
`38`		`- group.addTask {`
`39`		`- try await client.run()`
`40`		`- }`
`41`		`-`
	`35`	`+ ) { client in`
`42`	`36`	`let echo = Echo_Echo.Client(wrapping: client)`
`43`	`37`
`44`	`38`	`for _ in 0 ..< self.arguments.repetitions {`
`@@ -50,8 +44,6 @@ struct Expand: AsyncParsableCommand {`
`50`	`44`	`}`
`51`	`45`	`}`
`52`	`46`	`}`
`53`		`-`
`54`		`- client.beginGracefulShutdown()`
`55`	`47`	`}`
`56`	`48`	`}`
`57`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,18 +25,12 @@ struct Get: AsyncParsableCommand {`
`25`	`25`	`var arguments: ClientArguments`
`26`	`26`
`27`	`27`	`func run() async throws {`
`28`		`- let client = GRPCClient(`
`29`		`- transport: try .http2NIOPosix(`
	`28`	`+ try await withGRPCClient(`
	`29`	`+ transport: .http2NIOPosix(`
`30`	`30`	`target: self.arguments.target,`
`31`	`31`	`transportSecurity: .plaintext`
`32`	`32`	`)`
`33`		`- )`
`34`		`-`
`35`		`- try await withThrowingDiscardingTaskGroup { group in`
`36`		`- group.addTask {`
`37`		`- try await client.run()`
`38`		`- }`
`39`		`-`
	`33`	`+ ) { client in`
`40`	`34`	`let echo = Echo_Echo.Client(wrapping: client)`
`41`	`35`
`42`	`36`	`for _ in 0 ..< self.arguments.repetitions {`
`@@ -45,8 +39,6 @@ struct Get: AsyncParsableCommand {`
`45`	`39`	`let response = try await echo.get(message)`
`46`	`40`	`print("get ← \(response.text)")`
`47`	`41`	`}`
`48`		`-`
`49`		`- client.beginGracefulShutdown()`
`50`	`42`	`}`
`51`	`43`	`}`
`52`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,18 +27,12 @@ struct Update: AsyncParsableCommand {`
`27`	`27`	`var arguments: ClientArguments`
`28`	`28`
`29`	`29`	`func run() async throws {`
`30`		`- let client = GRPCClient(`
`31`		`- transport: try .http2NIOPosix(`
	`30`	`+ try await withGRPCClient(`
	`31`	`+ transport: .http2NIOPosix(`
`32`	`32`	`target: self.arguments.target,`
`33`	`33`	`transportSecurity: .plaintext`
`34`	`34`	`)`
`35`		`- )`
`36`		`-`
`37`		`- try await withThrowingDiscardingTaskGroup { group in`
`38`		`- group.addTask {`
`39`		`- try await client.run()`
`40`		`- }`
`41`		`-`
	`35`	`+ ) { client in`
`42`	`36`	`let echo = Echo_Echo.Client(wrapping: client)`
`43`	`37`
`44`	`38`	`for _ in 0 ..< self.arguments.repetitions {`
`@@ -53,8 +47,6 @@ struct Update: AsyncParsableCommand {`
`53`	`47`	`}`
`54`	`48`	`}`
`55`	`49`	`}`
`56`		`-`
`57`		`- client.beginGracefulShutdown()`
`58`	`50`	`}`
`59`	`51`	`}`
`60`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ struct DetailedErrorExample {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`- static func doRPC(_ greeter: Helloworld_Greeter.Client) async throws {`
	`32`	`+ static func doRPC(_ greeter: Helloworld_Greeter.Client<some ClientTransport>) async throws {`
`33`	`33`	`do {`
`34`	`34`	`let reply = try await greeter.sayHello(.with { $0.name = "(ignored)" })`
`35`	`35`	`print("Unexpected reply: \(reply.message)")`