Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MAINTENANCE] Clean up cloud-tests environment variables #10792

Merged
merged 15 commits into from
Dec 18, 2024
+2 −11
Merged

[MAINTENANCE] Clean up cloud-tests environment variables #10792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ace6bcf
Remove a few and see what happens
NathanFarmer Dec 18, 2024
af44ccb
Merge branch 'develop' into m/core-736/cloud-tests-env-var-cleanup
NathanFarmer Dec 18, 2024
9335816
Re-add GX_SCHEDULER vars in v0 api
NathanFarmer Dec 18, 2024
18a68bf
Only remove AWS_DEFAULT_REGION
NathanFarmer Dec 18, 2024
e386fe9
Try removing just AWS_ACCESS_KEY_ID
NathanFarmer Dec 18, 2024
ab3c387
Revert "Try removing just AWS_ACCESS_KEY_ID"
NathanFarmer Dec 18, 2024
9f8ab87
Remove env vars from v0 container again
NathanFarmer Dec 18, 2024
a039039
Rename env variable
NathanFarmer Dec 18, 2024
d82c706
Merge branch 'develop' into m/core-736/cloud-tests-env-var-cleanup
billdirks Dec 18, 2024
efda605
Merge branch 'develop' into m/core-736/cloud-tests-env-var-cleanup
NathanFarmer Dec 18, 2024
1609b70
Update ci.yml
NathanFarmer Dec 18, 2024
22a942b
Merge branch 'm/core-736/cloud-tests-env-var-cleanup' of github.com:g…
NathanFarmer Dec 18, 2024
0db7949
Typo
NathanFarmer Dec 18, 2024
0a0fa57
Need some localstack vars still
NathanFarmer Dec 18, 2024
ad9a077
Move var for ocd purposes
NathanFarmer Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,8 @@ jobs:
GX_SCHEDULER_LAMBDA_ARN: ${{secrets.GX_SCHEDULER_LAMBDA_ARN}}
GX_SCHEDULER_EXECUTION_ROLE_ARN: ${{secrets.GX_SCHEDULER_EXECUTION_ROLE_ARN}}
GX_SCHEDULER_EVENTBRIDGE_DLQ_ARN: ${{secrets.GX_SCHEDULER_EVENTBRIDGE_DLQ_ARN}}
GX_SCHEDULER_EVENTBRIDGE_REGION: ${{secrets.GX_SCHEDULER_EVENTBRIDGE_REGION}}
LOCALSTACK_AWS_ENDPOINT_URL: ${{secrets.LOCALSTACK_AWS_ENDPOINT_URL}}
LOCALSTACK_AWS_DEFAULT_REGION: ${{secrets.LOCALSTACK_AWS_DEFAULT_REGION}}
LOCALSTACK_AWS_SECRET_ACCESS_KEY: ${{secrets.LOCALSTACK_AWS_SECRET_ACCESS_KEY}}
LOCALSTACK_AWS_ACCESS_KEY_ID: ${{secrets.LOCALSTACK_AWS_ACCESS_KEY_ID}}
PACT_DO_NOT_TRACK: true
Expand Down
11 changes: 1 addition & 10 deletions assets/docker/mercury/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,6 @@ services:
AUTH0_MERCURY_API_CLIENT_SECRET: ${AUTH0_MERCURY_API_CLIENT_SECRET}
SENDGRID_API_KEY: fake_key
LD_SDK_KEY: ${LD_SDK_KEY}
GX_SCHEDULER_LAMBDA_ARN: ${GX_SCHEDULER_LAMBDA_ARN}
GX_SCHEDULER_EXECUTION_ROLE_ARN: ${GX_SCHEDULER_EXECUTION_ROLE_ARN}
GX_SCHEDULER_EVENTBRIDGE_DLQ_ARN: ${GX_SCHEDULER_EVENTBRIDGE_DLQ_ARN}
GX_SCHEDULER_EVENTBRIDGE_REGION: ${LOCALSTACK_AWS_DEFAULT_REGION}
AWS_ENDPOINT_URL: ${LOCALSTACK_AWS_ENDPOINT_URL}
AWS_DEFAULT_REGION: ${LOCALSTACK_AWS_DEFAULT_REGION}
AWS_SECRET_ACCESS_KEY: ${LOCALSTACK_AWS_SECRET_ACCESS_KEY}
AWS_ACCESS_KEY_ID: ${LOCALSTACK_AWS_ACCESS_KEY_ID}
# TODO replace migtrations with ./scripts/automated_migrations.sh
entrypoint:
- /bin/bash
Expand Down Expand Up @@ -113,9 +105,8 @@ services:
GX_SCHEDULER_LAMBDA_ARN: ${GX_SCHEDULER_LAMBDA_ARN}
GX_SCHEDULER_EXECUTION_ROLE_ARN: ${GX_SCHEDULER_EXECUTION_ROLE_ARN}
GX_SCHEDULER_EVENTBRIDGE_DLQ_ARN: ${GX_SCHEDULER_EVENTBRIDGE_DLQ_ARN}
GX_SCHEDULER_EVENTBRIDGE_REGION: ${LOCALSTACK_AWS_DEFAULT_REGION}
GX_SCHEDULER_EVENTBRIDGE_REGION: ${GX_SCHEDULER_EVENTBRIDGE_REGION}
AWS_ENDPOINT_URL: ${LOCALSTACK_AWS_ENDPOINT_URL}
AWS_DEFAULT_REGION: ${LOCALSTACK_AWS_DEFAULT_REGION}
AWS_SECRET_ACCESS_KEY: ${LOCALSTACK_AWS_SECRET_ACCESS_KEY}
AWS_ACCESS_KEY_ID: ${LOCALSTACK_AWS_ACCESS_KEY_ID}
depends_on:
Expand Down
Loading