-
Notifications
You must be signed in to change notification settings - Fork 5
NCBI FTP Integration #133
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
Open
mattldawson
wants to merge
80
commits into
develop
Choose a base branch
from
develop-add-ncbi-ftp
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
NCBI FTP Integration #133
Changes from all commits
Commits
Show all changes
80 commits
Select commit
Hold shift + click to select a range
f7fc9d5
draft ncbi scripts
mattldawson fa5fa97
add local minio testing
mattldawson f4d838a
add NCBI end-to-end testing instructions
mattldawson 5c6c547
debug and cleanup
mattldawson e5bc2f6
cleanup and formatting
mattldawson de8d325
formatting
mattldawson 3f0e604
Potential fix for pull request finding 'Unused import'
mattldawson 4f93d5f
Potential fix for pull request finding 'Unused import'
mattldawson 399a00d
Potential fix for pull request finding
mattldawson fee2ab4
Potential fix for pull request finding
mattldawson 5233d9d
Potential fix for pull request finding
mattldawson e5b58f2
Potential fix for pull request finding
mattldawson 64ead4c
Potential fix for pull request finding
mattldawson 9fba2c5
Potential fix for pull request finding
mattldawson c89ad37
address copilot comments
mattldawson 9a5e2fe
increased timeout for trivy action
mattldawson de77b14
Potential fix for pull request finding 'Unused import'
mattldawson 7d9ced1
Potential fix for pull request finding 'Unused import'
mattldawson 16dfda3
Potential fix for pull request finding
mattldawson 521978d
Potential fix for pull request finding
mattldawson 8f73674
Potential fix for pull request finding
mattldawson 1e8f363
add progress bar to manifest verification
mattldawson 7326641
add synthetic assembly summary generation option
mattldawson 4cf60d6
debug synthetic manifest
mattldawson 9a1d1e5
add custom release date to synthetic manifest generation
mattldawson a4ee186
fix style
mattldawson e351288
Merge branch 'main' into develop-add-ncbi-ftp
mattldawson 6e45879
update docs and progress bar
mattldawson adfda18
add checks for synthetic summary creation
mattldawson fdd67c4
add connection check to S3 store
mattldawson d4f868d
add s3 connection check
mattldawson 55cbf9e
reduce progress bar update rate
mattldawson c1ee7e3
select database for synthetic summary
mattldawson 76349c1
formatting
mattldawson 3369e11
add frictionless descriptors
mattldawson 21dda1c
Potential fix for pull request finding 'CodeQL / Incomplete URL subst…
mattldawson 803d8c4
update url parsing test
mattldawson 280bb63
Potential fix for pull request finding 'CodeQL / Incomplete URL subst…
mattldawson 81a0821
Merge branch 'develop' into develop-add-ncbi-ftp
mattldawson 09df496
merge file upload functions
mattldawson c56c3c9
formatting
mattldawson 6d6415b
merge copy object functions
mattldawson bf0c01e
use tenacity
mattldawson de041dc
address reviewer comments
mattldawson 0fefd29
remove defaults for minio test env vars
mattldawson f9bcaee
cleanup
mattldawson f88df1d
add docker compose integration test option and draft new action
mattldawson c9aa9ff
try again for the integration action
mattldawson 36369ca
Potential fix for pull request finding 'CodeQL / Workflow does not co…
mattldawson f2f8a78
add labels to tests the send requests to the NCBI FTP server
mattldawson 1bc43c7
Merge branch 'develop' into develop-add-ncbi-ftp
mattldawson 6d923ce
address reviewer comments
mattldawson 60d18f4
Merge branch 'develop' into develop-add-ncbi-ftp
mattldawson cc1042b
Potential fix for pull request finding 'Unused import'
mattldawson 3216403
add notebook option for download phase
mattldawson 3952655
formatting
mattldawson 991b40e
Potential fix for pull request finding 'Unused import'
mattldawson 359901f
Potential fix for pull request finding 'Unused import'
mattldawson 51a3680
update notebooks
mattldawson 8a41164
allow separate staging and destination buckets
mattldawson 1da3d05
consolidate progress bars
mattldawson 0d3aa68
consolidate download with staging and promotion with deletion from st…
mattldawson c823283
Potential fix for pull request finding 'Unused global variable'
mattldawson cf93013
Potential fix for pull request finding 'Unused global variable'
mattldawson 2b45416
fix tests
mattldawson f3c0984
keep ftp connection alive
mattldawson b6f0bdd
Potential fix for pull request finding 'Unused import'
mattldawson 5fcada9
smooth progress bars
mattldawson 6b78cb0
add promote progress bar and reduce logger output on dry runs
mattldawson afcae5c
print removed manifest path
mattldawson 2e8da0c
optimize array creation
mattldawson ae92916
remove checksum type from copy headers
mattldawson 1a8f54a
use tags for metadata on copy to avoid boto errors
mattldawson fa3df73
remove tagging option on s3 copy
mattldawson 4c9c1c8
parallelize copies and batch deletes
mattldawson 409626d
optimize promotion step
mattldawson fdb7026
Potential fix for pull request finding 'Unused local variable'
mattldawson 4d690a8
Potential fix for pull request finding 'Unused import'
mattldawson e305d74
Potential fix for pull request finding 'Unused import'
mattldawson c01dbdc
capture missing return values
mattldawson 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
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| name: Integration tests | ||
|
|
||
| on: | ||
| workflow_call: | ||
|
|
||
| push: | ||
| branches: | ||
| - main | ||
| pull_request: | ||
| types: | ||
| - opened | ||
| - reopened | ||
| - synchronize | ||
| - ready_for_review | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| integration_tests: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v6 | ||
|
|
||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v3 | ||
|
|
||
| - name: Build integration test image | ||
| uses: docker/build-push-action@v6 | ||
| with: | ||
| context: . | ||
| load: true | ||
| tags: cdm-data-loaders-integration-tests:latest | ||
| cache-from: type=gha | ||
| cache-to: type=gha,mode=max | ||
|
|
||
| - name: Run integration tests | ||
| run: | | ||
| docker compose up \ | ||
| --no-build \ | ||
| --abort-on-container-exit \ | ||
| --exit-code-from integration-tests | ||
|
|
||
| - name: Tear down | ||
| if: always() | ||
| run: docker compose down --volumes | ||
|
github-advanced-security[bot] marked this conversation as resolved.
Fixed
|
||
This file contains hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| services: | ||
| minio: | ||
| image: quay.io/minio/minio:latest | ||
| command: server /data --console-address ":9001" | ||
| environment: | ||
| MINIO_ROOT_USER: minioadmin | ||
| MINIO_ROOT_PASSWORD: minioadmin | ||
| ports: | ||
| - "9000:9000" | ||
| - "9001:9001" | ||
| healthcheck: | ||
| test: [ "CMD", "mc", "ready", "local" ] | ||
| interval: 5s | ||
| timeout: 5s | ||
| retries: 5 | ||
|
|
||
| integration-tests: | ||
| image: cdm-data-loaders-integration-tests:latest | ||
| build: | ||
| context: . | ||
| depends_on: | ||
| minio: | ||
| condition: service_healthy | ||
| environment: | ||
| MINIO_ENDPOINT_URL: http://minio:9000 | ||
| MINIO_ACCESS_KEY: minioadmin | ||
| MINIO_SECRET_KEY: minioadmin | ||
| entrypoint: | ||
| - /bin/sh | ||
| - -c | ||
| - | | ||
| attempts=0 | ||
| until python3 -c " | ||
| import urllib.request, os | ||
| urllib.request.urlopen(os.environ['MINIO_ENDPOINT_URL'] + '/minio/health/live', timeout=1) | ||
| " 2>/dev/null; do | ||
| attempts=$$((attempts + 1)) | ||
| if [ "$$attempts" -ge 30 ]; then | ||
| echo 'Timed out waiting for MinIO.' && exit 1 | ||
| fi | ||
| echo 'Waiting for MinIO...' && sleep 1 | ||
| done | ||
| exec /app/scripts/entrypoint.sh integration-test | ||
| command: [] |
Oops, something went wrong.
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.
This is excellent -- thank you!
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.
sure thing!