Skip to content

Pack 2.1.3: fix update_branch_protection action #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cognifloyd merged 4 commits into from
Sep 7, 2022
Merged

Pack 2.1.3: fix update_branch_protection action #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5048fc9
2.1.3: fix update_branch_protection action
igcherkaev Sep 7, 2022
f9e0415
Merge remote-tracking branch 'origin/dev' into dev
igcherkaev Sep 7, 2022
487508a
Merge pull request #10
igcherkaev Sep 7, 2022
c9890b2
Merge branch 'StackStorm-Exchange:master' into master
igcherkaev Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions actions/lib/formatters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,16 @@ def branch_protection_to_dict(branch_protection):
result[attr] = {}
for attr2 in required_pull_request_reviews_attributes:
if attr2 == 'dismissal_users':
users = [user.login for user in req_pr_reviews.dismissal_users]
if req_pr_reviews.dismissal_users is not None:
users = [user.login for user in req_pr_reviews.dismissal_users]
else:
users = None
result[attr][attr2] = users
elif attr2 == 'dismissal_teams':
teams = [team.slug for team in req_pr_reviews.dismissal_teams]
if req_pr_reviews.dismissal_teams is not None:
teams = [team.slug for team in req_pr_reviews.dismissal_teams]
else:
teams = None
result[attr][attr2] = teams
else:
result[attr][attr2] = getattr(req_pr_reviews, attr2)
Expand Down
15 changes: 12 additions & 3 deletions actions/update_branch_protection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ def run(self, user, repo, branch, required_status_checks, enforce_admins,
user_push_restrictions = restrictions['user_push_restrictions']
team_push_restrictions = restrictions['team_push_restrictions']

if not dismissal_users:
dismissal_users = NotSet
if not dismissal_teams:
dismissal_teams = NotSet

branch.edit_protection(strict=strict, contexts=contexts,
enforce_admins=enforce_admins,
dismissal_users=dismissal_users,
Expand All @@ -64,9 +69,13 @@ def run(self, user, repo, branch, required_status_checks, enforce_admins,
GITHUB_BRANCH = os.environ.get('GITHUB_BRANCH')

# As produced by get_branch_protection action
BRANCH_PROTECTION = {'enforce_admins': True,
'required_pull_request_reviews': None,
'required_status_checks': {'contexts': [], 'strict': True},
BRANCH_PROTECTION = {'enforce_admins': False,
'required_pull_request_reviews': {'dismiss_stale_reviews': False,
'dismissal_teams': None,
'dismissal_users': None,
'require_code_owner_reviews': False,
'required_approving_review_count': 0},
'required_status_checks': None,
'restrictions': None
}

Expand Down
2 changes: 1 addition & 1 deletion pack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ keywords:
- git
- scm
- serverless
version: 2.1.2
version: 2.1.3
python_versions:
- "3"
author : StackStorm, Inc.
Expand Down