feat: migrate rust 2024 (#1840)

* feat: bump to cardo edition 2024

* feat: fmt

* feat: cleanup lifetimes

Author: maxday

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "common_lib"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 serde = "1.0.192"

common_lib/Cargo.toml

@@ -3,11 +3,11 @@ use std::{thread, time::Duration};
 use async_trait::async_trait;
 use aws_config::BehaviorVersion;
 use aws_sdk_dynamodb::{
+    Client as DynamoDbClient,
     types::{
         self, AttributeDefinition, AttributeValue, BillingMode, KeySchemaElement, KeyType,
         ScalarAttributeType,
     },
-    Client as DynamoDbClient,
 };
 
 use lambda_runtime::Error;
@@ -189,9 +189,9 @@ mod tests {
     use aws_sdk_dynamodb::config::{Credentials, Region};
     use aws_sdk_dynamodb::{Client, Config};
     use testcontainers::{
+        GenericImage,
         core::{IntoContainerPort, WaitFor},
         runners::AsyncRunner,
-        GenericImage,
     };
 
     use std::io::Result;

common_lib/src/dynamodb_manager.rs

@@ -3,14 +3,14 @@ use std::{thread, time::Duration};
 
 use async_trait::async_trait;
 use aws_config::BehaviorVersion;
-use aws_sdk_lambda::types::builders::EnvironmentBuilder;
 use aws_sdk_lambda::types::SnapStartApplyOn::PublishedVersions;
+use aws_sdk_lambda::types::builders::EnvironmentBuilder;
 use aws_sdk_lambda::{
+    Client as LambdaClient,
     types::{
-        builders::{FunctionCodeBuilder, SnapStartBuilder},
         Architecture, ImageConfig, PackageType,
+        builders::{FunctionCodeBuilder, SnapStartBuilder},
     },
-    Client as LambdaClient,
 };
 
 use lambda_runtime::Error;

common_lib/src/lambda_manager.rs

@@ -36,7 +36,7 @@ impl RetryManager {
                     break result;
                 }
                 nb_attempt += 1;
-                let delay = rand::thread_rng().gen_range(self.delay_min..self.delay_max);
+                let delay = rand::rng().random_range(self.delay_min..self.delay_max);
                 info!("delay: {:?}", delay);
                 tokio::time::sleep(delay).await;
             }

common_lib/src/retry_manager.rs

@@ -306,7 +306,10 @@ mod tests {
             None,
             false,
         );
-        assert_eq!(test_runtime.json(), "{\"architecture\":\"arm64\",\"displayName\":\"nodejs20\",\"handler\":\"index.handler\",\"image\":{\"baseImage\":\"test_image\"},\"isSnapstart\":false,\"layer\":null,\"memorySize\":128,\"path\":\"nodejs20\",\"runtime\":\"nodejs20.x\"}");
+        assert_eq!(
+            test_runtime.json(),
+            "{\"architecture\":\"arm64\",\"displayName\":\"nodejs20\",\"handler\":\"index.handler\",\"image\":{\"baseImage\":\"test_image\"},\"isSnapstart\":false,\"layer\":null,\"memorySize\":128,\"path\":\"nodejs20\",\"runtime\":\"nodejs20.x\"}"
+        );
     }
 
     #[test]

common_lib/src/runtime.rs

@@ -1,7 +1,7 @@
 [package]
 name = "function-deployer-rs"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 aws_lambda_events = "0.16.0"

function-deployer-rs/Cargo.toml

@@ -8,7 +8,7 @@ use common_lib::runtime::Runtime;
 use common_lib::{lambda_manager::FunctionManager, retry_manager::RetryManager};
 
 use common_lib::lambda_manager::LambdaManager;
-use lambda_runtime::{service_fn, Error, LambdaEvent};
+use lambda_runtime::{Error, LambdaEvent, service_fn};
 use tracing::info;
 
 #[tokio::main]
@@ -56,9 +56,9 @@ async fn main() -> Result<(), Error> {
     Ok(())
 }
 
-async fn process_event<'a>(
+async fn process_event(
     event: LambdaEvent<SqsEventObj<Runtime>>,
-    lambda_manager: &LambdaManager<'a>,
+    lambda_manager: &LambdaManager<'_>,
     cloudwatch_manager: &CloudWatchManager,
     invoker_sqs_manager: &InvokerSQSManager,
 ) -> Result<Response, Error> {

function-deployer-rs/src/main.rs

@@ -1,7 +1,7 @@
 [package]
 name = "function-invoker-rs"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 aws_lambda_events = "0.16.0"

function-invoker-rs/Cargo.toml

@@ -1,15 +1,11 @@
-use std::thread;
-use std::time::Duration;
-
 use aws_lambda_events::event::sqs::SqsEventObj;
-
 use common_lib::lambda_manager::{FunctionManager, LambdaManager};
-
 use common_lib::reponse::Response;
 use common_lib::retry_manager::RetryManager;
 use common_lib::runtime::Runtime;
-
-use lambda_runtime::{service_fn, Error, LambdaEvent};
+use lambda_runtime::{Error, LambdaEvent, service_fn};
+use std::thread;
+use std::time::Duration;
 use tracing::info;
 
 #[tokio::main]
@@ -28,18 +24,19 @@ async fn main() -> Result<(), Error> {
     let account_id = std::env::var("ACCOUNT_ID").expect("ACCOUNT_ID not set");
     let region = std::env::var("AWS_REGION").expect("AWS_REGION not set");
     let lambda_manager = LambdaManager::new(None, &account_id, &region, &role_arn).await;
-    let lambda_manager_ref = &lambda_manager;
-    let handler_func_closure = |event: LambdaEvent<SqsEventObj<Runtime>>| async move {
-        process_event(event, lambda_manager_ref).await
-    };
 
-    lambda_runtime::run(service_fn(handler_func_closure)).await?;
+    lambda_runtime::run(service_fn(|event: LambdaEvent<SqsEventObj<Runtime>>| {
+        let lambda_manager_ref = &lambda_manager; // Reference instead of move
+        async move { process_event(event, lambda_manager_ref).await }
+    }))
+    .await?;
+
     Ok(())
 }
 
-async fn process_event<'a>(
+async fn process_event(
     event: LambdaEvent<SqsEventObj<Runtime>>,
-    lambda_manager: &LambdaManager<'a>,
+    lambda_manager: &LambdaManager<'_>,
 ) -> Result<Response, Error> {
     for record in event.payload.records.iter() {
         let retry = RetryManager::new(3, Duration::from_secs(1), Duration::from_secs(30));
@@ -53,10 +50,10 @@ async fn process_event<'a>(
     Ok(Response::success())
 }
 
-async fn invoke_snapstart<'a>(
+async fn invoke_snapstart(
     runtime: &Runtime,
     retry: &RetryManager,
-    lambda_manager: &LambdaManager<'a>,
+    lambda_manager: &LambdaManager<'_>,
 ) -> Result<(), Error> {
     let arns = lambda_manager.list_versions_by_function(runtime).await?;
     for i in 0..10 {
@@ -81,10 +78,10 @@ async fn invoke_snapstart<'a>(
     Ok(())
 }
 
-async fn invoke<'a>(
+async fn invoke(
     runtime: &Runtime,
     retry: &RetryManager,
-    lambda_manager: &LambdaManager<'a>,
+    lambda_manager: &LambdaManager<'_>,
 ) -> Result<(), Error> {
     for i in 0..10 {
         info!("run #: {}", i);
@@ -96,7 +93,7 @@ async fn invoke<'a>(
             })
             .await?;
         info!("function updated to ensure cold start");
-        thread::sleep(Duration::from_secs(15));
+        thread::sleep(Duration::from_secs(5));
         retry
             .retry_async(|| async {
                 lambda_manager

function-invoker-rs/src/main.rs

@@ -1,7 +1,7 @@
 [package]
 name = "function-report-log-processor-rs"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 aws_lambda_events = "0.16.0"

function-report-log-processor-rs/Cargo.toml

@@ -6,7 +6,7 @@ use common_lib::{
     reponse::Response,
     report_log::{ReportLog, ReportLogData},
 };
-use lambda_runtime::{service_fn, Error, LambdaEvent};
+use lambda_runtime::{Error, LambdaEvent, service_fn};
 use tracing::info;
 
 #[tokio::main]

function-report-log-processor-rs/src/main.rs

@@ -1,7 +1,7 @@
 [package]
 name = "function-trigger-deployer-rs"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 lambda_runtime = "0.13.0"

function-trigger-deployer-rs/Cargo.toml

@@ -1,4 +1,4 @@
-use lambda_runtime::{service_fn, Error, LambdaEvent};
+use lambda_runtime::{Error, LambdaEvent, service_fn};
 use serde_json::Value;
 use tracing::log::info;
 

function-trigger-deployer-rs/src/main.rs

@@ -1,7 +1,7 @@
 [package]
 name = "lambda-perf"
 version = "1.0.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 lambda_runtime = "0.12.0"

s3-uploader/runtimes/rust_on_provided_al2/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "lambda-perf"
 version = "1.0.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 lambda_runtime = "0.12.0"