first cut of http support for VPC Lattice

Author: andrewpatto

.gitignore

@@ -16,3 +16,4 @@ build
 
 node_modules
 cdk.out
+/.idea/

lambda-http/Cargo.toml

@@ -17,11 +17,12 @@ categories = ["web-programming::http-server"]
 readme = "README.md"
 
 [features]
-default = ["apigw_rest", "apigw_http", "apigw_websockets", "alb", "tracing"]
+default = ["apigw_rest", "apigw_http", "apigw_websockets", "alb", "vpc_lattice", "tracing"]
 apigw_rest = []
 apigw_http = []
 apigw_websockets = []
 alb = []
+vpc_lattice = []
 pass_through = []
 catch-all-fields = ["aws_lambda_events/catch-all-fields"]
 tracing = ["lambda_runtime/tracing"] # enables access to the Tracing utilities

lambda-http/src/deserializer.rs

@@ -7,6 +7,7 @@ use aws_lambda_events::apigw::ApiGatewayProxyRequest;
 use aws_lambda_events::apigw::ApiGatewayV2httpRequest;
 #[cfg(feature = "apigw_websockets")]
 use aws_lambda_events::apigw::ApiGatewayWebsocketProxyRequest;
+use aws_lambda_events::vpc_lattice::VpcLatticeRequestV2;
 use serde::{de::Error, Deserialize};
 use serde_json::value::RawValue;
 
@@ -39,6 +40,10 @@ impl<'de> Deserialize<'de> for LambdaRequest {
         if let Ok(res) = serde_json::from_str::<ApiGatewayWebsocketProxyRequest>(data) {
             return Ok(LambdaRequest::WebSocket(res));
         }
+        #[cfg(feature = "vpc_lattice")]
+        if let Ok(res) = serde_json::from_str::<VpcLatticeRequestV2>(data) {
+            return Ok(LambdaRequest::VpcLattice(res));
+        }
         #[cfg(feature = "pass_through")]
         if PASS_THROUGH_ENABLED {
             return Ok(LambdaRequest::PassThrough(data.to_string()));

lambda-http/src/lib.rs

@@ -2,7 +2,9 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 //#![deny(warnings)]
 //! Enriches the `lambda` crate with [`http`](https://github.com/hyperium/http)
-//! types targeting AWS [ALB](https://docs.aws.amazon.com/elasticloadbalancing/latest/application/introduction.html), [API Gateway](https://docs.aws.amazon.com/apigateway/latest/developerguide/welcome.html) REST and HTTP API lambda integrations.
+//! types targeting AWS [ALB](https://docs.aws.amazon.com/elasticloadbalancing/latest/application/introduction.html),
+//! [API Gateway](https://docs.aws.amazon.com/apigateway/latest/developerguide/welcome.html),
+//! [VPC Lattice]() REST and HTTP API lambda integrations
 //!
 //! This crate abstracts over all of these trigger events using standard [`http`](https://github.com/hyperium/http) types minimizing the mental overhead
 //! of understanding the nuances and variation between trigger details allowing you to focus more on your application while also giving you to the maximum flexibility to

lambda-http/src/request.rs

@@ -1,4 +1,4 @@
-//! ALB and API Gateway request adaptations
+//! ALB and API Gateway and VPC Lattice request adaptations
 //!
 //! Typically these are exposed via the [`request_context()`] or [`request_context_ref()`]
 //! request extension methods provided by the [`RequestExt`] trait.
@@ -12,7 +12,8 @@ use crate::ext::extensions::{PathParameters, StageVariables};
     feature = "apigw_rest",
     feature = "apigw_http",
     feature = "alb",
-    feature = "apigw_websockets"
+    feature = "apigw_websockets",
+    feature = "vpc_lattice"
 ))]
 use crate::ext::extensions::{QueryStringParameters, RawHttpPath};
 #[cfg(feature = "alb")]
@@ -25,6 +26,9 @@ use aws_lambda_events::apigw::{ApiGatewayProxyRequest, ApiGatewayProxyRequestCon
 use aws_lambda_events::apigw::{ApiGatewayV2httpRequest, ApiGatewayV2httpRequestContext};
 #[cfg(feature = "apigw_websockets")]
 use aws_lambda_events::apigw::{ApiGatewayWebsocketProxyRequest, ApiGatewayWebsocketProxyRequestContext};
+#[cfg(feature = "vpc_lattice")]
+use aws_lambda_events::vpc_lattice::{VpcLatticeRequestV2, VpcLatticeRequestV2Context};
+
 use aws_lambda_events::{encodings::Body, query_map::QueryMap};
 use http::{header::HeaderName, HeaderMap, HeaderValue};
 
@@ -50,6 +54,8 @@ pub enum LambdaRequest {
     Alb(AlbTargetGroupRequest),
     #[cfg(feature = "apigw_websockets")]
     WebSocket(ApiGatewayWebsocketProxyRequest),
+    #[cfg(feature = "vpc_lattice")]
+    VpcLattice(VpcLatticeRequestV2),
     #[cfg(feature = "pass_through")]
     PassThrough(String),
 }
@@ -68,6 +74,8 @@ impl LambdaRequest {
             LambdaRequest::Alb { .. } => RequestOrigin::Alb,
             #[cfg(feature = "apigw_websockets")]
             LambdaRequest::WebSocket { .. } => RequestOrigin::WebSocket,
+            #[cfg(feature = "vpc_lattice")]
+            LambdaRequest::VpcLattice { .. } => RequestOrigin::VpcLattice,
             #[cfg(feature = "pass_through")]
             LambdaRequest::PassThrough { .. } => RequestOrigin::PassThrough,
             #[cfg(not(any(
@@ -100,6 +108,9 @@ pub enum RequestOrigin {
     /// API Gateway WebSocket
     #[cfg(feature = "apigw_websockets")]
     WebSocket,
+    /// VPC Lattice origin
+    #[cfg(feature = "vpc_lattice")]
+    VpcLattice,
     /// PassThrough request origin
     #[cfg(feature = "pass_through")]
     PassThrough,
@@ -282,6 +293,58 @@ fn into_alb_request(alb: AlbTargetGroupRequest) -> http::Request<Body> {
     req
 }
 
+#[cfg(feature = "vpc_lattice")]
+fn into_vpc_lattice_request(vpclat: VpcLatticeRequestV2) -> http::Request<Body> {
+    let http_method = vpclat.method;
+    let host = vpclat.headers.get(http::header::HOST).and_then(|s| s.to_str().ok());
+    let raw_path = vpclat.path.unwrap_or_default();
+
+    let query_string_parameters = decode_query_map(vpclat.query_string_parameters);
+    //let multi_value_query_string_parameters = decode_query_map(vpclat.multi_value_query_string_parameters);
+
+    let builder = http::Request::builder()
+        .uri(build_request_uri(
+            &raw_path,
+            &vpclat.headers,
+            host,
+            Some((&query_string_parameters, &query_string_parameters)),
+        ))
+        .extension(RawHttpPath(raw_path))
+        // multi valued query string parameters are always a super
+        // set of singly valued query string parameters,
+        // when present, multi-valued query string parameters are preferred
+        .extension(QueryStringParameters(
+            //if multi_value_query_string_parameters.is_empty() {
+            query_string_parameters, //} else {
+                                     //    multi_value_query_string_parameters
+                                     //},
+        ))
+        .extension(RequestContext::VpcLattice(vpclat.request_context));
+
+    // merge headers into multi_value_headers and make
+    // multi-value_headers our canonical source of request headers
+    let mut headers = vpclat.headers;
+    //headers.extend(vpclat.headers);
+    update_xray_trace_id_header(&mut headers);
+
+    let base64 = vpclat.is_base64_encoded;
+
+    let mut req = builder
+        .body(
+            vpclat
+                .body
+                .as_deref()
+                .map_or_else(Body::default, |b| Body::from_maybe_encoded(base64, b)),
+        )
+        .expect("failed to build request");
+
+    // no builder method that sets headers in batch
+    let _ = std::mem::replace(req.headers_mut(), headers);
+    let _ = std::mem::replace(req.method_mut(), http_method);
+
+    req
+}
+
 #[cfg(feature = "alb")]
 fn decode_query_map(query_map: QueryMap) -> QueryMap {
     use std::str::FromStr;
@@ -403,6 +466,8 @@ pub enum RequestContext {
     /// WebSocket request context
     #[cfg(feature = "apigw_websockets")]
     WebSocket(ApiGatewayWebsocketProxyRequestContext),
+    #[cfg(feature = "vpc_lattice")]
+    VpcLattice(VpcLatticeRequestV2Context),
     /// Custom request context
     #[cfg(feature = "pass_through")]
     PassThrough,
@@ -420,6 +485,8 @@ impl From<LambdaRequest> for http::Request<Body> {
             LambdaRequest::Alb(alb) => into_alb_request(alb),
             #[cfg(feature = "apigw_websockets")]
             LambdaRequest::WebSocket(ag) => into_websocket_request(ag),
+            #[cfg(feature = "vpc_lattice")]
+            LambdaRequest::VpcLattice(vpclat) => into_vpc_lattice_request(vpclat),
             #[cfg(feature = "pass_through")]
             LambdaRequest::PassThrough(data) => into_pass_through_request(data),
         }

lambda-http/src/response.rs

@@ -8,6 +8,8 @@ use aws_lambda_events::apigw::ApiGatewayProxyResponse;
 #[cfg(feature = "apigw_http")]
 use aws_lambda_events::apigw::ApiGatewayV2httpResponse;
 use aws_lambda_events::encodings::Body;
+#[cfg(feature = "vpc_lattice")]
+use aws_lambda_events::vpc_lattice::VpcLatticeResponse;
 use encoding_rs::Encoding;
 use http::{
     header::{CONTENT_ENCODING, CONTENT_TYPE},
@@ -50,6 +52,8 @@ pub enum LambdaResponse {
     ApiGatewayV2(ApiGatewayV2httpResponse),
     #[cfg(feature = "alb")]
     Alb(AlbTargetGroupResponse),
+    #[cfg(feature = "vpc_lattice")]
+    VpcLattice(VpcLatticeResponse),
     #[cfg(feature = "pass_through")]
     PassThrough(serde_json::Value),
 }
@@ -141,6 +145,23 @@ impl LambdaResponse {
                 #[cfg(feature = "catch-all-fields")]
                 other: Default::default(),
             }),
+            #[cfg(feature = "vpc_lattice")]
+            RequestOrigin::VpcLattice => LambdaResponse::VpcLattice(VpcLatticeResponse {
+                body,
+                is_base64_encoded,
+                status_code: status_code as u16,
+                status_description: Some(format!(
+                    "{} {}",
+                    status_code,
+                    parts.status.canonical_reason().unwrap_or_default()
+                )),
+                // Explicitly empty, as API gateway v1 will merge "headers" and
+                // "multi_value_headers" fields together resulting in duplicate response headers.
+                headers: HeaderMap::new(),
+                // Today, this implementation doesn't provide any additional fields
+                #[cfg(feature = "catch-all-fields")]
+                other: Default::default(),
+            }),
             #[cfg(feature = "pass_through")]
             RequestOrigin::PassThrough => {
                 match body {
@@ -154,9 +175,10 @@ impl LambdaResponse {
                 feature = "apigw_rest",
                 feature = "apigw_http",
                 feature = "alb",
-                feature = "apigw_websockets"
+                feature = "apigw_websockets",
+                feature = "vpc_lattice"
             )))]
-            _ => compile_error!("Either feature `apigw_rest`, `apigw_http`, `alb`, or `apigw_websockets` must be enabled for the `lambda-http` crate."),
+            _ => compile_error!("Either feature `apigw_rest`, `apigw_http`, `alb`, `apigw_websockets` or `vpc_lattice` must be enabled for the `lambda-http` crate."),
         }
     }
 }