Skip to content

Commit eab0f07

Browse files
committed
[u r] Promotion 2025-12-09 prod (#7628, PR #7636)
2 parents adc5df2 + 7e65530 commit eab0f07

File tree

15 files changed

+587
-372
lines changed

15 files changed

+587
-372
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
name: Update the ZAP scan context file
3+
about: Template for the annual review/update of the web application vulnerability scan (DAST) context file
4+
title: Update the ZAP scan context file
5+
labels: -,compliance,infra,no demo,operator
6+
type: Chore
7+
_repository: DataBiosphere/azul-private
8+
_start: 2026-01-01T09:00
9+
_period: 1 year
10+
---
11+
- [ ] Export the `Default Context` provided by ZAP to a temporary file
12+
- [ ] Compare the exported file with [azul-zap-scan.context](https://github.com/DataBiosphere/azul-private/blob/main/azul-zap-scan.context) and apply any relevant changes to the latter
13+
- [ ] Open a new PR with the resulting changes, if any
14+
15+
Relevant changes are those that add entries to the `<tech>` element, or that enable additional features. The `<alertFilters>` element should generally be left as is, because it controls what findings we deem false positives.

OPERATOR.rst

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -743,24 +743,34 @@ session`_ and run a scan. After your scan has completed and you have generated
743743
a report, close the ZAP application, and then repeat the steps above to start
744744
each additional scan with a fresh authentication token.
745745

746-
.. _`create a new session`: #zap-sessions
747-
748-
ZAP Sessions
749-
""""""""""""
750-
751-
With the ZAP application open, you must start a new session prior to running a
752-
new scan. Failure to do so can pollute the scan results with the findings from
753-
the previous scan. A new session is created each time you launch ZAP, or
754-
alternatively, to manually open a new session, from the app menu bar select
755-
*File*, and then *New Session*.
756-
746+
.. _`create a new session`: #zap-context-and-sessions
747+
748+
ZAP Context and Sessions
749+
""""""""""""""""""""""""
750+
751+
With the ZAP application open, and prior to running any scan, start a new
752+
session and import `azul-zap-scan.context`_ from the azul-private repo.
753+
Failure to do so will pollute the scan results with known false positives and
754+
findings from the previous scan. A new session is created each time you launch
755+
ZAP. Alternatively, to manually open a new session, select *File* from the
756+
application menu bar, and then select *New Session*.
757+
758+
To import the context file select *File* from the application menu bar, followed
759+
by *Import Context…* and then proceed to find the `azul-zap-scan.context`_ file
760+
and click *Open*. Confirm the context is *In Scope* by double-clicking the newly
761+
imported context and ensuring the checkmark is present in the *In Scope*
762+
checkbox. After clicking *OK*, a red dot will be shown in the icon next to the
763+
entry labeled *Azul Context*. Lastly, delete the ``Default Context`` by
764+
right-clicking it and selecting the *Delete* option.
765+
˚
757766
If you are prompted with options to persist the ZAP session, select the *No, I
758767
do not want to persis this session at this moment in time* option and click
759768
*Start*.
760769

761770
You may now continue with either a `Data Portal / Browser scan`_ or `Azul
762771
Indexer / Service API scan`_.
763772

773+
.. _`azul-zap-scan.context`: https://github.com/DataBiosphere/azul-private/blob/main/azul-zap-scan.context
764774
.. _`Portal / Browser scan`: #running-a-portal-browser-scan
765775
.. _`Azul Indexer / Service API scan`: #running-an-azul-indexer-service-api-scan
766776

UPGRADING.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ reverted. This is all fairly informal and loosely defined. Hopefully we won't
2020
have too many entries in this file.
2121

2222

23+
#7543 No mirror-able sources in anvildev/anvilbox
24+
=================================================
25+
26+
In your AnVIL personal deployments' ``environment.py`` files, update the list of
27+
sources for the ``anvil`` catalog using the anvilbox deployment's
28+
``environment.py`` as a model. Redeploy and reindex your deployments after
29+
updating their configuration.
30+
31+
2332
#7571 Add new snapshot to dcp3 on HCA dev
2433
=========================================
2534

deployments/anvilbox/environment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def union(previous_catalog: dict[DatasetName, SourceItem | None],
7676
anvil_sources = union({}, 3, delta([
7777
source('e53e74aa', '1000G_2019_Dev_20230609_ANV5_202306121732'),
7878
source('42c70e6a', 'CCDG_Sample_1_20230228_ANV5_202302281520'),
79-
source('97ad270b', 'CMG_Sample_1_20230225_ANV5_202302281509')
79+
source('dd576076', 'CMG_Sample_1_20230225_ANV5_202512031111')
8080
]))
8181

8282

deployments/anvildev/environment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def union(previous_catalog: dict[DatasetName, SourceItem | None],
7474
anvil_sources = union({}, 3, delta([
7575
source('e53e74aa', '1000G_2019_Dev_20230609_ANV5_202306121732'),
7676
source('42c70e6a', 'CCDG_Sample_1_20230228_ANV5_202302281520'),
77-
source('97ad270b', 'CMG_Sample_1_20230225_ANV5_202302281509')
77+
source('dd576076', 'CMG_Sample_1_20230225_ANV5_202512031111')
7878
]))
7979

8080

deployments/prod/environment.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,6 +1759,14 @@ def union(previous_catalog: dict[DatasetName, SourceItem | None],
17591759
source('bigquery', 'datarepo-bb0a7bc5', 'hca_prod_c7a342eb777e447995ce468f5bbcd893__20251104_dcp2_20251104_dcp55'),
17601760
]))
17611761

1762+
dcp56_sources = union(dcp55_sources, 527, delta([
1763+
source('bigquery', 'datarepo-be20d3ab', 'hca_prod_1662accf0e0c48c493145aba063f2220__20240503_dcp2_20251202_dcp56'),
1764+
source('bigquery', 'datarepo-acfb8443', 'hca_prod_2079bb2e676e4bbf8c68f9c6459edcbb__20240327_dcp2_20251202_dcp56'),
1765+
source('bigquery', 'datarepo-37069141', 'hca_prod_4bcc16b57a4745bbb9c0be9d5336df2d__20240327_dcp2_20251202_dcp56'),
1766+
source('bigquery', 'datarepo-e753ed10', 'hca_prod_76bc0e978cae43d4a647477a13be47f9__20251202_dcp2_20251202_dcp56'),
1767+
source('bigquery', 'datarepo-91033277', 'hca_prod_9c20a245f2c043ae82c92232ec6b594f__20220212_dcp2_20251202_dcp56'),
1768+
]))
1769+
17621770
lungmap_sources = union({}, 3, delta([
17631771
source('bigquery', 'datarepo-32f75497', 'lungmap_prod_00f056f273ff43ac97ff69ca10e38c89__20220308_20220308'),
17641772
source('bigquery', 'datarepo-7066459d', 'lungmap_prod_1bdcecde16be420888f478cd2133d11d__20220308_20220308'),
@@ -1871,6 +1879,7 @@ def env() -> Mapping[str, str | None]:
18711879
sources=condense(sources))
18721880
for atlas, catalog, sources, mirror_limit, it_mirror_limit in [
18731881
('hca', 'dcp55', dcp55_sources, None, int(1.5 * 1024 ** 3)),
1882+
('hca', 'dcp56', dcp56_sources, None, int(1.5 * 1024 ** 3)),
18741883
('lungmap', 'lm9', lm9_sources, -1, -1)
18751884
]
18761885
for suffix, is_it in [

0 commit comments

Comments
 (0)