Merge branch 'mr/trespeuch/ruff' into 'master'

Remove deprecated Py38Function

See merge request it/e3-aws!140

Author: pierretr

src/e3/aws/troposphere/awslambda/__init__.py

@@ -926,55 +926,6 @@ def show(self, stack: Stack) -> None:
             print("No files")
 
 
-class Py38Function(PyFunction):
-    """Lambda using the Python 3.8 runtime."""
-
-    def __init__(
-        self,
-        name: str,
-        description: str,
-        role: str | GetAtt | Role,
-        code_dir: str | Path,
-        handler: str,
-        version: int | Version | AutoVersion | None = None,
-        min_version: int | None = None,
-        alias: str | Alias | BlueGreenAliases | None = None,
-        requirement_file: str | Path | None = None,
-        code_version: int | None = None,
-        timeout: int = 3,
-        memory_size: int | None = None,
-        ephemeral_storage_size: int | None = None,
-        logs_retention_in_days: int | None = None,
-        reserved_concurrent_executions: int | None = None,
-        logging_config: awslambda.LoggingConfig | None = None,
-        dl_config: awslambda.DeadLetterConfig | None = None,
-    ) -> None:
-        """Initialize an AWS lambda function using Python 3.8 runtime.
-
-        See PyFunction for params description.
-        """
-        super().__init__(
-            name=name,
-            description=description,
-            role=role,
-            code_dir=code_dir,
-            handler=handler,
-            version=version,
-            min_version=min_version,
-            alias=alias,
-            requirement_file=requirement_file,
-            code_version=code_version,
-            timeout=timeout,
-            runtime="python3.8",
-            memory_size=memory_size,
-            ephemeral_storage_size=ephemeral_storage_size,
-            logs_retention_in_days=logs_retention_in_days,
-            reserved_concurrent_executions=reserved_concurrent_executions,
-            logging_config=logging_config,
-            dl_config=dl_config,
-        )
-
-
 class Alias(Construct):
     """A lambda alias."""
 

tests/tests_e3_aws/troposphere/awslambda/awslambda_test.py

@@ -29,7 +29,6 @@
     BlueGreenAliases,
     BlueGreenVersions,
     Function,
-    Py38Function,
     PyFunction,
     Version,
 )
@@ -71,28 +70,6 @@
     },
 }
 
-EXPECTED_PY38FUNCTION_TEMPLATE = EXPECTED_STACK_TEMPLATE | {
-    "Resources": {
-        "Mypylambda": {
-            "Properties": {
-                "Code": {
-                    "S3Bucket": "cfn_bucket",
-                    "S3Key": {
-                        "Fn::Sub": "assets/${MypylambdaSourcesS3Key}",
-                    },
-                },
-                "Description": "this is a test",
-                "FunctionName": "mypylambda",
-                "Handler": "app.main",
-                "Role": "somearn",
-                "Runtime": "python3.8",
-                "Timeout": 3,
-            },
-            "Type": "AWS::Lambda::Function",
-        }
-    }
-}
-
 EXPECTED_PYFUNCTION_DEFAULT_TEMPLATE = EXPECTED_STACK_TEMPLATE | {
     "Resources": {
         "Mypylambda": {
@@ -565,20 +542,6 @@ def simple_lambda_function() -> PyFunction:
     )
 
 
-def test_py38function(stack: Stack) -> None:
-    """Test Py38Function creation."""
-    stack.add(
-        Py38Function(
-            name="mypylambda",
-            description="this is a test",
-            role="somearn",
-            code_dir="my_code_dir",
-            handler="app.main",
-        )
-    )
-    assert stack.export() == EXPECTED_PY38FUNCTION_TEMPLATE
-
-
 def test_pyfunction_default(stack: Stack) -> None:
     """Test PyFunction creation with default settings."""
     stack.add(

tests/tests_e3_aws/troposphere/s3/bucket.json

@@ -25,11 +25,20 @@
             "Description": "this is a test",
             "Role": "somearn",
             "FunctionName": "mypylambda",
-            "Runtime": "python3.8",
+            "Runtime": "python3.9",
             "Handler": "app.main"
         },
         "Type": "AWS::Lambda::Function"
     },
+    "MypylambdaLogGroup": {
+        "DeletionPolicy": "Retain",
+        "Properties": {
+            "LogGroupName": "/aws/lambda/mypylambda",
+            "RetentionInDays": 731
+        },
+        "Type": "AWS::Logs::LogGroup",
+        "UpdateReplacePolicy": "Retain"
+    },
     "TestBucket": {
         "DeletionPolicy": "Retain",
         "Properties": {
@@ -196,4 +205,4 @@
         },
         "Type": "AWS::SQS::QueuePolicy"
     }
-}
+}

tests/tests_e3_aws/troposphere/s3/s3_test.py

@@ -6,7 +6,7 @@
 import pytest
 
 from e3.aws.troposphere import Stack
-from e3.aws.troposphere.awslambda import Py38Function
+from e3.aws.troposphere.awslambda import PyFunction
 from e3.aws.troposphere.iam.policy_document import PolicyDocument
 from e3.aws.troposphere.iam.policy_statement import Trust
 from e3.aws.troposphere.s3 import BucketWithRoles
@@ -24,10 +24,11 @@ def test_bucket(stack: Stack) -> None:
 
     topic_test = Topic(name="test-topic")
     queue_test = Queue(name="test-queue")
-    lambda_test = Py38Function(
+    lambda_test = PyFunction(
         name="mypylambda",
         description="this is a test",
         role="somearn",
+        runtime="python3.9",
         code_dir="my_code_dir",
         handler="app.main",
     )