This repository has been archived by the owner on Aug 21, 2024. It is now read-only.
Fixed some AWS Settings. #8094
Merged
Fixed some AWS Settings. #8094
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hanzlamateen
suggested changes
Jun 16, 2023
| endpoint: process.env.STORAGE_S3_ENDPOINT, | ||
| staticResourceBucket: process.env.STORAGE_S3_STATIC_RESOURCE_BUCKET, | ||
| region: process.env.STORAGE_S3_REGION, | ||
| avatarDir: process.env.STORAGE_S3_AVATAR_DIRECTORY, | ||
| s3DevMode: process.env.STORAGE_S3_DEV_MODE | ||
| }), | ||
| eks: JSON.stringify({ |
There was a problem hiding this comment.
This will work for dev-reinit and for prepare-database when there is no existing record. But for scenarios where there is already an existing data and you used prepare-database then you will need to add this data to the column, else it will be empty.
You can have a look of packages/server-core/src/setting/client-setting/client-setting.seed.ts and see around line 87.
There was a problem hiding this comment.
I've added a migration which will perform this conversion.
barankyle
force-pushed
the
aws-config-refactor
branch
5 times, most recently
from
d15d8f0
to
6472604
Compare
hanzlamateen
approved these changes
Jun 20, 2023
barankyle
force-pushed
the
aws-config-refactor
branch
from
6472604
to
552b6d5
Compare
S3/Cloudfront keys were put in config.aws.keys, which did not reflect what those keys did. Moved them to config.aws.s3, where it is more obvious what they have access to. EKS/ECR keys were not in the AWS config/settings at all. Added new config child 'eks' to store them. Also, these keys were named as environment variables as 'AWS_ACCESS_KEY'/'AWS_SECRET', which did not indicate what they had access to. Renamed these references to 'EKS_AWS_ACCESS_KEY'/ 'EKS_AWS_SECRET'. Updated aws-setting schema to reflect this change. Added migration to add this column and update s3 and eks columns with this changed schema and values. Made custom dbToSchema resolvers non-async. They were returning promises instead of values, which were not being merged properly with the base settings.
barankyle
force-pushed
the
aws-config-refactor
branch
from
552b6d5
to
0c4c078
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
S3/Cloudfront keys were put in config.aws.keys, which did not reflect what those keys did. Moved them to config.aws.s3, where it is more obvious what they have access to.
EKS/ECR keys were not in the AWS config/settings at all. Added new config child 'eks' to store them. Also, these keys were named as environment variables as 'AWS_ACCESS_KEY'/'AWS_SECRET', which did not indicate what they had access to. Renamed these references to 'EKS_AWS_ACCESS_KEY'/ 'EKS_AWS_SECRET'. Updated aws-setting schema to reflect this change. Added script to convert existing databases to the new schema/placement.
References
closes #insert number here
Checklist
QA Steps
List any additional steps required to QA the changes of this PR, as well as any supplemental images or videos.