Revert "feat: Support all formats of function name in invoke (#8295)" (#8349)

This reverts commit 92e801e.

Author: bnusunny

.gitignore

@@ -414,11 +414,9 @@ coverage.xml
 tests/integration/buildcmd/scratch
 tests/integration/testdata/buildcmd/Dotnet*/bin
 tests/integration/testdata/buildcmd/Dotnet*/obj
-tests/integration/testdata/buildcmd/Java/**/build/
 tests/integration/testdata/invoke/credential_tests/inprocess/dotnet/STS/obj
 tests/integration/testdata/sync/code/after/dotnet_function/src/HelloWorld/obj/
 tests/integration/testdata/sync/code/before/dotnet_function/src/HelloWorld/obj/
-samcli/lib/init/templates/cookiecutter-aws-sam-hello-java-gradle/**/.gradle/
 
 # End of https://www.gitignore.io/api/osx,node,macos,linux,python,windows,pycharm,intellij,sublimetext,visualstudiocode
 

samcli/commands/local/invoke/cli.py

@@ -190,7 +190,6 @@ def do_cli( # pylint: disable=R0914
  from samcli.commands.local.lib.exceptions import NoPrivilegeException, OverridesNotWellDefinedError
  from samcli.commands.validate.lib.exceptions import InvalidSamDocumentException
  from samcli.lib.providers.exceptions import InvalidLayerReference
- from samcli.lib.utils.name_utils import InvalidFunctionNameException
  from samcli.local.docker.lambda_debug_settings import DebuggingNotSupported
  from samcli.local.docker.manager import DockerImagePullFailedException
  from samcli.local.lambdafn.exceptions import FunctionNotFound
@@ -248,7 +247,6 @@ def do_cli( # pylint: disable=R0914
  except (
  InvalidSamDocumentException,
  OverridesNotWellDefinedError,
- InvalidFunctionNameException,
  InvalidLayerReference,
  InvalidIntermediateImageError,
  DebuggingNotSupported,

samcli/commands/local/lib/local_lambda.py

@@ -23,7 +23,6 @@
 from samcli.lib.utils.architecture import validate_architecture_runtime
 from samcli.lib.utils.codeuri import resolve_code_path
 from samcli.lib.utils.colors import Colored
-from samcli.lib.utils.name_utils import normalize_lambda_function_name
 from samcli.lib.utils.packagetype import IMAGE, ZIP
 from samcli.lib.utils.stream_writer import StreamWriter
 from samcli.local.docker.container import ContainerConnectionTimeoutException, ContainerResponseException
@@ -128,11 +127,8 @@ def invoke(
  When we cannot find a function with the given name
  """
 
- # Normalize function identifier from ARN if provided
- normalized_function_identifier = normalize_lambda_function_name(function_identifier)
-
  # Generate the correct configuration based on given inputs
- function = self.provider.get(normalized_function_identifier)
+ function = self.provider.get(function_identifier)
 
  if not function:
  all_function_full_paths = [f.full_path for f in self.provider.get_all()]

samcli/lib/utils/name_utils.py

@@ -19,9 +19,6 @@ class LambdaErrorResponses:
  # The request body could not be parsed as JSON.
  InvalidRequestContentException = ("InvalidRequestContent", 400)
 
- # One or more parameters values were invalid.
- ValidationException = ("ValidationException", 400)
-
  NotImplementedException = ("NotImplemented", 501)
 
  ContainerCreationFailed = ("ContainerCreationFailed", 501)
@@ -88,29 +85,6 @@ def invalid_request_content(message):
  exception_tuple[1],
  )
 
- @staticmethod
- def validation_exception(message):
- """
- Creates a Lambda Service ValidationException Response
-
- Parameters
- ----------
- message str
- Message to be added to the body of the response
-
- Returns
- -------
- Flask.Response
- A response object representing the ValidationException Error
- """
- exception_tuple = LambdaErrorResponses.ValidationException
-
- return BaseLocalService.service_response(
- LambdaErrorResponses._construct_error_response_body(LambdaErrorResponses.USER_ERROR, message),
- LambdaErrorResponses._construct_headers(exception_tuple[0]),
- exception_tuple[1],
- )
-
  @staticmethod
  def unsupported_media_type(content_type):
  """

samcli/local/lambda_service/lambda_error_responses.py

@@ -8,7 +8,6 @@
 from werkzeug.routing import BaseConverter
 
 from samcli.commands.local.lib.exceptions import UnsupportedInlineCodeError
-from samcli.lib.utils.name_utils import InvalidFunctionNameException, normalize_lambda_function_name
 from samcli.lib.utils.stream_writer import StreamWriter
 from samcli.local.docker.exceptions import DockerContainerCreationFailedException
 from samcli.local.lambdafn.exceptions import FunctionNotFound
@@ -152,7 +151,7 @@ def _invoke_request_handler(self, function_name):
  Parameters
  ----------
  function_name str
- Name or ARN of the function to invoke
+ Name of the function to invoke
 
  Returns
  -------
@@ -167,24 +166,15 @@ def _invoke_request_handler(self, function_name):
 
  request_data = request_data.decode("utf-8")
 
- # Normalize function name from ARN if provided
- try:
- normalized_function_name = normalize_lambda_function_name(function_name)
- except InvalidFunctionNameException as e:
- LOG.error("Invalid function name: %s", str(e))
- return LambdaErrorResponses.validation_exception(str(e))
-
  stdout_stream_string = io.StringIO()
  stdout_stream_bytes = io.BytesIO()
  stdout_stream_writer = StreamWriter(stdout_stream_string, stdout_stream_bytes, auto_flush=True)
 
  try:
- self.lambda_runner.invoke(
- normalized_function_name, request_data, stdout=stdout_stream_writer, stderr=self.stderr
- )
+ self.lambda_runner.invoke(function_name, request_data, stdout=stdout_stream_writer, stderr=self.stderr)
  except FunctionNotFound:
- LOG.debug("%s was not found to invoke.", normalized_function_name)
- return LambdaErrorResponses.resource_not_found(normalized_function_name)
+ LOG.debug("%s was not found to invoke.", function_name)
+ return LambdaErrorResponses.resource_not_found(function_name)
  except UnsupportedInlineCodeError:
  return LambdaErrorResponses.not_implemented_locally(
  "Inline code is not supported for sam local commands. Please write your code in a separate file."

samcli/local/lambda_service/local_lambda_invoke_service.py

@@ -26,18 +26,9 @@ def test_invalid_request_content(self, service_response_mock):
  response = LambdaErrorResponses.invalid_request_content("InvalidRequestContent")
 
  self.assertEqual(response, "InvalidRequestContent")
-
- @patch("samcli.local.services.base_local_service.BaseLocalService.service_response")
- def test_validation_exception(self, service_response_mock):
- service_response_mock.return_value = "ValidationException"
-
- response = LambdaErrorResponses.validation_exception("ValidationException")
-
- self.assertEqual(response, "ValidationException")
-
  service_response_mock.assert_called_once_with(
- '{"Type": "User", "Message": "ValidationException"}',
- {"x-amzn-errortype": "ValidationException", "Content-Type": "application/json"},
+ '{"Type": "User", "Message": "InvalidRequestContent"}',
+ {"x-amzn-errortype": "InvalidRequestContent", "Content-Type": "application/json"},
  400,
  )