Skip to content

Commit

Permalink
Merge branch 'update_the_security_reviewer' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
RotemAmit authored Feb 2, 2025
2 parents e018c5e + 2675697 commit a60d2d5
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/content_roles.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"talzich"
],
"CONTRIBUTION_TL": "JudahSchwartz",
"CONTRIBUTION_SECURITY_REVIEWER": ["karinafishman"],
"CONTRIBUTION_SECURITY_REVIEWER": ["benimanela"],
"ON_CALL_DEVS": [
"mwienfeld",
"okarkkatz"
Expand Down
1 change: 1 addition & 0 deletions .github/github_workflow_scripts/handle_external_pr.py
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ def main():
# Parse PR reviewers from JSON and assign them
# Exit if JSON doesn't exist or not parsable
content_roles = get_content_roles()
print(f"{content_roles=}")

if not content_roles:
print("Unable to retrieve the content roles. Exiting...")
Expand Down
20 changes: 12 additions & 8 deletions .github/github_workflow_scripts/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,14 +297,18 @@ def get_content_roles(path: Path | None = None) -> dict[str, Any] | None:
- `dict[str, Any]` representing the content roles.
"""

print(f"Attempting to retrieve '{CONTENT_ROLES_FILENAME}' from blob {CONTENT_ROLES_BLOB_MASTER_URL}...")
roles = get_content_roles_from_blob()

if not roles:
print(f"Unable to retrieve '{CONTENT_ROLES_FILENAME}' from blob. Attempting to retrieve from the filesystem...")
repo_root_path = get_repo_path(str(path))
content_roles_path = repo_root_path / GITHUB_HIDDEN_DIR / CONTENT_ROLES_FILENAME
roles = load_json(content_roles_path)
# print(f"Attempting to retrieve '{CONTENT_ROLES_FILENAME}' from blob {CONTENT_ROLES_BLOB_MASTER_URL}...")
# roles = get_content_roles_from_blob()
#
# if not roles:
# print(f"Unable to retrieve '{CONTENT_ROLES_FILENAME}' from blob. Attempting to retrieve from the filesystem...")
# repo_root_path = get_repo_path(str(path))
# content_roles_path = repo_root_path / GITHUB_HIDDEN_DIR / CONTENT_ROLES_FILENAME
# roles = load_json(content_roles_path)
print(f"Unable to retrieve '{CONTENT_ROLES_FILENAME}' from blob. Attempting to retrieve from the filesystem...")
repo_root_path = get_repo_path(str(path))
content_roles_path = repo_root_path / GITHUB_HIDDEN_DIR / CONTENT_ROLES_FILENAME
roles = load_json(content_roles_path)

return roles

Expand Down

0 comments on commit a60d2d5

Please sign in to comment.