Merge pull request #78 from oslokommune/dockerize

Dockerify Lambda runtimes

Dockerfile

@@ -0,0 +1,8 @@
+FROM public.ecr.aws/lambda/python:3.11
+
+COPY event ${LAMBDA_TASK_ROOT}/event
+COPY status ${LAMBDA_TASK_ROOT}/status
+COPY requirements.txt ${LAMBDA_TASK_ROOT}
+RUN pip install --no-cache-dir -r requirements.txt
+
+CMD ["set-me-in-serverless.yaml"]

package.json

@@ -1,13 +1,12 @@
 {
-    "name": "status-api-serverless-testing",
+    "name": "okdata-status-api",
     "description": "",
     "version": "0.1.0",
     "devDependencies": {
         "serverless": "^3.38.0",
         "serverless-better-credentials": "^2.0.0",
         "serverless-plugin-git-variables": "^5.2.0",
         "serverless-prune-plugin": "^2.0.2",
-        "serverless-python-requirements": "^6.0.1",
         "serverless-scriptable-plugin": "^1.3.1"
     }
 }

requirements.txt

@@ -72,7 +72,7 @@ rsa==4.8
     # via python-jose
 s3transfer==0.6.0
     # via boto3
-simplejson==3.17.6
+simplejson==3.17.2
     # via status-api (setup.py)
 six==1.16.0
     # via

serverless.yml

@@ -4,7 +4,11 @@ service: status-api
 
 provider:
   name: aws
-  runtime: python3.11
+  ecr:
+    images:
+      okdata-status-api:
+        path: ./
+        platform: linux/amd64
   region: ${opt:region, 'eu-west-1'}
   endpointType: REGIONAL
   stage: ${opt:stage, 'dev'}
@@ -40,20 +44,13 @@ plugins:
   - serverless-better-credentials # must be first
   - serverless-plugin-git-variables
   - serverless-prune-plugin
-  - serverless-python-requirements
   - serverless-scriptable-plugin
 
 resources:
   Description: |
     ${self:service} ${git:branch}:${git:sha1}
     ${git:message}
 
-package:
-  patterns:
-    - '!**/*'
-    - event/*.py
-    - status/*.py
-
 functions:
   get_status: ${file(serverless/functions/get_status.yaml)}
   get_status_from_s3_path: ${file(serverless/functions/get_status_from_s3_path.yaml)}
@@ -62,9 +59,6 @@ functions:
   act_on_queue: ${file(serverless/functions/act_on_queue.yaml)}
 
 custom:
-  pythonRequirements:
-    dockerizePip: non-linux
-    usePoetry: false
   prune:
     automatic: true
     number: 3

serverless/functions/act_on_queue.yaml

@@ -1,4 +1,7 @@
-handler: event.handler.act_on_queue
+image:
+  name: okdata-status-api
+  command:
+    - event.handler.act_on_queue
 timeout: 60
 events:
   - sns: arn:aws:sns:${self:provider.region}:${aws:accountId}:dataplatform_state_machine_event

serverless/functions/create_status.yaml

@@ -1,4 +1,7 @@
-handler: status.create_status.handler
+image:
+  name: okdata-status-api
+  command:
+    - status.create_status.handler
 events:
 - http:
     path: status

serverless/functions/get_status.yaml

@@ -1,4 +1,7 @@
-handler: status.get_status.handler
+image:
+  name: okdata-status-api
+  command:
+    - status.get_status.handler
 events:
 - http:
     path: status/{trace_id}

serverless/functions/get_status_from_s3_path.yaml

@@ -1,4 +1,7 @@
-handler: status.get_status_from_s3_path.handler
+image:
+  name: okdata-status-api
+  command:
+    - status.get_status_from_s3_path.handler
 events:
 - http:
     path: status-from-path/{s3_path}

serverless/functions/update_status.yaml

@@ -1,4 +1,7 @@
-handler: status.update_status.handler
+image:
+  name: okdata-status-api
+  command:
+    - status.update_status.handler
 events:
 - http:
     path: status/{trace_id}

setup.py

@@ -21,6 +21,10 @@
         "okdata-resource-auth",
         "okdata-sdk>=2.4,<4",
         "requests",
-        "simplejson",
+        # Require this version specifically to not clash with the version
+        # required by AWS' Python image for Lambda. ("awslambdaric 2.0.10
+        # requires simplejson==3.17.2, but you have simplejson [...] which is
+        # incompatible.")
+        "simplejson==3.17.2",
     ],
 )