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

Fix remaining ruff PLR0912 violations

See merge request it/e3-aws!146

Author: pierretr

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

@@ -492,37 +492,27 @@ def lambda_resources(
             }
         )
 
-        if self.runtime is not None:
-            params["Runtime"] = self.runtime
-
-        if self.handler is not None:
-            params["Handler"] = self.handler
+        optional_params = {
+            "Runtime": self.runtime,
+            "Handler": self.handler,
+            "MemorySize": self.memory_size,
+            "ReservedConcurrentExecutions": self.reserved_concurrent_executions,
+            "LoggingConfig": self.logging_config,
+            "DeadLetterConfig": self.dl_config,
+            "VpcConfig": self.vpc_config,
+        }
+        params.update({k: v for k, v in optional_params.items() if v is not None})
 
         if self.architecture is not None:
             params["Architectures"] = [self.architecture.value]
 
-        if self.memory_size is not None:
-            params["MemorySize"] = self.memory_size
-
         if self.ephemeral_storage_size is not None:
             params["EphemeralStorage"] = awslambda.EphemeralStorage(
                 Size=self.ephemeral_storage_size
             )
         if self.environment is not None:
             params["Environment"] = awslambda.Environment(Variables=self.environment)
 
-        if self.reserved_concurrent_executions is not None:
-            params["ReservedConcurrentExecutions"] = self.reserved_concurrent_executions
-
-        if self.logging_config is not None:
-            params["LoggingConfig"] = self.logging_config
-
-        if self.dl_config is not None:
-            params["DeadLetterConfig"] = self.dl_config
-
-        if self.vpc_config is not None:
-            params["VpcConfig"] = self.vpc_config
-
         result = [awslambda.Function(name_to_id(self.name), **params)]
         # If retention duration is given provide a log group.
         # If not provided the lambda creates a log group with

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

@@ -132,7 +132,6 @@ def create_flask_wsgi_environ(self, event: dict, context: dict) -> dict:
         """
         del context
         request_ctx = event["requestContext"]
-        remote_user: str | None = None
 
         # http is True if the event comes from HTTP API gateway
         # otherwise it is false and the event is either from a REST API
@@ -141,10 +140,12 @@ def create_flask_wsgi_environ(self, event: dict, context: dict) -> dict:
         # elb is True if the event comes from ELB
         elb = "elb" in request_ctx
 
-        if "authorizer" in request_ctx:
-            remote_user = request_ctx["authorizer"].get("principalId")
-        elif "identity" in request_ctx:
-            remote_user = request_ctx["identity"].get("userArn")
+        # Falls back from authorizer to identity: if authorizer exists but has
+        # no principalId, we still pick up identity.userArn rather than leaving
+        # remote_user as None.
+        remote_user: str | None = request_ctx.get("authorizer", {}).get(
+            "principalId"
+        ) or request_ctx.get("identity", {}).get("userArn")
 
         # Normalized headers
         headers = {k.title(): v for k, v in event["headers"].items()}