Merge branch 'main' into dependabot/cargo/axum-extra-0.12.5

Author: GradExMachina

.github/workflows/release-plz.yml

@@ -0,0 +1,54 @@
+name: Publish release
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release-plz-release:
+    name: Release-plz release
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'aws' }}
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - &checkout
+        name: Checkout repository
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+      - &install-rust
+        name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Authenticate to crates.io
+        uses: rust-lang/crates-io-auth-action@v1
+        id: auth
+      - name: Run release-plz
+        uses: release-plz/action@v0.5
+        with:
+          command: release
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_PLZ_TOKEN }}
+          CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}
+
+  release-plz-pr:
+    name: Release-plz PR
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'aws' }}
+    permissions:
+      pull-requests: write
+      contents: write
+    concurrency:
+      group: release-plz-${{ github.ref }}
+      cancel-in-progress: false
+    steps:
+      - *checkout
+      - *install-rust
+      - name: Run release-plz
+        uses: release-plz/action@v0.5
+        with:
+          command: release-pr
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_PLZ_TOKEN }}

.github/workflows/run-integration-test.yml

@@ -47,12 +47,15 @@ jobs:
             echo "STACK_NAME=$stackName" >> "$GITHUB_OUTPUT"
             echo "Stack name = $stackName"
             sam deploy --stack-name "${stackName}" --parameter-overrides "ParameterKey=SecretToken,ParameterValue=${{ secrets.SECRET_TOKEN }}" "ParameterKey=LambdaRole,ParameterValue=${{ secrets.AWS_LAMBDA_ROLE }}" --no-confirm-changeset  --no-progressbar  > disable_output
-            TEST_ENDPOINT=$(sam list stack-outputs --stack-name "${stackName}" --output json | jq -r '.[] | .OutputValue')
+            TEST_ENDPOINT=$(sam list stack-outputs --stack-name "${stackName}" --output json | jq -r '.[] | select(.OutputKey=="HelloApiEndpoint") | .OutputValue')
+            TENANT_ID_TEST_FUNCTION=$(sam list stack-outputs --stack-name "${stackName}" --output json | jq -r '.[] | select(.OutputKey=="TenantIdTestFunction") | .OutputValue')
             echo "TEST_ENDPOINT=$TEST_ENDPOINT" >> "$GITHUB_OUTPUT"
+            echo "TENANT_ID_TEST_FUNCTION=$TENANT_ID_TEST_FUNCTION" >> "$GITHUB_OUTPUT"
         - name: run test
           env:
             SECRET_TOKEN: ${{ secrets.SECRET_TOKEN }}
             TEST_ENDPOINT: ${{ steps.deploy_stack.outputs.TEST_ENDPOINT }}
+            TENANT_ID_TEST_FUNCTION: ${{ steps.deploy_stack.outputs.TENANT_ID_TEST_FUNCTION }}
           run: cd lambda-integration-tests && cargo test
         - name: cleanup
           if: always() && steps.deploy_stack.outputs.STACK_NAME

examples/basic-tenant-id/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "basic-tenant-id"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+lambda_runtime = { path = "../../lambda-runtime" }
+serde_json = "1.0"
+tokio = { version = "1", features = ["macros"] }
+tracing = { version = "0.1", features = ["log"] }
+tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt"] }

examples/basic-tenant-id/README.md

@@ -0,0 +1,38 @@
+# Basic Tenant ID Example
+
+This example demonstrates how to access and use tenant ID information in a Lambda function.
+
+## Key Features
+
+- Extracts tenant ID from Lambda runtime headers
+- Includes tenant ID in tracing logs
+- Returns tenant ID in the response
+- Handles cases where tenant ID is not provided
+
+## Usage
+
+The tenant ID is automatically extracted from the `lambda-runtime-aws-tenant-id` header and made available in the Lambda context.
+
+```rust
+async fn function_handler(event: LambdaEvent<Value>) -> Result<Value, Error> {
+    let (event, context) = event.into_parts();
+    
+    // Access tenant ID from context
+    match &context.tenant_id {
+        Some(tenant_id) => println!("Processing for tenant: {}", tenant_id),
+        None => println!("No tenant ID provided"),
+    }
+    
+    // ... rest of function logic
+}
+```
+
+## Testing
+
+You can test this function locally using cargo lambda:
+
+```bash
+cargo lambda invoke --data-ascii '{"test": "data"}'
+```
+
+The tenant ID will be None when testing locally unless you set up a mock runtime environment with the appropriate headers.

examples/basic-tenant-id/src/main.rs

@@ -0,0 +1,36 @@
+use lambda_runtime::{service_fn, Error, LambdaEvent};
+use serde_json::{json, Value};
+
+async fn function_handler(event: LambdaEvent<Value>) -> Result<Value, Error> {
+    let (event, context) = event.into_parts();
+    
+    // Access tenant ID from context
+    let tenant_info = match &context.tenant_id {
+        Some(tenant_id) => format!("Processing request for tenant: {}", tenant_id),
+        None => "No tenant ID provided".to_string(),
+    };
+    
+    tracing::info!("Request ID: {}", context.request_id);
+    tracing::info!("Tenant info: {}", tenant_info);
+    
+    // Include tenant ID in response
+    let response = json!({
+        "message": "Hello from Lambda!",
+        "request_id": context.request_id,
+        "tenant_id": context.tenant_id,
+        "input": event
+    });
+
+    Ok(response)
+}
+
+#[tokio::main]
+async fn main() -> Result<(), Error> {
+    tracing_subscriber::fmt()
+        .with_max_level(tracing::Level::INFO)
+        .with_target(false)
+        .without_time()
+        .init();
+
+    lambda_runtime::run(service_fn(function_handler)).await
+}

lambda-events/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aws_lambda_events"
-version = "1.0.2"
+version = "1.0.3"
 rust-version = "1.84.0"
 description = "AWS Lambda event definitions"
 authors = [
@@ -131,4 +131,4 @@ catch-all-fields = []
 all-features = true
 
 [dev-dependencies]
-lambda_runtime = { path = "../lambda-runtime" }
+lambda_runtime = { version = "1.1.0-rc1", path = "../lambda-runtime" }

lambda-extension/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lambda-extension"
-version = "1.0.1"
+version = "1.0.2"
 edition = "2021"
 rust-version = "1.84.0"
 authors = [
@@ -25,7 +25,7 @@ http = { workspace = true }
 http-body-util = { workspace = true }
 hyper = { workspace = true, features = ["http1", "client", "server"] }
 hyper-util = { workspace = true }
-lambda_runtime_api_client = { version = "1.0", path = "../lambda-runtime-api-client" }
+lambda_runtime_api_client = { version = "1.0.2", path = "../lambda-runtime-api-client" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "^1"
 tokio = { version = "1.0", features = [

lambda-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lambda_http"
-version = "1.0.2"
+version = "1.1.0-rc1"
 authors = [
     "David Calavera <dcalaver@amazon.com>",
     "Harold Sun <sunhua@amazon.com>",
@@ -39,7 +39,7 @@ http = { workspace = true }
 http-body = { workspace = true }
 http-body-util = { workspace = true }
 hyper = { workspace = true }
-lambda_runtime = { version = "1.0", path = "../lambda-runtime" }
+lambda_runtime = { version = "1.1.0-rc1", path = "../lambda-runtime" }
 mime = "0.3"
 percent-encoding = "2.2"
 pin-project-lite = { workspace = true }
@@ -57,8 +57,10 @@ features = ["alb", "apigw"]
 
 [dev-dependencies]
 axum-core = "0.5.4"
+
 axum-extra = { version = "0.12.5", features = ["query"] }
-lambda_runtime_api_client = { version = "1.0", path = "../lambda-runtime-api-client" }
+lambda_runtime_api_client = { version = "1.0.2", path = "../lambda-runtime-api-client" }
+
 log = "^0.4"
 maplit = "1.0"
 tokio = { version = "1.0", features = ["macros"] }

lambda-integration-tests/Cargo.toml

@@ -17,6 +17,7 @@ aws_lambda_events = { path = "../lambda-events" }
 serde_json = "1.0.121"
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1.0.204", features = ["derive"] }
+tracing = "0.1"
 
 [dev-dependencies]
 reqwest = { version = "0.13.1", features = ["blocking"] }
@@ -31,3 +32,7 @@ path = "src/helloworld.rs"
 [[bin]]
 name = "authorizer"
 path = "src/authorizer.rs"
+
+[[bin]]
+name = "tenant-id-test"
+path = "src/tenant_id_test.rs"

lambda-integration-tests/src/tenant_id_test.rs

@@ -0,0 +1,26 @@
+use lambda_runtime::{service_fn, Error, LambdaEvent};
+use serde_json::{json, Value};
+
+async fn function_handler(event: LambdaEvent<Value>) -> Result<Value, Error> {
+    let (event, context) = event.into_parts();
+
+    tracing::info!("Processing request with tenant ID: {:?}", context.tenant_id);
+
+    let response = json!({
+        "statusCode": 200,
+        "body": json!({
+            "message": "Tenant ID test successful",
+            "request_id": context.request_id,
+            "tenant_id": context.tenant_id,
+            "input": event
+        }).to_string()
+    });
+
+    Ok(response)
+}
+
+#[tokio::main]
+async fn main() -> Result<(), Error> {
+    lambda_runtime::tracing::init_default_subscriber();
+    lambda_runtime::run(service_fn(function_handler)).await
+}