Add python3.8 runtime

Author: mhart

README.md

@@ -78,7 +78,7 @@ docker run --rm -v "$PWD":/var/task lambci/lambda:python2.7
 # Test on Python 3.6 with a custom file named my_module.py containing a my_handler function
 docker run --rm -v "$PWD":/var/task lambci/lambda:python3.6 my_module.my_handler
 
-# Python 3.7 requires the handler be given explicitly
+# Python 3.7/3.8 require the handler be given explicitly
 docker run --rm -v "$PWD":/var/task lambci/lambda:python3.7 lambda_function.lambda_handler
 
 # Similarly with Ruby 2.5
@@ -204,6 +204,7 @@ These follow the Lambda runtime names:
   - `python2.7`
   - `python3.6`
   - `python3.7`
+  - `python3.8`
   - `ruby2.5`
   - `java8`
   - `go1.x`
@@ -218,6 +219,7 @@ These follow the Lambda runtime names:
   - `build-python2.7`
   - `build-python3.6`
   - `build-python3.7`
+  - `build-python3.8`
   - `build-ruby2.5`
   - `build-java8`
   - `build-go1.x`

base/build-all.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 nodejs10.x nodejs12.x python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1"
+RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 nodejs10.x nodejs12.x python2.7 python3.6 python3.7 python3.8 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1"
 
 TOP_DIR="${PWD}/.."
 

base/diff-2.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RUNTIMES="nodejs10.x nodejs12.x"
+RUNTIMES="nodejs10.x nodejs12.x python3.8"
 
 rm -rf diff-2
 mkdir -p diff-2
@@ -45,3 +45,9 @@ pwd
 diff docker/var/runtime lambda/var/runtime
 diff -qr docker lambda
 echo
+
+cd ${DIFF_DIR}/python3.8
+pwd
+diff docker/var/runtime lambda/var/runtime
+diff -qr docker lambda
+echo

base/dump-python38.py

@@ -0,0 +1,43 @@
+from __future__ import print_function
+
+import os
+import sys
+import subprocess
+import json
+import boto3
+from boto3.s3.transfer import S3Transfer
+
+TRANSFER = S3Transfer(boto3.client('s3'))
+
+
+def lambda_handler(event, context):
+    if 'cmd' in event:
+        return print(subprocess.check_output(['sh', '-c', event['cmd']]).decode('utf-8'))
+
+    filename = 'python3.8.tgz'
+
+    subprocess.call(['sh', '-c', f'tar -cpzf /tmp/{filename} --numeric-owner --ignore-failed-read ' +
+                     '/var/runtime /var/lang /var/rapid'])
+
+    print('Zipping done! Uploading...')
+
+    TRANSFER.upload_file(f'/tmp/{filename}', 'lambci',
+                         f'fs/{filename}', extra_args={'ACL': 'public-read'})
+
+    print('Uploading done!')
+
+    info = {'sys.executable': sys.executable,
+            'sys.argv': sys.argv,
+            'sys.path': sys.path,
+            'os.getcwd': os.getcwd(),
+            '__file__': __file__,
+            'os.environ': {k: str(v) for k, v in os.environ.items()},
+            'context': {k: str(v) for k, v in context.__dict__.items()},
+            'proc environ': subprocess.check_output(
+                ['sh', '-c', 'echo /proc/1/environ; xargs -n 1 -0 < /proc/1/environ']).decode('utf-8').splitlines(),
+            'ps aux': subprocess.check_output(
+                ['bash', '-O', 'extglob', '-c', 'for cmd in /proc/+([0-9])/cmdline; do echo $cmd; xargs -n 1 -0 < $cmd; done']).decode('utf-8').splitlines()}
+
+    print(json.dumps(info, indent=2))
+
+    return info

base/publish-all.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 nodejs10.x nodejs12.x python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1"
+RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 nodejs10.x nodejs12.x python2.7 python3.6 python3.7 python3.8 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1"
 
 echo -n "Enter repository passphrase: "
 read -s DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE

base/tag-all.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 nodejs10.x nodejs12.x python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1"
+RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 nodejs10.x nodejs12.x python2.7 python3.6 python3.7 python3.8 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1"
 
 git tag -f latest
 

base/test-all.sh

@@ -20,10 +20,12 @@ cd ${EXAMPLES_DIR}/python
 docker run --rm -v "$PWD":/var/task lambci/lambda:python2.7
 docker run --rm -v "$PWD":/var/task lambci/lambda:python3.6
 docker run --rm -v "$PWD":/var/task lambci/lambda:python3.7 lambda_function.lambda_handler
+docker run --rm -v "$PWD":/var/task lambci/lambda:python3.8 lambda_function.lambda_handler
 
 docker run --rm -it lambci/lambda:build-python2.7 pip install marisa-trie
 docker run --rm -it lambci/lambda:build-python3.6 pip install marisa-trie
 docker run --rm -it lambci/lambda:build-python3.7 pip install marisa-trie
+docker run --rm -it lambci/lambda:build-python3.8 pip install marisa-trie
 
 cd ${EXAMPLES_DIR}/ruby
 docker run --rm -v "$PWD":/var/task lambci/lambda:ruby2.5 lambda_function.lambda_handler

examples/python/lambda_function.py

@@ -29,6 +29,5 @@ def lambda_handler(event, context):
         "__file__": str(__file__),
         "os.environ": str(os.environ),
         "context.__dict__": str(context.__dict__),
-        "ps aux": str(subprocess.check_output(['ps', 'aux'])),
         "event": event
     }

nodejs12.x/run/Dockerfile

@@ -18,4 +18,4 @@ COPY --from=1 /var/runtime/init /var/rapid/init
 
 USER sbx_user1051
 
-ENTRYPOINT ["/var/rapid/init", "--bootstrap", "/var/runtime/bootstrap"]
+ENTRYPOINT ["/var/rapid/init", "--bootstrap", "/var/runtime/bootstrap", "--enable-msg-logs"]

python3.8/build/Dockerfile

@@ -0,0 +1,15 @@
+FROM lambci/lambda-base-2:build
+
+ENV PATH=/var/lang/bin:$PATH \
+    LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \
+    AWS_EXECUTION_ENV=AWS_Lambda_python3.8 \
+    PYTHONPATH=/var/runtime \
+    PKG_CONFIG_PATH=/var/lang/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
+
+RUN rm -rf /var/runtime /var/lang /var/rapid && \
+  curl https://lambci.s3.amazonaws.com/fs/python3.8.tgz | tar -zx -C /
+
+# Add these as a separate layer as they get updated frequently
+RUN pip install -U pip setuptools --no-cache-dir && \
+  pip install -U virtualenv pipenv --no-cache-dir && \
+  pip install -U awscli boto3 aws-sam-cli==0.31.0 aws-lambda-builders==0.5.0 --no-cache-dir

python3.8/run/Dockerfile

@@ -0,0 +1,22 @@
+FROM lambci/lambda-base
+
+RUN curl https://lambci.s3.amazonaws.com/fs/python3.8.tgz | tar -zx -C /opt
+
+
+FROM lambci/lambda:provided
+
+
+FROM lambci/lambda-base-2
+
+ENV PATH=/var/lang/bin:$PATH \
+    LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \
+    AWS_EXECUTION_ENV=AWS_Lambda_python3.8
+
+COPY --from=0 /opt/* /var/
+
+COPY --from=1 /var/runtime/init /var/rapid/init
+
+USER sbx_user1051
+
+ENTRYPOINT ["/var/rapid/init", "--bootstrap", "/var/runtime/bootstrap", "--enable-msg-logs"]
+