Skip to content

Conversation

@nadove-ucsc
Copy link
Contributor

@nadove-ucsc nadove-ucsc commented Jul 23, 2025

Linked issues: #7066

Checklist

Author

  • PR is assigned to the author
  • Status of PR is In progress
  • PR is a draft
  • Target branch is develop
  • Name of PR branch matches issues/<GitHub handle of author>/<issue#>-<slug>
  • PR is linked to all issues it (partially) resolves
  • Status of linked issues is In progress
  • PR description links to linked issues
  • PR title matches1 that of a linked issue or comment in PR explains why they're different
  • PR title references all linked issues
  • For each linked issue, there is at least one commit whose title references that issue

1 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 linked issues
  • This PR partially resolves each of the linked issues or does not have the partial label

Author (reindex)

  • 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

Author (API changes)

  • This PR and its linked 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 linked issues or the none of the stable branches (anvilprod and prod) have temporary hotfixes for any of the issues linked to this PR

Author (before every review)

  • Rebased PR branch on develop, squashed fixups from prior reviews
  • Ran make requirements_update or this PR does not modify Dockerfile, environment, requirements*.txt, common.mk, Makefile or environment.boot
  • 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
  • PR is awaiting requested review from a peer
  • Status of PR is Review requested
  • PR is assigned to only the peer

Peer reviewer (after approval)

Note that when requesting changes, the PR must be assigned back to the author.

  • Actually approved the PR
  • PR is not a draft
  • PR is awaiting requested review from system administrator
  • Status of PR is Review requested
  • PR is assigned to only the system administrator

System administrator (after approval)

  • Actually approved the PR
  • Labeled linked issues as demo or no demo
  • Commented on linked issues about demo expectations or all linked 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
  • Status of PR is Approved
  • PR is assigned to only the operator

Operator

  • Checked reindex:… labels and r commit title tag
  • Checked that demo expectations are clear or all linked issues are labeled no demo
  • Squashed PR branch and rebased onto develop
  • Sanity-checked history
  • Pushed PR branch to GitHub

Operator (deploy .shared and .gitlab components)

  • Ran _select dev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unused or this PR is not labeled deploy:shared
  • Ran _select dev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab apply or this PR is not labeled deploy:gitlab
  • Ran _select anvildev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unused or this PR is not labeled deploy:shared
  • Ran _select anvildev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab apply or this PR is not labeled deploy:gitlab
  • Checked the items in the next section or this PR is labeled deploy:gitlab
  • PR is assigned to only the system administrator or this PR is not labeled deploy:gitlab

System administrator (post-deploy of .gitlab component)

  • 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 (deploy runner image)

  • Ran _select dev.gitlab && make -C terraform/gitlab/runner or this PR is not labeled deploy:runner
  • Ran _select anvildev.gitlab && make -C terraform/gitlab/runner or this PR is not labeled deploy:runner

Operator (sandbox build)

  • Added sandbox label or PR is labeled no sandbox
  • Pushed PR branch to GitLab dev or PR is labeled no sandbox
  • Pushed PR branch to GitLab anvildev or PR is labeled no sandbox
  • Build passes in sandbox deployment or PR is labeled no sandbox
  • Build passes in anvilbox deployment or PR is labeled no sandbox
  • Reviewed build logs for anomalies in sandbox deployment or PR is labeled no sandbox
  • Reviewed build logs for anomalies in anvilbox deployment or PR is labeled no sandbox
  • Deleted unreferenced indices in sandbox or this PR does not remove catalogs or otherwise causes unreferenced indices in dev
  • Deleted unreferenced indices in anvilbox or this PR does not remove catalogs or otherwise causes unreferenced indices in anvildev
  • Started reindex in sandbox or this PR is not labeled reindex:dev
  • Started reindex in anvilbox or this PR is not labeled reindex:anvildev
  • Checked for failures in sandbox or this PR is not labeled reindex:dev
  • Checked for failures in anvilbox or this PR is not labeled reindex:anvildev

Operator (merge the branch)

  • All status checks passed and the PR is mergeable
  • The title of the merge commit starts with the title of this PR
  • Added PR # reference to merge commit title
  • Collected commit title tags in merge commit title but only included p if the PR is also labeled partial
  • Pushed merge commit to GitHub
  • Status of PR is Merged lower
  • Status of blocked issues is Triage or no issues are blocked on the linked issues

Operator (main build)

  • Pushed merge commit to GitLab dev
  • Pushed merge commit to GitLab anvildev
  • Build passes on GitLab dev
  • Reviewed build logs for anomalies on GitLab dev
  • Build passes on GitLab anvildev
  • Reviewed build logs for anomalies on GitLab anvildev
  • Ran _select dev.shared && make -C terraform/shared apply or this PR is not labeled deploy:shared
  • Ran _select anvildev.shared && make -C terraform/shared apply or this PR is not labeled deploy:shared
  • Deleted PR branch from GitHub
  • Deleted PR branch from GitLab dev
  • Deleted PR branch from GitLab anvildev
  • Status of linked issues is Lower, or Triage, if PR is partial

Operator (reindex)

  • Deindexed all unreferenced catalogs in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Deindexed all unreferenced catalogs in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Deindexed specific sources in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Deindexed specific sources in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Indexed specific sources in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Indexed specific sources in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Started reindex in dev or this PR does not require reindexing dev
  • Started reindex in anvildev or this PR does not require reindexing anvildev
  • Checked for, triaged and possibly requeued messages in both fail queues in dev or this PR does not require reindexing dev
  • Checked for, triaged and possibly requeued messages in both fail queues in anvildev or this PR does not require reindexing anvildev
  • Emptied fail queues in dev or this PR does not require reindexing dev
  • Emptied fail queues in anvildev or this PR does not require reindexing anvildev
  • Restarted the Data Browser pipeline for the ucsc/hca/dev branch on GitLab in dev or this PR does not require reindexing dev
  • Restarted the Data Browser pipeline for the ucsc/lungmap/dev branch on GitLab in dev or this PR does not require reindexing dev
  • Restarted deploy_browser job in the GitLab pipeline for this PR in dev or this PR does not require reindexing dev
  • Restarted the Data Browser pipeline for the ucsc/anvil/anvildev branch on GitLab in anvildev or this PR does not require reindexing anvildev
  • Restarted deploy_browser job in the GitLab pipeline for this PR in anvildev or this PR does not require reindexing anvildev

Operator (mirroring)

  • Started mirroring in dev or this PR does not require mirroring dev
  • Started mirroring in anvildev or this PR does not require mirroring anvildev
  • Checked for, triaged and possibly requeued messages in mirror fail queue in dev or this PR does not require mirroring dev
  • Checked for, triaged and possibly requeued messages in mirror fail queue in anvildev or this PR does not require mirroring anvildev
  • Emptied mirror fail queue in dev or this PR does not require mirroring dev
  • Emptied mirror fail queue in anvildev or this PR does not require mirroring anvildev

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

@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7066-configure-mirroring-per-catalog-source branch from ec00e72 to 9a2a0df Compare July 23, 2025 23:58
@codecov
Copy link

codecov bot commented Jul 24, 2025

Codecov Report

❌ Patch coverage is 76.47059% with 24 lines in your changes missing coverage. Please review.
✅ Project coverage is 85.18%. Comparing base (27e0702) to head (a4b4c1f).
⚠️ Report is 16 commits behind head on develop.

Files with missing lines Patch % Lines
test/integration_test.py 0.00% 22 Missing ⚠️
src/azul/azulclient.py 84.61% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #7304      +/-   ##
===========================================
- Coverage    85.19%   85.18%   -0.01%     
===========================================
  Files          156      156              
  Lines        22571    22626      +55     
===========================================
+ Hits         19229    19275      +46     
- Misses        3342     3351       +9     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@coveralls
Copy link

coveralls commented Jul 24, 2025

Coverage Status

coverage: 85.407% (-0.002%) from 85.409%
when pulling a4b4c1f on issues/nadove-ucsc/7066-configure-mirroring-per-catalog-source
into 27e0702 on develop.

@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7066-configure-mirroring-per-catalog-source branch from 9a2a0df to bd78fc9 Compare July 24, 2025 01:18
@nadove-ucsc nadove-ucsc added reindex:dev [process] PR requires reindexing dev reindex:anvildev [process] PR requires reindexing anvildev reindex:anvilprod [process] PR requires reindexing anvilprod reindex:prod [process] PR requires reindexing prod upgrade [process] PR includes commit requiring manual upgrade API API change affecting callers labels Jul 24, 2025
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7066-configure-mirroring-per-catalog-source branch 2 times, most recently from a362f4b to 3cbdd94 Compare July 24, 2025 02:16
@hannes-ucsc hannes-ucsc linked an issue Sep 11, 2025 that may be closed by this pull request
@hannes-ucsc hannes-ucsc removed the orange label Oct 2, 2025
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7066-configure-mirroring-per-catalog-source branch from 3cbdd94 to 81888a7 Compare October 15, 2025 21:24
@nadove-ucsc nadove-ucsc changed the base branch from develop to issues/nadove-ucsc/7305-separate-prefix-source-spec October 15, 2025 21:25
@nadove-ucsc nadove-ucsc added the chained [process] PR needs to based of develop before merging label Oct 15, 2025
@nadove-ucsc nadove-ucsc changed the base branch from issues/nadove-ucsc/7305-separate-prefix-source-spec to develop October 15, 2025 21:50
@nadove-ucsc nadove-ucsc removed the chained [process] PR needs to based of develop before merging label Oct 15, 2025
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7066-configure-mirroring-per-catalog-source branch 2 times, most recently from 499183d to b57682a Compare October 17, 2025 04:10
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7066-configure-mirroring-per-catalog-source branch 2 times, most recently from c51b2ee to 95769be Compare October 17, 2025 19:30
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7066-configure-mirroring-per-catalog-source branch 4 times, most recently from cbdef15 to 401f5a2 Compare October 30, 2025 07:23
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7066-configure-mirroring-per-catalog-source branch from 2f20db8 to 687456b Compare November 18, 2025 07:26
Copy link
Member

@hannes-ucsc hannes-ucsc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comparing anvildev and anvilbox, I don't think I should be getting this hunk:

Image

I'm just spot-checking. Please do a systematic comparison of the environment.py files. Compare the sandboxes against each other, and compare each main deployment against its sandbox. Compare all AnVIL main deployments against each other. Compare all HCA main deployments against each other.

@hannes-ucsc hannes-ucsc removed their assignment Nov 18, 2025
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7066-configure-mirroring-per-catalog-source branch from 687456b to 229bdbd Compare November 19, 2025 08:31
hannes-ucsc
hannes-ucsc previously approved these changes Nov 19, 2025
@hannes-ucsc
Copy link
Member

Security design review

  • Security design review completed; this PR does not
    • … affect authentication; for example:
      • OAuth 2.0 with the application (API or Swagger UI)
      • Authentication of developers with Google Cloud APIs
      • Authentication of developers with AWS APIs
      • Authentication with a GitLab instance in the system
      • Password and 2FA authentication with GitHub
      • API access token authentication with GitHub
      • Authentication with Terra
    • … affect the permissions of internal users like access to
      • Cloud resources on AWS and GCP
      • GitLab repositories, projects and groups, administration
      • an EC2 instance via SSH
      • GitHub issues, pull requests, commits, commit statuses, wikis, repositories, organizations
    • … affect the permissions of external users like access to
      • TDR snapshots
    • … affect permissions of service or bot accounts
      • Cloud resources on AWS and GCP
    • … affect audit logging in the system, like
      • adding, removing or changing a log message that represents an auditable event
      • changing the routing of log messages through the system
    • … affect monitoring of the system
    • … introduce a new software dependency like
      • Python packages on PYPI
      • Command-line utilities
      • Docker images
      • Terraform providers
    • … add an interface that exposes sensitive or confidential data at the security boundary
    • … affect the encryption of data at rest
    • … require persistence of sensitive or confidential data that might require encryption at rest
    • … require unencrypted transmission of data within the security boundary
    • … affect the network security layer; for example by
      • modifying, adding or removing firewall rules
      • modifying, adding or removing security groups
      • changing or adding a port a service, proxy or load balancer listens on
  • Documentation on any unchecked boxes is provided in comments below

@achave11-ucsc achave11-ucsc force-pushed the issues/nadove-ucsc/7066-configure-mirroring-per-catalog-source branch from 229bdbd to 7717cce Compare November 19, 2025 18:48
@achave11-ucsc achave11-ucsc added the sandbox [process] Resolution is being verified in sandbox deployment label Nov 19, 2025
@achave11-ucsc
Copy link
Member

Sandbox builds failed for this PR, see:

python -m azul.template .chalice/config.json.template.py .chalice/config.json
Traceback (most recent call last):
  File "<frozen runpy>", line 198, in _run_module_as_main
  File "<frozen runpy>", line 88, in _run_code
  File "/builds/ucsc/azul/src/azul/template/__main__.py", line 35, in <module>
    load_module(template, __name__)
    ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^
  File "/builds/ucsc/azul/src/azul/modules.py", line 50, in load_module
    spec.loader.exec_module(module)
    ~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^
  File "<frozen importlib._bootstrap_external>", line 1027, in exec_module
  File "<frozen importlib._bootstrap>", line 488, in _call_with_frames_removed
  File "/builds/ucsc/azul/lambdas/indexer/.chalice/config.json.template.py", line 19, in <module>
    indexer = load_app_module(app_name)
  File "/builds/ucsc/azul/src/azul/modules.py", line 57, in load_app_module
    return load_module(path, f'lambdas.{lambda_name}.app')
  File "/builds/ucsc/azul/src/azul/modules.py", line 50, in load_module
    spec.loader.exec_module(module)
    ~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^
  File "<frozen importlib._bootstrap_external>", line 1027, in exec_module
  File "<frozen importlib._bootstrap>", line 488, in _call_with_frames_removed
  File "/builds/ucsc/azul/lambdas/indexer/app.py", line 112, in <module>
    globals().update(app.index_controller.handlers())
                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/builds/ucsc/azul/src/azul/indexer/index_controller.py", line 116, in handlers
    schema.enum(*config.catalogs),
                 ^^^^^^^^^^^^^^^
  File "/builds/ucsc/azul/src/azul/caching.py", line 203, in __get__
    value = obj.__dict__[self.fget.__name__] = self.fget(obj)
                                               ~~~~~~~~~^^^^^
  File "/builds/ucsc/azul/src/azul/__init__.py", line 1017, in catalogs
    name: self.Catalog.from_json(name, catalog)
          ~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^
  File "/builds/ucsc/azul/src/azul/__init__.py", line 989, in from_json
    for source_spec, source_config in json_mapping(spec['sources']).items()
                                      ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^
  File "/builds/ucsc/azul/src/azul/types.py", line 61, in json_mapping
    assert isinstance(v, Mapping), type(v)
           ~~~~~~~~~~^^^^^^^^^^^^
AssertionError: <class 'list'>
make[2]: *** [/builds/ucsc/azul/lambdas/../common.mk:123: .chalice/config.json] Error 1
make[2]: Leaving directory '/builds/ucsc/azul/lambdas/indexer'
make[1]: Leaving directory '/builds/ucsc/azul/lambdas'
make[1]: *** [Makefile:12: indexer] Error 2
make: *** [Makefile:98: lambdas] Error 2
Cleaning up project directory and file based variables 00:00
ERROR: Job failed: exit code 1

@achave11-ucsc achave11-ucsc removed their assignment Nov 19, 2025
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/7066-configure-mirroring-per-catalog-source branch 2 times, most recently from a8d2464 to c92bc8a Compare November 19, 2025 22:54
@achave11-ucsc achave11-ucsc force-pushed the issues/nadove-ucsc/7066-configure-mirroring-per-catalog-source branch from c92bc8a to a4b4c1f Compare November 20, 2025 01:07
@hannes-ucsc hannes-ucsc merged commit a20581b into develop Nov 20, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1 review [process] Lead requested changes once API API change affecting callers reindex:anvildev [process] PR requires reindexing anvildev reindex:anvilprod [process] PR requires reindexing anvilprod reindex:dev [process] PR requires reindexing dev reindex:prod [process] PR requires reindexing prod sandbox [process] Resolution is being verified in sandbox deployment upgrade [process] PR includes commit requiring manual upgrade

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Configure mirroring per catalog and source

5 participants