Skip to content

Commit 5f395c6

Browse files
authored
chore: switch to v2 style workgroups (#8656)
* chore: rename mozilla-confidential workgroup * chore: rename ads workgroup * chore: rename contextual-services workgroup
1 parent 63393b2 commit 5f395c6

File tree

167 files changed

+178
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+178
-175
lines changed

bigquery_etl/backfill/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
BACKFILL_DESTINATION_DATASET = "backfills_staging_derived"
2929

3030
# currently only supporting backfilling tables with workgroup access: mozilla-confidential.
31-
VALID_WORKGROUP_MEMBER = "workgroup:mozilla-confidential"
31+
VALID_WORKGROUP_MEMBER = "workgroup:mozilla-confidential/data-viewers"
3232

3333
# Backfills older than this will not run due to staging table expiration
3434
MAX_BACKFILL_ENTRY_AGE_DAYS = 28
@@ -185,7 +185,7 @@ def validate_metadata_workgroups(sql_dir, qualified_table_name) -> bool:
185185
"""
186186
Check if either table or dataset metadata workgroup is valid.
187187
188-
The backfill staging dataset currently only support backfilling datasets and tables for workgroup:mozilla-confidential.
188+
The backfill staging dataset currently only support backfilling datasets and tables for workgroup:mozilla-confidential/data-viewers.
189189
"""
190190
project, dataset, table = qualified_table_name_matching(qualified_table_name)
191191
query_file = Path(sql_dir) / project / dataset / table / "query.sql"
@@ -237,7 +237,7 @@ def validate_metadata_workgroups(sql_dir, qualified_table_name) -> bool:
237237

238238

239239
def _validate_workgroup_members(workgroup_access, metadata_filename):
240-
"""Return True if workgroup members is valid (workgroup:mozilla-confidential)."""
240+
"""Return True if workgroup members is valid (workgroup:mozilla-confidential/data-viewers)."""
241241
if workgroup_access:
242242
for workgroup in workgroup_access:
243243
if metadata_filename == METADATA_FILE:

bigquery_etl/metadata/parse_metadata.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
METADATA_FILE = "metadata.yaml"
1919
DATASET_METADATA_FILE = "dataset_metadata.yaml"
2020
DEFAULT_WORKGROUP_ACCESS = [
21-
dict(role="roles/bigquery.dataViewer", members=["workgroup:mozilla-confidential"])
21+
dict(
22+
role="roles/bigquery.dataViewer",
23+
members=["workgroup:mozilla-confidential/data-viewers"],
24+
)
2225
]
2326
DEFAULT_TABLE_WORKGROUP_ACCESS = DEFAULT_WORKGROUP_ACCESS
2427

docs/cookbooks/common_workflows.md

Lines changed: 1 addition & 1 deletion

sql/moz-fx-data-shared-prod/accounts_backend/dataset_metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ labels: {}
77
workgroup_access:
88
- role: roles/bigquery.dataViewer
99
members:
10-
- workgroup:mozilla-confidential
10+
- workgroup:mozilla-confidential/data-viewers

sql/moz-fx-data-shared-prod/accounts_db/dataset_metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ labels: {}
99
workgroup_access:
1010
- role: roles/bigquery.dataViewer
1111
members:
12-
- workgroup:mozilla-confidential
12+
- workgroup:mozilla-confidential/data-viewers

sql/moz-fx-data-shared-prod/accounts_db_derived/dataset_metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ labels: {}
77
workgroup_access:
88
- role: roles/bigquery.dataViewer
99
members:
10-
- workgroup:mozilla-confidential
10+
- workgroup:mozilla-confidential/data-viewers
1111
syndication: {}

sql/moz-fx-data-shared-prod/acoustic/dataset_metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ labels: {}
77
workgroup_access:
88
- role: roles/bigquery.dataViewer
99
members:
10-
- workgroup:mozilla-confidential
10+
- workgroup:mozilla-confidential/data-viewers

sql/moz-fx-data-shared-prod/acoustic_derived/dataset_metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ labels: {}
77
workgroup_access:
88
- role: roles/bigquery.dataViewer
99
members:
10-
- workgroup:mozilla-confidential
10+
- workgroup:mozilla-confidential/data-viewers

sql/moz-fx-data-shared-prod/activity_stream/dataset_metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ labels: {}
88
workgroup_access:
99
- role: roles/bigquery.dataViewer
1010
members:
11-
- workgroup:mozilla-confidential
11+
- workgroup:mozilla-confidential/data-viewers
1212
- workgroup:pocket/prefect

sql/moz-fx-data-shared-prod/activity_stream_bi/dataset_metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ labels: {}
88
workgroup_access:
99
- role: roles/bigquery.dataViewer
1010
members:
11-
- workgroup:mozilla-confidential
11+
- workgroup:mozilla-confidential/data-viewers
1212
- workgroup:pocket/external
1313
- workgroup:pocket/prefect

0 commit comments

Comments
 (0)