Merge pull request #1278 from gitlabhq/bugfix/issue-1267

timofurrer · web-flow · commit 31bd5388e265 · 2022-10-24T19:36:16.000+02:00
resource/gitlab_branch_protection: Support `no one` in `unprotect_access_level`
diff --git a/docs/resources/branch_protection.md b/docs/resources/branch_protection.md
@@ -96,7 +96,7 @@ resource "gitlab_branch_protection" "main" {
 - `code_owner_approval_required` (Boolean) Can be set to true to require code owner approval before merging.
 - `merge_access_level` (String) Access levels allowed to merge. Valid values are: `no one`, `developer`, `maintainer`.
 - `push_access_level` (String) Access levels allowed to push. Valid values are: `no one`, `developer`, `maintainer`.
-- `unprotect_access_level` (String) Access levels allowed to unprotect. Valid values are: `developer`, `maintainer`.
+- `unprotect_access_level` (String) Access levels allowed to unprotect. Valid values are: `no one`, `developer`, `maintainer`.
 
 ### Read-Only
 
diff --git a/internal/provider/access_level_helpers.go b/internal/provider/access_level_helpers.go
@@ -54,7 +54,7 @@ var validProtectedBranchTagAccessLevelNames = []string{
 // The only access levels allowed to be configured to unprotect a protected branch
 // The API states the others are either forbidden (via 403) or invalid
 var validProtectedBranchUnprotectAccessLevelNames = []string{
-	"developer", "maintainer",
+	"no one", "developer", "maintainer",
 }
 
 var validProtectedEnvironmentDeploymentLevelNames = []string{

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ var validProtectedBranchTagAccessLevelNames = []string{`
`54`	`54`	`// The only access levels allowed to be configured to unprotect a protected branch`
`55`	`55`	`// The API states the others are either forbidden (via 403) or invalid`
`56`	`56`	`var validProtectedBranchUnprotectAccessLevelNames = []string{`
`57`		`- "developer", "maintainer",`
	`57`	`+ "no one", "developer", "maintainer",`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`var validProtectedEnvironmentDeploymentLevelNames = []string{`