Merge pull request #2491 from ymwjbxxq/ymwjbxxq-feature-move_all_rust…

…_example_to_aws_cargolambda Rust: upgrade to aws cargo lambda
aws-samples · Nov 20, 2024 · 05045de · 05045de
2 parents 89e78ef + b487ae6
commit 05045de
Show file tree

Hide file tree

Showing 79 changed files with 241 additions and 770 deletions.
diff --git a/alb-lambda-rust/Cargo.toml b/alb-lambda-rust/Cargo.toml
@@ -9,8 +9,8 @@ name = "handler"
 path = "src/bin/handler.rs"
 
 [dependencies]
-lambda_http = "0.11"
-lambda_runtime = "0.11"
+lambda_http = "0.13"
+lambda_runtime = "0.13"
 serde = {version = "1.0", features = ["derive"] }
 serde_json = "1"
 tokio = { version = "1", features = ["macros"] }

diff --git a/alb-lambda-rust/Makefile b/alb-lambda-rust/Makefile
diff --git a/alb-lambda-rust/README.md b/alb-lambda-rust/README.md
@@ -13,7 +13,7 @@ Important: this application uses various AWS services and there are costs associ
 * [Git Installed](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 * [AWS Serverless Application Model](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html) (AWS SAM) installed
 * [Rust](https://www.rust-lang.org/) 1.56.0 or higher
-* [cargo-zigbuild](https://github.com/messense/cargo-zigbuild) and [Zig](https://ziglang.org/) for cross-compilation
+* [CargoLambda](https://www.cargo-lambda.info/guide/installation.html)
 
 ## Deployment Instructions
 
@@ -27,11 +27,11 @@ Important: this application uses various AWS services and there are costs associ
     ```
 3. Install dependencies and build:
     ```
-    make build
+    sam build
     ```
 4. From the command line, use AWS SAM to deploy the AWS resources for the pattern as specified in the template.yml file:
     ```
-    make deploy
+    sam deploy
     ```
 5. During the prompts:
     * Enter a stack name
@@ -70,7 +70,7 @@ Response:
  
 1. Delete the stack
     ```bash
-    make delete
+    sam delete
     ```
 2. Confirm the stack has been deleted
     ```bash
@@ -80,4 +80,4 @@ Response:
 ----
 Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
-SPDX-License-Identifier: MIT-0
+SPDX-License-Identifier: MIT-0
diff --git a/alb-lambda-rust/template.yml b/alb-lambda-rust/template.yml
@@ -28,11 +28,13 @@ Resources:
   MyLambdaFunction:
     Type: 'AWS::Serverless::Function'
     Properties:
-      CodeUri: ./build/handler
+      CodeUri: .
       Policies:
         - AWSLambdaBasicExecutionRole
       Tags:
         name: !Ref AWS::StackName
+    Metadata:
+      BuildMethod: rust-cargolambda
 
   MyLambdaFunctionPermission:
     Type: AWS::Lambda::Permission
@@ -110,4 +112,4 @@ Resources:
 
 Outputs:
   DNSName:
-    Value: !GetAtt MyLoadBalancer.DNSName
+    Value: !GetAtt MyLoadBalancer.DNSName
diff --git a/apigw-http-api-lambda-rust/Cargo.toml b/apigw-http-api-lambda-rust/Cargo.toml
@@ -9,8 +9,8 @@ name = "handler"
 path = "src/bin/handler.rs"
 
 [dependencies]
-lambda_http = "0.11"
-lambda_runtime = "0.11"
+lambda_http = "0.13"
+lambda_runtime = "0.13"
 serde_json = "1"
 tokio = { version = "1", features = ["macros"] }
 tracing-subscriber = { version = "0.3", features = ["fmt", "json"] }
diff --git a/apigw-http-api-lambda-rust/Makefile b/apigw-http-api-lambda-rust/Makefile
diff --git a/apigw-http-api-lambda-rust/README.md b/apigw-http-api-lambda-rust/README.md
@@ -13,7 +13,7 @@ Important: this application uses various AWS services and there are costs associ
 * [Git Installed](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 * [AWS Serverless Application Model](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html) (AWS SAM) installed
 * [Rust](https://www.rust-lang.org/) 1.56.0 or higher
-* [cargo-zigbuild](https://github.com/messense/cargo-zigbuild) and [Zig](https://ziglang.org/) for cross-compilation
+* [CargoLambda](https://www.cargo-lambda.info/guide/installation.html)
 
 ## Deployment Instructions
 
@@ -27,11 +27,11 @@ Important: this application uses various AWS services and there are costs associ
     ```
 3. Install dependencies and build:
     ```
-    make build
+    sam build
     ```
 4. From the command line, use AWS SAM to deploy the AWS resources for the pattern as specified in the template.yml file:
     ```
-    make deploy
+    sam deploy
     ```
 5. During the prompts:
     * Enter a stack name
@@ -98,4 +98,4 @@ This pattern was contributed by Greg Davis.
 ----
 Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
-SPDX-License-Identifier: MIT-0
+SPDX-License-Identifier: MIT-0
diff --git a/apigw-http-api-lambda-rust/template.yml b/apigw-http-api-lambda-rust/template.yml
@@ -46,7 +46,10 @@ Resources:
   LambdaFunction:
     Type: 'AWS::Serverless::Function'
     Properties:
-      CodeUri: ./build/handler
+      CodeUri: .
+    Metadata:
+      BuildMethod: rust-cargolambda
+
   # Function permissions grant an AWS service or another account permission to use a function
   FunctionResourcePermission:
     Type: 'AWS::Lambda::Permission'
@@ -59,4 +62,4 @@ Resources:
 Outputs:
   HttpApiEndpoint:
     Description: The default endpoint for the HTTP API.
-    Value: !GetAtt HttpApi.ApiEndpoint
+    Value: !GetAtt HttpApi.ApiEndpoint
diff --git a/apigw-lambda-rust/Cargo.toml b/apigw-lambda-rust/Cargo.toml
@@ -9,8 +9,8 @@ name = "handler"
 path = "src/bin/handler.rs"
 
 [dependencies]
-lambda_http = "0.11"
-lambda_runtime = "0.11"
+lambda_http = "0.13.0"
+lambda_runtime = "0.13.0"
 serde = {version = "1.0", features = ["derive"] }
 serde_json = "1"
 tokio = { version = "1", features = ["macros"] }

diff --git a/apigw-lambda-rust/Makefile b/apigw-lambda-rust/Makefile
diff --git a/apigw-lambda-rust/README.md b/apigw-lambda-rust/README.md
@@ -13,7 +13,7 @@ Important: this application uses various AWS services and there are costs associ
 * [Git Installed](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 * [AWS Serverless Application Model](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html) (AWS SAM) installed
 * [Rust](https://www.rust-lang.org/) 1.56.0 or higher
-* [cargo-zigbuild](https://github.com/messense/cargo-zigbuild) and [Zig](https://ziglang.org/) for cross-compilation
+* [CargoLambda](https://www.cargo-lambda.info/guide/installation.html)
 
 ## Deployment Instructions
 
@@ -27,11 +27,11 @@ Important: this application uses various AWS services and there are costs associ
     ```
 3. Install dependencies and build:
     ```
-    make build
+    sam build
     ```
 4. From the command line, use AWS SAM to deploy the AWS resources for the pattern as specified in the template.yml file:
     ```
-    make deploy
+    sam deploy
     ```
 5. During the prompts:
     * Enter a stack name
@@ -70,7 +70,7 @@ Response:
  
 1. Delete the stack
     ```bash
-    make delete
+    sam delete
     ```
 2. Confirm the stack has been deleted
     ```bash
@@ -80,4 +80,4 @@ Response:
 ----
 Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
-SPDX-License-Identifier: MIT-0
+SPDX-License-Identifier: MIT-0
diff --git a/apigw-lambda-rust/template.yml b/apigw-lambda-rust/template.yml
@@ -8,7 +8,7 @@ Globals:
     MemorySize: 128
     Architectures: ["arm64"]
     Handler: bootstrap
-    Runtime: provided.al2
+    Runtime: provided.al2023
     Timeout: 29
     Environment:
       Variables:
@@ -46,7 +46,7 @@ Resources:
   LambdaFunction:
     Type: 'AWS::Serverless::Function'
     Properties:
-      CodeUri: ./build/handler
+      CodeUri: .
       Policies:
         - AWSLambdaBasicExecutionRole
       Events:
@@ -56,8 +56,10 @@ Resources:
             Path: /do
             Method: POST
             RestApiId: !Ref MyApi
+    Metadata:
+      BuildMethod: rust-cargolambda
 
 Outputs:
   HttpApiEndpoint:
     Description: The default endpoint for the REST API.
-    Value: !Sub "https://${MyApi}.execute-api.${AWS::Region}.amazonaws.com/${StageName}/"
+    Value: !Sub "https://${MyApi}.execute-api.${AWS::Region}.amazonaws.com/${StageName}/"
diff --git a/appconfig-lambda-rust/Cargo.toml b/appconfig-lambda-rust/Cargo.toml
@@ -10,8 +10,8 @@ path = "src/bin/handler.rs"
 
 [dependencies]
 aws-config = {version = "1", features = ["behavior-version-latest"] }
-lambda_runtime = "0.11"
-lazy_static = "1.4"
+lambda_runtime = "0.13"
+lazy_static = "1"
 reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "json"] }
 serde = {version = "1.0", features = ["derive"] }
 serde_json = "1"

diff --git a/appconfig-lambda-rust/Makefile b/appconfig-lambda-rust/Makefile
diff --git a/appconfig-lambda-rust/README.md b/appconfig-lambda-rust/README.md
@@ -13,7 +13,7 @@ Important: this application uses various AWS services and there are costs associ
 * [Git Installed](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 * [AWS Serverless Application Model](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html) (AWS SAM) installed
 * [Rust](https://www.rust-lang.org/) 1.56.0 or higher
-* [cargo-zigbuild](https://github.com/messense/cargo-zigbuild) and [Zig](https://ziglang.org/) for cross-compilation
+* [CargoLambda](https://www.cargo-lambda.info/guide/installation.html)
 * [AWS AppConfig integration with Lambda extensions](https://docs.aws.amazon.com/appconfig/latest/userguide/appconfig-integration-lambda-extensions.html)
 
 ## Deployment Instructions
@@ -28,11 +28,11 @@ Important: this application uses various AWS services and there are costs associ
     ```
 3. Install dependencies and build:
     ```
-    make build
+    sam build
     ```
 4. From the command line, use AWS SAM to deploy the AWS resources for the pattern as specified in the template.yml file:
     ```
-    make deploy
+    sam deploy
     ```
 5. During the prompts:
     * Enter a stack name

diff --git a/appconfig-lambda-rust/template.yml b/appconfig-lambda-rust/template.yml
@@ -76,7 +76,7 @@ Resources:
   PutObjectFunction:
     Type: AWS::Serverless::Function 
     Properties:
-      CodeUri: ./build/handler
+      CodeUri: .
       Policies:
         - AWSLambdaBasicExecutionRole
         - Version: '2012-10-17'
@@ -94,4 +94,6 @@ Resources:
           AWS_APPCONFIG_PROFILE: MyTestProfile
           AWS_APPCONFIG_EXTENSION_HTTP_PORT: 2772
       Layers:
-        - arn:aws:lambda:eu-central-1:066940009817:layer:AWS-AppConfig-Extension-Arm64:2
+        - arn:aws:lambda:eu-central-1:066940009817:layer:AWS-AppConfig-Extension-Arm64:101
+    Metadata:
+      BuildMethod: rust-cargolambda
diff --git a/cloudfront-apigw-http-api-lambda-rust/Cargo.toml b/cloudfront-apigw-http-api-lambda-rust/Cargo.toml
@@ -9,7 +9,7 @@ name = "handler"
 path = "src/bin/handler.rs"
 
 [dependencies]
-lambda_http = "0.11"
+lambda_http = "0.13"
 serde_json = "1"
 tokio = { version = "1", features = ["macros"] }
 tracing-subscriber = { version = "0.3", features = ["fmt", "json"] }