Fix issue with default branch being empty on forked repos (#270)

* Add acceptance test for forked repo

* Add branch waiting

* Lower waiting time

Co-authored-by: Nicholas M. Iodice <niiodice@microsoft.com>

Author: EliiseS

azuredevops/resource_git_repository.go

@@ -4,8 +4,10 @@ import (
 	"fmt"
 	"log"
 	"strings"
+	"time"
 
 	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"github.com/microsoft/azure-devops-go-api/azuredevops/core"
@@ -144,11 +146,45 @@ func resourceGitRepositoryCreate(d *schema.ResourceData, m interface{}) error {
 			return fmt.Errorf("Error initializing repository in Azure DevOps: %+v", err)
 		}
 	}
+	if !(strings.EqualFold(initialization.initType, "uninitialized") && parentRepoRef == nil) {
+		err := waitForBranch(clients, repo.Name, projectID)
+		if err != nil {
+			return err
+		}
+	}
 
 	d.SetId(createdRepo.Id.String())
 	return resourceGitRepositoryRead(d, m)
 }
 
+func waitForBranch(clients *config.AggregatedClient, repoName *string, projectID fmt.Stringer) error {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{"Waiting"},
+		Target:  []string{"Synched"},
+		Refresh: func() (interface{}, string, error) {
+			state := "Waiting"
+			gitRepo, err := gitRepositoryRead(clients, "", *repoName, projectID.String())
+			if err != nil {
+				return nil, "", fmt.Errorf("Error reading repository: %+v", err)
+			}
+
+			if converter.ToString(gitRepo.DefaultBranch, "") != "" {
+				state = "Synched"
+			}
+
+			return state, state, nil
+		},
+		Timeout:                   60 * time.Second,
+		MinTimeout:                2 * time.Second,
+		Delay:                     1 * time.Second,
+		ContinuousTargetOccurence: 1,
+	}
+	if _, err := stateConf.WaitForState(); err != nil {
+		return fmt.Errorf("Error retrieving expected branch for repository [%s]: %+v", *repoName, err)
+	}
+	return nil
+}
+
 func createGitRepository(clients *config.AggregatedClient, repoName *string, projectID *uuid.UUID, parentRepo *git.GitRepositoryRef) (*git.GitRepository, error) {
 	args := git.CreateRepositoryArgs{
 		GitRepositoryToCreate: &git.GitRepositoryCreateOptions{

azuredevops/resource_git_repository_test.go

@@ -420,6 +420,34 @@ func TestAccAzureGitRepo_RepoInitialization_Uninitialized(t *testing.T) {
 	})
 }
 
+// Verifies that a newly forked repo does NOT return an empty branch_name
+func TestAccAzureGitRepo_RepoFork_BranchNotEmpty(t *testing.T) {
+	projectName := testhelper.TestAccResourcePrefix + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
+	gitRepoName := testhelper.TestAccResourcePrefix + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
+	gitForkedRepoName := testhelper.TestAccResourcePrefix + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
+	tfRepoNode := "azuredevops_git_repository.gitrepo"
+	tfForkedRepoNode := "azuredevops_git_repository.gitforkedrepo"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testhelper.TestAccPreCheck(t, nil) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccAzureGitRepoCheckDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testhelper.TestAccAzureForkedGitRepoResource(projectName, gitRepoName, gitForkedRepoName, "Clean", "Uninitialized"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAzureGitRepoResourceExists(gitRepoName),
+					resource.TestCheckResourceAttrSet(tfRepoNode, "project_id"),
+					resource.TestCheckResourceAttr(tfRepoNode, "name", gitRepoName),
+					resource.TestCheckResourceAttr(tfRepoNode, "default_branch", "refs/heads/master"),
+					resource.TestCheckResourceAttr(tfForkedRepoNode, "name", gitForkedRepoName),
+					resource.TestCheckResourceAttr(tfForkedRepoNode, "default_branch", "refs/heads/master"),
+				),
+			},
+		},
+	})
+}
+
 func init() {
 	InitProvider()
 }

azuredevops/utils/testhelper/hcl.go

@@ -20,6 +20,22 @@ resource "azuredevops_git_repository" "gitrepo" {
 	return fmt.Sprintf("%s\n%s", projectResource, azureGitRepoResource)
 }
 
+// TestAccAzureForkedGitRepoResource HCL describing an AzDO GIT repository resource
+func TestAccAzureForkedGitRepoResource(projectName string, gitRepoName string, gitForkedRepoName string, initType string, forkedInitType string) string {
+	azureGitRepoResource := fmt.Sprintf(`
+resource "azuredevops_git_repository" "gitforkedrepo" {
+	project_id      		= azuredevops_project.project.id
+	parent_repository_id    = azuredevops_git_repository.gitrepo.id
+	name            		= "%s"
+	initialization {
+		init_type = "%s"
+	}
+}`, gitForkedRepoName, forkedInitType)
+
+	gitRepoResource := TestAccAzureGitRepoResource(projectName, gitRepoName, initType)
+	return fmt.Sprintf("%s\n%s", gitRepoResource, azureGitRepoResource)
+}
+
 // TestAccGroupDataSource HCL describing an AzDO Group Data Source
 func TestAccGroupDataSource(projectName string, groupName string) string {
 	dataSource := fmt.Sprintf(`