From 0340136f11578eaa5f55215b7df0bfd6515c12b7 Mon Sep 17 00:00:00 2001 From: "@zimeg" Date: Mon, 16 Dec 2024 19:16:28 -0800 Subject: [PATCH 1/4] fix: deploy with unreleased patched changes of python-lambda https://github.com/nficano/python-lambda/issues/711 --- examples/aws_lambda/aws_lambda.py | 2 +- examples/aws_lambda/aws_lambda_oauth.py | 2 +- examples/aws_lambda/deploy.sh | 2 +- examples/aws_lambda/deploy_lazy.sh | 2 +- examples/aws_lambda/deploy_oauth.sh | 2 +- examples/aws_lambda/lazy_aws_lambda.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/aws_lambda/aws_lambda.py b/examples/aws_lambda/aws_lambda.py index 8ca79a82c..171de6e2e 100644 --- a/examples/aws_lambda/aws_lambda.py +++ b/examples/aws_lambda/aws_lambda.py @@ -31,5 +31,5 @@ def handler(event, context): # export SLACK_BOT_TOKEN=xoxb-*** # rm -rf vendor && cp -pr ../../src/* vendor/ -# pip install python-lambda +# pip install git+https://github.com/nficano/python-lambda # lambda deploy --config-file aws_lambda_config.yaml --requirements requirements.txt diff --git a/examples/aws_lambda/aws_lambda_oauth.py b/examples/aws_lambda/aws_lambda_oauth.py index 06b2572a6..f8fd175d5 100644 --- a/examples/aws_lambda/aws_lambda_oauth.py +++ b/examples/aws_lambda/aws_lambda_oauth.py @@ -46,5 +46,5 @@ def handler(event, context): # - AWSLambdaRole # rm -rf latest_slack_bolt && cp -pr ../../src latest_slack_bolt -# pip install python-lambda +# pip install git+https://github.com/nficano/python-lambda # lambda deploy --config-file aws_lambda_oauth_config.yaml --requirements requirements_oauth.txt diff --git a/examples/aws_lambda/deploy.sh b/examples/aws_lambda/deploy.sh index 0a8f13197..ae916063f 100755 --- a/examples/aws_lambda/deploy.sh +++ b/examples/aws_lambda/deploy.sh @@ -1,6 +1,6 @@ #!/bin/bash rm -rf vendor && mkdir -p vendor/slack_bolt && cp -pr ../../slack_bolt/* vendor/slack_bolt/ -pip install python-lambda -U +pip install git+https://github.com/nficano/python-lambda lambda deploy \ --config-file aws_lambda_config.yaml \ --requirements requirements.txt \ No newline at end of file diff --git a/examples/aws_lambda/deploy_lazy.sh b/examples/aws_lambda/deploy_lazy.sh index 61a1e3ab4..a76c8165f 100755 --- a/examples/aws_lambda/deploy_lazy.sh +++ b/examples/aws_lambda/deploy_lazy.sh @@ -1,6 +1,6 @@ #!/bin/bash rm -rf slack_bolt && mkdir slack_bolt && cp -pr ../../slack_bolt/* slack_bolt/ -pip install python-lambda -U +pip install git+https://github.com/nficano/python-lambda lambda deploy \ --config-file lazy_aws_lambda_config.yaml \ --requirements requirements.txt diff --git a/examples/aws_lambda/deploy_oauth.sh b/examples/aws_lambda/deploy_oauth.sh index d8f05c501..266aae0f8 100755 --- a/examples/aws_lambda/deploy_oauth.sh +++ b/examples/aws_lambda/deploy_oauth.sh @@ -1,6 +1,6 @@ #!/bin/bash rm -rf slack_bolt && mkdir slack_bolt && cp -pr ../../slack_bolt/* slack_bolt/ -pip install python-lambda -U +pip install git+https://github.com/nficano/python-lambda lambda deploy \ --config-file aws_lambda_oauth_config.yaml \ --requirements requirements_oauth.txt diff --git a/examples/aws_lambda/lazy_aws_lambda.py b/examples/aws_lambda/lazy_aws_lambda.py index dcc47498f..788ea5ca0 100644 --- a/examples/aws_lambda/lazy_aws_lambda.py +++ b/examples/aws_lambda/lazy_aws_lambda.py @@ -46,5 +46,5 @@ def handler(event, context): # export SLACK_BOT_TOKEN=xoxb-*** # rm -rf vendor && cp -pr ../../src/* vendor/ -# pip install python-lambda +# pip install git+https://github.com/nficano/python-lambda # lambda deploy --config-file aws_lambda_config.yaml --requirements requirements.txt From b532892a666419e6a2fd48553c85102ee9fc0e52 Mon Sep 17 00:00:00 2001 From: "@zimeg" Date: Mon, 16 Dec 2024 19:18:16 -0800 Subject: [PATCH 2/4] fix: use the aws iam role created for specific configs --- examples/aws_lambda/aws_lambda_config.yaml | 2 +- examples/aws_lambda/aws_lambda_oauth_config.yaml | 1 - examples/aws_lambda/lazy_aws_lambda_config.yaml | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/examples/aws_lambda/aws_lambda_config.yaml b/examples/aws_lambda/aws_lambda_config.yaml index 5f158892e..cd07fce52 100644 --- a/examples/aws_lambda/aws_lambda_config.yaml +++ b/examples/aws_lambda/aws_lambda_config.yaml @@ -4,7 +4,7 @@ function_name: bolt_py_function handler: aws_lambda.handler description: My first lambda function runtime: python3.8 -# role: lambda_basic_execution +role: bolt_python_lambda_invocation # S3 upload requires appropriate role with s3:PutObject permission # (ex. basic_s3_upload), a destination bucket, and the key prefix diff --git a/examples/aws_lambda/aws_lambda_oauth_config.yaml b/examples/aws_lambda/aws_lambda_oauth_config.yaml index b491a54e2..41c971f60 100644 --- a/examples/aws_lambda/aws_lambda_oauth_config.yaml +++ b/examples/aws_lambda/aws_lambda_oauth_config.yaml @@ -4,7 +4,6 @@ function_name: bolt_py_oauth_function handler: aws_lambda_oauth.handler description: My first lambda function runtime: python3.8 -# role: lambda_basic_execution role: bolt_python_s3_storage # S3 upload requires appropriate role with s3:PutObject permission diff --git a/examples/aws_lambda/lazy_aws_lambda_config.yaml b/examples/aws_lambda/lazy_aws_lambda_config.yaml index f992f8684..df70e0901 100644 --- a/examples/aws_lambda/lazy_aws_lambda_config.yaml +++ b/examples/aws_lambda/lazy_aws_lambda_config.yaml @@ -4,9 +4,7 @@ function_name: bolt_py_function handler: lazy_aws_lambda.handler description: My first lambda function runtime: python3.8 -# role: lambda_basic_execution -# Have lambda:InvokeFunction & lambda:GetFunction in the allowed actions -role: bolt_python_lambda_invocation +role: bolt_python_lambda_invocation # S3 upload requires appropriate role with s3:PutObject permission # (ex. basic_s3_upload), a destination bucket, and the key prefix From 9948383cd80a04728ed1a4d1ada09b4c908820f4 Mon Sep 17 00:00:00 2001 From: "@zimeg" Date: Mon, 16 Dec 2024 19:24:53 -0800 Subject: [PATCH 3/4] fix: match apps with configuration scripts --- examples/aws_lambda/deploy.sh | 2 +- examples/aws_lambda/lazy_aws_lambda.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/aws_lambda/deploy.sh b/examples/aws_lambda/deploy.sh index ae916063f..54ca3abdc 100755 --- a/examples/aws_lambda/deploy.sh +++ b/examples/aws_lambda/deploy.sh @@ -3,4 +3,4 @@ rm -rf vendor && mkdir -p vendor/slack_bolt && cp -pr ../../slack_bolt/* vendor/ pip install git+https://github.com/nficano/python-lambda lambda deploy \ --config-file aws_lambda_config.yaml \ - --requirements requirements.txt \ No newline at end of file + --requirements requirements.txt diff --git a/examples/aws_lambda/lazy_aws_lambda.py b/examples/aws_lambda/lazy_aws_lambda.py index 788ea5ca0..185e33347 100644 --- a/examples/aws_lambda/lazy_aws_lambda.py +++ b/examples/aws_lambda/lazy_aws_lambda.py @@ -47,4 +47,4 @@ def handler(event, context): # rm -rf vendor && cp -pr ../../src/* vendor/ # pip install git+https://github.com/nficano/python-lambda -# lambda deploy --config-file aws_lambda_config.yaml --requirements requirements.txt +# lambda deploy --config-file lazy_aws_lambda_config.yaml --requirements requirements.txt From e19e339f97d17c399a629428815c46fe964c80d9 Mon Sep 17 00:00:00 2001 From: "@zimeg" Date: Mon, 16 Dec 2024 19:26:08 -0800 Subject: [PATCH 4/4] style: notate configured environment variables as stable --- examples/aws_lambda/aws_lambda_config.yaml | 7 +++---- examples/aws_lambda/aws_lambda_oauth_config.yaml | 16 +++++++--------- examples/aws_lambda/lazy_aws_lambda_config.yaml | 7 +++---- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/examples/aws_lambda/aws_lambda_config.yaml b/examples/aws_lambda/aws_lambda_config.yaml index cd07fce52..5c7c7a6de 100644 --- a/examples/aws_lambda/aws_lambda_config.yaml +++ b/examples/aws_lambda/aws_lambda_config.yaml @@ -20,12 +20,11 @@ aws_secret_access_key: # timeout: 15 # memory_size: 512 # concurrency: 500 -# -# Experimental Environment variables +# Lambda environment variables environment_variables: - SLACK_BOT_TOKEN: ${SLACK_BOT_TOKEN} - SLACK_SIGNING_SECRET: ${SLACK_SIGNING_SECRET} + SLACK_BOT_TOKEN: ${SLACK_BOT_TOKEN} + SLACK_SIGNING_SECRET: ${SLACK_SIGNING_SECRET} # If `tags` is uncommented then tags will be set at creation or update # time. During an update all other tags will be removed except the tags diff --git a/examples/aws_lambda/aws_lambda_oauth_config.yaml b/examples/aws_lambda/aws_lambda_oauth_config.yaml index 41c971f60..e5e837566 100644 --- a/examples/aws_lambda/aws_lambda_oauth_config.yaml +++ b/examples/aws_lambda/aws_lambda_oauth_config.yaml @@ -20,17 +20,15 @@ aws_secret_access_key: # timeout: 15 # memory_size: 512 # concurrency: 500 -# -# Experimental Environment variables +# Lambda environment variables environment_variables: - SLACK_SIGNING_SECRET: ${SLACK_SIGNING_SECRET} - SLACK_CLIENT_ID: ${SLACK_CLIENT_ID} - SLACK_CLIENT_SECRET: ${SLACK_CLIENT_SECRET} - SLACK_SCOPES: ${SLACK_SCOPES} - SLACK_INSTALLATION_S3_BUCKET_NAME: ${SLACK_INSTALLATION_S3_BUCKET_NAME} - SLACK_STATE_S3_BUCKET_NAME: ${SLACK_STATE_S3_BUCKET_NAME} - + SLACK_SIGNING_SECRET: ${SLACK_SIGNING_SECRET} + SLACK_CLIENT_ID: ${SLACK_CLIENT_ID} + SLACK_CLIENT_SECRET: ${SLACK_CLIENT_SECRET} + SLACK_SCOPES: ${SLACK_SCOPES} + SLACK_INSTALLATION_S3_BUCKET_NAME: ${SLACK_INSTALLATION_S3_BUCKET_NAME} + SLACK_STATE_S3_BUCKET_NAME: ${SLACK_STATE_S3_BUCKET_NAME} # If `tags` is uncommented then tags will be set at creation or update # time. During an update all other tags will be removed except the tags diff --git a/examples/aws_lambda/lazy_aws_lambda_config.yaml b/examples/aws_lambda/lazy_aws_lambda_config.yaml index df70e0901..a1ee748d3 100644 --- a/examples/aws_lambda/lazy_aws_lambda_config.yaml +++ b/examples/aws_lambda/lazy_aws_lambda_config.yaml @@ -20,12 +20,11 @@ aws_secret_access_key: # timeout: 15 # memory_size: 512 # concurrency: 500 -# -# Experimental Environment variables +# Lambda environment variables environment_variables: - SLACK_BOT_TOKEN: ${SLACK_BOT_TOKEN} - SLACK_SIGNING_SECRET: ${SLACK_SIGNING_SECRET} + SLACK_BOT_TOKEN: ${SLACK_BOT_TOKEN} + SLACK_SIGNING_SECRET: ${SLACK_SIGNING_SECRET} # If `tags` is uncommented then tags will be set at creation or update # time. During an update all other tags will be removed except the tags