fixup: Treat the user handler throwing GRPCStatus.ok as an error

Signed-off-by: Si Beaumont <[email protected]>

Author: simonjbeaumont

Sources/GRPC/AsyncAwaitSupport/GRPCAsyncServerHandler.swift

@@ -362,7 +362,18 @@ internal final class AsyncServerHandler<
         }
 
         // Call the user function.
-        try await self.userHandler(requestStream, responseStreamWriter, context)
+        do {
+          try await self.userHandler(requestStream, responseStreamWriter, context)
+        } catch {
+          // Throwing GRPCStatus.ok is considered to be invalid.
+          if (error as? GRPCStatus)?.isOk ?? false {
+            throw GRPCStatus(
+              code: .unknown,
+              message: "Handler threw GRPCStatus error with code .ok"
+            )
+          }
+          throw error
+        }
 
         // Check for cancellation after the user function has returned so we don't return OK in the
         // event the RPC was cancelled. This is probably overkill because the `handleError(_:)`

Tests/GRPCTests/GRPCAsyncServerHandlerTests.swift

@@ -287,7 +287,7 @@ class AsyncServerHandlerTests: ServerHandlerTestCaseBase {
     await assertThat(self.recorder.trailers, .is([:]))
   } }
 
-  func testHandlerThrowsGRPCStatusOK() { XCTAsyncTest {
+  func testHandlerThrowsGRPCStatusOKResultsInUnknownStatus() { XCTAsyncTest {
     // Create a user function that immediately throws GRPCStatus.ok.
     let handler = self.makeHandler { _, _, _ in
       throw GRPCStatus.ok
@@ -299,9 +299,10 @@ class AsyncServerHandlerTests: ServerHandlerTestCaseBase {
     // Wait for user handler to finish (it's gonna throw immediately).
     await assertThat(await handler.task?.value, .notNil())
 
-    // Check the status is OK.
-    await assertThat(self.recorder.status, .notNil(.hasCode(.ok)))
+    // Check the status is `.unknown`.
+    await assertThat(self.recorder.status, .notNil(.hasCode(.unknown)))
   } }
+
 }
 
 #endif