Merge branch 'main' into explicit_web_commit_signoff_required

Author: steveteuber

github/repository_utils.go

@@ -9,11 +9,16 @@ import (
 	"strings"
 
 	"github.com/google/go-github/v82/github"
+	"github.com/hashicorp/terraform-plugin-log/tflog"
 )
 
 // checkRepositoryBranchExists tests if a branch exists in a repository.
-func checkRepositoryBranchExists(client *github.Client, owner, repo, branch string) error {
-	ctx := context.WithValue(context.Background(), ctxId, buildTwoPartID(repo, branch))
+func checkRepositoryBranchExists(ctx context.Context, client *github.Client, owner, repo, branch string) error {
+	tflog.Debug(ctx, "Checking if branch exists", map[string]any{
+		"branch": branch,
+		"owner":  owner,
+		"repo":   repo,
+	})
 	_, _, err := client.Repositories.GetBranch(ctx, owner, repo, branch, 2)
 	if err != nil {
 		var ghErr *github.ErrorResponse

github/resource_github_emu_group_mapping.go

@@ -24,7 +24,7 @@ func resourceGithubEMUGroupMapping() *schema.Resource {
 		Description:   "Manages the mapping of an external group to a GitHub team.",
 		Schema: map[string]*schema.Schema{
 			"team_id": {
-				Type:        schema.TypeString,
+				Type:        schema.TypeInt,
 				Computed:    true,
 				Description: "ID of the GitHub team.",
 			},
@@ -99,7 +99,7 @@ func resourceGithubEMUGroupMappingCreate(ctx context.Context, d *schema.Resource
 		return diag.FromErr(err)
 	}
 
-	if err := d.Set("team_id", teamID); err != nil {
+	if err := d.Set("team_id", int(teamID)); err != nil {
 		return diag.FromErr(err)
 	}
 
@@ -334,7 +334,7 @@ func resourceGithubEMUGroupMappingImport(ctx context.Context, d *schema.Resource
 		return nil, err
 	}
 
-	if err := d.Set("team_id", teamID); err != nil {
+	if err := d.Set("team_id", int(teamID)); err != nil {
 		return nil, err
 	}
 

github/resource_github_emu_group_mapping_migration.go

@@ -56,7 +56,7 @@ func resourceGithubEMUGroupMappingStateUpgradeV0(ctx context.Context, rawState m
 	if err != nil {
 		return nil, err
 	}
-	rawState["team_id"] = teamID
+	rawState["team_id"] = int(teamID)
 	resourceID, err := buildID(strconv.FormatInt(teamID, 10), teamSlug, strconv.FormatInt(group.GetGroupID(), 10))
 	if err != nil {
 		return nil, err

github/resource_github_repository.go

@@ -628,9 +628,11 @@ func resourceGithubRepositoryObject(d *schema.ResourceData) *github.Repository {
 	}
 
 	// only configure allow forking if repository is not public
-	if allowForking, ok := d.GetOkExists("allow_forking"); ok && visibility != "public" { //nolint:staticcheck,SA1019 // We sometimes need to use GetOkExists for booleans
-		if val, ok := allowForking.(bool); ok {
-			repository.AllowForking = github.Ptr(val)
+	if visibility != "public" && (d.IsNewResource() || d.HasChange("allow_forking")) {
+		if allowForking, ok := d.GetOkExists("allow_forking"); ok { //nolint:staticcheck,SA1019 // We sometimes need to use GetOkExists for booleans
+			if val, ok := allowForking.(bool); ok {
+				repository.AllowForking = github.Ptr(val)
+			}
 		}
 	}