Use new reusable diffing pattern

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

Author: deiga

github/resource_github_emu_group_mapping.go

@@ -8,7 +8,6 @@ import (
 	"github.com/google/go-github/v82/github"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -21,10 +20,8 @@ func resourceGithubEMUGroupMapping() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: resourceGithubEMUGroupMappingImport,
 		},
-		CustomizeDiff: customdiff.All(
-			customdiff.ForceNewIf("team_slug", hasNewTeamID),
-		),
-		Description: "Manages the mapping of an external group to a GitHub team.",
+		CustomizeDiff: diffTeam,
+		Description:   "Manages the mapping of an external group to a GitHub team.",
 		Schema: map[string]*schema.Schema{
 			"team_id": {
 				Type:        schema.TypeString,
@@ -361,45 +358,3 @@ func resourceGithubEMUGroupMappingImport(ctx context.Context, d *schema.Resource
 
 	return []*schema.ResourceData{d}, nil
 }
-
-func hasNewTeamID(ctx context.Context, diff *schema.ResourceDiff, meta any) bool {
-	// Skip for new resources - no existing team_id to compare against
-	if diff.Id() == "" {
-		return false
-	}
-
-	// Only check when team_slug changes
-	if !diff.HasChange("team_slug") {
-		return false
-	}
-
-	// Get old team_id from state
-	oldTeamID := toInt64(diff.Get("team_id"))
-	if oldTeamID == 0 {
-		return false
-	}
-
-	// Resolve new team_slug to team ID via API
-	oldTeamSlug, newTeamSlug := diff.GetChange("team_slug")
-	newTeamID, err := lookupTeamID(ctx, meta.(*Owner), newTeamSlug.(string))
-	if err != nil {
-		// If team doesn't exist or API fails, skip ForceNew check and let Read handle it
-		tflog.Debug(ctx, "Unable to resolve new team_slug to team ID, skipping ForceNew check", map[string]any{
-			"new_team_slug": newTeamSlug,
-			"error":         err.Error(),
-		})
-		return false
-	}
-
-	if newTeamID != oldTeamID {
-		tflog.Debug(ctx, "Team ID changed, forcing new resource", map[string]any{
-			"old_team_id":   oldTeamID,
-			"new_team_id":   newTeamID,
-			"new_team_slug": newTeamSlug,
-			"old_team_slug": oldTeamSlug,
-		})
-		return true
-	}
-
-	return false
-}

github/util_diff.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 
 	"github.com/google/go-github/v82/github"
+	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -109,3 +110,53 @@ func diffSecretVariableVisibility(ctx context.Context, d *schema.ResourceDiff, _
 
 	return nil
 }
+
+// diffTeam compares the team_id and team_slug fields to determine if the team has changed.
+func diffTeam(ctx context.Context, diff *schema.ResourceDiff, m any) error {
+	// Skip for new resources - no existing team_id to compare against
+	if len(diff.Id()) == 0 {
+		return nil
+	}
+
+	if diff.HasChange("team_slug") {
+		if isNewTeamID(ctx, diff, m) {
+			return diff.ForceNew("team_slug")
+		}
+	}
+
+	return nil
+}
+
+// helper function to determine if the team has changed or was renamed.
+func isNewTeamID(ctx context.Context, diff *schema.ResourceDiff, m any) bool {
+	// Get old team_id from state
+	oldTeamID := toInt64(diff.Get("team_id"))
+	if oldTeamID == 0 {
+		return false
+	}
+	meta := m.(*Owner)
+
+	// Resolve new team_slug to team ID via API
+	oldTeamSlug, newTeamSlug := diff.GetChange("team_slug")
+	newTeamID, err := lookupTeamID(ctx, meta, newTeamSlug.(string))
+	if err != nil {
+		// If team doesn't exist or API fails, skip ForceNew check and let Read handle it
+		tflog.Debug(ctx, "Unable to resolve new team_slug to team ID, skipping ForceNew check", map[string]any{
+			"new_team_slug": newTeamSlug,
+			"error":         err.Error(),
+		})
+		return false
+	}
+
+	if newTeamID != oldTeamID {
+		tflog.Debug(ctx, "Team ID changed, forcing new resource", map[string]any{
+			"old_team_id":   oldTeamID,
+			"new_team_id":   newTeamID,
+			"new_team_slug": newTeamSlug,
+			"old_team_slug": oldTeamSlug,
+		})
+		return true
+	}
+
+	return false
+}