Merge branch 'develop' into feat-java25-python314

Author: bnusunny

Makefile

@@ -13,8 +13,7 @@ init:
 	fi
 
 test:
-	# Run unit tests
-	# Fail if coverage falls below 95%
+	# Run unit tests and fail if coverage falls below 94%
 	pytest --cov samcli --cov schema --cov-report term-missing --cov-fail-under 94 tests/unit
 
 test-cov-report:

requirements/base.txt

@@ -11,7 +11,7 @@ aws-sam-translator==1.101.0
 docker~=7.1.0
 dateparser~=1.2
 requests~=2.32.5
-aws_lambda_builders==1.58.0
+aws_lambda_builders==1.59.0
 tomlkit==0.13.3
 # NOTE: For supporting watchdog in Python3.8, version is pinned to 4.0.2 as 
 # version 5.0.2 introduced some breaking changes for versions > Python3.8

requirements/reproducible-linux.txt

@@ -18,9 +18,9 @@ attrs==25.4.0 \
     # via
     #   jsonschema
     #   referencing
-aws-lambda-builders==1.58.0 \
-    --hash=sha256:95bf2a502bd9cf5abc14b1a27e9d0c7378cf261abb52373ea16be7ca22b7e812 \
-    --hash=sha256:e096f8126e67341f6d24791f933d186745c97d3cbf156122df732436a4c03010
+aws-lambda-builders==1.59.0 \
+    --hash=sha256:87b3ac37598418e8d41c1c65bfd90768ad6737da73585d645274b9bdb1122565 \
+    --hash=sha256:d863db6b6fcf1377bd6e4b2eb5443874b839ffa65d4cde2b531c8c2120bd99e3
     # via aws-sam-cli (setup.py)
 aws-sam-translator==1.101.0 \
     --hash=sha256:234c1ca29d47f2cd276858371d4a646bc5cdb0de1e07724721d9358d6de005aa \

requirements/reproducible-mac.txt

@@ -18,9 +18,9 @@ attrs==25.4.0 \
     # via
     #   jsonschema
     #   referencing
-aws-lambda-builders==1.58.0 \
-    --hash=sha256:95bf2a502bd9cf5abc14b1a27e9d0c7378cf261abb52373ea16be7ca22b7e812 \
-    --hash=sha256:e096f8126e67341f6d24791f933d186745c97d3cbf156122df732436a4c03010
+aws-lambda-builders==1.59.0 \
+    --hash=sha256:87b3ac37598418e8d41c1c65bfd90768ad6737da73585d645274b9bdb1122565 \
+    --hash=sha256:d863db6b6fcf1377bd6e4b2eb5443874b839ffa65d4cde2b531c8c2120bd99e3
     # via aws-sam-cli (setup.py)
 aws-sam-translator==1.101.0 \
     --hash=sha256:234c1ca29d47f2cd276858371d4a646bc5cdb0de1e07724721d9358d6de005aa \

requirements/reproducible-win.txt

@@ -18,9 +18,9 @@ attrs==25.4.0 \
     # via
     #   jsonschema
     #   referencing
-aws-lambda-builders==1.58.0 \
-    --hash=sha256:95bf2a502bd9cf5abc14b1a27e9d0c7378cf261abb52373ea16be7ca22b7e812 \
-    --hash=sha256:e096f8126e67341f6d24791f933d186745c97d3cbf156122df732436a4c03010
+aws-lambda-builders==1.59.0 \
+    --hash=sha256:87b3ac37598418e8d41c1c65bfd90768ad6737da73585d645274b9bdb1122565 \
+    --hash=sha256:d863db6b6fcf1377bd6e4b2eb5443874b839ffa65d4cde2b531c8c2120bd99e3
     # via aws-sam-cli (setup.py)
 aws-sam-translator==1.101.0 \
     --hash=sha256:234c1ca29d47f2cd276858371d4a646bc5cdb0de1e07724721d9358d6de005aa \

samcli/commands/remote/invoke/cli.py

@@ -166,10 +166,15 @@ def do_cli(
                 and remote_invoke_context.resource_summary
                 and remote_invoke_context.resource_summary.resource_type == AWS_LAMBDA_FUNCTION
             ):
-                lambda_test_event = remote_invoke_context.get_lambda_shared_test_event_provider()
                 LOG.debug("Retrieving remote event %s", test_event_name)
-                event = lambda_test_event.get_event(test_event_name, remote_invoke_context.resource_summary)
+                lambda_test_event = remote_invoke_context.get_lambda_shared_test_event_provider().get_event(
+                    test_event_name, remote_invoke_context.resource_summary
+                )
+                event = lambda_test_event["json"]
                 LOG.debug("Remote event contents: %s", event)
+                metadata = lambda_test_event["metadata"]
+                if "invocationType" in metadata:
+                    parameter.setdefault("InvocationType", metadata["invocationType"])
             elif test_event_name:
                 LOG.info("Note: remote event is only supported for AWS Lambda Function resource.")
                 test_event_name = ""

samcli/commands/remote/test_event/get/cli.py

@@ -127,7 +127,7 @@ def do_cli(
         raise UserException(str(ex), wrapped_from=ex.__class__.__name__) from ex
 
     LOG.debug("Getting remote event '%s' for resource: %s", name, function_resource)
-    event = lambda_test_event.get_event(name, function_resource)
+    event = lambda_test_event.get_event(name, function_resource)["json"]
 
     try:
         output_file.write(event)

samcli/commands/remote/test_event/put/cli.py

@@ -11,6 +11,7 @@
 from samcli.cli.cli_config_file import ConfigProvider, configuration_option
 from samcli.cli.context import Context
 from samcli.cli.main import aws_creds_options, common_options, pass_context, print_cmdline_args
+from samcli.commands._utils.click_mutex import ClickMutex
 from samcli.commands._utils.command_exception_handler import command_exception_handler
 from samcli.commands.remote.exceptions import IllFormedEventData
 from samcli.commands.remote.test_event.put.core.command import RemoteTestEventPutCommand
@@ -19,6 +20,7 @@
     stack_name_or_resource_id_atleast_one_option_validation,
 )
 from samcli.lib.telemetry.metric import track_command
+from samcli.lib.utils.invocation_type import EVENT, REQUEST_RESPONSE
 from samcli.lib.utils.version_checker import check_newer_version
 from samcli.yamlhelper import yaml_parse
 
@@ -56,6 +58,14 @@
         "The option '--file' is required (You can provide '-' to read from stdin)"
     ),
 )
+@click.option(
+    "--invocation-type",
+    type=click.Choice([EVENT, REQUEST_RESPONSE]),
+    replace_help_option="--invocation-type INVOCATION_TYPE",
+    help="Lambda function invocation type."
+    + click.style(f"\n\nInvocation types: {[EVENT, REQUEST_RESPONSE]}", bold=True),
+    cls=ClickMutex,
+)
 @click.option("--force", "-f", is_flag=True, help="Force saving the event even if it already exists")
 @click.argument("resource-id", required=False)
 @aws_creds_options
@@ -72,6 +82,7 @@ def cli(
     resource_id: Optional[str],
     name: str,
     file: TextIOWrapper,
+    invocation_type: str,
     force: bool,
     config_file: str,
     config_env: str,
@@ -84,6 +95,7 @@ def cli(
         resource_id,
         name,
         file,
+        invocation_type,
         force,
         ctx.region,
         ctx.profile,
@@ -97,6 +109,7 @@ def do_cli(
     resource_id: Optional[str],
     name: str,
     file: TextIOWrapper,
+    invocation_type: str,
     force: bool,
     region: str,
     profile: str,
@@ -147,7 +160,7 @@ def do_cli(
         data = yaml_parse(contents)
         event_data = json.dumps(data)
         LOG.debug("Creating remote event %s from resource: %s", name, function_resource)
-        lambda_test_event.create_event(name, function_resource, event_data, force=force)
+        lambda_test_event.create_event(name, function_resource, event_data, invocation_type, force=force)
         click.echo(f"Put remote event '{name}' completed successfully")
     except (ValueError, YAMLError, JSONDecodeError) as ex:
         raise IllFormedEventData(f"File {file.name} doesn't contain a valid JSON:\n {ex}") from ex

samcli/commands/remote/test_event/put/core/options.py

@@ -18,7 +18,7 @@
 # NOTE: The ordering of the option lists matter, they are the order
 # in which options will be displayed.
 
-EVENT_OPTIONS: List[str] = ["name", "file", "force"]
+EVENT_OPTIONS: List[str] = ["name", "file", "invocation_type", "force"]
 
 ALL_OPTIONS: List[str] = (
     INFRASTRUCTURE_OPTION_NAMES

samcli/lib/shared_test_events/lambda_shared_test_event.py

@@ -3,7 +3,7 @@
 import json
 import logging
 from json import JSONDecodeError
-from typing import Any
+from typing import Any, Optional
 
 import botocore
 
@@ -17,6 +17,7 @@
 )
 from samcli.lib.schemas.schemas_api_caller import SchemasApiCaller
 from samcli.lib.utils.cloudformation import CloudFormationResourceSummary
+from samcli.lib.utils.invocation_type import REQUEST_RESPONSE
 from samcli.lib.utils.resources import AWS_LAMBDA_FUNCTION
 
 LAMBDA_TEST_EVENT_REGISTRY = "lambda-testevent-schemas"
@@ -142,7 +143,14 @@ def limit_versions(self, schema_name: str, registry_name: str = LAMBDA_TEST_EVEN
             )
             self._api_caller.delete_version(registry_name, schema_name, version_to_delete)
 
-    def add_event_to_schema(self, schema: str, event: str, event_name: str, replace_if_exists: bool = False) -> str:
+    def add_event_to_schema(
+        self,
+        schema: str,
+        event: str,
+        event_name: str,
+        metadata: Optional[dict[str, str]],
+        replace_if_exists: bool = False,
+    ) -> str:
         """
         Adds an event to a schema
 
@@ -176,6 +184,8 @@ def add_event_to_schema(self, schema: str, event: str, event_name: str, replace_
             schema_dict["components"]["examples"][event_name] = {
                 "value": event_dict,
             }
+            if metadata:
+                schema_dict["components"]["examples"][event_name]["x-metadata"] = metadata
 
             schema = json.dumps(schema_dict)
 
@@ -200,7 +210,7 @@ def get_event_from_schema(self, schema: str, event_name: str) -> Any:
             the name of the event to retrieve from the schema
         Returns
         -------
-        The event data of the event "event_name"
+        The event data and metadata of the event "event_name"
         """
         try:
             schema_dict = json.loads(schema)
@@ -211,7 +221,7 @@ def get_event_from_schema(self, schema: str, event_name: str) -> Any:
                 raise ResourceNotFound(f"Event {event_name} not found")
 
             # can use square brackets here since we know each of these subdicts exist
-            return existing_events[event_name]["value"]
+            return existing_events[event_name]
 
         except JSONDecodeError as ex:
             LOG.error("Error decoding schema when getting event %s", event_name)
@@ -263,6 +273,7 @@ def create_event(
         event_name: str,
         function_resource: CloudFormationResourceSummary,
         event_data: str,
+        invocation_type: str = REQUEST_RESPONSE,
         force: bool = False,
         registry_name: str = LAMBDA_TEST_EVENT_REGISTRY,
     ) -> str:
@@ -277,6 +288,8 @@ def create_event(
             The function where the event will be created
         event_data: str
             The JSON data of the event to be created
+        invocation_type: str
+            The Lambda invocation type of the event to be created
         registry_name: str
             The name of the registry that contains the schema
         """
@@ -287,16 +300,19 @@ def create_event(
 
         schema_name = self._get_schema_name(function_resource)
         original_schema = api_caller.get_schema(registry_name, schema_name)
+        metadata = {"invocationType": invocation_type}
 
         if original_schema:
             LOG.debug("Schema %s already exists, adding event %s", schema_name, event_name)
             self.limit_versions(schema_name, registry_name)
-            schema = self.add_event_to_schema(original_schema, event_data, event_name, replace_if_exists=force)
+            schema = self.add_event_to_schema(
+                original_schema, event_data, event_name, metadata, replace_if_exists=force
+            )
             api_caller.update_schema(schema, registry_name, schema_name, OPEN_API_TYPE)
         else:
             LOG.debug("Schema %s does not already exist, creating new", schema_name)
             schema = api_caller.discover_schema(event_data, OPEN_API_TYPE)
-            schema = self.add_event_to_schema(schema, event_data, event_name)
+            schema = self.add_event_to_schema(schema, event_data, event_name, metadata)
             api_caller.create_schema(schema, registry_name, schema_name, OPEN_API_TYPE)
 
         return schema
@@ -346,7 +362,7 @@ def get_event(
         event_name: str,
         function_resource: CloudFormationResourceSummary,
         registry_name: str = LAMBDA_TEST_EVENT_REGISTRY,
-    ) -> str:
+    ) -> Any:
         """
         Returns a remote test event
 
@@ -360,7 +376,7 @@ def get_event(
             The name of the registry that contains the schema
         Returns
         -------
-        The JSON data of the event
+        The parsed JSON data and metadata of the event
         """
         api_caller = self._api_caller
 
@@ -377,7 +393,7 @@ def get_event(
         event = self.get_event_from_schema(schema, event_name)
 
         try:
-            return json.dumps(event)
+            return {"json": json.dumps(event["value"]), "metadata": event.get("x-metadata", {})}
 
         except JSONDecodeError as ex:
             LOG.error("Error parsing event %s from schema %s", event_name, schema_name)