Merge pull request #6 from seattleagainstslavery/feature/add_support_for_multiple_layers_and_functions

Feature/add support for multiple layers and functions

Author: Pete

Dockerfile

@@ -1,9 +1,9 @@
-FROM python:3.8
+FROM python:3.7
 
 RUN apt-get update
 RUN apt-get install -y jq zip
 RUN pip install awscli
 
 ADD entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

action.yml

@@ -2,6 +2,9 @@ name: AWS Lambda Zip Deploy - Python
 author: Qubitro
 description: Zip deploy to AWS Lambda with requirements in a separate layer.
 inputs:
+  aws_region:
+    description: the AWS region where your lambdas are located
+    required: true
   requirements_txt:
     description: the name/path to the requirements.txt file
     required: true
@@ -32,6 +35,7 @@ runs:
   using: 'docker'
   image: 'Dockerfile'
   args:
+    - ${{ inputs.aws_region }}
     - ${{ inputs.requirements_txt }}
     - ${{ inputs.lambda_function_names }}
     - ${{ inputs.pip_layer_arn }}

entrypoint.sh

@@ -4,70 +4,99 @@ configure_aws_credentials(){
   aws configure set aws_access_key_id "${INPUT_AWS_ACCESS_KEY_ID}"
   aws configure set aws_secret_access_key "${INPUT_AWS_SECRET_ACCESS_KEY}"
   aws configure set default.region "${INPUT_AWS_REGION}"
+  echo "REGION SET AS: ${INPUT_AWS_REGION}"
 }
 
-install_zip_dependencies(){
+publish_pip_layer(){
+  ALL_LAYERS_ARN_VERSION=()
   echo "Installing and zipping dependencies..."
   mkdir python
   pip 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_PIP_LAYER_ARN}" --zip-file fileb://dependencies.zip)
   PIP_LAYER_VERSION=$(jq '.Version' <<< "$result")
+  ALL_LAYERS_ARN_VERSION+="${INPUT_PIP_LAYER_ARN}:${PIP_LAYER_VERSION}"
   rm -rf python
   rm dependencies.zip
 }
 
 publish_custom_layers(){
-  echo "Publishing custom layer 1"
-  cd "${INPUT_CUSTOM_LAYER_1_PATH}"
-  zip -r custom_layer_1.zip .
-  local result=$(aws lambda publish-layer-version --layer-name "${INPUT_CUSTOM_LAYER_1_ARN}" --zip-file fileb://custom_layer_1.zip)
-  CUSTOM_LAYER_1_VERSION=$(jq '.Version' <<< "$result")
-  cd ..
+  if [ -z ${INPUT_CUSTOM_LAYER_1_PATH} ]; then
+    echo "custom_layer_1_path is not set"
+  else
+    echo "Publishing custom layer 1"
+    mkdir python
+    cp -r ${INPUT_CUSTOM_LAYER_1_PATH} python
+    zip -r custom_layer_1.zip ./python
+    local result=$(aws lambda publish-layer-version --layer-name "${INPUT_CUSTOM_LAYER_1_ARN}" --zip-file fileb://custom_layer_1.zip)
+    CUSTOM_LAYER_1_VERSION=$(jq '.Version' <<< "$result")
+    ALL_LAYERS_ARN_VERSION+=" ${INPUT_CUSTOM_LAYER_1_ARN}:${CUSTOM_LAYER_1_VERSION}"
+    rm -rf python
+    rm custom_layer_1.zip
+  fi
 
-  echo "Publishing custom layer 2"
-  cd "${INPUT_CUSTOM_LAYER_2_PATH}"
-  zip -r custom_layer_2.zip .
-  local result=$(aws lambda publish-layer-version --layer-name "${INPUT_CUSTOM_LAYER_2_ARN}" --zip-file fileb://custom_layer_2.zip)
-  CUSTOM_LAYER_2_VERSION=$(jq '.Version' <<< "$result")
-  cd ..
+  if [ -z ${INPUT_CUSTOM_LAYER_2_PATH} ]; then
+    echo "custom_layer_2_path is not set"
+  else
+    echo "Publishing custom layer 2"
+    mkdir python
+    cp -r ${INPUT_CUSTOM_LAYER_2_PATH} python
+    zip -r custom_layer_2.zip ./python
+    local result=$(aws lambda publish-layer-version --layer-name "${INPUT_CUSTOM_LAYER_2_ARN}" --zip-file fileb://custom_layer_2.zip)
+    CUSTOM_LAYER_2_VERSION=$(jq '.Version' <<< "$result")
+    ALL_LAYERS_ARN_VERSION+=" ${INPUT_CUSTOM_LAYER_2_ARN}:${CUSTOM_LAYER_2_VERSION}"
+    rm -rf python
+    rm custom_layer_2.zip
+  fi
 
-  echo "Publishing custom layer 3"
-  cd "${INPUT_CUSTOM_LAYER_3_PATH}"
-  zip -r custom_layer_3.zip .
-  local result=$(aws lambda publish-layer-version --layer-name "${INPUT_CUSTOM_LAYER_3_ARN}" --zip-file fileb://custom_layer_3.zip)
-  CUSTOM_LAYER_3_VERSION=$(jq '.Version' <<< "$result")
-  cd ..
+  if [ -z ${INPUT_CUSTOM_LAYER_3_PATH} ]; then
+    echo "custom_layer_3_path is not set"
+  else
+    echo "Publishing custom layer 3"
+    mkdir python
+    cp -r ${INPUT_CUSTOM_LAYER_3_PATH} python
+    zip -r custom_layer_3.zip ./python
+    local result=$(aws lambda publish-layer-version --layer-name "${INPUT_CUSTOM_LAYER_3_ARN}" --zip-file fileb://custom_layer_3.zip)
+    CUSTOM_LAYER_3_VERSION=$(jq '.Version' <<< "$result")
+    ALL_LAYERS_ARN_VERSION+=" ${INPUT_CUSTOM_LAYER_3_ARN}:${CUSTOM_LAYER_3_VERSION}"
+    rm -rf python
+    rm custom_layer_3.zip
+  fi
 
-  echo "Publishing custom layer 4"
-  cd "${INPUT_CUSTOM_LAYER_4_PATH}"
-  zip -r custom_layer_4.zip .
-  local result=$(aws lambda publish-layer-version --layer-name "${INPUT_CUSTOM_LAYER_4_ARN}" --zip-file fileb://custom_layer_4.zip)
-  CUSTOM_LAYER_4_VERSION=$(jq '.Version' <<< "$result")
-  cd ..
+  if [ -z ${INPUT_CUSTOM_LAYER_4_PATH} ]; then
+    echo "custom_layer_4_path is not set"
+  else
+    echo "Publishing custom layer 4"
+    mkdir python
+    cp -r ${INPUT_CUSTOM_LAYER_4_PATH} python
+    zip -r custom_layer_4.zip ./python
+    local result=$(aws lambda publish-layer-version --layer-name "${INPUT_CUSTOM_LAYER_4_ARN}" --zip-file fileb://custom_layer_4.zip)
+    CUSTOM_LAYER_4_VERSION=$(jq '.Version' <<< "$result")
+    ALL_LAYERS_ARN_VERSION+=" ${INPUT_CUSTOM_LAYER_4_ARN}:${CUSTOM_LAYER_4_VERSION}"
+    rm -rf python
+    rm custom_layer_4.zip
+  fi
 }
 
 publish_function(){
   echo "Deploying the code for ${1}"
   cd "${1}"
-  zip -r "${1}".zip .
-  aws lambda update-function-code --function-name "${1}" --zip-file fileb://"${1}".zip
+  zip -r code.zip .
+  aws lambda update-function-code --function-name "${1}" --zip-file fileb://code.zip
+  rm code.zip
   cd ..
 }
 
 update_function_layers(){
   echo "Adding pip layer and custom layers to ${1}"
-  aws lambda update-function-configuration --function-name "${1}" --layers "${INPUT_PIP_LAYER_ARN}:${PIP_LAYER_VERSION}" "${INPUT_CUSTOM_LAYER_1_ARN}:${CUSTOM_LAYER_1_VERSION}" "${INPUT_CUSTOM_LAYER_2_ARN}:${CUSTOM_LAYER_2_VERSION}" "${INPUT_CUSTOM_LAYER_3_ARN}:${CUSTOM_LAYER_3_VERSION}" "${INPUT_CUSTOM_LAYER_4_ARN}:${CUSTOM_LAYER_4_VERSION}"
+  echo ${ALL_LAYERS_ARN_VERSION[@]}
+  aws lambda update-function-configuration --function-name "${1}" --layers ${ALL_LAYERS_ARN_VERSION[@]}
 }
 
 deploy_lambda_function(){
   configure_aws_credentials
-  install_zip_dependencies
-  publish_dependencies_as_layer
+  publish_pip_layer
   publish_custom_layers
 
   functionNames=(${INPUT_LAMBDA_FUNCTION_NAMES//,/ })