Update branch to Computed field

Signed-off-by: Timo Sand <[email protected]>

Author: deiga

github/resource_github_repository_file.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"strings"
 
 	"github.com/google/go-github/v82/github"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
@@ -47,6 +48,7 @@ func resourceGithubRepositoryFile() *schema.Resource {
 				Type:        schema.TypeString,
 				Optional:    true,
 				ForceNew:    true,
+				Computed:    true,
 				Description: "The branch name, defaults to the repository's default branch",
 			},
 			"ref": {
@@ -175,6 +177,14 @@ func resourceGithubRepositoryFileCreate(ctx context.Context, d *schema.ResourceD
 			}
 		}
 		checkOpt.Ref = branch.(string)
+	} else {
+		repoInfo, _, err := client.Repositories.Get(ctx, owner, repo)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		if err := d.Set("branch", repoInfo.GetDefaultBranch()); err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	opts := resourceGithubRepositoryFileOptions(d)
@@ -427,27 +437,34 @@ func autoBranchDiffSuppressFunc(k, _, _ string, d *schema.ResourceData) bool {
 }
 
 func resourceGithubRepositoryFileImport(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
-	repoFilePath, branch, err := parseID2(d.Id())
-	if err != nil {
-		return nil, fmt.Errorf("invalid ID specified. Supplied ID must be written as <repository>/<file path>:<branch>. %w", err)
+	importIDParts := strings.Split(d.Id(), idSeparator)
+
+	if len(importIDParts) > 2 {
+		return nil, fmt.Errorf("invalid ID specified. Supplied ID must be written as <repository>/<file path> (when branch is \"main\") or <repository>/<file path>:<branch>")
 	}
+	repoFilePath := importIDParts[0]
 
 	client := meta.(*Owner).v3client
 	owner := meta.(*Owner).name
 	repo, file := splitRepoFilePath(repoFilePath)
 
-	repoInfo, _, err := client.Repositories.Get(ctx, owner, repo)
-	if err != nil {
-		return nil, err
-	}
-	defaultBranch := repoInfo.GetDefaultBranch()
 	opts := &github.RepositoryContentGetOptions{}
 
-	if branch != defaultBranch {
+	if len(importIDParts) == 2 {
+		branch := importIDParts[1]
 		opts.Ref = branch
 		if err := d.Set("branch", branch); err != nil {
 			return nil, err
 		}
+	} else {
+		repoInfo, _, err := client.Repositories.Get(ctx, owner, repo)
+		if err != nil {
+			return nil, err
+		}
+		defaultBranch := repoInfo.GetDefaultBranch()
+		if err := d.Set("branch", defaultBranch); err != nil {
+			return nil, err
+		}
 	}
 
 	fc, _, _, err := client.Repositories.GetContents(ctx, owner, repo, file, opts)

github/resource_github_repository_file_test.go

@@ -420,6 +420,71 @@ func TestAccGithubRepositoryFile(t *testing.T) {
 			}
 		`, repoName)
 
+		resource.Test(t, resource.TestCase{
+			PreCheck:          func() { skipUnauthenticated(t) },
+			ProviderFactories: providerFactories,
+			Steps: []resource.TestStep{
+				{
+					Config: config,
+					Check: resource.ComposeTestCheckFunc(
+						resource.TestCheckResourceAttr(
+							"github_repository_file.test", "content",
+							"bar",
+						),
+						resource.TestCheckResourceAttr(
+							"github_repository_file.test", "sha",
+							"ba0e162e1c47469e3fe4b393a8bf8c569f302116",
+						),
+						resource.TestCheckResourceAttr(
+							"github_repository_file.test", "ref",
+							"main",
+						),
+						resource.TestCheckResourceAttrSet(
+							"github_repository_file.test", "commit_author",
+						),
+						resource.TestCheckResourceAttrSet(
+							"github_repository_file.test", "commit_email",
+						),
+						resource.TestCheckResourceAttrSet(
+							"github_repository_file.test", "commit_message",
+						),
+						resource.TestCheckResourceAttrSet(
+							"github_repository_file.test", "commit_sha",
+						),
+						resource.TestCheckNoResourceAttr("github_repository_file.test", "autocreate_branch"),
+						resource.TestCheckNoResourceAttr("github_repository_file.test", "autocreate_branch_source_branch"),
+						resource.TestCheckNoResourceAttr("github_repository_file.test", "autocreate_branch_source_sha"),
+					),
+				},
+				{
+					ResourceName:            "github_repository_file.test",
+					ImportState:             true,
+					ImportStateVerify:       true,
+					ImportStateVerifyIgnore: []string{"commit_author", "commit_email"}, // For some reason `d` doesn't contain the commit author and email when importing.
+				},
+			},
+		})
+	})
+	t.Run("imports_files_with_branch_in_id_without_error", func(t *testing.T) {
+		randomID := acctest.RandString(5)
+		repoName := fmt.Sprintf("%sfile-import-%s", testResourcePrefix, randomID)
+		config := fmt.Sprintf(`
+			resource "github_repository" "test" {
+				name                 = "%s"
+				auto_init            = true
+				vulnerability_alerts = true
+			}
+
+			resource "github_repository_file" "test" {
+				repository     = github_repository.test.name
+				file           = "test"
+				content        = "bar"
+				commit_message = "Managed by Terraform"
+				commit_author  = "Terraform User"
+				commit_email   = "[email protected]"
+			}
+		`, repoName)
+
 		resource.Test(t, resource.TestCase{
 			PreCheck:          func() { skipUnauthenticated(t) },
 			ProviderFactories: providerFactories,