diff --git a/.github/workflows/actions/deploy-lambda/action.yml b/.github/workflows/actions/deploy-lambda/action.yml index 7f4b3adc..529817a4 100644 --- a/.github/workflows/actions/deploy-lambda/action.yml +++ b/.github/workflows/actions/deploy-lambda/action.yml @@ -14,9 +14,6 @@ inputs: app_name: description: The application name. required: true - resource: - description: The resource path of the lambda function. - required: true lambda_name: description: The lambda function name name. required: true @@ -71,7 +68,7 @@ runs: id: ecr-check shell: bash run: | - IMAGE_TAG=${{ inputs.resource }}${{ inputs.lambda_name }}-${{ inputs.short_sha }} + IMAGE_TAG=${{ inputs.lambda_name }}-${{ inputs.short_sha }} REPOSITORY_NAME=${{ inputs.app_name }}-lambda-repo-${{ inputs.environment }} IMAGE_EXISTS=$(aws ecr describe-images --repository-name $REPOSITORY_NAME --query "imageDetails[?contains(imageTags, '$IMAGE_TAG')]" --output text) diff --git a/.github/workflows/publish-lambdas.yml b/.github/workflows/publish-lambdas.yml index bf2203dc..8b58ad2b 100644 --- a/.github/workflows/publish-lambdas.yml +++ b/.github/workflows/publish-lambdas.yml @@ -48,7 +48,7 @@ jobs: LAMBDA_DIR_LIST=$(echo "${LAMBDA_DIRS}" | jq -R 'split(";")' -c) echo "LAMBDA_DIR_LIST=$LAMBDA_DIR_LIST" >> $GITHUB_OUTPUT - deploy-to-gchr: + deploy2gchr: needs: get-lambdas environment: ${{ inputs.environment }} permissions: @@ -121,7 +121,7 @@ jobs: deploy2dev: name: Deploy to DEV - needs: [get-lambdas, deploy-to-gchr] + needs: [get-lambdas, deploy2gchr] env: ENVIRONMENT: dev permissions: @@ -157,7 +157,6 @@ jobs: aws_role_arn: ${{ vars.AWS_ROLE_ARN }} ghcr_token: ${{ secrets.GITHUB_TOKEN }} github_image_repo: ${{ env.GITHUB_IMAGE_REPO }} - resource: ${{ env.RESOURCE }} lambda_name: ${{ env.LAMBDA }} image_name: ${{ env.RESOURCE }}.${{ env.LAMBDA }} - short_sha: ${{ needs.deploy-to-gchr.outputs.short_sha }} + short_sha: ${{ needs.deploy2gchr.outputs.short_sha }}