refactor: rename setting_value/policy_value to setting/policy

The _value suffix is redundant — every attribute is a value. Shorter
names improve readability without losing clarity.

Co-Authored-By: Claude Opus 4.7 (1M context) <[email protected]>

Author: andrewesweet

github/resource_github_enterprise_private_repository_forking_setting.go

@@ -22,14 +22,14 @@ func resourceGithubEnterprisePrivateRepositoryForkingSetting() *schema.Resource
 		},
 
 		CustomizeDiff: func(_ context.Context, diff *schema.ResourceDiff, _ any) error {
-			settingValue := diff.Get("setting_value").(string)
-			policyValue := diff.Get("policy_value").(string)
+			settingValue := diff.Get("setting").(string)
+			policyValue := diff.Get("policy").(string)
 
 			if settingValue == "ENABLED" && policyValue == "" {
-				return fmt.Errorf("policy_value is required when setting_value is ENABLED")
+				return fmt.Errorf("policy is required when setting is ENABLED")
 			}
 			if settingValue != "ENABLED" && policyValue != "" {
-				return fmt.Errorf("policy_value must not be set when setting_value is %s", settingValue)
+				return fmt.Errorf("policy must not be set when setting is %s", settingValue)
 			}
 			return nil
 		},
@@ -41,7 +41,7 @@ func resourceGithubEnterprisePrivateRepositoryForkingSetting() *schema.Resource
 				ForceNew:    true,
 				Description: "The slug of the enterprise.",
 			},
-			"setting_value": {
+			"setting": {
 				Type:     schema.TypeString,
 				Required: true,
 				ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{
@@ -51,7 +51,7 @@ func resourceGithubEnterprisePrivateRepositoryForkingSetting() *schema.Resource
 				}, false)),
 				Description: "Whether private repository forking is enabled for the enterprise. Must be one of: ENABLED, DISABLED, NO_POLICY.",
 			},
-			"policy_value": {
+			"policy": {
 				Type:     schema.TypeString,
 				Optional: true,
 				ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{
@@ -62,7 +62,7 @@ func resourceGithubEnterprisePrivateRepositoryForkingSetting() *schema.Resource
 					"USER_ACCOUNTS",
 					"EVERYWHERE",
 				}, false)),
-				Description: "Where members can fork private repositories. Required when setting_value is ENABLED. Must be one of: ENTERPRISE_ORGANIZATIONS, SAME_ORGANIZATION, SAME_ORGANIZATION_USER_ACCOUNTS, ENTERPRISE_ORGANIZATIONS_USER_ACCOUNTS, USER_ACCOUNTS, EVERYWHERE.",
+				Description: "Where members can fork private repositories. Required when setting is ENABLED. Must be one of: ENTERPRISE_ORGANIZATIONS, SAME_ORGANIZATION, SAME_ORGANIZATION_USER_ACCOUNTS, ENTERPRISE_ORGANIZATIONS_USER_ACCOUNTS, USER_ACCOUNTS, EVERYWHERE.",
 			},
 		},
 	}
@@ -79,14 +79,14 @@ func resourceGithubEnterprisePrivateRepositoryForkingSettingCreateOrUpdate(d *sc
 		return fmt.Errorf("error resolving enterprise ID for slug %q: %w", enterpriseSlug, err)
 	}
 
-	settingValue := githubv4.EnterpriseEnabledDisabledSettingValue(d.Get("setting_value").(string))
+	settingValue := githubv4.EnterpriseEnabledDisabledSettingValue(d.Get("setting").(string))
 
 	input := githubv4.UpdateEnterpriseAllowPrivateRepositoryForkingSettingInput{
 		EnterpriseID: enterpriseID,
 		SettingValue: settingValue,
 	}
 
-	if v, ok := d.GetOk("policy_value"); ok {
+	if v, ok := d.GetOk("policy"); ok {
 		pv := githubv4.EnterpriseAllowPrivateRepositoryForkingPolicyValue(v.(string))
 		input.PolicyValue = &pv
 	}
@@ -141,16 +141,16 @@ func resourceGithubEnterprisePrivateRepositoryForkingSettingRead(d *schema.Resou
 	}
 
 	settingValue := string(query.Enterprise.OwnerInfo.AllowPrivateRepositoryForkingSetting)
-	if err := d.Set("setting_value", settingValue); err != nil {
+	if err := d.Set("setting", settingValue); err != nil {
 		return err
 	}
 
 	if settingValue == "ENABLED" {
-		if err := d.Set("policy_value", string(query.Enterprise.OwnerInfo.AllowPrivateRepositoryForkingSettingPolicyValue)); err != nil {
+		if err := d.Set("policy", string(query.Enterprise.OwnerInfo.AllowPrivateRepositoryForkingSettingPolicyValue)); err != nil {
 			return err
 		}
 	} else {
-		if err := d.Set("policy_value", ""); err != nil {
+		if err := d.Set("policy", ""); err != nil {
 			return err
 		}
 	}

github/resource_github_enterprise_private_repository_forking_setting_test.go

@@ -15,24 +15,24 @@ func testAccEnterpriseForkingSettingConfig(settingValue, policyValue string) str
 		return fmt.Sprintf(`
 		resource "github_enterprise_private_repository_forking_setting" "test" {
 			enterprise_slug = "%s"
-			setting_value   = "%s"
-			policy_value    = "%s"
+			setting   = "%s"
+			policy    = "%s"
 		}
 		`, testAccConf.enterpriseSlug, settingValue, policyValue)
 	}
 	return fmt.Sprintf(`
 	resource "github_enterprise_private_repository_forking_setting" "test" {
 		enterprise_slug = "%s"
-		setting_value   = "%s"
+		setting   = "%s"
 	}
 	`, testAccConf.enterpriseSlug, settingValue)
 }
 
 func testAccEnterpriseForkingSettingCheck(settingValue, policyValue string) resource.TestCheckFunc {
 	return resource.ComposeTestCheckFunc(
 		resource.TestCheckResourceAttr(testAccEnterpriseForkingSettingResource, "enterprise_slug", testAccConf.enterpriseSlug),
-		resource.TestCheckResourceAttr(testAccEnterpriseForkingSettingResource, "setting_value", settingValue),
-		resource.TestCheckResourceAttr(testAccEnterpriseForkingSettingResource, "policy_value", policyValue),
+		resource.TestCheckResourceAttr(testAccEnterpriseForkingSettingResource, "setting", settingValue),
+		resource.TestCheckResourceAttr(testAccEnterpriseForkingSettingResource, "policy", policyValue),
 	)
 }
 
@@ -110,27 +110,27 @@ func TestAccGithubEnterprisePrivateRepositoryForkingSetting(t *testing.T) {
 		})
 	})
 
-	t.Run("rejects policy_value when disabled", func(t *testing.T) {
+	t.Run("rejects policy when disabled", func(t *testing.T) {
 		resource.Test(t, resource.TestCase{
 			PreCheck:          func() { skipUnlessEnterprise(t) },
 			ProviderFactories: providerFactories,
 			Steps: []resource.TestStep{
 				{
 					Config:      testAccEnterpriseForkingSettingConfig("DISABLED", "SAME_ORGANIZATION"),
-					ExpectError: regexp.MustCompile(`policy_value must not be set when setting_value is DISABLED`),
+					ExpectError: regexp.MustCompile(`policy must not be set when setting is DISABLED`),
 				},
 			},
 		})
 	})
 
-	t.Run("requires policy_value when enabled", func(t *testing.T) {
+	t.Run("requires policy when enabled", func(t *testing.T) {
 		resource.Test(t, resource.TestCase{
 			PreCheck:          func() { skipUnlessEnterprise(t) },
 			ProviderFactories: providerFactories,
 			Steps: []resource.TestStep{
 				{
 					Config:      testAccEnterpriseForkingSettingConfig("ENABLED", ""),
-					ExpectError: regexp.MustCompile(`policy_value is required when setting_value is ENABLED`),
+					ExpectError: regexp.MustCompile(`policy is required when setting is ENABLED`),
 				},
 			},
 		})

website/docs/r/enterprise_private_repository_forking_setting.html.markdown

@@ -10,7 +10,7 @@ description: |-
 This resource allows you to create and manage the private repository forking policy for a GitHub Enterprise.
 You must have enterprise admin access to use this resource.
 
-When `setting_value` is `ENABLED`, the `policy_value` attribute controls where forks
+When `setting` is `ENABLED`, the `policy` attribute controls where forks
 can be created. When `DISABLED`, forking of private repositories is not allowed.
 When `NO_POLICY`, individual organizations within the enterprise control their own
 forking settings.
@@ -22,8 +22,8 @@ forking settings.
 ```hcl
 resource "github_enterprise_private_repository_forking_setting" "example" {
   enterprise_slug = "my-enterprise"
-  setting_value   = "ENABLED"
-  policy_value    = "SAME_ORGANIZATION"
+  setting   = "ENABLED"
+  policy    = "SAME_ORGANIZATION"
 }
 ```
 
@@ -32,8 +32,8 @@ resource "github_enterprise_private_repository_forking_setting" "example" {
 ```hcl
 resource "github_enterprise_private_repository_forking_setting" "example" {
   enterprise_slug = "my-enterprise"
-  setting_value   = "ENABLED"
-  policy_value    = "ENTERPRISE_ORGANIZATIONS_USER_ACCOUNTS"
+  setting   = "ENABLED"
+  policy    = "ENTERPRISE_ORGANIZATIONS_USER_ACCOUNTS"
 }
 ```
 
@@ -42,7 +42,7 @@ resource "github_enterprise_private_repository_forking_setting" "example" {
 ```hcl
 resource "github_enterprise_private_repository_forking_setting" "example" {
   enterprise_slug = "my-enterprise"
-  setting_value   = "DISABLED"
+  setting   = "DISABLED"
 }
 ```
 
@@ -51,7 +51,7 @@ resource "github_enterprise_private_repository_forking_setting" "example" {
 ```hcl
 resource "github_enterprise_private_repository_forking_setting" "example" {
   enterprise_slug = "my-enterprise"
-  setting_value   = "NO_POLICY"
+  setting   = "NO_POLICY"
 }
 ```
 
@@ -60,8 +60,8 @@ resource "github_enterprise_private_repository_forking_setting" "example" {
 The following arguments are supported:
 
 * `enterprise_slug` - (Required) The slug of the enterprise.
-* `setting_value` - (Required) Whether private repository forking is enabled for the enterprise. Must be one of `ENABLED`, `DISABLED`, or `NO_POLICY`.
-* `policy_value` - (Optional) Where members can fork private repositories. Required when `setting_value` is `ENABLED`. Must be one of:
+* `setting` - (Required) Whether private repository forking is enabled for the enterprise. Must be one of `ENABLED`, `DISABLED`, or `NO_POLICY`.
+* `policy` - (Optional) Where members can fork private repositories. Required when `setting` is `ENABLED`. Must be one of:
   * `ENTERPRISE_ORGANIZATIONS` - Members can fork to an organization within this enterprise.
   * `SAME_ORGANIZATION` - Members can fork only within the same organization (intra-org).
   * `SAME_ORGANIZATION_USER_ACCOUNTS` - Members can fork to their user account or within the same organization.