fix: Add DiffSuppressFunc and DiffSuppressOnRefresh to remaining etag fields

PR #2840 added etag diff suppression to 7 resources but missed the
remaining 22. This causes spurious diffs on every plan/apply for
resources like github_team, github_membership, github_team_repository,
github_repository_deploy_key, and others.

Apply the same pattern (Optional + DiffSuppressFunc returning true +
DiffSuppressOnRefresh) to all remaining resource etag schema fields
and extend the unit test to cover all 29 resources.

Fixes #3103
Fixes #3291

Co-Authored-By: Claude <[email protected]>

Author: ei-grad

github/resource_github_actions_runner_group.go

@@ -42,8 +42,13 @@ func resourceGithubActionsRunnerGroup() *schema.Resource {
 			},
 			"etag": {
 				Type:        schema.TypeString,
+				Optional:    true,
 				Computed:    true,
 				Description: "An etag representing the runner group object",
+				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
+					return true
+				},
+				DiffSuppressOnRefresh: true,
 			},
 			"inherited": {
 				Type:        schema.TypeBool,

github/resource_github_branch_protection_v3.go

@@ -213,7 +213,12 @@ func resourceGithubBranchProtectionV3() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
+				Optional: true,
 				Computed: true,
+				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
+					return true
+				},
+				DiffSuppressOnRefresh: true,
 			},
 		},
 	}

github/resource_github_emu_group_mapping.go

@@ -46,7 +46,12 @@ func resourceGithubEMUGroupMapping() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
+				Optional: true,
 				Computed: true,
+				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
+					return true
+				},
+				DiffSuppressOnRefresh: true,
 			},
 		},
 		SchemaVersion: 1,

github/resource_github_enterprise_actions_runner_group.go

@@ -43,8 +43,13 @@ func resourceGithubActionsEnterpriseRunnerGroup() *schema.Resource {
 			},
 			"etag": {
 				Type:        schema.TypeString,
+				Optional:    true,
 				Computed:    true,
 				Description: "An etag representing the runner group object",
+				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
+					return true
+				},
+				DiffSuppressOnRefresh: true,
 			},
 			"name": {
 				Type:        schema.TypeString,

github/resource_github_etag_unit_test.go

@@ -74,13 +74,35 @@ func TestEtagDiffSuppressFunction(t *testing.T) {
 // TestEtagSchemaConsistency ensure DiffSuppressFunc and DiffSuppressOnRefresh are consistently applied.
 func TestEtagSchemaConsistency(t *testing.T) {
 	resourcesWithEtag := map[string]*schema.Resource{
-		"github_repository":                          resourceGithubRepository(),
+		"github_actions_runner_group":                resourceGithubActionsRunnerGroup(),
 		"github_branch":                              resourceGithubBranch(),
 		"github_branch_default":                      resourceGithubBranchDefault(),
+		"github_branch_protection_v3":                resourceGithubBranchProtectionV3(),
+		"github_emu_group_mapping":                   resourceGithubEMUGroupMapping(),
+		"github_enterprise_actions_runner_group":     resourceGithubActionsEnterpriseRunnerGroup(),
+		"github_issue":                               resourceGithubIssue(),
 		"github_issue_label":                         resourceGithubIssueLabel(),
-		"github_repository_webhook":                  resourceGithubRepositoryWebhook(),
+		"github_membership":                          resourceGithubMembership(),
+		"github_organization_project":                resourceGithubOrganizationProject(),
+		"github_organization_ruleset":                resourceGithubOrganizationRuleset(),
+		"github_organization_webhook":                resourceGithubOrganizationWebhook(),
+		"github_project_card":                        resourceGithubProjectCard(),
+		"github_project_column":                      resourceGithubProjectColumn(),
+		"github_release":                             resourceGithubRelease(),
+		"github_repository":                          resourceGithubRepository(),
+		"github_repository_autolink_reference":       resourceGithubRepositoryAutolinkReference(),
+		"github_repository_deploy_key":               resourceGithubRepositoryDeployKey(),
 		"github_repository_deployment_branch_policy": resourceGithubRepositoryDeploymentBranchPolicy(),
 		"github_repository_project":                  resourceGithubRepositoryProject(),
+		"github_repository_ruleset":                  resourceGithubRepositoryRuleset(),
+		"github_repository_webhook":                  resourceGithubRepositoryWebhook(),
+		"github_team":                                resourceGithubTeam(),
+		"github_team_membership":                     resourceGithubTeamMembership(),
+		"github_team_repository":                     resourceGithubTeamRepository(),
+		"github_team_sync_group_mapping":             resourceGithubTeamSyncGroupMapping(),
+		"github_user_gpg_key":                        resourceGithubUserGpgKey(),
+		"github_user_ssh_key":                        resourceGithubUserSshKey(),
+		"organization_block":                         resourceOrganizationBlock(),
 	}
 
 	for resourceName, resource := range resourcesWithEtag {

github/resource_github_issue.go

@@ -69,7 +69,12 @@ func resourceGithubIssue() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
+				Optional: true,
 				Computed: true,
+				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
+					return true
+				},
+				DiffSuppressOnRefresh: true,
 			},
 		},
 	}

github/resource_github_membership.go

@@ -39,7 +39,12 @@ func resourceGithubMembership() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
+				Optional: true,
 				Computed: true,
+				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
+					return true
+				},
+				DiffSuppressOnRefresh: true,
 			},
 			"downgrade_on_destroy": {
 				Type:        schema.TypeBool,

github/resource_github_organization_project.go

@@ -36,7 +36,12 @@ func resourceGithubOrganizationProject() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
+				Optional: true,
 				Computed: true,
+				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
+					return true
+				},
+				DiffSuppressOnRefresh: true,
 			},
 		},
 	}

github/resource_github_organization_ruleset.go

@@ -675,8 +675,13 @@ func resourceGithubOrganizationRuleset() *schema.Resource {
 			},
 			"etag": {
 				Type:        schema.TypeString,
+				Optional:    true,
 				Computed:    true,
 				Description: "An etag representing the ruleset for caching purposes.",
+				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
+					return true
+				},
+				DiffSuppressOnRefresh: true,
 			},
 		},
 	}

github/resource_github_organization_webhook.go

@@ -53,7 +53,12 @@ func resourceGithubOrganizationWebhook() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
+				Optional: true,
 				Computed: true,
+				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
+					return true
+				},
+				DiffSuppressOnRefresh: true,
 			},
 		},
 	}