-
Notifications
You must be signed in to change notification settings - Fork 4
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.
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
[ETL-138] Integrate JSON schemas #84
Merged
Merged
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
d003e6a
schema mapping to data type identifier intial commit
philerooski a06d07a
Update dataset mapping to use schema mapping data type identifiers
philerooski 65a3919
Change the data resource identifiers to the JSON schema identifiers
philerooski 0ec5e96
Make sure stackname_prefix is alphanumeric
philerooski 6fabdda
Use new dataset mapping format in s3 to json job
philerooski 8d1cf50
Update schema mapping file
philerooski 642805d
Get rid of client info related code in S3 to JSON job
philerooski 8cabdc7
change archive-map.json allOf references to anyOf
philerooski 0d35c5d
improve getting json schema function, improved logging
philerooski e3a74aa
use 'main' branch of archive-map.json
philerooski 9ad7f08
remove unnused datasets from glue resource files
philerooski 8bdc139
Update lambda test events for test dataset version 2
philerooski c57789e
Update Pipfile.lock
philerooski 5938483
Use crontab from namespaced artifacts
philerooski 469bac3
Fix archive map version
philerooski eb6304d
Cast assessment revision to int for archive-map.json lookup
philerooski 05529e7
Update lambda test events
philerooski 2a2260e
Update crontab to reference new dataset identifiers
philerooski 0dc0404
Refactor S3 to JSON job and add docstrings
philerooski a848ec0
Remove unnessecary sceptre user data from study pmbfzc
philerooski File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| 55 * * * * aws ecr get-login-password | docker login --username AWS --password-stdin 611413694531.dkr.ecr.us-east-1.amazonaws.com/bootstrap_trigger:latest && docker pull 611413694531.dkr.ecr.us-east-1.amazonaws.com/bootstrap_trigger:latest | ||
| 0 * * * * ec2-user docker run --rm 611413694531.dkr.ecr.us-east-1.amazonaws.com/bootstrap_trigger:latest python /root/BridgeDownstream/src/scripts/bootstrap_trigger/bootstrap_trigger.py --file-view syn29357512 --raw-folder-id syn29300097 --glue-workflow bridge-downstream-mobile-toolbox-cxhnxd-S3ToJsonWorkflow --ssm-parameter synapse-bridgedownstream-auth --diff-s3-uri 's3://bridge-downstream-parquet/bridge-downstream/mobile-toolbox/cxhnxd/parquet/dataset_metadata_v1/' --diff-parquet-field recordid --diff-file-view-field recordId | ||
| 5 * * * * ec2-user docker run --rm 611413694531.dkr.ecr.us-east-1.amazonaws.com/bootstrap_trigger:latest python /root/BridgeDownstream/src/scripts/bootstrap_trigger/bootstrap_trigger.py --file-view syn29357540 --raw-folder-id syn29300165 --glue-workflow bridge-downstream-mobile-toolbox-htshxm-S3ToJsonWorkflow --ssm-parameter synapse-bridgedownstream-auth --diff-s3-uri 's3://bridge-downstream-parquet/bridge-downstream/mobile-toolbox/htshxm/parquet/dataset_metadata_v1/' --diff-parquet-field recordid --diff-file-view-field recordId | ||
| 10 * * * * ec2-user docker run --rm 611413694531.dkr.ecr.us-east-1.amazonaws.com/bootstrap_trigger:latest python /root/BridgeDownstream/src/scripts/bootstrap_trigger/bootstrap_trigger.py --file-view syn29357582 --raw-folder-id syn29300178 --glue-workflow bridge-downstream-mobile-toolbox-fmqcjv-S3ToJsonWorkflow --ssm-parameter synapse-bridgedownstream-auth --diff-s3-uri 's3://bridge-downstream-parquet/bridge-downstream/mobile-toolbox/fmqcjv/parquet/dataset_metadata_v1/' --diff-parquet-field recordid --diff-file-view-field recordId | ||
| 15 * * * * ec2-user docker run --rm 611413694531.dkr.ecr.us-east-1.amazonaws.com/bootstrap_trigger:latest python /root/BridgeDownstream/src/scripts/bootstrap_trigger/bootstrap_trigger.py --file-view syn30034467 --raw-folder-id syn29456518 --glue-workflow bridge-downstream-mobile-toolbox-hktrrx-S3ToJsonWorkflow --ssm-parameter synapse-bridgedownstream-auth --diff-s3-uri 's3://bridge-downstream-parquet/bridge-downstream/mobile-toolbox/hktrrx/parquet/dataset_metadata_v1/' --diff-parquet-field recordid --diff-file-view-field recordId | ||
| 20 * * * * ec2-user docker run --rm 611413694531.dkr.ecr.us-east-1.amazonaws.com/bootstrap_trigger:latest python /root/BridgeDownstream/src/scripts/bootstrap_trigger/bootstrap_trigger.py --file-view syn30795668 --raw-folder-id syn29456954 --glue-workflow bridge-downstream-mobile-toolbox-pmbfzc-S3ToJsonWorkflow --ssm-parameter synapse-bridgedownstream-auth --diff-s3-uri 's3://bridge-downstream-parquet/bridge-downstream/mobile-toolbox/pmbfzc/parquet/dataset_metadata_v1/' --diff-parquet-field recordid --diff-file-view-field recordId | ||
| 0 * * * * ec2-user docker run --rm 611413694531.dkr.ecr.us-east-1.amazonaws.com/bootstrap_trigger:latest python /root/BridgeDownstream/src/scripts/bootstrap_trigger/bootstrap_trigger.py --file-view syn29357512 --raw-folder-id syn29300097 --glue-workflow bridge-downstream-mobile-toolbox-cxhnxd-S3ToJsonWorkflow --ssm-parameter synapse-bridgedownstream-auth --diff-s3-uri 's3://bridge-downstream-parquet/bridge-downstream/mobile-toolbox/cxhnxd/parquet/dataset_archivemetadata_v1/' --diff-parquet-field recordid --diff-file-view-field recordId | ||
| 5 * * * * ec2-user docker run --rm 611413694531.dkr.ecr.us-east-1.amazonaws.com/bootstrap_trigger:latest python /root/BridgeDownstream/src/scripts/bootstrap_trigger/bootstrap_trigger.py --file-view syn29357540 --raw-folder-id syn29300165 --glue-workflow bridge-downstream-mobile-toolbox-htshxm-S3ToJsonWorkflow --ssm-parameter synapse-bridgedownstream-auth --diff-s3-uri 's3://bridge-downstream-parquet/bridge-downstream/mobile-toolbox/htshxm/parquet/dataset_archivemetadata_v1/' --diff-parquet-field recordid --diff-file-view-field recordId | ||
| 10 * * * * ec2-user docker run --rm 611413694531.dkr.ecr.us-east-1.amazonaws.com/bootstrap_trigger:latest python /root/BridgeDownstream/src/scripts/bootstrap_trigger/bootstrap_trigger.py --file-view syn29357582 --raw-folder-id syn29300178 --glue-workflow bridge-downstream-mobile-toolbox-fmqcjv-S3ToJsonWorkflow --ssm-parameter synapse-bridgedownstream-auth --diff-s3-uri 's3://bridge-downstream-parquet/bridge-downstream/mobile-toolbox/fmqcjv/parquet/dataset_archivemetadata_v1/' --diff-parquet-field recordid --diff-file-view-field recordId | ||
| 15 * * * * ec2-user docker run --rm 611413694531.dkr.ecr.us-east-1.amazonaws.com/bootstrap_trigger:latest python /root/BridgeDownstream/src/scripts/bootstrap_trigger/bootstrap_trigger.py --file-view syn30034467 --raw-folder-id syn29456518 --glue-workflow bridge-downstream-mobile-toolbox-hktrrx-S3ToJsonWorkflow --ssm-parameter synapse-bridgedownstream-auth --diff-s3-uri 's3://bridge-downstream-parquet/bridge-downstream/mobile-toolbox/hktrrx/parquet/dataset_archivemetadata_v1/' --diff-parquet-field recordid --diff-file-view-field recordId | ||
| 20 * * * * ec2-user docker run --rm 611413694531.dkr.ecr.us-east-1.amazonaws.com/bootstrap_trigger:latest python /root/BridgeDownstream/src/scripts/bootstrap_trigger/bootstrap_trigger.py --file-view syn30795668 --raw-folder-id syn29456954 --glue-workflow bridge-downstream-mobile-toolbox-pmbfzc-S3ToJsonWorkflow --ssm-parameter synapse-bridgedownstream-auth --diff-s3-uri 's3://bridge-downstream-parquet/bridge-downstream/mobile-toolbox/pmbfzc/parquet/dataset_archivemetadata_v1/' --diff-parquet-field recordid --diff-file-view-field recordId |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Noting here the passing of latest_version -- @philerooski & @thomasyu888 do we want to prioritize the discussion about our versioning system (and potential conflict with namespacing system), or just file a ticket and worry about it later?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My initial thought is let's file a ticket and worry about it later unless it will be a huge shift later on to resolve this. I don't necessarily want to block this from being pulled in.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree it definitely shouldn't block this PR from being merged
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes I'd like to sort out versioning. It's not urgent.