Fix: Various problems in can_bundle script (#6669) #6670

nadove-ucsc · 2024-10-31T00:22:12Z

Connected issues: #6669

Checklist

Author

PR is a draft
Target branch is develop
Name of PR branch matches issues/<GitHub handle of author>/<issue#>-<slug>
On ZenHub, PR is connected to all issues it (partially) resolves
PR description links to connected issues
PR title matches¹ that of a connected issue _{or comment in PR explains why they're different}
PR title references all connected issues
For each connected issue, there is at least one commit whose title references that issue

¹ when the issue title describes a problem, the corresponding PR
title is Fix: followed by the issue title

Author (partiality)

Added p tag to titles of partial commits
This PR is labeled partial _{or completely resolves all connected issues}
This PR partially resolves each of the connected issues _{or does not have the partial label}

Author (chains)

This PR is blocked by previous PR in the chain _{or is not chained to another PR}
The blocking PR is labeled base _{or this PR is not chained to another PR}
This PR is labeled chained _{or is not chained to another PR}

Author (reindex, API changes)

Added r tag to commit title _{or the changes introduced by this PR will not require reindexing of any deployment}
This PR is labeled reindex:dev _{or the changes introduced by it will not require reindexing of dev}
This PR is labeled reindex:anvildev _{or the changes introduced by it will not require reindexing of anvildev}
This PR is labeled reindex:anvilprod _{or the changes introduced by it will not require reindexing of anvilprod}
This PR is labeled reindex:prod _{or the changes introduced by it will not require reindexing of prod}
This PR is labeled reindex:partial and its description documents the specific reindexing procedure for dev, anvildev, anvilprod and prod _{or requires a full reindex or carries none of the labels reindex:dev, reindex:anvildev, reindex:anvilprod and reindex:prod}
This PR and its connected issues are labeled API _{or this PR does not modify a REST API}
Added a (A) tag to commit title for backwards (in)compatible changes _{or this PR does not modify a REST API}
Updated REST API version number in app.py _{or this PR does not modify a REST API}

Author (upgrading deployments)

Ran make docker_images.json and committed the resulting changes _{or this PR does not modify azul_docker_images, or any other variables referenced in the definition of that variable}
Documented upgrading of deployments in UPGRADING.rst _{or this PR does not require upgrading deployments}
Added u tag to commit title _{or this PR does not require upgrading deployments}
This PR is labeled upgrade _{or does not require upgrading deployments}
This PR is labeled deploy:shared _{or does not modify docker_images.json, and does not require deploying the shared component for any other reason}
This PR is labeled deploy:gitlab _{or does not require deploying the gitlab component}
This PR is labeled deploy:runner _{or does not require deploying the runner image}

Author (hotfixes)

Added F tag to main commit title _{or this PR does not include permanent fix for a temporary hotfix}
Reverted the temporary hotfixes for any connected issues _{or the none of the stable branches (anvilprod and prod) have temporary hotfixes for any of the issues connected to this PR}

Author (before every review)

Rebased PR branch on develop, squashed old fixups
Ran make requirements_update _{or this PR does not modify requirements*.txt, common.mk, Makefile and Dockerfile}
Added R tag to commit title _{or this PR does not modify requirements*.txt}
This PR is labeled reqs _{or does not modify requirements*.txt}
make integration_test passes in personal deployment _{or this PR does not modify functionality that could affect the IT outcome}

Peer reviewer (after approval)

PR is not a draft
Ticket is in Review requested column
PR is awaiting requested review from system administrator
PR is assigned to only the system administrator

System administrator (after approval)

Actually approved the PR
Labeled connected issues as demo or no demo
Commented on connected issues about demo expectations _{or all connected issues are labeled no demo}
Decided if PR can be labeled no sandbox
A comment to this PR details the completed security design review
PR title is appropriate as title of merge commit
N reviews label is accurate
Moved connected issues to Approved column
PR is assigned to only the operator

Operator (before pushing merge the commit)

System administrator

Background migrations for dev.gitlab are complete _{or this PR is not labeled deploy:gitlab}
Background migrations for anvildev.gitlab are complete _{or this PR is not labeled deploy:gitlab}
PR is assigned to only the operator

Operator (before pushing merge the commit)

Operator (chain shortening)

Changed the target branch of the blocked PR to develop _{or this PR is not labeled base}
Removed the chained label from the blocked PR _{or this PR is not labeled base}
Removed the blocking relationship from the blocked PR _{or this PR is not labeled base}
Removed the base label from this PR _{or this PR is not labeled base}

Operator (after pushing the merge commit)

Operator (reindex)

Operator

Propagated the deploy:shared, deploy:gitlab, deploy:runner, API, reindex:partial, reindex:anvilprod and reindex:prod labels to the next promotion PRs _{or this PR carries none of these labels}
Propagated any specific instructions related to the deploy:shared, deploy:gitlab, deploy:runner, API, reindex:partial, reindex:anvilprod and reindex:prod labels, from the description of this PR to that of the next promotion PRs _{or this PR carries none of these labels}
PR is assigned to no one

Shorthand for review comments

L line is too long
W line wrapping is wrong
Q bad quotes
F other formatting problem

codecov · 2024-10-31T00:41:56Z

Codecov Report

Attention: Patch coverage is 26.66667% with 11 lines in your changes missing coverage. Please review.

Project coverage is 85.42%. Comparing base (787c416) to head (d53b159).
Report is 8 commits behind head on develop.

Files with missing lines	Patch %	Lines
test/integration_test.py	0.00%	10 Missing ⚠️
src/azul/plugins/__init__.py	50.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #6670      +/-   ##
===========================================
+ Coverage    85.40%   85.42%   +0.01%     
===========================================
  Files          155      155              
  Lines        20783    20777       -6     
===========================================
- Hits         17749    17748       -1     
+ Misses        3034     3029       -5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

coveralls · 2024-10-31T00:43:16Z

coverage: 85.439% (+0.02%) from 85.419%
when pulling d53b159 on issues/nadove-ucsc/6669-various-problems-can-bundle-script
into 787c416 on develop.

dsotirho-ucsc · 2024-10-31T16:27:51Z

scripts/can_bundle.py

+    table_name = args.table_name
+    if table_name is not None:
+        fields['table_name'] = table_name


Suggested change

table_name = args.table_name

if table_name is not None:

fields['table_name'] = table_name

if args.table_name is not None:

fields['table_name'] = args.table_name

dsotirho-ucsc · 2024-10-31T16:31:02Z

scripts/can_bundle.py

                    bundle = plugin.fetch_bundle(fqid)
                    log.info('Fetched bundle %r version %r from catalog %r.',
                             fqid.uuid, fqid.version, catalog)
                    return bundle
    raise ValueError(f'No repository using source {source!r}')


+def parse_fqid_fields(args: argparse.Namespace) -> JSON:


Since parse_fqid_fields() is called before fetch_bundle(), it would make more sense to have it moved up so it is defined before fetch_bundle().

dsotirho-ucsc

Approved.

hannes-ucsc · 2024-11-02T05:43:56Z

Security design review

…script (#6669)

#6669)

This fix is untested since it touches code that is disabled (conditional upon DSS direct access).

github-actions bot added the orange [process] Done by the Azul team label Oct 31, 2024

nadove-ucsc assigned dsotirho-ucsc Oct 31, 2024

nadove-ucsc requested a review from dsotirho-ucsc October 31, 2024 03:36

dsotirho-ucsc requested changes Oct 31, 2024

View reviewed changes

dsotirho-ucsc removed their assignment Oct 31, 2024

nadove-ucsc requested a review from dsotirho-ucsc October 31, 2024 22:11

nadove-ucsc assigned dsotirho-ucsc Oct 31, 2024

dsotirho-ucsc previously approved these changes Nov 1, 2024

View reviewed changes

dsotirho-ucsc marked this pull request as ready for review November 1, 2024 16:49

dsotirho-ucsc requested a review from hannes-ucsc as a code owner November 1, 2024 16:49

dsotirho-ucsc assigned hannes-ucsc and unassigned dsotirho-ucsc Nov 1, 2024

hannes-ucsc previously approved these changes Nov 2, 2024

View reviewed changes

hannes-ucsc dismissed stale reviews from dsotirho-ucsc and themself via 8ae55de November 2, 2024 07:51

hannes-ucsc force-pushed the issues/nadove-ucsc/6669-various-problems-can-bundle-script branch from c6799f3 to 8ae55de Compare November 2, 2024 07:51

hannes-ucsc self-requested a review November 2, 2024 07:51

hannes-ucsc previously approved these changes Nov 2, 2024

View reviewed changes

hannes-ucsc assigned achave11-ucsc and unassigned hannes-ucsc Nov 2, 2024

achave11-ucsc added the sandbox [process] Resolution is being verified in sandbox deployment label Nov 5, 2024

achave11-ucsc dismissed hannes-ucsc’s stale review via 1a6d5e3 November 5, 2024 07:21

achave11-ucsc force-pushed the issues/nadove-ucsc/6669-various-problems-can-bundle-script branch 2 times, most recently from 1a6d5e3 to 8ae55de Compare November 5, 2024 19:41

achave11-ucsc removed their assignment Nov 5, 2024

nadove-ucsc added 2 commits November 5, 2024 11:48

Rename, relocate, and document method

cad323c

Fix: Inaccurate module-level docstring in can_bundle script (#6669)

644377f

nadove-ucsc and others added 5 commits November 5, 2024 11:48

Fix: Faulty/brittle default value for source parameter in can_bundle …

8da52fb

…script (#6669)

Fix: Incorrect help message for version parameter in can_bundle script (

2b0d7d8

#6669)

can_bundle script requires explicit table name for AnVIL sources (#6669)

f0be49d

Fix formatting

85b36ea

Fix missing parameter in inactive code

d53b159

This fix is untested since it touches code that is disabled (conditional upon DSS direct access).

nadove-ucsc force-pushed the issues/nadove-ucsc/6669-various-problems-can-bundle-script branch from 8ae55de to d53b159 Compare November 5, 2024 19:48

nadove-ucsc assigned achave11-ucsc Nov 5, 2024

achave11-ucsc requested a review from hannes-ucsc November 5, 2024 20:51

achave11-ucsc assigned hannes-ucsc and unassigned achave11-ucsc Nov 5, 2024

hannes-ucsc approved these changes Nov 5, 2024

View reviewed changes

hannes-ucsc assigned achave11-ucsc and unassigned hannes-ucsc Nov 5, 2024

hannes-ucsc removed the sandbox [process] Resolution is being verified in sandbox deployment label Nov 5, 2024

achave11-ucsc added the sandbox [process] Resolution is being verified in sandbox deployment label Nov 6, 2024

achave11-ucsc merged commit bee4a60 into develop Nov 6, 2024
11 checks passed

achave11-ucsc deleted the issues/nadove-ucsc/6669-various-problems-can-bundle-script branch November 6, 2024 16:14

achave11-ucsc removed their assignment Nov 6, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Various problems in can_bundle script (#6669) #6670

Fix: Various problems in can_bundle script (#6669) #6670

nadove-ucsc commented Oct 31, 2024 •

edited by achave11-ucsc

Loading

codecov bot commented Oct 31, 2024 •

edited

Loading

coveralls commented Oct 31, 2024 •

edited

Loading

dsotirho-ucsc Oct 31, 2024

dsotirho-ucsc Oct 31, 2024

dsotirho-ucsc left a comment

hannes-ucsc commented Nov 2, 2024

Fix: Various problems in can_bundle script (#6669) #6670

Fix: Various problems in can_bundle script (#6669) #6670

Conversation

nadove-ucsc commented Oct 31, 2024 • edited by achave11-ucsc Loading

Checklist

Author

Author (partiality)

Author (chains)

Author (reindex, API changes)

Author (upgrading deployments)

Author (hotfixes)

Author (before every review)

Peer reviewer (after approval)

System administrator (after approval)

Operator (before pushing merge the commit)

System administrator

Operator (before pushing merge the commit)

Operator (chain shortening)

Operator (after pushing the merge commit)

Operator (reindex)

Operator

Shorthand for review comments

codecov bot commented Oct 31, 2024 • edited Loading

Codecov Report

coveralls commented Oct 31, 2024 • edited Loading

dsotirho-ucsc Oct 31, 2024

Choose a reason for hiding this comment

dsotirho-ucsc Oct 31, 2024

Choose a reason for hiding this comment

dsotirho-ucsc left a comment

Choose a reason for hiding this comment

hannes-ucsc commented Nov 2, 2024

Security design review

nadove-ucsc commented Oct 31, 2024 •

edited by achave11-ucsc

Loading

codecov bot commented Oct 31, 2024 •

edited

Loading

coveralls commented Oct 31, 2024 •

edited

Loading