AWSLambda: PackageType now defaults to Zip (#7111)

moto/awslambda/models.py

@@ -620,7 +620,7 @@ class LambdaFunction(CloudFormationModel, DockerModel):
 
         self.description = spec.get("Description", "")
         self.memory_size = spec.get("MemorySize", 128)
-        self.package_type = spec.get("PackageType", None)
+        self.package_type = spec.get("PackageType", "Zip")
         self.publish = spec.get("Publish", False)  # this is ignored currently
         self.timeout = spec.get("Timeout", 3)
         self.layers: List[Dict[str, str]] = self._get_layers_data(

tests/test_awslambda/__init__.py

@@ -1 +1,108 @@
-# This file is intentionally left blank.
+import json
+import os
+from functools import wraps
+from time import sleep
+from uuid import uuid4
+
+import boto3
+from botocore.exceptions import ClientError
+
+from moto import mock_iam, mock_lambda, mock_sts
+
+
+def lambda_aws_verified(func):
+    """
+    Function that is verified to work against AWS.
+    Can be run against AWS at any time by setting:
+      MOTO_TEST_ALLOW_AWS_REQUEST=true
+
+    If this environment variable is not set, the function runs in a `mock_lambda/mock_iam/mock_sts` context.
+
+    This decorator will:
+      - Create an IAM-role that can be used by AWSLambda functions table
+      - Run the test
+      - Delete the role
+    """
+
+    @wraps(func)
+    def pagination_wrapper():
+        role_name = "moto_test_role_" + str(uuid4())[0:6]
+
+        allow_aws_request = (
+            os.environ.get("MOTO_TEST_ALLOW_AWS_REQUEST", "false").lower() == "true"
+        )
+
+        if allow_aws_request:
+            return create_role_and_test(role_name)
+        else:
+            with mock_lambda(), mock_iam(), mock_sts():
+                return create_role_and_test(role_name)
+
+    def create_role_and_test(role_name):
+        from .test_lambda import _lambda_region
+
+        policy_doc = {
+            "Version": "2012-10-17",
+            "Statement": [
+                {
+                    "Sid": "LambdaAssumeRole",
+                    "Effect": "Allow",
+                    "Principal": {"Service": "lambda.amazonaws.com"},
+                    "Action": "sts:AssumeRole",
+                }
+            ],
+        }
+        iam = boto3.client("iam", region_name=_lambda_region)
+        iam_role_arn = iam.create_role(
+            RoleName=role_name,
+            AssumeRolePolicyDocument=json.dumps(policy_doc),
+            Path="/",
+        )["Role"]["Arn"]
+
+        try:
+            # Role is not immediately available
+            check_iam_role_is_ready_to_use(iam_role_arn, role_name, _lambda_region)
+
+            resp = func(iam_role_arn)
+        finally:
+            iam.delete_role(RoleName=role_name)
+
+        return resp
+
+    def check_iam_role_is_ready_to_use(role_arn: str, role_name: str, region: str):
+        from .utilities import get_test_zip_file1
+
+        iam = boto3.client("iam", region_name=region)
+
+        # The waiter is normally used to wait until a resource is ready
+        wait_for_role = iam.get_waiter("role_exists")
+        wait_for_role.wait(RoleName=role_name)
+
+        # HOWEVER:
+        # Just because the role exists, doesn't mean it can be used by Lambda
+        # The only reliable way to check if our role is ready:
+        #   - try to create a function and see if it succeeds
+        #
+        # The alternive is to wait between 5 and 10 seconds, which is not a great solution either
+        _lambda = boto3.client("lambda", region)
+        for _ in range(15):
+            try:
+                fn_name = f"fn_for_{role_name}"
+                _lambda.create_function(
+                    FunctionName=fn_name,
+                    Runtime="python3.11",
+                    Role=role_arn,
+                    Handler="lambda_function.lambda_handler",
+                    Code={"ZipFile": get_test_zip_file1()},
+                )
+                # If it succeeded, our role is ready
+                _lambda.delete_function(FunctionName=fn_name)
+
+                return
+            except ClientError:
+                sleep(1)
+        raise Exception(
+            f"Couldn't create test Lambda FN using IAM role {role_name}, probably because it wasn't ready in time"
+        )
+
+    return pagination_wrapper

tests/test_awslambda/test_lambda.py

@@ -14,6 +14,7 @@ from moto import mock_ecr, mock_lambda, mock_s3, settings
 from moto.core import DEFAULT_ACCOUNT_ID as ACCOUNT_ID
 from tests.test_ecr.test_ecr_helpers import _create_image_manifest
 
+from . import lambda_aws_verified
 from .utilities import (
     _process_lambda,
     create_invalid_lambda,
@@ -40,10 +41,14 @@ def test_lambda_regions(region):
     assert resp["ResponseMetadata"]["HTTPStatusCode"] == 200
 
 
-@mock_lambda
+@pytest.mark.aws_verified
-def test_list_functions():
+@lambda_aws_verified
+def test_list_functions(iam_role_arn=None):
+    sts = boto3.client("sts", "eu-west-2")
+    account_id = sts.get_caller_identity()["Account"]
+
     conn = boto3.client("lambda", _lambda_region)
-    function_name = str(uuid4())[0:6]
+    function_name = "moto_test_" + str(uuid4())[0:6]
     initial_list = conn.list_functions()["Functions"]
     initial_names = [f["FunctionName"] for f in initial_list]
     assert function_name not in initial_names
@@ -51,10 +56,14 @@ def test_list_functions():
     conn.create_function(
         FunctionName=function_name,
         Runtime=PYTHON_VERSION,
-        Role=get_role_name(),
+        Role=iam_role_arn,
         Handler="lambda_function.lambda_handler",
         Code={"ZipFile": get_test_zip_file1()},
     )
+
+    wait_for_func = conn.get_waiter("function_active")
+    wait_for_func.wait(FunctionName=function_name, WaiterConfig={"Delay": 1})
+
     names = [f["FunctionName"] for f in conn.list_functions()["Functions"]]
     assert function_name in names
 
@@ -62,26 +71,31 @@ def test_list_functions():
     func_list = conn.list_functions()["Functions"]
     our_functions = [f for f in func_list if f["FunctionName"] == function_name]
     assert len(our_functions) == 1
+    assert our_functions[0]["PackageType"] == "Zip"
 
     # FunctionVersion=ALL means we should get a list of all versions
     full_list = conn.list_functions(FunctionVersion="ALL")["Functions"]
     our_functions = [f for f in full_list if f["FunctionName"] == function_name]
     assert len(our_functions) == 2
+    for func in our_functions:
+        assert func["PackageType"] == "Zip"
 
     v1 = [f for f in our_functions if f["Version"] == "1"][0]
     assert v1["Description"] == "v2"
     assert (
         v1["FunctionArn"]
-        == f"arn:aws:lambda:{_lambda_region}:{ACCOUNT_ID}:function:{function_name}:1"
+        == f"arn:aws:lambda:{_lambda_region}:{account_id}:function:{function_name}:1"
     )
 
     latest = [f for f in our_functions if f["Version"] == "$LATEST"][0]
     assert latest["Description"] == ""
     assert (
         latest["FunctionArn"]
-        == f"arn:aws:lambda:{_lambda_region}:{ACCOUNT_ID}:function:{function_name}:$LATEST"
+        == f"arn:aws:lambda:{_lambda_region}:{account_id}:function:{function_name}:$LATEST"
     )
 
+    conn.delete_function(FunctionName=function_name)
+
 
 @mock_lambda
 def test_create_based_on_s3_with_missing_bucket():
@@ -189,6 +203,7 @@ def test_create_function_from_zipfile():
         "Description": "test lambda function",
         "Timeout": 3,
         "MemorySize": 128,
+        "PackageType": "Zip",
         "CodeSha256": base64.b64encode(hashlib.sha256(zip_content).digest()).decode(
             "utf-8"
         ),
@@ -965,6 +980,7 @@ def test_list_create_list_get_delete_list():
             "FunctionName": function_name,
             "Handler": "lambda_function.lambda_handler",
             "MemorySize": 128,
+            "PackageType": "Zip",
             "Role": get_role_name(),
             "Runtime": PYTHON_VERSION,
             "Timeout": 3,