Multiple Fixes and Improvements

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6
+FROM dhermes/python-multi
 
 RUN apt-get update
 RUN apt-get install -y jq zip

README.md

@@ -2,21 +2,21 @@
 
 [![GitHubActions](https://img.shields.io/badge/listed%20on-GitHubActions-blue.svg)](https://github-actions.netlify.com/py-lambda)
 
-A Github Action to deploy AWS Lambda functions written in Python with their dependencies in a separate layer. For now, only works with Python 3.6. PRs welcome.
+A GitHub Action to deploy AWS Lambda functions written in Python with their dependencies in a separate layer. Works with Python versions 3.8, 3.9, 3.10, 3.11, 3.12. PRs welcome.
 
 ## Use
 Deploys everything in the repo as code to the Lambda function, and installs/zips/deploys the dependencies as a separate layer the function can then immediately use.
 
 ### Pre-requisites
-In order for the Action to have access to the code, you must use the `actions/checkout@master` job before it. See the example below.
+In order for the Action to have access to the code, you must use the `actions/checkout@main` job before it. See the example below.
 
 ### Structure
 - Lambda code should be structured normally/as Lambda would expect it.
 - **Dependencies must be stored in a `requirements.txt`** or a similar file (provide the filename explicitly if that's the case).
 
 ### Environment variables
 Stored as secrets or env vars, doesn't matter. But also please don't put your AWS keys outside Secrets.
-- **AWS Credentials**  
+- **AWS Credentials**
     That includes the `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, etc. It's used by `awscli`, so the docs for that [can be found here](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html).
 
 ### Inputs
@@ -29,6 +29,8 @@ Stored as secrets or env vars, doesn't matter. But also please don't put your AW
     - Partial ARN - `123456789012:function:my-function`
 - `requirements_txt`
     The name/path for the `requirements.txt` file. Defaults to `requirements.txt`.
+- `python_version`
+    The version of Python to build with. (3.8, 3.9, 3.10, 3.11, 3.12)
 
 
 ### Example workflow
@@ -43,12 +45,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@main
     - name: Deploy code to Lambda
-      uses: mariamrf/py-lambda-action@v1.0.0
+      uses: mariamrf/py-lambda-action@master
       with:
         lambda_layer_arn: 'arn:aws:lambda:us-east-2:123456789012:layer:my-layer'
         lambda_function_name: 'my-function'
+        python_version: '3.12'
       env:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

action.yml

@@ -1,9 +1,9 @@
 name: Py Lambda Deploy
 author: Mariam Maarouf
-description: Deploy python code to AWS Lambda with dependencies in a separate layer.
+description: Deploy Python code to AWS Lambda with dependencies in a separate layer.
 inputs:
   requirements_txt:
-    description: the name/path to the requirements.txt file
+    description: The name/path to the requirements.txt file.
     required: true
     default: 'requirements.txt'
   lambda_layer_arn:
@@ -12,13 +12,18 @@ inputs:
   lambda_function_name:
     description: The Lambda function name. Check the AWS docs/readme for examples.
     required: true
+  python_version:
+    description: The version of Python to build with.
+    required: true
+    default: '3.12'
 runs:
   using: 'docker'
   image: 'Dockerfile'
   args:
     - ${{ inputs.requirements_txt }}
     - ${{ inputs.lambda_layer_arn }}
     - ${{ inputs.lambda_function_name }}
+    - ${{ inputs.python_version }}
 branding:
   icon: 'layers'
   color: 'yellow'

entrypoint.sh

@@ -4,13 +4,14 @@ set -e
 install_zip_dependencies(){
 	echo "Installing and zipping dependencies..."
 	mkdir python
-	pip install --target=python -r "${INPUT_REQUIREMENTS_TXT}"
+	pip${INPUT_PYTHON_VERSION} install --target=python -r "${INPUT_REQUIREMENTS_TXT}"
 	zip -r dependencies.zip ./python
 }
 
 publish_dependencies_as_layer(){
 	echo "Publishing dependencies as a layer..."
-	local result=$(aws lambda publish-layer-version --layer-name "${INPUT_LAMBDA_LAYER_ARN}" --zip-file fileb://dependencies.zip)
+ 	local result
+	result=$(aws lambda publish-layer-version --layer-name "${INPUT_LAMBDA_LAYER_ARN}" --zip-file fileb://dependencies.zip --compatible-runtimes "python${INPUT_PYTHON_VERSION}" --compatible-architectures "x86_64")
 	LAYER_VERSION=$(jq '.Version' <<< "$result")
 	rm -rf python
 	rm dependencies.zip
@@ -24,6 +25,19 @@ publish_function_code(){
 
 update_function_layers(){
 	echo "Using the layer in the function..."
+ 	local function_state
+  	local function_status
+	function_state=$(aws lambda get-function --function-name "${INPUT_LAMBDA_FUNCTION_NAME}" --query 'Configuration.State')
+ 	function_status=$(aws lambda get-function --function-name "${INPUT_LAMBDA_FUNCTION_NAME}" --query 'Configuration.LastUpdateStatus')
+  	echo "Waiting... Current Function State is $function_state and Function Status is $function_status"
+	sleep 10
+	while [[ $function_state != "\"Active\"" && $function_status != "\"Successful\"" ]]
+ 	do
+		function_state=$(aws lambda get-function --function-name "${INPUT_LAMBDA_FUNCTION_NAME}" --query 'Configuration.State')
+  		function_status=$(aws lambda get-function --function-name "${INPUT_LAMBDA_FUNCTION_NAME}" --query 'Configuration.LastUpdateStatus')
+    		echo "Waiting... Current Function State is $function_state and Function Status is $function_status"
+		sleep 10
+	done
 	aws lambda update-function-configuration --function-name "${INPUT_LAMBDA_FUNCTION_NAME}" --layers "${INPUT_LAMBDA_LAYER_ARN}:${LAYER_VERSION}"
 }