address code review feedback

Author: sebsto

Examples/quoteapi-alb/template.yaml

@@ -63,7 +63,7 @@ Resources:
       SecurityGroups:
         - !Ref ALBSecurityGroup
 
-  # Listener
+  # HTTP Listener (HTTPS requires valid domain certificate)
   ALBListener:
     Type: AWS::ElasticLoadBalancingV2::Listener
     Properties:

Makefile

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

Sources/ALB/ALBTargetGroup+HTTPRequest.swift renamed to Sources/EventSource/ALB/ALBTargetGroup+HTTPRequest.swift

@@ -22,8 +22,8 @@ extension ALBTargetGroupRequest {
     public func httpRequest() throws -> HTTPRequest {
         HTTPRequest(
             method: self.httpMethod,
-            scheme: nil,
-            authority: nil,
+            scheme: self.headers?["X-Forwarded-Proto"],
+            authority: self.headers?["Host"],
             path: self.path,
             headerFields: self.headers?.httpFields() ?? [:]
         )
@@ -32,7 +32,7 @@ extension ALBTargetGroupRequest {
 
 extension ALBTargetGroupResponse {
 
-    /// Create a `APIGatewayV2Response` from an `HTTPResponse`
+    /// Create an `ALBTargetGroupResponse` from an `HTTPResponse`
     public init(from response: HTTPResponse) {
         self = ALBTargetGroupResponse(
             statusCode: response.status,

Sources/ALB/OpenAPILambdaALB.swift renamed to Sources/EventSource/ALB/OpenAPILambdaALB.swift

@@ -18,7 +18,7 @@ import AWSLambdaEvents
 import OpenAPIRuntime
 import HTTPTypes
 
-/// An specialization of the `OpenAPILambda` protocol that works with Amazon API Gateway HTTP Mode, aka API Gateway v2
+/// An specialization of the `OpenAPILambda` protocol that works with an Application Load Balancer
 public protocol OpenAPILambdaALB: OpenAPILambdaService
 where
     Event == ALBTargetGroupRequest,
@@ -27,12 +27,12 @@ where
 
 
 extension OpenAPILambdaALB {
-    /// Transform a Lambda input (`APIGatewayV2Request` and `LambdaContext`) to an OpenAPILambdaRequest (`HTTPRequest`, `String?`)
+    /// Transform a Lambda input (`ALBTargetGroupRequest` and `LambdaContext`) to an OpenAPILambdaRequest (`HTTPRequest`, `String?`)
     public func request(context: LambdaContext, from request: Event) throws -> OpenAPILambdaRequest {
         (try request.httpRequest(), request.body)
     }
 
-    /// Transform an OpenAPI response (`HTTPResponse`, `String?`) to a Lambda Output (`APIGatewayV2Response`)
+    /// Transform an OpenAPI response (`HTTPResponse`, `String?`) to a Lambda Output (`ALBTargetGroupResponse`)
     public func output(from response: OpenAPILambdaResponse) -> Output {
         var apiResponse = ALBTargetGroupResponse(from: response.0)
         apiResponse.body = response.1 ?? ""

Sources/EventSource/HTTPHeadersExtension.swift

@@ -0,0 +1,38 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift OpenAPI Lambda open source project
+//
+// Copyright Swift OpenAPI Lambda project authors
+// Copyright (c) 2023 Amazon.com, Inc. or its affiliates.
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift OpenAPI Lambda project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+import AWSLambdaEvents
+import HTTPTypes
+
+public extension HTTPHeaders {
+    /// Create an `HTTPFields` (from `HTTPTypes` library) from this APIGateway `HTTPHeader`
+    func httpFields() -> HTTPFields {
+        HTTPFields(self.map { key, value in HTTPField(name: .init(key)!, value: value) })
+    }
+
+    /// Create HTTPHeaders from HTTPFields
+    init(from fields: HTTPFields) {
+        var headers: HTTPHeaders = [:]
+        for field in fields {
+            let name = field.name.rawName
+            if let existing = headers[name] {
+                headers[name] = "\(existing), \(field.value)"
+            }
+            else {
+                headers[name] = field.value
+            }
+        }
+        self = headers
+    }
+}

Sources/HttpApi/APIGatewayV2+HTTPRequest.swift renamed to Sources/EventSource/HttpApi/APIGatewayV2+HTTPRequest.swift

@@ -27,8 +27,8 @@ extension APIGatewayV2Request {
     public func httpRequest() throws -> HTTPRequest {
         HTTPRequest(
             method: self.context.http.method,
-            scheme: "https",
-            authority: "",
+            scheme: "https",  // APIGateway is always HTTPS
+            authority: self.headers["Host"],
             path: pathWithQueryString,
             headerFields: self.headers.httpFields()
         )
@@ -47,17 +47,3 @@ extension APIGatewayV2Response {
         )
     }
 }
-
-public extension HTTPHeaders {
-    /// Create an `HTTPFields` (from `HTTPTypes` library) from this APIGateway `HTTPHeader`
-    func httpFields() -> HTTPFields {
-        HTTPFields(self.map { key, value in HTTPField(name: .init(key)!, value: value) })
-    }
-
-    /// Create HTTPHeaders from HTTPFields
-    init(from fields: HTTPFields) {
-        var headers: HTTPHeaders = [:]
-        fields.forEach { headers[$0.name.rawName] = $0.value }
-        self = headers
-    }
-}