fix ci

Author: sebsto

.licenseignore

@@ -33,3 +33,4 @@ Package.resolved
 *.yml
 *.json
 *.gif
+Makefile

Examples/quoteapi-alb/Sources/QuoteAPI/QuoteService.swift

@@ -2,8 +2,8 @@
 //
 // This source file is part of the Swift OpenAPI Lambda open source project
 //
-// Copyright (c) 2023 Amazon.com, Inc. or its affiliates
-//                    and the Swift OpenAPI Lambda project authors
+// Copyright Swift OpenAPI Lambda project authors
+// Copyright (c) Amazon.com, Inc. or its affiliates.
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information

Makefile

@@ -1,2 +1,2 @@
 format:
-	@swift format -i -r Package.swift Examples Sources    
+	@swift format -i -r Package.swift Examples Sources Tests

Sources/EventSource/ALB/ALBTargetGroup+HTTPRequest.swift

@@ -23,7 +23,7 @@ extension ALBTargetGroupRequest {
         let headers = self.headers ?? [:]
         let scheme = headers.first { $0.key.lowercased() == "x-forwarded-proto" }?.value
         let authority = headers.first { $0.key.lowercased() == "host" }?.value
-        
+
         return HTTPRequest(
             method: self.httpMethod,
             scheme: scheme,

Tests/OpenAPILambdaTests/ALBConversionTests.swift

@@ -20,7 +20,7 @@ import Testing
 @testable import OpenAPILambda
 
 struct ALBConversionTests {
-    
+
     static let albEventJSON = """
         {
           "requestContext": {
@@ -40,21 +40,27 @@ struct ALBConversionTests {
           "isBase64Encoded": false
         }
         """
-    
+
     @Test("ALB request to HTTPRequest conversion")
     func testALBRequestToHTTPRequest() throws {
         let data = ALBConversionTests.albEventJSON.data(using: .utf8)!
         let albRequest = try JSONDecoder().decode(ALBTargetGroupRequest.self, from: data)
-        
+
         let httpRequest = try albRequest.httpRequest()
-        
+
         #expect(httpRequest.method == HTTPRequest.Method.get)
         #expect(httpRequest.path == "/stocks/AAPL")
-        #expect(httpRequest.headerFields[HTTPField.Name.accept] == "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8")
+        #expect(
+            httpRequest.headerFields[HTTPField.Name.accept]
+                == "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8"
+        )
         #expect(httpRequest.headerFields[HTTPField.Name("host")!] == "lambda-alb-123578498.us-east-1.elb.amazonaws.com")
-        #expect(httpRequest.headerFields[HTTPField.Name.userAgent] == "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36")
+        #expect(
+            httpRequest.headerFields[HTTPField.Name.userAgent]
+                == "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
+        )
     }
-    
+
     @Test("ALB X-Forwarded-Proto and Host mapping")
     func testALBForwardedHeaders() throws {
         let albEventWithForwardedHeaders = """
@@ -75,16 +81,16 @@ struct ALBConversionTests {
               "isBase64Encoded": false
             }
             """
-        
+
         let data = albEventWithForwardedHeaders.data(using: .utf8)!
         let albRequest = try JSONDecoder().decode(ALBTargetGroupRequest.self, from: data)
-        
+
         let httpRequest = try albRequest.httpRequest()
-        
+
         #expect(httpRequest.scheme == "https")
         #expect(httpRequest.authority == "lambda-alb-123578498.us-east-1.elb.amazonaws.com")
     }
-    
+
     @Test("ALB lowercase headers mapping")
     func testALBLowercaseHeaders() throws {
         let albEventWithLowercaseHeaders = """
@@ -105,29 +111,29 @@ struct ALBConversionTests {
               "isBase64Encoded": false
             }
             """
-        
+
         let data = albEventWithLowercaseHeaders.data(using: .utf8)!
         let albRequest = try JSONDecoder().decode(ALBTargetGroupRequest.self, from: data)
-        
+
         let httpRequest = try albRequest.httpRequest()
-        
+
         #expect(httpRequest.scheme == "https")
         #expect(httpRequest.authority == "lambda-alb-123578498.us-east-1.elb.amazonaws.com")
     }
-    
+
     @Test("HTTPResponse to ALB response conversion")
     func testHTTPResponseToALBResponse() throws {
         var httpResponse = HTTPResponse(status: .ok)
         httpResponse.headerFields[HTTPField.Name.contentType] = "application/json"
         httpResponse.headerFields[HTTPField.Name.contentLength] = "42"
-        
+
         let albResponse = ALBTargetGroupResponse(from: httpResponse)
-        
+
         #expect(albResponse.statusCode == .ok)
         #expect(albResponse.headers?[HTTPField.Name.contentType.rawName] == "application/json")
         #expect(albResponse.headers?[HTTPField.Name.contentLength.rawName] == "42")
         #expect(albResponse.isBase64Encoded == false)
     }
-    
 
-}
+
+}

Tests/OpenAPILambdaTests/APIGatewayV2ConversionTests.swift

@@ -20,7 +20,7 @@ import Testing
 @testable import OpenAPILambda
 
 struct APIGatewayV2ConversionTests {
-    
+
     static let apiGatewayEventJSON = """
         {
           "rawQueryString": "",
@@ -53,7 +53,7 @@ struct APIGatewayV2ConversionTests {
           "rawPath": "/stocks/AAPL"
         }
         """
-    
+
     static let apiGatewayEventWithQueryJSON = """
         {
           "rawQueryString": "limit=10&offset=0",
@@ -83,14 +83,14 @@ struct APIGatewayV2ConversionTests {
           "rawPath": "/stocks/AAPL"
         }
         """
-    
+
     @Test("API Gateway v2 request to HTTPRequest conversion")
     func testAPIGatewayV2RequestToHTTPRequest() throws {
         let data = APIGatewayV2ConversionTests.apiGatewayEventJSON.data(using: .utf8)!
         let apiGatewayRequest = try JSONDecoder().decode(APIGatewayV2Request.self, from: data)
-        
+
         let httpRequest = try apiGatewayRequest.httpRequest()
-        
+
         #expect(httpRequest.method == HTTPRequest.Method.get)
         #expect(httpRequest.path == "/stocks/AAPL")
         #expect(httpRequest.scheme == "https")
@@ -99,29 +99,29 @@ struct APIGatewayV2ConversionTests {
         #expect(httpRequest.headerFields[HTTPField.Name.userAgent] == "curl/8.1.2")
         #expect(httpRequest.headerFields[HTTPField.Name.authorization] == "Bearer 123")
     }
-    
+
     @Test("API Gateway v2 request with query string")
     func testAPIGatewayV2RequestWithQueryString() throws {
         let data = APIGatewayV2ConversionTests.apiGatewayEventWithQueryJSON.data(using: .utf8)!
         let apiGatewayRequest = try JSONDecoder().decode(APIGatewayV2Request.self, from: data)
-        
+
         let httpRequest = try apiGatewayRequest.httpRequest()
-        
+
         #expect(httpRequest.path == "/stocks/AAPL?limit=10&offset=0")
     }
-    
+
     @Test("HTTPResponse to API Gateway v2 response conversion")
     func testHTTPResponseToAPIGatewayV2Response() throws {
         var httpResponse = HTTPResponse(status: .ok)
         httpResponse.headerFields[HTTPField.Name.contentType] = "application/json"
         httpResponse.headerFields[HTTPField.Name.contentLength] = "42"
-        
+
         let apiGatewayResponse = APIGatewayV2Response(from: httpResponse)
-        
+
         #expect(apiGatewayResponse.statusCode == .ok)
         #expect(apiGatewayResponse.headers?[HTTPField.Name.contentType.rawName] == "application/json")
         #expect(apiGatewayResponse.headers?[HTTPField.Name.contentLength.rawName] == "42")
         #expect(apiGatewayResponse.isBase64Encoded == false)
         #expect(apiGatewayResponse.cookies == nil)
     }
-}
+}

Tests/OpenAPILambdaTests/HTTPHeadersConversionTests.swift

@@ -20,29 +20,29 @@ import Testing
 
 @Suite("HTTP Headers Conversion Tests")
 struct HTTPHeadersConversionTests {
-    
+
     @Test("Multi-value headers preserved as comma-separated")
     func testMultiValueHeadersPreserved() throws {
         var httpResponse = HTTPResponse(status: .ok)
         httpResponse.headerFields.append(HTTPField(name: HTTPField.Name.setCookie, value: "session=abc123"))
         httpResponse.headerFields.append(HTTPField(name: HTTPField.Name.setCookie, value: "theme=dark"))
-        
+
         let albResponse = ALBTargetGroupResponse(from: httpResponse)
-        
+
         #expect(albResponse.headers?[HTTPField.Name.setCookie.rawName] == "session=abc123, theme=dark")
         #expect(albResponse.multiValueHeaders == nil)
     }
-    
+
     @Test("HTTPHeaders to HTTPFields conversion")
     func testHTTPHeadersToHTTPFields() throws {
         let headers: HTTPHeaders = [
             "Set-Cookie": "session=abc123, theme=dark",
-            "Content-Type": "application/json"
+            "Content-Type": "application/json",
         ]
-        
+
         let httpFields = headers.httpFields()
-        
+
         #expect(httpFields[HTTPField.Name.setCookie] == "session=abc123, theme=dark")
         #expect(httpFields[HTTPField.Name.contentType] == "application/json")
     }
-}
+}