Update references for conformance

.github/CONTRIBUTING.md

@@ -154,6 +154,8 @@ To update dependencies such as `SwiftProtobuf` in this repository:
    [`Connect-Swift-Mocks.podspec`](../Connect-Swift-Mocks.podspec) files.
 4. Open the [Swift package example app](../Examples/ElizaSwiftPackageApp) to ensure its `Package.resolved` file gets updated.
 5. Run `pod update` in the [CocoaPods example app's directory](../Examples/ElizaCocoaPodsApp).
+6. Update remote plugin entries (such as `buf.build/apple/swift`) in all `buf.gen.yaml` files to be in sync with their respective runtime libraries.
+7. Run `make generate` to apply any generated diffs from the newly updated plugins.
 
 ## Releasing
 

.github/workflows/ci.yaml

@@ -44,7 +44,7 @@ jobs:
     runs-on: macos-12
     steps:
       - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1.22.0
+      - uses: bufbuild/buf-setup-action@v1.26.1
         with:
           github_token: ${{ github.token }}
       - name: Build plugins

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: macos-12
     steps:
       - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1.22.0
+      - uses: bufbuild/buf-setup-action@v1.26.1
         with:
           github_token: ${{ github.token }}
       - name: Build plugins

Connect-Swift-Mocks.podspec

@@ -13,7 +13,7 @@ Pod::Spec.new do |spec|
   spec.tvos.deployment_target = '13.0'
 
   spec.dependency 'Connect-Swift', "#{spec.version.to_s}"
-  spec.dependency 'SwiftProtobuf', '~> 1.22.0'
+  spec.dependency 'SwiftProtobuf', '~> 1.23.0'
 
   spec.source_files = 'Libraries/ConnectMocks/**/*.swift'
 

Connect-Swift.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |spec|
   spec.osx.deployment_target = '10.15'
   spec.tvos.deployment_target = '13.0'
 
-  spec.dependency 'SwiftProtobuf', '~> 1.22.0'
+  spec.dependency 'SwiftProtobuf', '~> 1.23.0'
 
   spec.source_files = 'Libraries/Connect/**/*.swift'
 

Examples/ElizaCocoaPodsApp/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
   - Connect-Swift (0.6.0):
-    - SwiftProtobuf (~> 1.22.0)
-  - SwiftProtobuf (1.22.0)
+    - SwiftProtobuf (~> 1.23.0)
+  - SwiftProtobuf (1.23.0)
 
 DEPENDENCIES:
   - Connect-Swift (from `../..`)
@@ -15,8 +15,8 @@ EXTERNAL SOURCES:
     :path: "../.."
 
 SPEC CHECKSUMS:
-  Connect-Swift: ba76bc64b2153cacce4f7985a21d4d81473dac90
-  SwiftProtobuf: 40bd808372cb8706108f22d28f8ab4a6b9bc6989
+  Connect-Swift: ca072ef1a95341460bcc08074fc5d46ecc055fb9
+  SwiftProtobuf: b70d65f419fbfe61a2d58003456ca5da58e337d6
 
 PODFILE CHECKSUM: b598f373a6ab5add976b09c2ac79029bf2200d48
 

Examples/ElizaSwiftPackageApp/ElizaSwiftPackageApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-protobuf.git",
       "state" : {
-        "revision" : "f25867a208f459d3c5a06935dceb9083b11cd539",
-        "version" : "1.22.0"
+        "revision" : "cf62cdaea48b77f1a631e5cb3aeda6047c2cba1d",
+        "version" : "1.23.0"
       }
     }
   ],

Examples/buf.gen.yaml

@@ -1,6 +1,6 @@
 version: v1
 plugins:
-  - plugin: buf.build/apple/swift
+  - plugin: buf.build/apple/swift:v1.23.0
     opt: Visibility=Internal
     out: ./ElizaSharedSources/GeneratedSources
   - name: connect-swift

Libraries/Connect/Implementation/Streaming/URLSessionStream.swift

@@ -17,6 +17,7 @@ import Foundation
 /// Stream implementation that wraps a `URLSession` stream.
 final class URLSessionStream: NSObject {
     private var closedByServer = false
+    private let readStream: Foundation.InputStream
     private let responseCallbacks: ResponseCallbacks
     private let task: URLSessionUploadTask
     private let writeStream: Foundation.OutputStream
@@ -26,6 +27,10 @@ final class URLSessionStream: NSObject {
         case unableToWriteData
     }
 
+    var requestBodyStream: Foundation.InputStream {
+        return self.readStream
+    }
+
     var taskID: Int {
         return self.task.taskIdentifier
     }
@@ -44,11 +49,8 @@ final class URLSessionStream: NSObject {
         )
 
         self.responseCallbacks = responseCallbacks
+        self.readStream = readStream
         self.writeStream = writeStream
-
-        var request = request
-        request.httpBodyStream = readStream
-
         self.task = session.uploadTask(withStreamedRequest: request)
         super.init()
 

Libraries/Connect/Implementation/URLSessionHTTPClient.swift

@@ -140,6 +140,15 @@ extension URLSessionHTTPClient: URLSessionDataDelegate {
         let stream = self.lock.perform { self.streams[dataTask.taskIdentifier] }
         stream?.handleResponseData(data)
     }
+
+    open func urlSession(
+        _ session: URLSession, task: URLSessionTask,
+        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void
+    ) {
+        completionHandler(
+            self.lock.perform { self.streams[task.taskIdentifier]?.requestBodyStream }
+        )
+    }
 }
 
 extension URLSessionHTTPClient: URLSessionTaskDelegate {

Libraries/Connect/buf.gen.yaml

@@ -1,5 +1,5 @@
 version: v1
 plugins:
-  - plugin: buf.build/apple/swift
+  - plugin: buf.build/apple/swift:v1.23.0
     opt: Visibility=Internal
     out: ./Implementation/Generated

Makefile

@@ -8,7 +8,7 @@ MAKEFLAGS += --no-builtin-rules
 MAKEFLAGS += --no-print-directory
 BIN := .tmp/bin
 LICENSE_HEADER_YEAR_RANGE := 2022-2023
-CONFORMANCE_VERSION := 4f4e96d8fea3ed9473b90a964a5ba429e7ea5649
+CONFORMANCE_VERSION := 0b07f579cb61ad89de24524d62f804a2b03b1acf
 LICENSE_HEADER_VERSION := v1.12.0
 LICENSE_IGNORE := -e Package.swift \
     -e $(BIN)\/ \
@@ -57,7 +57,7 @@ conformanceserverrun: conformanceserverstop ## Start the conformance server
 generate: cleangenerated ## Regenerate outputs for all .proto files
 	cd Examples; buf generate
 	cd Libraries/Connect; buf generate
-	cd Tests/ConnectLibraryTests; buf generate
+	cd Tests/ConnectLibraryTests; buf generate https://github.com/connectrpc/conformance.git#ref=$(CONFORMANCE_VERSION),subdir=proto
 
 .PHONY: help
 help: ## Describe useful make targets

Package.resolved

@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-protobuf.git",
       "state" : {
-        "revision" : "f25867a208f459d3c5a06935dceb9083b11cd539",
-        "version" : "1.22.0"
+        "revision" : "cf62cdaea48b77f1a631e5cb3aeda6047c2cba1d",
+        "version" : "1.23.0"
       }
     }
   ],

Package.swift

@@ -60,7 +60,7 @@ let package = Package(
         ),
         .package(
             url: "https://github.com/apple/swift-protobuf.git",
-            from: "1.22.0"
+            from: "1.23.0"
         ),
     ],
     targets: [
@@ -89,8 +89,6 @@ let package = Package(
             path: "Tests/ConnectLibraryTests",
             exclude: [
                 "buf.gen.yaml",
-                "buf.work.yaml",
-                "proto",
             ],
             resources: [
                 .copy("TestResources"),

README.md

@@ -157,7 +157,7 @@ for details.
 - [connect-go][connect-go]: Go service stubs for servers
 - [connect-es][connect-es]: Type-safe APIs with Protobuf and TypeScript
 - [Buf Studio][buf-studio]: Web UI for ad-hoc RPCs
-- [connect-conformance][connect-conformance]: Connect, gRPC, and gRPC-Web
+- [conformance][connect-conformance]: Connect, gRPC, and gRPC-Web
   interoperability tests
 
 ## Status