lambda handlers explicit in definition.yml #139

src/cirrus/builtins/feeders/feed-rerun/definition.yml

@@ -2,6 +2,7 @@ description: Rerun items in the database
 lambda:
   memorySize: 128
   timeout: 900
+  handler: lambda_function.lambda_handler
   iamRoleStatements:
     - Effect: "Allow"
       Action:

src/cirrus/builtins/functions/api/definition.yml

@@ -2,6 +2,7 @@ description: Cirrus API
 lambda:
   memorySize: 128
   timeout: 10
+  handler: lambda_function.lambda_handler
   events:
     - http: GET /
     - http: GET /{proxy+}

src/cirrus/builtins/functions/process/definition.yml

@@ -5,6 +5,7 @@ environment:
 lambda:
   memorySize: 128
   timeout: 900
+  handler: lambda_function.lambda_handler
   events:
     - sqs:
         arn: !GetAtt ProcessQueue.Arn

src/cirrus/builtins/functions/update-state/definition.yml

@@ -2,6 +2,7 @@ description: update the cirrus database with the execution state
 lambda:
   memorySize: 128
   timeout: 15
+  handler: lambda_function.lambda_handler
   events:
     - eventBridge:
         pattern:

src/cirrus/builtins/tasks/post-batch/definition.yml

@@ -2,6 +2,7 @@ description: Post process batch job by copying input from S3
 lambda:
   memorySize: 128
   timeout: 15
+  handler: lambda_function.lambda_handler
   iamRoleStatements:
     - Effect: "Allow"
       Action:

src/cirrus/builtins/tasks/pre-batch/definition.yml

@@ -2,6 +2,7 @@ description: Pre process batch job by copying input to S3
 lambda:
   memorySize: 128
   timeout: 15
+  handler: lambda_function.lambda_handler
   iamRoleStatements:
     - Effect: "Allow"
       Action:

src/cirrus/builtins/tasks/publish/definition.yml

@@ -2,6 +2,7 @@ description: Publish resulting STAC Collections and Items to catalog, and option
 lambda:
   memorySize: 128
   timeout: 30
+  handler: lambda_function.lambda_handler
   iamRoleStatements:
     - Effect: "Allow"
       Action:

src/cirrus/core/components/base/_lambda.py

@@ -63,10 +63,11 @@ def load_config(self):
             + project_reqs
         }))
 
-        if not hasattr(self.lambda_config, 'module'):
+        # if this is a non-container lambda that needs to be packaged
+        # by serverless, then we need to ensure the module points to the
+        # place in the build dir where we'll copy all the code
+        if hasattr(self.lambda_config, 'handler'):
             self.lambda_config.module = f'lambdas/{self.name}'
-        if not hasattr(self.lambda_config, 'handler'):
-            self.lambda_config.handler = 'lambda_function.lambda_handler'
 
     @property
     def enabled(self):
@@ -92,11 +93,14 @@ def copy_for_config(self):
         return lc
 
     def get_outdir(self, project_build_dir: Path) -> Path:
-        return project_build_dir.joinpath(self.lambda_config.module)
+        return project_build_dir.joinpath(self.lambda_config.module) if self.lambda_enabled else None
 
     def copy_to_outdir(self, outdir: Path) -> None:
         import shutil
 
+        if not self.lambda_enabled:
+            return
+
         try:
             outdir.mkdir(parents=True)
         except FileExistsError:

src/cirrus/core/components/files/definitions.py

@@ -33,6 +33,7 @@
 lambda_lambda = '''lambda:
   memorySize: 128
   timeout: 60
+  handler: lambda_function.lambda_handler
   pythonRequirements:
     include: []
 '''.format

src/cirrus/core/project.py

@@ -158,6 +158,9 @@ def build(self) -> None:
         # setup all required lambda dirs
         fn_dirs = set()
         for fn in self.groups.lambdas:
+            if not fn.lambda_enabled:
+                continue
+
             outdir = fn.get_outdir(bd).resolve()
             if outdir in fn_dirs:
                 logger.debug(