diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d8788df..2bd88c2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -72,14 +72,15 @@ jobs: deploy-backend: runs-on: ubuntu-latest env: + # .aws/.env vars AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - + # .env vars CORS_DOMAIN: ${{ vars.CORS_DOMAIN }} - + # make.docker vars AWS_ARN: ${{ vars.AWS_ACCOUNT_ID }} - # AWS_ACCOUNT_ID: ${{ vars.AWS_ACCOUNT_ID }} - # AWS_REGION: ${{ vars.AWS_REGION }} + AWS_ACCOUNT_ID: ${{ vars.AWS_ACCOUNT_ID }} + AWS_REGION: ${{ vars.AWS_REGION }} LAMBDA_FUNCTION_NAME: ${{ vars.LAMBDA_FUNCTION_NAME }} ECR_DOCKER_REPO_NAME: ${{ vars.ECR_DOCKER_REPO_NAME }} ECR_DOCKER_IMAGE_NAME: ${{ vars.ECR_DOCKER_IMAGE_NAME }} @@ -91,25 +92,25 @@ jobs: with: python-version: '3.9' - - name: Create `.env` file - run: | - # set the Airtable environment variables manually - printf "CORS_DOMAIN=$CORS_DOMAIN" > .env - working-directory: ./lambdas/todos - - name: Create `.aws` credentials file run: | printf "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID\n" > .env printf "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY\n" >> .env working-directory: ./lambdas/todos/.aws + - name: Create `.env` file + run: | + # set the Airtable environment variables manually + printf "CORS_DOMAIN=$CORS_DOMAIN" > .env + working-directory: ./lambdas/todos + - name: Create `.make.docker` config file run: | printf "ECR_DOCKER_REPO_NAME=$ECR_DOCKER_REPO_NAME" > .make.docker printf "ECR_DOCKER_IMAGE_NAME=$ECR_DOCKER_IMAGE_NAME" >> .make.docker printf "LAMBDA_FUNCTION_NAME=$LAMBDA_FUNCTION_NAME" >> .make.docker - printf "AWS_REGION=${{ vars.AWS_REGION }}" >> .make.docker - printf "AWS_ACCOUNT_ID=${{ vars.AWS_ACCOUNT_ID }}" >> .make.docker + printf "AWS_REGION=$AWS_REGION" >> .make.docker + printf "AWS_ACCOUNT_ID=$AWS_ACCOUNT_ID" >> .make.docker printf "AWS_ARN=$AWS_ACCOUNT_ID" >> .make.docker working-directory: ./lambdas/todos @@ -118,9 +119,7 @@ jobs: make auth working-directory: ./lambdas/todos - # - run: | - # docker build -t "$(image_name)" . - # working-directory: ./lambdas/todos - # - run: | - # docker push "$(ecr)"/"$(docker_repo)" - # working-directory: ./lambdas/todos + - name: Push changes and update function + run: | + make update + working-directory: ./lambdas/todos