Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bug Fix] - azuredevops_git_repository - Fix default branch not set when init_type=Clean or init_type=Fork #946

Merged
merged 1 commit into from
Jan 9, 2024
Merged

[Bug Fix] - azuredevops_git_repository - Fix default branch not set when init_type=Clean or init_type=Fork #946

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 29 additions & 31 deletions azuredevops/internal/service/git/resource_git_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,52 +183,50 @@ func resourceGitRepositoryCreate(d *schema.ResourceData, m interface{}) error {
// repository in state and will taint the resource if further errors are encountered during initialization
d.SetId(createdRepo.Id.String())

if initialization != nil && strings.EqualFold(initialization.initType, string(RepoInitTypeValues.Import)) &&
strings.EqualFold(initialization.sourceType, "Git") {
importRequest := git.GitImportRequest{
Parameters: &git.GitImportRequestParameters{
GitSource: &git.GitImportGitSource{
Url: &initialization.sourceURL,
if initialization != nil {
if strings.EqualFold(initialization.initType, string(RepoInitTypeValues.Import)) && strings.EqualFold(initialization.sourceType, "Git") {
importRequest := git.GitImportRequest{
Parameters: &git.GitImportRequestParameters{
GitSource: &git.GitImportGitSource{
Url: &initialization.sourceURL,
},
},
},
Repository: createdRepo,
}
Repository: createdRepo,
}

if initialization.serviceConnectionID != "" {
importRequest.Parameters.ServiceEndpointId = converter.UUID(initialization.serviceConnectionID)
importRequest.Parameters.DeleteServiceEndpointAfterImportIsDone = converter.Bool(false)
}
if initialization.serviceConnectionID != "" {
importRequest.Parameters.ServiceEndpointId = converter.UUID(initialization.serviceConnectionID)
importRequest.Parameters.DeleteServiceEndpointAfterImportIsDone = converter.Bool(false)
}

_, importErr := createImportRequest(clients, importRequest, projectID.String(), *createdRepo.Name)
if importErr != nil {
return fmt.Errorf("Error import repository in Azure DevOps: %+v ", importErr)
_, importErr := createImportRequest(clients, importRequest, projectID.String(), *createdRepo.Name)
if importErr != nil {
return fmt.Errorf("Error import repository in Azure DevOps: %+v ", importErr)
}
}

// update default_branch if configured
err := waitForBranch(clients, repo.Name, projectID)
if err != nil {
return err
}
if v := d.Get("default_branch").(string); v != "" {
createdRepo.DefaultBranch = converter.String(v)
_, err = updateGitRepository(clients, createdRepo, projectID)
if strings.EqualFold(initialization.initType, string(RepoInitTypeValues.Clean)) ||
strings.EqualFold(initialization.initType, string(RepoInitTypeValues.Fork)) {
err = initializeGitRepository(clients, createdRepo, repo.DefaultBranch)
if err != nil {
return fmt.Errorf(" updating repository `default_branch`: %+v", err)
return fmt.Errorf(" initializing repository in Azure DevOps: %+v ", err)
}
}
}

if initialization != nil && strings.EqualFold(initialization.initType, string(RepoInitTypeValues.Clean)) {
err = initializeGitRepository(clients, createdRepo, repo.DefaultBranch)
if !strings.EqualFold(initialization.initType, string(RepoInitTypeValues.Uninitialized)) || parentRepoRef != nil {
err := waitForBranch(clients, repo.Name, projectID)
if err != nil {
return fmt.Errorf("Error initializing repository in Azure DevOps: %+v", err)
return err
}
}

if initialization != nil && !(strings.EqualFold(initialization.initType, string(RepoInitTypeValues.Uninitialized)) && parentRepoRef == nil) {
err := waitForBranch(clients, repo.Name, projectID)
// update default_branch
if v := d.Get("default_branch").(string); v != "" {
createdRepo.DefaultBranch = converter.String(v)
_, err = updateGitRepository(clients, createdRepo, projectID)
if err != nil {
return err
return fmt.Errorf(" updating repository `default_branch`: %+v", err)
}
}

Expand Down