Removed all high level stuff.

Author: fabianfett

Sources/AWSLambdaEvents/ALB.swift

@@ -17,7 +17,7 @@ import class Foundation.JSONEncoder
 // https://github.com/aws/aws-lambda-go/blob/master/events/alb.go
 public enum ALB {
     /// ALBTargetGroupRequest contains data originating from the ALB Lambda target group integration
-    public struct TargetGroupRequest {
+    public struct TargetGroupRequest: Codable {
         /// ALBTargetGroupRequestContext contains the information to identify the load balancer invoking the lambda
         public struct Context: Codable {
             public let elb: ELBContext
@@ -26,7 +26,20 @@ public enum ALB {
         public let httpMethod: HTTPMethod
         public let path: String
         public let queryStringParameters: [String: [String]]
-        public let headers: HTTPHeaders
+
+        /// Depending on your configuration of your target group either `headers` or `multiValueHeaders`
+        /// are set.
+        ///
+        /// For more information visit:
+        /// https://docs.aws.amazon.com/elasticloadbalancing/latest/application/lambda-functions.html#multi-value-headers
+        public let headers: [String: String]?
+
+        /// Depending on your configuration of your target group either `headers` or `multiValueHeaders`
+        /// are set.
+        ///
+        /// For more information visit:
+        /// https://docs.aws.amazon.com/elasticloadbalancing/latest/application/lambda-functions.html#multi-value-headers
+        public let multiValueHeaders: [String: [String]]?
         public let requestContext: Context
         public let isBase64Encoded: Bool
         public let body: String?
@@ -37,174 +50,28 @@ public enum ALB {
         public let targetGroupArn: String
     }
 
-    public struct TargetGroupResponse {
+    public struct TargetGroupResponse: Codable {
         public let statusCode: HTTPResponseStatus
         public let statusDescription: String?
-        public let headers: HTTPHeaders?
+        public let headers: [String: String]?
+        public let multiValueHeaders: [String: [String]]?
         public let body: String
         public let isBase64Encoded: Bool
 
         public init(
             statusCode: HTTPResponseStatus,
             statusDescription: String? = nil,
-            headers: HTTPHeaders? = nil,
+            headers: [String: String]? = nil,
+            multiValueHeaders: [String: [String]]? = nil,
             body: String = "",
             isBase64Encoded: Bool = false
         ) {
             self.statusCode = statusCode
             self.statusDescription = statusDescription
             self.headers = headers
+            self.multiValueHeaders = multiValueHeaders
             self.body = body
             self.isBase64Encoded = isBase64Encoded
         }
     }
 }
-
-// MARK: - Request -
-
-extension ALB.TargetGroupRequest: Decodable {
-    enum CodingKeys: String, CodingKey {
-        case httpMethod
-        case path
-        case queryStringParameters
-        case multiValueQueryStringParameters
-        case headers
-        case multiValueHeaders
-        case requestContext
-        case isBase64Encoded
-        case body
-    }
-
-    public init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-
-        let rawMethod = try container.decode(String.self, forKey: .httpMethod)
-        guard let method = HTTPMethod(rawValue: rawMethod) else {
-            throw DecodingError.dataCorruptedError(
-                forKey: .httpMethod,
-                in: container,
-                debugDescription: #"Method "\#(rawMethod)" does not conform to allowed http method syntax defined in RFC 7230 Section 3.2.6"#
-            )
-        }
-        self.httpMethod = method
-
-        self.path = try container.decode(String.self, forKey: .path)
-
-        // crazy multiple headers
-        // https://docs.aws.amazon.com/elasticloadbalancing/latest/application/lambda-functions.html#multi-value-headers
-
-        if let multiValueQueryStringParameters =
-            try container.decodeIfPresent([String: [String]].self, forKey: .multiValueQueryStringParameters) {
-            self.queryStringParameters = multiValueQueryStringParameters
-        } else {
-            let singleValueQueryStringParameters = try container.decode(
-                [String: String].self,
-                forKey: .queryStringParameters
-            )
-            self.queryStringParameters = singleValueQueryStringParameters.mapValues { [$0] }
-        }
-
-        if let multiValueHeaders =
-            try container.decodeIfPresent([String: [String]].self, forKey: .multiValueHeaders) {
-            self.headers = HTTPHeaders(multiValueHeaders)
-        } else {
-            let singleValueHeaders = try container.decode(
-                [String: String].self,
-                forKey: .headers
-            )
-            let multiValueHeaders = singleValueHeaders.mapValues { [$0] }
-            self.headers = HTTPHeaders(multiValueHeaders)
-        }
-
-        self.requestContext = try container.decode(Context.self, forKey: .requestContext)
-        self.isBase64Encoded = try container.decode(Bool.self, forKey: .isBase64Encoded)
-
-        let body = try container.decode(String.self, forKey: .body)
-        self.body = body != "" ? body : nil
-    }
-}
-
-// MARK: - Response -
-
-extension ALB.TargetGroupResponse: Encodable {
-    static let MultiValueHeadersEnabledKey =
-        CodingUserInfoKey(rawValue: "ALB.TargetGroupResponse.MultiValueHeadersEnabledKey")!
-
-    enum CodingKeys: String, CodingKey {
-        case statusCode
-        case statusDescription
-        case headers
-        case multiValueHeaders
-        case body
-        case isBase64Encoded
-    }
-
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(statusCode.code, forKey: .statusCode)
-
-        let multiValueHeaderSupport =
-            encoder.userInfo[ALB.TargetGroupResponse.MultiValueHeadersEnabledKey] as? Bool ?? false
-
-        switch (multiValueHeaderSupport, headers) {
-        case (true, .none):
-            try container.encode([String: String](), forKey: .multiValueHeaders)
-        case (false, .none):
-            try container.encode([String: [String]](), forKey: .headers)
-        case (true, .some(let headers)):
-            try container.encode(headers.headers, forKey: .multiValueHeaders)
-        case (false, .some(let headers)):
-            let singleValueHeaders = headers.headers.mapValues { (values) -> String in
-                #warning("Is this correct?")
-                return values.joined(separator: ", ")
-            }
-            try container.encode(singleValueHeaders, forKey: .headers)
-        }
-
-        try container.encodeIfPresent(statusDescription, forKey: .statusDescription)
-        try container.encodeIfPresent(body, forKey: .body)
-        try container.encodeIfPresent(isBase64Encoded, forKey: .isBase64Encoded)
-    }
-}
-
-extension ALB.TargetGroupResponse {
-    public init<Payload: Encodable>(
-        statusCode: HTTPResponseStatus,
-        statusDescription: String? = nil,
-        headers: HTTPHeaders? = nil,
-        payload: Payload,
-        encoder: JSONEncoder = JSONEncoder()
-    ) throws {
-        var headers = headers ?? HTTPHeaders()
-        if !headers.contains(name: "Content-Type") {
-            headers.add(name: "Content-Type", value: "application/json")
-        }
-
-        self.statusCode = statusCode
-        self.statusDescription = statusDescription
-        self.headers = headers
-
-        let data = try encoder.encode(payload)
-        self.body = String(decoding: data, as: Unicode.UTF8.self)
-        self.isBase64Encoded = false
-    }
-
-    public init(
-        statusCode: HTTPResponseStatus,
-        statusDescription: String? = nil,
-        headers: HTTPHeaders? = nil,
-        bytes: [UInt8]?
-    ) {
-        let headers = headers ?? HTTPHeaders()
-
-        self.statusCode = statusCode
-        self.statusDescription = statusDescription
-        self.headers = headers
-        if let bytes = bytes {
-            self.body = String(base64Encoding: bytes)
-        } else {
-            self.body = ""
-        }
-        self.isBase64Encoded = true
-    }
-}

Sources/AWSLambdaEvents/APIGateway.swift

@@ -18,7 +18,7 @@ import class Foundation.JSONEncoder
 
 public enum APIGateway {
     /// APIGatewayRequest contains data coming from the API Gateway
-    public struct Request {
+    public struct Request: Codable {
         public struct Context: Codable {
             public struct Identity: Codable {
                 public let cognitoIdentityPoolId: String?
@@ -54,7 +54,8 @@ public enum APIGateway {
 
         public let queryStringParameters: [String: String]?
         public let multiValueQueryStringParameters: [String: [String]]?
-        public let headers: HTTPHeaders
+        public let headers: [String: String]
+        public let multiValueHeaders: [String: [String]]
         public let pathParameters: [String: String]?
         public let stageVariables: [String: String]?
 
@@ -64,54 +65,28 @@ public enum APIGateway {
     }
 }
 
-// MARK: - Request -
-
-extension APIGateway.Request: Decodable {
-    enum CodingKeys: String, CodingKey {
-        case resource
-        case path
-        case httpMethod
-
-        case queryStringParameters
-        case multiValueQueryStringParameters
-        case headers = "multiValueHeaders"
-        case pathParameters
-        case stageVariables
-
-        case requestContext
-        case body
-        case isBase64Encoded
-    }
-}
-
 // MARK: - Response -
 
 extension APIGateway {
-    public struct Response {
+    public struct Response: Codable {
         public let statusCode: HTTPResponseStatus
-        public let headers: HTTPHeaders?
+        public let headers: [String: String]?
+        public let multiValueHeaders: [String: [String]]?
         public let body: String?
         public let isBase64Encoded: Bool?
 
         public init(
             statusCode: HTTPResponseStatus,
-            headers: HTTPHeaders? = nil,
+            headers: [String: String]? = nil,
+            multiValueHeaders: [String: [String]]? = nil,
             body: String? = nil,
             isBase64Encoded: Bool? = nil
         ) {
             self.statusCode = statusCode
             self.headers = headers
+            self.multiValueHeaders = multiValueHeaders
             self.body = body
             self.isBase64Encoded = isBase64Encoded
         }
     }
 }
-
-extension APIGateway.Response: Encodable {
-    enum CodingKeys: String, CodingKey {
-        case statusCode
-        case headers = "multiValueHeaders"
-        case body
-        case isBase64Encoded
-    }
-}