Add LambdaFunctionOptions type to allow additional optional settings to be made for the Lambda function. Added the logging options as initial place options. (#33)

Author: normj

.autover/changes/c510e231-0c7f-4f60-b3f6-914884cbaa9b.json

@@ -0,0 +1,11 @@
+{
+  "Projects": [
+    {
+      "Name": "Aspire.Hosting.AWS",
+      "Type": "Patch",
+      "ChangelogMessages": [
+        "Add ability to configure log format and level for Lambda functions"
+      ]
+    }
+  ]
+}

Directory.Packages.props

@@ -15,6 +15,7 @@
     <PackageVersion Include="AWSSDK.CloudFormation" Version="3.7.402.6" />
     <PackageVersion Include="AWSSDK.Core" Version="3.7.402.2" />
     <PackageVersion Include="AWSSDK.DynamoDBv2" Version="3.7.405.23" />
+    <PackageVersion Include="AWSSDK.Lambda" Version="3.7.411.39" />
     <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.45" />
     <PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.96" />
     <PackageVersion Include="AWSSDK.SQS" Version="3.7.400.96" />

playground/Lambda/Lambda.AppHost/Program.cs

@@ -1,4 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+using Amazon.Lambda;
 using Aspire.Hosting.AWS.Lambda;
 
 #pragma warning disable CA2252 // This API requires opting into preview features
@@ -7,7 +8,7 @@
 
 var awsSdkConfig = builder.AddAWSSDKConfig().WithRegion(Amazon.RegionEndpoint.USWest2);
 
-builder.AddAWSLambdaFunction<Projects.ToUpperLambdaFunctionExecutable>("ToUpperFunction", lambdaHandler: "ToUpperLambdaFunctionExecutable");
+builder.AddAWSLambdaFunction<Projects.ToUpperLambdaFunctionExecutable>("ToUpperFunction", lambdaHandler: "ToUpperLambdaFunctionExecutable", new LambdaFunctionOptions { ApplicationLogLevel = ApplicationLogLevel.DEBUG, LogFormat = LogFormat.JSON});
 
 var defaultRouteLambda = builder.AddAWSLambdaFunction<Projects.WebDefaultLambdaFunction>("LambdaDefaultRoute", lambdaHandler: "WebDefaultLambdaFunction");
 var addRouteLambda = builder.AddAWSLambdaFunction<Projects.WebAddLambdaFunction>("AddDefaultRoute", lambdaHandler: "WebAddLambdaFunction");

playground/Lambda/ToUpperLambdaFunctionExecutable/LambdaFunction.cs

@@ -22,6 +22,8 @@ private string TracingLambdaHandler(string input, ILambdaContext context)
 
     private string LambdaHandler(string input, ILambdaContext context)
     {
+        context.Logger.LogDebug("Performing ToUpper for {input}", input);
+
         return input.ToUpper();
     }
 }

src/Aspire.Hosting.AWS/Aspire.Hosting.AWS.csproj

@@ -15,6 +15,7 @@
     <PackageReference Include="Amazon.CDK.Lib" />
     <PackageReference Include="AWSSDK.Core" />
     <PackageReference Include="AWSSDK.CloudFormation" />
+    <PackageReference Include="AWSSDK.Lambda" />
     <PackageReference Include="AWSSDK.SecurityToken" />	  
     <PackageReference Include="AWSSDK.SSO" />	  
     <PackageReference Include="AWSSDK.SSOOIDC" />	  

src/Aspire.Hosting.AWS/Lambda/LambdaExtensions.cs

@@ -30,8 +30,9 @@ public static class LambdaExtensions
     /// <param name="lambdaHandler">Lambda function handler</param>
     /// <returns></returns>
     /// <exception cref="NotImplementedException"></exception>
-    public static IResourceBuilder<LambdaProjectResource> AddAWSLambdaFunction<TLambdaProject>(this IDistributedApplicationBuilder builder, string name, string lambdaHandler) where TLambdaProject : IProjectMetadata, new()
+    public static IResourceBuilder<LambdaProjectResource> AddAWSLambdaFunction<TLambdaProject>(this IDistributedApplicationBuilder builder, string name, string lambdaHandler, LambdaFunctionOptions? options = null) where TLambdaProject : IProjectMetadata, new()
     {
+        options ??= new LambdaFunctionOptions();
         var metadata = new TLambdaProject();
 
         var serviceEmulator = AddOrGetLambdaServiceEmulatorResource(builder);
@@ -63,6 +64,9 @@ public static class LambdaExtensions
             context.EnvironmentVariables["AWS_LAMBDA_FUNCTION_NAME"] = name;
             context.EnvironmentVariables["_HANDLER"] = lambdaHandler;
 
+            context.EnvironmentVariables["AWS_LAMBDA_LOG_FORMAT"] = options.LogFormat.Value;
+            context.EnvironmentVariables["AWS_LAMBDA_LOG_LEVEL"] = options.ApplicationLogLevel.Value;
+
             var lambdaEmulatorEndpoint = $"http://{serviceEmulatorEndpoint.Host}:{serviceEmulatorEndpoint.Port}/?function={Uri.EscapeDataString(name)}";
 
             resource.WithAnnotation(new ResourceCommandAnnotation(

src/Aspire.Hosting.AWS/Lambda/LambdaFunctionOptions.cs

@@ -0,0 +1,21 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+using Amazon.CDK.AWS.Lambda;
+
+namespace Aspire.Hosting.AWS.Lambda;
+
+/// <summary>
+/// Options that can be added to the Lambda function resource.
+/// </summary>
+public class LambdaFunctionOptions
+{
+    /// <summary>
+    /// The format for the log messages generated by the Lambda function. Default format is Text.
+    /// </summary>
+    public Amazon.Lambda.LogFormat LogFormat { get; set; } = Amazon.Lambda.LogFormat.Text;
+
+    /// <summary>
+    /// The minimum log level captured from the Lambda function. Default log level is INFO.
+    /// </summary>
+    public Amazon.Lambda.ApplicationLogLevel ApplicationLogLevel { get; set; } = Amazon.Lambda.ApplicationLogLevel.INFO;
+}