Skip to content

Commit

Permalink
fix: Rename AWS credential envvars to avoid collisions
Browse files Browse the repository at this point in the history
  • Loading branch information
untitaker committed Mar 1, 2019
1 parent b15a96e commit 85ec3f2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
7 changes: 6 additions & 1 deletion scripts/aws-cleanup.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/sh
# Delete all AWS Lambda functions
for func in $(aws lambda list-functions | jq .Functions[].FunctionName); do

export AWS_ACCESS_KEY_ID="$SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID"
export AWS_SECRET_ACCESS_KEY="$SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY"
export AWS_IAM_ROLE="$SENTRY_PYTHON_TEST_AWS_IAM_ROLE"

for func in $(aws lambda list-functions | jq -r .Functions[].FunctionName); do
echo "Deleting $func"
aws lambda delete-function --function-name $func
done
8 changes: 4 additions & 4 deletions tests/integrations/aws_lambda/test_aws.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ def init_sdk(**extra_init_args):

@pytest.fixture
def lambda_client():
if "AWS_ACCESS_KEY_ID" not in os.environ:
if "SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID" not in os.environ:
pytest.skip("AWS environ vars not set")

return boto3.client(
"lambda",
aws_access_key_id=os.environ["AWS_ACCESS_KEY_ID"],
aws_secret_access_key=os.environ["AWS_SECRET_ACCESS_KEY"],
aws_access_key_id=os.environ["SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID"],
aws_secret_access_key=os.environ["SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY"],
region_name="us-east-1",
)

Expand Down Expand Up @@ -84,7 +84,7 @@ def inner(code, payload):
lambda_client.create_function(
FunctionName=fn_name,
Runtime=runtime,
Role=os.environ["AWS_IAM_ROLE"],
Role=os.environ["SENTRY_PYTHON_TEST_AWS_IAM_ROLE"],
Handler="test_lambda.test_handler",
Code={"ZipFile": tmpdir.join("ball.zip").read(mode="rb")},
Description="Created as part of testsuite for getsentry/sentry-python",
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ setenv =

COVERAGE_FILE=.coverage-{envname}
passenv =
AWS_ACCESS_KEY_ID
AWS_SECRET_ACCESS_KEY
AWS_IAM_ROLE
SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID
SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY
SENTRY_PYTHON_TEST_AWS_IAM_ROLE
usedevelop = True
extras =
flask: flask
Expand Down

0 comments on commit 85ec3f2

Please sign in to comment.