Implementation of Lambda Advanced Configuration attribute

localstack/services/lambda_/api_utils.py

@@ -488,6 +488,7 @@ def map_config_out(
         EphemeralStorage=EphemeralStorage(Size=version.config.ephemeral_storage.size),
         SnapStart=version.config.snap_start,
         RuntimeVersionConfig=version.config.runtime_version_config,
+        LoggingConfig=version.config.logging_config,
         **optional_kwargs,
     )
     return func_conf

localstack/services/lambda_/invocation/lambda_models.py

@@ -27,6 +27,7 @@
     InvocationType,
     InvokeMode,
     LastUpdateStatus,
+    LoggingConfig,
     PackageType,
     ProvisionedConcurrencyStatusEnum,
     Runtime,
@@ -558,6 +559,8 @@ class VersionFunctionConfiguration:
     # file_system_configs: FileSystemConfig
     vpc_config: Optional[VpcConfig] = None
 
+    logging_config: LoggingConfig = dataclasses.field(default_factory=dict)
+
 
 @dataclasses.dataclass(frozen=True)
 class FunctionVersion:

localstack/services/lambda_/provider.py

@@ -83,6 +83,8 @@
     ListProvisionedConcurrencyConfigsResponse,
     ListTagsResponse,
     ListVersionsByFunctionResponse,
+    LogFormat,
+    LoggingConfig,
     LogType,
     MasterRegion,
     MaxFunctionEventInvokeConfigListItems,
@@ -636,7 +638,7 @@ def _validate_layers(self, new_layers: list[str], region: str, account_id: str):
             if layer_version_str is None:
                 raise ValidationException(
                     f"1 validation error detected: Value '[{layer_version_arn}]'"
-                    + r" at 'layers' failed to satisfy constraint: Member must satisfy constraint: [Member must have length less than or equal to 140, Member must have length greater than or equal to 1, Member must satisfy regular expression pattern: (arn:[a-zA-Z0-9-]+:lambda:[a-zA-Z0-9-]+:\d{12}:layer:[a-zA-Z0-9-_]+:[0-9]+)|(arn:[a-zA-Z0-9-]+:lambda:::awslayer:[a-zA-Z0-9-_]+), Member must not be null]",
+                    + r" at 'layers' failed to satisfy constraint: Member must satisfy constraint: [Member must have length less than or equal to 140, Member must have length greater than or equal to 1, Member must satisfy regular expression pattern: (arn:[a-zA-Z0-9-]+:lambda:[a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\d{1}:\d{12}:layer:[a-zA-Z0-9-_]+:[0-9]+)|(arn:[a-zA-Z0-9-]+:lambda:::awslayer:[a-zA-Z0-9-_]+), Member must not be null]",
                 )
 
             state = lambda_stores[layer_account_id][layer_region]
@@ -867,6 +869,33 @@ def create_function(
                 )
                 # Runtime management controls are not available when providing a custom image
                 runtime_version_config = None
+            if "LoggingConfig" in request:
+                logging_config = request["LoggingConfig"]
+                LOG.warning(
+                    "Advanced Lambda Logging Configuration is currently mocked "
+                    "and will not impact the logging behavior. "
+                    "Please create a feature request if needed."
+                )
+
+                # when switching to JSON, app and system level log is auto set to INFO
+                if logging_config.get("LogFormat", None) == LogFormat.JSON:
+                    logging_config = {
+                        "ApplicationLogLevel": "INFO",
+                        "SystemLogLevel": "INFO",
+                        "LogGroup": f"/aws/lambda/{function_name}",
+                    } | logging_config
+                else:
+                    logging_config = (
+                        LoggingConfig(
+                            LogFormat=LogFormat.Text, LogGroup=f"/aws/lambda/{function_name}"
+                        )
+                        | logging_config
+                    )
+
+            else:
+                logging_config = LoggingConfig(
+                    LogFormat=LogFormat.Text, LogGroup=f"/aws/lambda/{function_name}"
+                )
 
             version = FunctionVersion(
                 id=arn,
@@ -906,6 +935,7 @@ def create_function(
                         code=StateReasonCode.Creating,
                         reason="The function is being created.",
                     ),
+                    logging_config=logging_config,
                 ),
             )
             fn.versions["$LATEST"] = version
@@ -1044,6 +1074,36 @@ def update_function_configuration(
                 working_directory=new_image_config.get("WorkingDirectory"),
             )
 
+        if "LoggingConfig" in request:
+            logging_config = request["LoggingConfig"]
+            LOG.warning(
+                "Advanced Lambda Logging Configuration is currently mocked "
+                "and will not impact the logging behavior. "
+                "Please create a feature request if needed."
+            )
+
+            # when switching to JSON, app and system level log is auto set to INFO
+            if logging_config.get("LogFormat", None) == LogFormat.JSON:
+                logging_config = {
+                    "ApplicationLogLevel": "INFO",
+                    "SystemLogLevel": "INFO",
+                } | logging_config
+
+            last_config = latest_version_config.logging_config
+
+            # add partial update
+            new_logging_config = last_config | logging_config
+
+            # in case we switched from JSON to Text we need to remove LogLevel keys
+            if (
+                new_logging_config.get("LogFormat") == LogFormat.Text
+                and last_config.get("LogFormat") == LogFormat.JSON
+            ):
+                new_logging_config.pop("ApplicationLogLevel", None)
+                new_logging_config.pop("SystemLogLevel", None)
+
+            replace_kwargs["logging_config"] = new_logging_config
+
         if "TracingConfig" in request:
             new_mode = request.get("TracingConfig", {}).get("Mode")
             if new_mode:

localstack/services/lambda_/runtimes.py

@@ -81,7 +81,7 @@
 SUPPORTED_RUNTIMES: list[Runtime] = list(set(IMAGE_MAPPING.keys()) - set(DEPRECATED_RUNTIMES))
 
 # A temporary list of missing runtimes not yet supported in LocalStack. Used for modular updates.
-MISSING_RUNTIMES = []
+MISSING_RUNTIMES = [Runtime.ruby3_3]
 
 # An unordered list of all Lambda runtimes supported by LocalStack.
 ALL_RUNTIMES: list[Runtime] = list(IMAGE_MAPPING.keys())
@@ -130,6 +130,6 @@
 SNAP_START_SUPPORTED_RUNTIMES = [Runtime.java11, Runtime.java17, Runtime.java21]
 
 # An ordered list of all Lambda runtimes considered valid by AWS. Matching snapshots in test_create_lambda_exceptions
-VALID_RUNTIMES: str = "[nodejs20.x, provided.al2023, python3.12, java17, nodejs16.x, dotnet8, python3.10, java11, python3.11, dotnet6, java21, nodejs18.x, provided.al2, java8.al2, ruby3.2, python3.8, python3.9]"
+VALID_RUNTIMES: str = "[nodejs20.x, provided.al2023, python3.12, java17, nodejs16.x, dotnet8, python3.10, java11, python3.11, dotnet6, java21, nodejs18.x, provided.al2, ruby3.3, java8.al2, ruby3.2, python3.8, python3.9]"
 # An ordered list of all Lambda runtimes for layers considered valid by AWS. Matching snapshots in test_layer_exceptions
 VALID_LAYER_RUNTIMES: str = "[ruby2.6, dotnetcore1.0, python3.7, nodejs8.10, nasa, ruby2.7, python2.7-greengrass, dotnetcore2.0, python3.8, java21, dotnet6, dotnetcore2.1, python3.9, java11, nodejs6.10, provided, dotnetcore3.1, dotnet8, java17, nodejs, nodejs4.3, java8.al2, go1.x, nodejs20.x, go1.9, byol, nodejs10.x, provided.al2023, python3.10, java8, nodejs12.x, python3.11, nodejs8.x, python3.12, nodejs14.x, nodejs8.9, python3.13, nodejs16.x, provided.al2, nodejs4.3-edge, nodejs18.x, ruby3.2, python3.4, ruby3.3, ruby2.5, python3.6, python2.7]"

tests/aws/scenario/lambda_destination/test_lambda_destination_scenario.snapshot.json

@@ -1,6 +1,6 @@
 {
   "tests/aws/scenario/lambda_destination/test_lambda_destination_scenario.py::TestLambdaDestinationScenario::test_infra": {
-    "recorded-date": "04-10-2023, 16:04:47",
+    "recorded-date": "17-04-2024, 07:04:49",
     "recorded-content": {
       "get_fn_1": {
         "Code": {
@@ -22,6 +22,10 @@
           "Handler": "index.handler",
           "LastModified": "date",
           "LastUpdateStatus": "Successful",
+          "LoggingConfig": {
+            "LogFormat": "Text",
+            "LogGroup": "/aws/lambda/<function-name:1>"
+          },
           "MemorySize": 128,
           "PackageType": "Zip",
           "RevisionId": "<uuid:1>",
@@ -71,6 +75,10 @@
           "Handler": "index.handler",
           "LastModified": "date",
           "LastUpdateStatus": "Successful",
+          "LoggingConfig": {
+            "LogFormat": "Text",
+            "LogGroup": "/aws/lambda/<function-name:2>"
+          },
           "MemorySize": 128,
           "PackageType": "Zip",
           "RevisionId": "<uuid:2>",

tests/aws/scenario/lambda_destination/test_lambda_destination_scenario.validation.json

@@ -3,6 +3,6 @@
     "last_validated_date": "2023-10-04T14:05:34+00:00"
   },
   "tests/aws/scenario/lambda_destination/test_lambda_destination_scenario.py::TestLambdaDestinationScenario::test_infra": {
-    "last_validated_date": "2023-10-04T14:04:47+00:00"
+    "last_validated_date": "2024-04-17T07:04:49+00:00"
   }
 }

tests/aws/scenario/note_taking/test_note_taking.snapshot.json

@@ -1,6 +1,6 @@
 {
   "tests/aws/scenario/note_taking/test_note_taking.py::TestNoteTakingScenario::test_validate_infra_setup": {
-    "recorded-date": "28-09-2023, 16:08:28",
+    "recorded-date": "16-04-2024, 08:42:29",
     "recorded-content": {
       "describe_stack_resources": {
         "StackResources": [
@@ -536,6 +536,10 @@
           "Handler": "index.handler",
           "LastModified": "date",
           "LastUpdateStatus": "Successful",
+          "LoggingConfig": {
+            "LogFormat": "Text",
+            "LogGroup": "/aws/lambda/<function-name:1>"
+          },
           "MemorySize": 128,
           "PackageType": "Zip",
           "RevisionId": "<uuid:2>",
@@ -590,6 +594,10 @@
           "Handler": "index.handler",
           "LastModified": "date",
           "LastUpdateStatus": "Successful",
+          "LoggingConfig": {
+            "LogFormat": "Text",
+            "LogGroup": "/aws/lambda/<function-name:2>"
+          },
           "MemorySize": 128,
           "PackageType": "Zip",
           "RevisionId": "<uuid:3>",
@@ -644,6 +652,10 @@
           "Handler": "index.handler",
           "LastModified": "date",
           "LastUpdateStatus": "Successful",
+          "LoggingConfig": {
+            "LogFormat": "Text",
+            "LogGroup": "/aws/lambda/<function-name:3>"
+          },
           "MemorySize": 128,
           "PackageType": "Zip",
           "RevisionId": "<uuid:4>",
@@ -698,6 +710,10 @@
           "Handler": "index.handler",
           "LastModified": "date",
           "LastUpdateStatus": "Successful",
+          "LoggingConfig": {
+            "LogFormat": "Text",
+            "LogGroup": "/aws/lambda/<function-name:4>"
+          },
           "MemorySize": 128,
           "PackageType": "Zip",
           "RevisionId": "<uuid:5>",
@@ -752,6 +768,10 @@
           "Handler": "index.handler",
           "LastModified": "date",
           "LastUpdateStatus": "Successful",
+          "LoggingConfig": {
+            "LogFormat": "Text",
+            "LogGroup": "/aws/lambda/<function-name:5>"
+          },
           "MemorySize": 128,
           "PackageType": "Zip",
           "RevisionId": "<uuid:6>",

tests/aws/scenario/note_taking/test_note_taking.validation.json

@@ -1,5 +1,5 @@
 {
   "tests/aws/scenario/note_taking/test_note_taking.py::TestNoteTakingScenario::test_validate_infra_setup": {
-    "last_validated_date": "2023-09-28T14:08:28+00:00"
+    "last_validated_date": "2024-04-16T08:42:29+00:00"
   }
 }

tests/aws/services/cloudformation/resources/test_lambda.py

@@ -106,6 +106,7 @@ def test_lambda_w_dynamodb_event_filter_update(deploy_cfn_template, snapshot, aw
         "$..access-control-expose-headers",
         "$..server",
         "$..content-length",
+        "$..InvokeMode",
     ]
 )
 @markers.aws.validated