Merge branch 'awslabs:main' into client-side-timeout

Author: DiscreteTom

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "lambda_web_adapter"
-version = "0.8.4"
+version = "0.9.0"
 authors = [
     "Harold Sun <[email protected]>",
     "David Calavera <[email protected]>",
@@ -17,34 +17,34 @@ readme = "README.md"
 exclude = ["examples"]
 
 [dependencies]
-bytes = "1.5.0"
-http = "1.0"
-http-body = "1.0.0"
-hyper = { version = "1.0", features = ["client"] }
-hyper-util = "0.1.2"
-lambda_http = { version = "0.9.3", default-features = false, features = [
+bytes = "1.9.0"
+http = "1.2.0"
+http-body = "1.0.1"
+hyper = { version = "1.5.2", features = ["client"] }
+hyper-util = "0.1.10"
+lambda_http = { version = "0.14.0", default-features = false, features = [
     "apigw_http",
     "apigw_rest",
     "alb",
     "pass_through",
 ] }
-serde_json = "1.0"
-tokio = { version = "1.35", features = [
+serde_json = "1.0.135"
+tokio = { version = "1.43.0", features = [
     "macros",
     "io-util",
     "sync",
     "rt-multi-thread",
     "time",
 ] }
-tokio-retry = "0.3"
+tokio-retry = "0.3.0"
 tracing = { version = "0.1.40", features = ["log"] }
 tracing-subscriber = { version = "0.3.17", default-features = false, features = [
     "env-filter",
     "fmt",
 ] }
-tower = "0.4"
-tower-http = { version = "0.5", features = ["compression-gzip"] }
-url = "2.3"
+tower = "0.5.2"
+tower-http = { version = "0.6.2", features = ["compression-gzip"] }
+url = "2.5.4"
 
 [dev-dependencies]
 flate2 = "1.0.25"

Cargo.toml

@@ -28,7 +28,7 @@ AWS Lambda Web Adapter work with Lambda functions packaged as both docker images
 To use Lambda Web Adapter with docker images, package your web app (http api) in a Dockerfile, and add one line to copy Lambda Web Adapter binary to /opt/extensions inside your container:
 
 ```dockerfile
-COPY --from=public.ecr.aws/awsguru/aws-lambda-adapter:0.8.4 /lambda-adapter /opt/extensions/lambda-adapter
+COPY --from=public.ecr.aws/awsguru/aws-lambda-adapter:0.9.0 /lambda-adapter /opt/extensions/lambda-adapter
 ```
 
 [Non-AWS base images](https://docs.aws.amazon.com/lambda/latest/dg/images-create.html) may be used since the [Runtime Interface Client](https://docs.aws.amazon.com/lambda/latest/dg/images-create.html#images-ric) ships with the Lambda Web Adapter.
@@ -42,7 +42,7 @@ Below is a Dockerfile for [an example nodejs application](examples/expressjs).
 
 ```dockerfile
 FROM public.ecr.aws/docker/library/node:20-slim
-COPY --from=public.ecr.aws/awsguru/aws-lambda-adapter:0.8.4 /lambda-adapter /opt/extensions/lambda-adapter
+COPY --from=public.ecr.aws/awsguru/aws-lambda-adapter:0.9.0 /lambda-adapter /opt/extensions/lambda-adapter
 ENV PORT=7000
 WORKDIR "/var/task"
 ADD src/package.json /var/task/package.json
@@ -61,15 +61,15 @@ AWS Lambda Web Adapter also works with AWS managed Lambda runtimes. You need to
 1. attach Lambda Web Adapter layer to your function.
    #### AWS Commercial Regions
 
-   1. x86_64: `arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerX86:23`
-   2. arm64: `arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerArm64:23`
+   1. x86_64: `arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerX86:24`
+   2. arm64: `arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerArm64:24`
 
    #### AWS China Regions
 
    1. cn-north-1 (Beijing)
-      - x86_64: `arn:aws-cn:lambda:cn-north-1:041581134020:layer:LambdaAdapterLayerX86:23`
+      - x86_64: `arn:aws-cn:lambda:cn-north-1:041581134020:layer:LambdaAdapterLayerX86:24`
    2. cn-northwest-1 (Ningxia)
-      - x86_64: `arn:aws-cn:lambda:cn-northwest-1:069767869989:layer:LambdaAdapterLayerX86:23`
+      - x86_64: `arn:aws-cn:lambda:cn-northwest-1:069767869989:layer:LambdaAdapterLayerX86:24`
 
 2. configure Lambda environment variable `AWS_LAMBDA_EXEC_WRAPPER` to `/opt/bootstrap`.
 3. set function handler to your web application start up script. e.g. `run.sh`.
@@ -214,6 +214,7 @@ The Lambda Web Adapter also supports all non-HTTP event triggers, such as SQS, S
 - [FastHTML with Response Streaming in Zip](examples/fasthtml-response-streaming-zip)
 - [Remix](examples/remix/)
 - [Remix in Zip](examples/remix-zip/)
+- [Sveltekit SSR Zip](examples/sveltekit-ssr-zip/)
 
 ## Acknowledgement
 

README.md

@@ -17,7 +17,7 @@ Resources:
           AWS_LAMBDA_EXEC_WRAPPER: /opt/bootstrap
           RUST_LOG: info
       Layers:
-        - !Sub arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerX86:23
+        - !Sub arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerX86:24
       Events:
         Api:
           Type: HttpApi

examples/aspnet-mvc-zip/README.md

@@ -22,7 +22,7 @@ Resources:
           AWS_LAMBDA_EXEC_WRAPPER: /opt/bootstrap
           RUST_LOG: info
       Layers:
-        - !Sub arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerX86:23
+        - !Sub arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerX86:24
       Events:
         Api:
           Type: HttpApi

examples/aspnet-mvc-zip/template.yaml

@@ -23,7 +23,7 @@ RUN dotnet publish "AspNetLambdaWebAdapter.csproj" -c Release -o /app/publish
 
 FROM base AS final
 ENV ASPNETCORE_URLS=http://+:8080
-COPY --from=public.ecr.aws/awsguru/aws-lambda-adapter:0.8.4 /lambda-adapter /opt/extensions/lambda-adapter
+COPY --from=public.ecr.aws/awsguru/aws-lambda-adapter:0.9.0 /lambda-adapter /opt/extensions/lambda-adapter
 WORKDIR /app
 COPY --from=publish /app/publish .
 ENTRYPOINT ["dotnet", "AspNetLambdaWebAdapter.dll"]
@@ -32,7 +32,7 @@ ENTRYPOINT ["dotnet", "AspNetLambdaWebAdapter.dll"]
 Line 12 copies lambda adapter binary into /opt/extenions. This is required to run ASP.NET application on Lambda. The `ASPNETCORE_URLS` environment variable is also set to 8080. This is required for the Lambda Web Adapter to work.
 
 ```dockerfile
-COPY --from=public.ecr.aws/awsguru/aws-lambda-adapter:0.8.4 /lambda-adapter /opt/extensions/lambda-adapter
+COPY --from=public.ecr.aws/awsguru/aws-lambda-adapter:0.9.0 /lambda-adapter /opt/extensions/lambda-adapter
 ```
 
 ## Pre-requisites

examples/aspnet-mvc/README.md

@@ -12,7 +12,7 @@ RUN dotnet publish "AspNetLambdaWebAdapter.csproj" -c Release -o /app/publish
 
 FROM base AS final
 ENV ASPNETCORE_URLS=http://+:<port>
-COPY --from=public.ecr.aws/awsguru/aws-lambda-adapter:0.8.4 /lambda-adapter /opt/extensions/lambda-adapter
+COPY --from=public.ecr.aws/awsguru/aws-lambda-adapter:0.9.0 /lambda-adapter /opt/extensions/lambda-adapter
 WORKDIR /app
 COPY --from=publish /app/publish .
 ENTRYPOINT ["dotnet", "AspNetLambdaWebAdapter.dll"]

examples/aspnet-mvc/src/Dockerfile

@@ -17,7 +17,7 @@ Resources:
           AWS_LAMBDA_EXEC_WRAPPER: /opt/bootstrap
           RUST_LOG: info
       Layers:
-        - !Sub arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerX86:23
+        - !Sub arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerX86:24
       Events:
         Api:
           Type: HttpApi

examples/aspnet-webapi-zip/README.md

@@ -22,7 +22,7 @@ Resources:
           AWS_LAMBDA_EXEC_WRAPPER: /opt/bootstrap
           RUST_LOG: info
       Layers:
-        - !Sub arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerX86:23
+        - !Sub arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerX86:24
       Events:
         Api:
           Type: HttpApi

examples/aspnet-webapi-zip/template.yaml

@@ -24,7 +24,7 @@ Resources:
           AWS_LWA_READINESS_CHECK_PROTOCOL: TCP
           PORT: 8000
       Layers:
-        - !Sub arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerX86:23 
+        - !Sub arn:aws:lambda:${AWS::Region}:753240598075:layer:LambdaAdapterLayerX86:24 
       Policies: AmazonS3ReadOnlyAccess
 
   BedrockAgentPermission: