Merge pull request #785 from timofurrer/bugfix/pr-551

nagyv · web-flow · commit bb6a929a4433 · 2022-01-22T14:24:10.000+01:00
Fix bugs introduced with PR #551
diff --git a/docs/data-sources/project_protected_branch.md b/docs/data-sources/project_protected_branch.md
@@ -30,13 +30,14 @@ The following arguments are supported:
 
 The following attributes are exported:
 
-* `push_access_levels`, `merge_access_levels`, `unprotect_access_levels` - Each block contains a list of which access levels, users or groups are allowed to perform the respective actions (documented below).
+* `push_access_levels`, `merge_access_levels` - Each block contains a list of which access levels, users or groups are allowed to perform the respective actions (documented below).
 
+* `allow_force_push` - Whether force push is allowed.
 * `code_owner_approval_required` - Reject code pushes that change files listed in the CODEOWNERS file.
 
 ## Nested Blocks
 
-### `push_access_levels`, `merge_access_levels`, `unprotect_access_levels`
+### `push_access_levels`, `merge_access_levels`
 
 #### Attributes
 
diff --git a/docs/data-sources/project_protected_branches.md b/docs/data-sources/project_protected_branches.md
@@ -36,11 +36,13 @@ The following attributes are exported:
 
 * `name` - The name of the protected branch.
 
-* `push_access_levels`, `merge_access_levels`, `unprotect_access_levels` - Each block contains a list of which access levels, users or groups are allowed to perform the respective actions (documented below).
+* `push_access_levels`, `merge_access_levels` - Each block contains a list of which access levels, users or groups are allowed to perform the respective actions (documented below).
+
+* `allow_force_push` - Whether force push is allowed.
 
 * `code_owner_approval_required` - Reject code pushes that change files listed in the CODEOWNERS file.
 
-### `push_access_levels`, `merge_access_levels`, `unprotect_access_levels`
+### `push_access_levels`, `merge_access_levels`
 
 #### Attributes
 
diff --git a/gitlab/data_source_gitlab_project_protected_branch.go b/gitlab/data_source_gitlab_project_protected_branch.go
@@ -29,9 +29,12 @@ func dataSourceGitlabProjectProtectedBranch() *schema.Resource {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
-			"push_access_levels":      dataSourceGitlabProjectProtectedBranchSchemaAccessLevels(),
-			"merge_access_levels":     dataSourceGitlabProjectProtectedBranchSchemaAccessLevels(),
-			"unprotect_access_levels": dataSourceGitlabProjectProtectedBranchSchemaAccessLevels(),
+			"push_access_levels":  dataSourceGitlabProjectProtectedBranchSchemaAccessLevels(),
+			"merge_access_levels": dataSourceGitlabProjectProtectedBranchSchemaAccessLevels(),
+			"allow_force_push": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 			"code_owner_approval_required": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -81,13 +84,15 @@ func dataSourceGitlabProjectProtectedBranchRead(d *schema.ResourceData, meta int
 		return fmt.Errorf("error getting protected branch (Project: %v / Name %v): %v", project, name, err)
 	}
 
+	// lintignore:R004 // TODO: Resolve this tfproviderlint issue
 	if err := d.Set("push_access_levels", convertBranchAccessDescriptionsToStateBranchAccessDescriptions(pb.PushAccessLevels)); err != nil {
 		return err
 	}
+	// lintignore:R004 // TODO: Resolve this tfproviderlint issue
 	if err := d.Set("merge_access_levels", convertBranchAccessDescriptionsToStateBranchAccessDescriptions(pb.MergeAccessLevels)); err != nil {
 		return err
 	}
-	if err := d.Set("unprotect_access_levels", convertBranchAccessDescriptionsToStateBranchAccessDescriptions(pb.UnprotectAccessLevels)); err != nil {
+	if err := d.Set("allow_force_push", pb.AllowForcePush); err != nil {
 		return err
 	}
 	if err := d.Set("code_owner_approval_required", pb.CodeOwnerApprovalRequired); err != nil {
@@ -102,8 +107,8 @@ func dataSourceGitlabProjectProtectedBranchRead(d *schema.ResourceData, meta int
 type stateBranchAccessDescription struct {
 	AccessLevel            string `json:"access_level" mapstructure:"access_level"`
 	AccessLevelDescription string `json:"access_level_description" mapstructure:"access_level_description"`
-	GroupID                *int   `json:"group_id,omitempty" mapstructure:"group_id,omitempty"`
-	UserID                 *int   `json:"user_id,omitempty" mapstructure:"user_id,omitempty"`
+	GroupID                int    `json:"group_id,omitempty" mapstructure:"group_id,omitempty"`
+	UserID                 int    `json:"user_id,omitempty" mapstructure:"user_id,omitempty"`
 }
 
 func convertBranchAccessDescriptionsToStateBranchAccessDescriptions(descriptions []*gitlab.BranchAccessDescription) []stateBranchAccessDescription {
@@ -122,10 +127,10 @@ func convertBranchAccessDescriptionToStateBranchAccessDescription(description *g
 		AccessLevelDescription: description.AccessLevelDescription,
 	}
 	if description.UserID != 0 {
-		stateDescription.UserID = &description.UserID
+		stateDescription.UserID = description.UserID
 	}
 	if description.GroupID != 0 {
-		stateDescription.GroupID = &description.GroupID
+		stateDescription.GroupID = description.GroupID
 	}
 	return stateDescription
 }
diff --git a/gitlab/data_source_gitlab_project_protected_branch_test.go b/gitlab/data_source_gitlab_project_protected_branch_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataGitlabProjectProtectedBranchSearch(t *testing.T) {
+func TestAccDataGitlabProjectProtectedBranch_search(t *testing.T) {
 	projectName := fmt.Sprintf("tf-%s", acctest.RandString(5))
 
 	resource.Test(t, resource.TestCase{
@@ -21,7 +21,7 @@ func TestAccDataGitlabProjectProtectedBranchSearch(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"data.gitlab_project_protected_branch.test",
 						"name",
-						"master",
+						"main",
 					),
 					resource.TestCheckResourceAttr(
 						"data.gitlab_project_protected_branch.test",
@@ -39,26 +39,19 @@ func testAccDataGitlabProjectProtectedBranchConfigGetProjectSearch(projectName s
 resource "gitlab_project" "test" {
   name           = "%s"
   path           = "%s"
-  default_branch = "master"
-}
-
-resource "gitlab_branch_protection" "master" {
-  project            = gitlab_project.test.id
-  branch             = "master"
-  push_access_level  = "maintainer"
-  merge_access_level = "developer"
+  default_branch = "main"
 }
 
 resource "gitlab_branch_protection" "test" {
   project            = gitlab_project.test.id
-  branch             = "master"
+  branch             = "main"
   push_access_level  = "maintainer"
   merge_access_level = "developer"
 }
 
 data "gitlab_project_protected_branch" "test" {
   project_id = gitlab_project.test.id
-  name       = gitlab_branch_protection.master.branch
+  name       = gitlab_branch_protection.test.branch
 }
 `, projectName, projectName)
 }
diff --git a/gitlab/data_source_gitlab_project_protected_branches.go b/gitlab/data_source_gitlab_project_protected_branches.go
@@ -32,9 +32,12 @@ func dataSourceGitlabProjectProtectedBranches() *schema.Resource {
 							Type:     schema.TypeInt,
 							Computed: true,
 						},
-						"push_access_levels":      dataSourceGitlabProjectProtectedBranchSchemaAccessLevels(),
-						"merge_access_levels":     dataSourceGitlabProjectProtectedBranchSchemaAccessLevels(),
-						"unprotect_access_levels": dataSourceGitlabProjectProtectedBranchSchemaAccessLevels(),
+						"push_access_levels":  dataSourceGitlabProjectProtectedBranchSchemaAccessLevels(),
+						"merge_access_levels": dataSourceGitlabProjectProtectedBranchSchemaAccessLevels(),
+						"allow_force_push": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
 						"code_owner_approval_required": {
 							Type:     schema.TypeBool,
 							Computed: true,
@@ -51,7 +54,7 @@ type stateProtectedBranch struct {
 	Name                      string                         `json:"name,omitempty" mapstructure:"name,omitempty"`
 	PushAccessLevels          []stateBranchAccessDescription `json:"push_access_levels,omitempty" mapstructure:"push_access_levels,omitempty"`
 	MergeAccessLevels         []stateBranchAccessDescription `json:"merge_access_levels,omitempty" mapstructure:"merge_access_levels,omitempty"`
-	UnprotectAccessLevels     []stateBranchAccessDescription `json:"unprotect_access_levels,omitempty" mapstructure:"unprotect_access_levels,omitempty"`
+	AllowForcePush            bool                           `json:"allow_force_push,omitempty" mapstructure:"allow_force_push,omitempty"`
 	CodeOwnerApprovalRequired bool                           `json:"code_owner_approval_required,omitempty" mapstructure:"code_owner_approval_required,omitempty"`
 }
 
@@ -83,12 +86,13 @@ func dataSourceGitlabProjectProtectedBranchesRead(d *schema.ResourceData, meta i
 				Name:                      pb.Name,
 				PushAccessLevels:          convertBranchAccessDescriptionsToStateBranchAccessDescriptions(pb.PushAccessLevels),
 				MergeAccessLevels:         convertBranchAccessDescriptionsToStateBranchAccessDescriptions(pb.MergeAccessLevels),
-				UnprotectAccessLevels:     convertBranchAccessDescriptionsToStateBranchAccessDescriptions(pb.UnprotectAccessLevels),
+				AllowForcePush:            pb.AllowForcePush,
 				CodeOwnerApprovalRequired: pb.CodeOwnerApprovalRequired,
 			})
 		}
 	}
 
+	// lintignore:R004 // TODO: Resolve this tfproviderlint issue
 	if err := d.Set("protected_branches", allProtectedBranches); err != nil {
 		return err
 	}
diff --git a/gitlab/data_source_gitlab_project_protected_branches_test.go b/gitlab/data_source_gitlab_project_protected_branches_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataGitlabProjectProtectedBranchesSearch(t *testing.T) {
+func TestAccDataGitlabProjectProtectedBranches_search(t *testing.T) {
 	projectName := fmt.Sprintf("tf-%s", acctest.RandString(5))
 
 	resource.Test(t, resource.TestCase{
@@ -21,7 +21,7 @@ func TestAccDataGitlabProjectProtectedBranchesSearch(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"data.gitlab_project_protected_branches.test",
 						"protected_branches.0.name",
-						"master",
+						"main",
 					),
 					resource.TestCheckResourceAttr(
 						"data.gitlab_project_protected_branches.test",
@@ -39,12 +39,12 @@ func testAccDataGitlabProjectProtectedBranchesConfigGetProjectSearch(projectName
 resource "gitlab_project" "test" {
   name           = "%s"
   path           = "%s"
-  default_branch = "master"
+  default_branch = "main"
 }
 
 resource "gitlab_branch_protection" "test" {
   project            = gitlab_project.test.id
-  branch             = "master"
+  branch             = "main"
   push_access_level  = "maintainer"
   merge_access_level = "developer"
 }
diff --git a/gitlab/resource_gitlab_branch_protection.go b/gitlab/resource_gitlab_branch_protection.go
@@ -255,13 +255,6 @@ func schemaAllowedTo() *schema.Schema {
 	}
 }
 
-type stateBranchAccessDescription struct {
-	AccessLevel            string `mapstructure:"access_level"`
-	AccessLevelDescription string `mapstructure:"access_level_description"`
-	GroupID                int    `mapstructure:"group_id,omitempty"`
-	UserID                 int    `mapstructure:"user_id,omitempty"`
-}
-
 func convertAllowedAccessLevelsToBranchAccessDescriptions(descriptions []*gitlab.BranchAccessDescription) []stateBranchAccessDescription {
 	result := make([]stateBranchAccessDescription, 0)
 

Original file line number	Diff line number	Diff line change
`@@ -255,13 +255,6 @@ func schemaAllowedTo() *schema.Schema {`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`
`258`		`-type stateBranchAccessDescription struct {`
`259`		- AccessLevel string `mapstructure:"access_level"`
`260`		- AccessLevelDescription string `mapstructure:"access_level_description"`
`261`		- GroupID int `mapstructure:"group_id,omitempty"`
`262`		- UserID int `mapstructure:"user_id,omitempty"`
`263`		`-}`
`264`		`-`
`265`	`258`	`func convertAllowedAccessLevelsToBranchAccessDescriptions(descriptions []*gitlab.BranchAccessDescription) []stateBranchAccessDescription {`
`266`	`259`	`result := make([]stateBranchAccessDescription, 0)`
`267`	`260`