fix: Remove Optional from etag fields per review feedback

ei-grad · claude · ei-grad · commit 1dafd3976769 · 2026-04-01T09:55:45.000+03:00
etag is server-computed and should not be user-editable. Remove Optional: true from all etag schema fields (both the 22 new ones and the 7 from PR #2840) and update the unit test accordingly. Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/github/resource_github_actions_runner_group.go b/github/resource_github_actions_runner_group.go
@@ -42,7 +42,6 @@ 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 {
diff --git a/github/resource_github_branch.go b/github/resource_github_branch.go
@@ -50,7 +50,6 @@ func resourceGithubBranch() *schema.Resource {
 			},
 			"etag": {
 				Type:        schema.TypeString,
-				Optional:    true,
 				Computed:    true,
 				Description: "An etag representing the Branch object.",
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
diff --git a/github/resource_github_branch_default.go b/github/resource_github_branch_default.go
@@ -40,7 +40,6 @@ func resourceGithubBranchDefault() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_branch_protection_v3.go b/github/resource_github_branch_protection_v3.go
@@ -213,7 +213,6 @@ func resourceGithubBranchProtectionV3() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_emu_group_mapping.go b/github/resource_github_emu_group_mapping.go
@@ -46,7 +46,6 @@ func resourceGithubEMUGroupMapping() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_enterprise_actions_runner_group.go b/github/resource_github_enterprise_actions_runner_group.go
@@ -43,7 +43,6 @@ 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 {
diff --git a/github/resource_github_etag_unit_test.go b/github/resource_github_etag_unit_test.go
@@ -113,10 +113,7 @@ func TestEtagSchemaConsistency(t *testing.T) {
 				return
 			}
 
-			// Verify etag is optional and computed
-			if !etagField.Optional {
-				t.Errorf("etag should be optional in %s", resourceName)
-			}
+			// Verify etag is computed
 			if !etagField.Computed {
 				t.Errorf("etag should be computed in %s", resourceName)
 			}
diff --git a/github/resource_github_issue.go b/github/resource_github_issue.go
@@ -69,7 +69,6 @@ func resourceGithubIssue() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_issue_label.go b/github/resource_github_issue_label.go
@@ -49,7 +49,6 @@ func resourceGithubIssueLabel() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_membership.go b/github/resource_github_membership.go
@@ -39,7 +39,6 @@ func resourceGithubMembership() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_organization_project.go b/github/resource_github_organization_project.go
@@ -36,7 +36,6 @@ func resourceGithubOrganizationProject() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_organization_ruleset.go b/github/resource_github_organization_ruleset.go
@@ -675,7 +675,6 @@ 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 {
diff --git a/github/resource_github_organization_webhook.go b/github/resource_github_organization_webhook.go
@@ -53,7 +53,6 @@ func resourceGithubOrganizationWebhook() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_project_card.go b/github/resource_github_project_card.go
@@ -41,7 +41,6 @@ func resourceGithubProjectCard() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_project_column.go b/github/resource_github_project_column.go
@@ -37,7 +37,6 @@ func resourceGithubProjectColumn() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_release.go b/github/resource_github_release.go
@@ -82,7 +82,6 @@ func resourceGithubRelease() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_repository.go b/github/resource_github_repository.go
@@ -439,7 +439,6 @@ func resourceGithubRepository() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_repository_autolink_reference.go b/github/resource_github_repository_autolink_reference.go
@@ -86,7 +86,6 @@ func resourceGithubRepositoryAutolinkReference() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_repository_deploy_key.go b/github/resource_github_repository_deploy_key.go
@@ -52,7 +52,6 @@ func resourceGithubRepositoryDeployKey() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_repository_deployment_branch_policy.go b/github/resource_github_repository_deployment_branch_policy.go
@@ -43,7 +43,6 @@ func resourceGithubRepositoryDeploymentBranchPolicy() *schema.Resource {
 			},
 			"etag": {
 				Type:        schema.TypeString,
-				Optional:    true,
 				Computed:    true,
 				Description: "An etag representing the Branch object.",
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
diff --git a/github/resource_github_repository_project.go b/github/resource_github_repository_project.go
@@ -53,7 +53,6 @@ func resourceGithubRepositoryProject() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_repository_ruleset.go b/github/resource_github_repository_ruleset.go
@@ -678,7 +678,6 @@ func resourceGithubRepositoryRuleset() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_repository_webhook.go b/github/resource_github_repository_webhook.go
@@ -71,7 +71,6 @@ func resourceGithubRepositoryWebhook() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_team.go b/github/resource_github_team.go
@@ -106,7 +106,6 @@ func resourceGithubTeam() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_team_membership.go b/github/resource_github_team_membership.go
@@ -57,7 +57,6 @@ func resourceGithubTeamMembership() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_team_repository.go b/github/resource_github_team_repository.go
@@ -56,7 +56,6 @@ func resourceGithubTeamRepository() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_team_sync_group_mapping.go b/github/resource_github_team_sync_group_mapping.go
@@ -60,7 +60,6 @@ func resourceGithubTeamSyncGroupMapping() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_user_gpg_key.go b/github/resource_github_user_gpg_key.go
@@ -31,7 +31,6 @@ func resourceGithubUserGpgKey() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_github_user_ssh_key.go b/github/resource_github_user_ssh_key.go
@@ -45,7 +45,6 @@ func resourceGithubUserSshKey() *schema.Resource {
 			},
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true
diff --git a/github/resource_organization_block.go b/github/resource_organization_block.go
@@ -29,7 +29,6 @@ func resourceOrganizationBlock() *schema.Resource {
 
 			"etag": {
 				Type:     schema.TypeString,
-				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, o, n string, d *schema.ResourceData) bool {
 					return true

Original file line number	Diff line number	Diff line change
`@@ -113,10 +113,7 @@ func TestEtagSchemaConsistency(t *testing.T) {`
`113`	`113`	`return`
`114`	`114`	`}`
`115`	`115`
`116`		`- // Verify etag is optional and computed`
`117`		`- if !etagField.Optional {`
`118`		`- t.Errorf("etag should be optional in %s", resourceName)`
`119`		`- }`
	`116`	`+ // Verify etag is computed`
`120`	`117`	`if !etagField.Computed {`
`121`	`118`	`t.Errorf("etag should be computed in %s", resourceName)`
`122`	`119`	`}`