Add Swift Integration Test

.github/workflows/integration-swift.yml

@@ -0,0 +1,14 @@
+name: Integrations (Swift)
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Run tests
+        run: docker-compose run integration_swift
+
+      - name: Cleanup
+        if: always()
+        run: docker-compose down

docker-compose.yml

@@ -114,3 +114,14 @@ services:
       - HTTPBIN=true
       - INTEGRATION_CLIENT=go
       - NODE_ENV=integration
+  integration_swift:
+    depends_on:
+      - reverse_proxy
+    build:
+      context: .
+      dockerfile: integrations/swift.Dockerfile
+    command: 'npx vitest run src/integration.test.ts'
+    environment:
+      - HTTPBIN=true
+      - INTEGRATION_CLIENT=swift
+      - NODE_ENV=integration

integrations/swift.Dockerfile

@@ -0,0 +1,19 @@
+FROM swift:latest
+
+COPY integrations/https-cert/rootCA.pem /usr/local/share/ca-certificates/integration-test.crt
+RUN rm -rf /var/lib/apt/lists/* && \
+  update-ca-certificates
+
+RUN apt-get update && \
+  apt-get install -y nodejs npm curl && \
+  npm install -g n && \
+  n stable
+
+WORKDIR /src
+
+# add pacakge.json first so we don't have to `npm install` unless it changes
+# package.json has changed
+ADD package.json /src/
+RUN npm install
+
+ADD . /src

src/helpers/__snapshots__/utils.test.ts.snap

@@ -390,6 +390,7 @@ exports[`availableTargets > returns all available targets 1`] = `
     "title": "Shell",
   },
   {
+    "cli": "swift",
     "clients": [
       {
         "description": "Foundation's URLSession request",

src/integration.test.ts

@@ -25,6 +25,7 @@ const ENVIRONMENT_CONFIG = {
     php: ['curl', 'guzzle'],
     python: ['requests'],
     shell: ['curl'],
+    swift: ['urlsession'],
   },
   local: {
     // When running tests locally, or within a CI environment, we shold limit the targets that
@@ -68,6 +69,34 @@ int main(void) {
   },
   go: (fixturePath: string) => {
     return shell.execSync(`go run ${fixturePath}`);
+
+  },
+  swift: (fixturePath: string) => {
+    const filePath = `/tmp/${path.basename(fixturePath)}`;
+    writeFileSync(
+      filePath,
+      `
+import FoundationNetworking
+
+extension URLSession {
+  func data(for request: URLRequest, delegate: (any URLSessionTaskDelegate)? = nil) async throws -> (Data, URLResponse) {
+    return try await withCheckedThrowingContinuation { continuation in
+      self.dataTask(with: request) { data, response, error in
+        if let error {
+          continuation.resume(throwing: error)
+        } else {
+          continuation.resume(returning: (data!, response!))
+        }
+      }
+      .resume()
+    }
+  }
+}
+
+${readFileSync(fixturePath, 'utf8')}
+`,
+    );
+    return shell.execSync(`swift ${filePath}`);
   },
 };
 

src/targets/swift/target.ts

@@ -7,6 +7,7 @@ export const swift: Target = {
     key: 'swift',
     title: 'Swift',
     default: 'urlsession',
+    cli: 'swift',
   },
   clientsById: {
     urlsession,

src/targets/swift/urlsession/client.ts

@@ -63,7 +63,7 @@ export const urlsession: Client<UrlsessionOptions> = {
 
         case 'application/json':
           if (postData.jsonObj) {
-            push(`${literalDeclaration('parameters', postData.jsonObj, opts)} as [String : Any]`);
+            push(`${literalDeclaration('parameters', postData.jsonObj, opts)} as [String : Any?]`);
             blank();
             push('let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])');
             blank();
@@ -87,7 +87,7 @@ export const urlsession: Client<UrlsessionOptions> = {
           push('body += "--\\(boundary)\\r\\n"', 1);
           push('body += "Content-Disposition:form-data; name=\\"\\(paramName)\\""', 1);
           push('if let filename = param["fileName"] {', 1);
-          push('let contentType = param["content-type"]!', 2);
+          push('let contentType = param["contentType"]!', 2);
           push('let fileContent = try String(contentsOfFile: filename, encoding: .utf8)', 2);
           push('body += "; filename=\\"\\(filename)\\"\\r\\n"', 2);
           push('body += "Content-Type: \\(contentType)\\r\\n\\r\\n"', 2);
@@ -150,7 +150,7 @@ export const urlsession: Client<UrlsessionOptions> = {
 
     blank();
 
-    push('let (data, response) = try await URLSession.shared.data(for: request)');
+    push('let (data, _) = try await URLSession.shared.data(for: request)');
     push('print(String(decoding: data, as: UTF8.self))');
 
     return join();

src/targets/swift/urlsession/fixtures/application-form-encoded.swift

@@ -14,5 +14,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "application/x-www-form-urlencoded"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/application-json.swift

@@ -7,7 +7,7 @@ let parameters = [
   "nested": ["a": "b"],
   "arr_mix": [1, "a", ["arr_mix_nested": []]],
   "boolean": false
-] as [String : Any]
+] as [String : Any?]
 
 let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
 
@@ -18,5 +18,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "application/json"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/cookies.swift

@@ -6,5 +6,5 @@ request.httpMethod = "GET"
 request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["cookie": "foo=bar; bar=baz"]
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/custom-method.swift

@@ -5,5 +5,5 @@ var request = URLRequest(url: url)
 request.httpMethod = "PROPFIND"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/full.swift

@@ -26,5 +26,5 @@ request.allHTTPHeaderFields = [
 ]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/headers.swift

@@ -11,5 +11,5 @@ request.allHTTPHeaderFields = [
   "quoted-value": "\"quoted\" 'string'"
 ]
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/http-insecure.swift

@@ -5,5 +5,5 @@ var request = URLRequest(url: url)
 request.httpMethod = "GET"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/indent-option.swift

@@ -5,5 +5,5 @@ var request = URLRequest(url: url)
 request.httpMethod = "GET"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/json-null-value.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-let parameters = ["foo": nil] as [String : Any]
+let parameters = ["foo": nil] as [String : Any?]
 
 let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
 
@@ -11,5 +11,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "application/json"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/jsonObj-multiline.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-let parameters = ["foo": "bar"] as [String : Any]
+let parameters = ["foo": "bar"] as [String : Any?]
 
 let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
 
@@ -11,5 +11,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "application/json"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/jsonObj-null-value.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-let parameters = ["foo": nil] as [String : Any]
+let parameters = ["foo": nil] as [String : Any?]
 
 let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
 
@@ -11,5 +11,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "application/json"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/multipart-data.swift

@@ -21,7 +21,7 @@ for param in parameters {
   body += "--\(boundary)\r\n"
   body += "Content-Disposition:form-data; name=\"\(paramName)\""
   if let filename = param["fileName"] {
-    let contentType = param["content-type"]!
+    let contentType = param["contentType"]!
     let fileContent = try String(contentsOfFile: filename, encoding: .utf8)
     body += "; filename=\"\(filename)\"\r\n"
     body += "Content-Type: \(contentType)\r\n\r\n"
@@ -40,5 +40,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "multipart/form-data; boundary=---011000010111000001101001"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/multipart-file.swift

@@ -16,7 +16,7 @@ for param in parameters {
   body += "--\(boundary)\r\n"
   body += "Content-Disposition:form-data; name=\"\(paramName)\""
   if let filename = param["fileName"] {
-    let contentType = param["content-type"]!
+    let contentType = param["contentType"]!
     let fileContent = try String(contentsOfFile: filename, encoding: .utf8)
     body += "; filename=\"\(filename)\"\r\n"
     body += "Content-Type: \(contentType)\r\n\r\n"
@@ -35,5 +35,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "multipart/form-data; boundary=---011000010111000001101001"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/multipart-form-data-no-params.swift

@@ -6,5 +6,5 @@ request.httpMethod = "POST"
 request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["Content-Type": "multipart/form-data"]
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/multipart-form-data.swift

@@ -15,7 +15,7 @@ for param in parameters {
   body += "--\(boundary)\r\n"
   body += "Content-Disposition:form-data; name=\"\(paramName)\""
   if let filename = param["fileName"] {
-    let contentType = param["content-type"]!
+    let contentType = param["contentType"]!
     let fileContent = try String(contentsOfFile: filename, encoding: .utf8)
     body += "; filename=\"\(filename)\"\r\n"
     body += "Content-Type: \(contentType)\r\n\r\n"
@@ -34,5 +34,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["Content-Type": "multipart/form-data; boundary=---011000010111000001101001"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/nested.swift

@@ -13,5 +13,5 @@ var request = URLRequest(url: components.url!)
 request.httpMethod = "GET"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/postdata-malformed.swift

@@ -6,5 +6,5 @@ request.httpMethod = "POST"
 request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "application/json"]
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/pretty-option.swift

@@ -20,5 +20,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["cookie": "foo=bar; bar=baz", "accept": "application/json", "content-type": "application/x-www-form-urlencoded"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/query-encoded.swift

@@ -12,5 +12,5 @@ var request = URLRequest(url: components.url!)
 request.httpMethod = "GET"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/query.swift

@@ -14,5 +14,5 @@ var request = URLRequest(url: components.url!)
 request.httpMethod = "GET"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/short.swift

@@ -5,5 +5,5 @@ var request = URLRequest(url: url)
 request.httpMethod = "GET"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/text-plain.swift

@@ -9,5 +9,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "text/plain"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/timeout-option.swift

@@ -5,5 +5,5 @@ var request = URLRequest(url: url)
 request.httpMethod = "GET"
 request.timeoutInterval = 5
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))