Skip to content

Prevent key sort on yaml_merge in fence#558

Merged
k-burt-uch merged 1 commit intomasterfrom
fix/fence-yaml-merge-no-sort
Apr 1, 2026
Merged

Prevent key sort on yaml_merge in fence#558
k-burt-uch merged 1 commit intomasterfrom
fix/fence-yaml-merge-no-sort

Conversation

@k-burt-uch
Copy link
Copy Markdown
Contributor

Link to JIRA ticket if there is one:

New Features

Breaking Changes

Bug Fixes

  • Fix issue where S3_BUCKETS were sorted by yaml_merge, causing credential matching issues when generating presigned-urls for commons that utilize regexes for S3_BUCKETS.

Improvements

Dependency updates

Deployment changes

@k-burt-uch k-burt-uch force-pushed the fix/fence-yaml-merge-no-sort branch from 1c2c17b to e73183d Compare April 1, 2026 02:34
@k-burt-uch k-burt-uch force-pushed the fix/fence-yaml-merge-no-sort branch from e73183d to d43c7f3 Compare April 1, 2026 02:40
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 1, 2026

Test summary after running integration tests

filepath passed failed error skipped SUBTOTAL
tests/test_gen3_workflow.py 15 2 0 0 17
tests/test_oauth2.py 15 0 0 0 15
tests/test_centralized_auth.py 16 0 0 0 16
tests/test_graph_submit_and_query.py 13 0 0 1 14
tests/test_dicom_viewer.py 4 0 0 0 4
tests/test_guppy_service.py 8 0 0 0 8
tests/test_audit_service.py 3 0 0 3 6
tests/test_data_upload.py 8 0 0 1 9
tests/test_presigned_url.py 7 0 0 0 7
tests/test_dbgap.py 4 0 0 1 5
tests/test_requestor.py 5 0 0 0 5
tests/test_drs_endpoint.py 4 0 0 0 4
tests/test_user_token.py 5 0 0 0 5
tests/test_user_data_library.py 2 0 0 1 3
tests/test_study_viewer.py 3 0 0 0 3
tests/test_login_page.py 2 0 0 0 2
tests/test_oidc_client.py 2 0 0 0 2
tests/test_gen3client.py 1 0 0 0 1
tests/test_register_user.py 2 0 0 0 2
tests/test_manifest_service.py 1 0 0 0 1
tests/test_discoverypage.py 1 0 0 0 1
tests/test_workspace.py 1 0 0 0 1
tests/test_client_credentials.py 1 0 0 0 1
tests/test_aggregate_mds.py 1 0 0 0 1
tests/test_google_data_access.py 1 0 0 0 1
tests/test_homepage.py 1 0 0 0 1
tests/test_ras_authn.py 0 0 0 3 3
tests/test_gen3ff_landing_page.py 0 0 0 2 2
tests/test_etl.py 0 0 0 1 1
tests/test_env_sanity.py 0 0 0 1 1
tests/test_pfb_export.py 0 0 1 0 1
TOTAL 126 2 1 14 143

Test summary after rerunning failed integration tests

filepath passed failed SUBTOTAL
tests/test_gen3_workflow.py 0 2 2
tests/test_pfb_export.py 1 0 1
TOTAL 1 2 3

Please find the detailed integration test report here

Please find the detailed integration test report after rerunning failed tests here

Please find the Github Action logs here

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 1, 2026

Test summary after running integration tests

filepath passed failed SUBTOTAL
tests/test_gen3_workflow.py 16 1 17
TOTAL 16 1 17

Test summary after rerunning failed integration tests

filepath failed SUBTOTAL
tests/test_gen3_workflow.py 1 1
TOTAL 1 1

Please find the detailed integration test report here

Please find the detailed integration test report after rerunning failed tests here

Please find the Github Action logs here

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 1, 2026

filepath passed SUBTOTAL
tests/test_gen3_workflow.py 17 17
TOTAL 17 17

Please find the detailed integration test report here

Please find the Github Action logs here

@k-burt-uch k-burt-uch merged commit 6d68df9 into master Apr 1, 2026
3 of 5 checks passed
@k-burt-uch k-burt-uch deleted the fix/fence-yaml-merge-no-sort branch April 1, 2026 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants