Updated aws_lambda_events dependency (#541)

Author: dcormier

lambda-http/Cargo.toml

@@ -32,14 +32,13 @@ lambda_runtime = { path = "../lambda-runtime", version = "0.6" }
 serde = { version = "^1", features = ["derive"] }
 serde_json = "^1"
 serde_urlencoded = "0.7.0"
-query_map = { version = "0.5", features = ["url-query"] }
 mime = "0.3.16"
 encoding_rs = "0.8.31"
 url = "2.2.2"
 percent-encoding = "2.2.0"
 
 [dependencies.aws_lambda_events]
-version = "^0.6.3"
+version = "^0.7"
 default-features = false
 features = ["alb", "apigw"]
 

lambda-http/src/ext.rs

@@ -1,8 +1,8 @@
 //! Extension methods for `http::Request` types
 
 use crate::{request::RequestContext, Body};
+use aws_lambda_events::query_map::QueryMap;
 use lambda_runtime::Context;
-use query_map::QueryMap;
 use serde::{de::value::Error as SerdeError, Deserialize};
 use std::{error::Error, fmt};
 

lambda-http/src/lib.rs

@@ -79,10 +79,10 @@ use crate::{
     response::LambdaResponse,
 };
 
-#[cfg(feature = "alb")]
-pub use aws_lambda_events::alb;
-#[cfg(any(feature = "apigw_rest", feature = "apigw_http", feature = "apigw_websockets"))]
-pub use aws_lambda_events::apigw;
+// Reexported in its entirety, regardless of what feature flags are enabled
+// because working with many of these types requires other types in, or
+// reexported by, this crate.
+pub use aws_lambda_events;
 
 pub use aws_lambda_events::encodings::Body;
 use std::{

lambda-http/src/request.rs

@@ -12,10 +12,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};
-use aws_lambda_events::encodings::Body;
+use aws_lambda_events::{encodings::Body, query_map::QueryMap};
 use http::header::HeaderName;
 use http::HeaderMap;
-use query_map::QueryMap;
 use serde::Deserialize;
 use serde_json::error::Error as JsonError;
 use std::future::Future;