Commita867c48

authored

feat(api): allow updating protected branches (#2771)

* feat(api): allow updating protected branchesCloses#2390

1 parent9440a32 commita867c48Copy full SHA for a867c48

File tree

+36

-5

lines changed

+36

-5

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,11 @@ Get a single protected branch::`
`27`	`27`
`28`	`28`	`p_branch = project.protectedbranches.get('main')`
`29`	`29`
	`30`	`+Update a protected branch:`
	`31`	`+`
	`32`	`+ p_branch.allow_force_push = True`
	`33`	`+ p_branch.save()`
	`34`	`+`
`30`	`35`	`Create a protected branch::`
`31`	`36`
`32`	`37`	`p_branch = project.protectedbranches.create({`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,13 @@`
`1`	`1`	`fromtypingimportAny,cast,Union`
`2`	`2`
`3`	`3`	`fromgitlab.baseimportRESTManager,RESTObject`
`4`		`-fromgitlab.mixinsimportNoUpdateMixin,ObjectDeleteMixin`
	`4`	`+fromgitlab.mixinsimport (`
	`5`	`+CRUDMixin,`
	`6`	`+NoUpdateMixin,`
	`7`	`+ObjectDeleteMixin,`
	`8`	`+SaveMixin,`
	`9`	`+UpdateMethod,`
	`10`	`+)`
`5`	`11`	`fromgitlab.typesimportRequiredOptional`
`6`	`12`
`7`	`13`	`__all__= [`
`@@ -28,11 +34,11 @@ def get(`
`28`	`34`	`returncast(ProjectBranch,super().get(id=id,lazy=lazy,**kwargs))`
`29`	`35`
`30`	`36`
`31`		`-classProjectProtectedBranch(ObjectDeleteMixin,RESTObject):`
	`37`	`+classProjectProtectedBranch(SaveMixin,ObjectDeleteMixin,RESTObject):`
`32`	`38`	`_id_attr="name"`
`33`	`39`
`34`	`40`
`35`		`-classProjectProtectedBranchManager(NoUpdateMixin,RESTManager):`
	`41`	`+classProjectProtectedBranchManager(CRUDMixin,RESTManager):`
`36`	`42`	`_path="/projects/{project_id}/protected_branches"`
`37`	`43`	`_obj_cls=ProjectProtectedBranch`
`38`	`44`	`_from_parent_attrs= {"project_id":"id"}`
`@@ -49,6 +55,7 @@ class ProjectProtectedBranchManager(NoUpdateMixin, RESTManager):`
`49`	`55`	`"code_owner_approval_required",`
`50`	`56`	`),`
`51`	`57`	`)`
	`58`	`+_update_method=UpdateMethod.PATCH`
`52`	`59`
`53`	`60`	`defget(`
`54`	`61`	`self,id:Union[str,int],lazy:bool=False,**kwargs:Any`

Lines changed: 21 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -258,12 +258,31 @@ def test_project_pages_domains(gl, project):`
`258`	`258`	`assertdomainnotinproject.pagesdomains.list()`
`259`	`259`
`260`	`260`
`261`		`-deftest_project_protected_branches(project):`
`262`		`-p_b=project.protectedbranches.create({"name":"*-stable"})`
	`261`	`+deftest_project_protected_branches(project,wait_for_sidekiq,gitlab_version):`
	`262`	`+# Updating a protected branch is possible from Gitlab 15.6`
	`263`	`+# https://docs.gitlab.com/ee/api/protected_branches.html#update-a-protected-branch`
	`264`	`+can_update_prot_branch=gitlab_version.major>15or (`
	`265`	`+gitlab_version.major==15andgitlab_version.minor>=6`
	`266`	`+ )`
	`267`	`+`
	`268`	`+p_b=project.protectedbranches.create(`
	`269`	`+ {`
	`270`	`+"name":"*-stable",`
	`271`	`+"allow_force_push":False,`
	`272`	`+ }`
	`273`	`+ )`
`263`	`274`	`assertp_b.name=="*-stable"`
	`275`	`+assertnotp_b.allow_force_push`
`264`	`276`	`assertp_binproject.protectedbranches.list()`
`265`	`277`
	`278`	`+ifcan_update_prot_branch:`
	`279`	`+p_b.allow_force_push=True`
	`280`	`+p_b.save()`
	`281`	`+wait_for_sidekiq(timeout=60)`
	`282`	`+`
`266`	`283`	`p_b=project.protectedbranches.get("*-stable")`
	`284`	`+ifcan_update_prot_branch:`
	`285`	`+assertp_b.allow_force_push`
`267`	`286`	`p_b.delete()`
`268`	`287`	`assertp_bnotinproject.protectedbranches.list()`
`269`	`288`

Comments

(0)