Ensure in acceptance test that master branch is protected

This is normally the case when creating from a template project, but not in an empty one.

Signed-off-by: Sune Keller <[email protected]>

Author: sirlatrom

gitlab/data_source_gitlab_project_protected_branch.go

@@ -5,6 +5,7 @@ import (
 	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"github.com/xanzy/go-gitlab"
 )
 
@@ -13,14 +14,16 @@ func dataSourceGitlabProjectProtectedBranch() *schema.Resource {
 		Read: dataSourceGitlabProjectProtectedBranchRead,
 		Schema: map[string]*schema.Schema{
 			"project_id": {
-				Type:        schema.TypeString,
-				Description: "ID or URL encoded name of project",
-				Required:    true,
+				Type:         schema.TypeString,
+				Description:  "ID or URL encoded name of project",
+				Required:     true,
+				ValidateFunc: validation.StringIsNotEmpty,
 			},
 			"name": {
-				Type:        schema.TypeString,
-				Description: "Name of the protected branch",
-				Required:    true,
+				Type:         schema.TypeString,
+				Description:  "Name of the protected branch",
+				Required:     true,
+				ValidateFunc: validation.StringIsNotEmpty,
 			},
 			"id": {
 				Type:     schema.TypeInt,
@@ -75,7 +78,7 @@ func dataSourceGitlabProjectProtectedBranchRead(d *schema.ResourceData, meta int
 	// Get protected branch by project ID/path and branch name
 	pb, _, err := client.ProtectedBranches.GetProtectedBranch(project, name)
 	if err != nil {
-		return err
+		return fmt.Errorf("error getting protected branch (Project: %v / Name %v): %v", project, name, err)
 	}
 
 	if err := d.Set("push_access_levels", convertBranchAccessDescriptionsToStateBranchAccessDescriptions(pb.PushAccessLevels)); err != nil {

gitlab/data_source_gitlab_project_protected_branch_test.go

@@ -19,14 +19,14 @@ func TestAccDataGitlabProjectProtectedBranchSearch(t *testing.T) {
 				Config: testAccDataGitlabProjectProtectedBranchConfigGetProjectSearch(projectName),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(
-						"data.gitlab_project_protected_branches.test",
+						"data.gitlab_project_protected_branch.test",
 						"name",
 						"master",
 					),
 					resource.TestCheckResourceAttr(
 						"data.gitlab_project_protected_branch.test",
 						"push_access_levels.0.access_level",
-						"40",
+						"maintainer",
 					),
 				),
 			},
@@ -42,16 +42,23 @@ resource "gitlab_project" "test" {
   default_branch = "master"
 }
 
+resource "gitlab_branch_protection" "master" {
+  project            = gitlab_project.test.id
+  branch             = "master"
+  push_access_level  = "maintainer"
+  merge_access_level = "developer"
+}
+
 resource "gitlab_branch_protection" "test" {
   project            = gitlab_project.test.id
-  branch             = gitlab_project.test.default_branch
+  branch             = "master"
   push_access_level  = "maintainer"
   merge_access_level = "developer"
 }
 
 data "gitlab_project_protected_branch" "test" {
   project_id = gitlab_project.test.id
-  name       = gitlab_project.test.default_branch
+  name       = gitlab_branch_protection.master.branch
 }
 `, projectName, projectName)
 }

gitlab/data_source_gitlab_project_protected_branches_test.go

@@ -26,7 +26,7 @@ func TestAccDataGitlabProjectProtectedBranchesSearch(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"data.gitlab_project_protected_branches.test",
 						"protected_branches.0.push_access_levels.0.access_level",
-						"40",
+						"maintainer",
 					),
 				),
 			},
@@ -44,13 +44,13 @@ resource "gitlab_project" "test" {
 
 resource "gitlab_branch_protection" "test" {
   project            = gitlab_project.test.id
-  branch             = gitlab_project.test.default_branch
+  branch             = "master"
   push_access_level  = "maintainer"
   merge_access_level = "developer"
 }
 
 data "gitlab_project_protected_branches" "test" {
-  project_id = gitlab_project.test.id
+  project_id = gitlab_branch_protection.test.project # This expresses the dependency of the data source on the protected branch having first been configured
 }
 `, projectName, projectName)
 }