Address review comments

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

Author: deiga

github/resource_github_organization_ruleset.go

@@ -27,7 +27,7 @@ func resourceGithubOrganizationRuleset() *schema.Resource {
 
 		SchemaVersion: 1,
 
-		CustomizeDiff: resourceGithubOrganizationRulesetValidate,
+		CustomizeDiff: resourceGithubOrganizationRulesetDiff,
 
 		Schema: map[string]*schema.Schema{
 			"name": {
@@ -39,7 +39,7 @@ func resourceGithubOrganizationRuleset() *schema.Resource {
 			"target": {
 				Type:     schema.TypeString,
 				Required: true,
-				// The API accepts an `repository` target, but any rule created with that doesn't show up in the UI, nor does it have any rules.
+				// The API accepts an `repository` target, but we don't support it yet.
 				ValidateFunc: validation.StringInSlice([]string{string(TargetBranch), string(TargetTag), string(TargetPush)}, false),
 				Description:  "The target of the ruleset. Possible values are `branch`, `tag` and `push`.",
 			},
@@ -863,7 +863,7 @@ func resourceGithubOrganizationRulesetImport(ctx context.Context, d *schema.Reso
 	return []*schema.ResourceData{d}, nil
 }
 
-func resourceGithubOrganizationRulesetValidate(ctx context.Context, d *schema.ResourceDiff, _ any) error {
+func resourceGithubOrganizationRulesetDiff(ctx context.Context, d *schema.ResourceDiff, _ any) error {
 	err := validateRulesetConditions(ctx, d, true)
 	if err != nil {
 		return err

github/resource_github_repository_ruleset.go

@@ -3,6 +3,7 @@ package github
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
 	"regexp"
 	"strconv"
@@ -26,7 +27,7 @@ func resourceGithubRepositoryRuleset() *schema.Resource {
 
 		SchemaVersion: 1,
 
-		CustomizeDiff: resourceGithubRepositoryRulesetValidate,
+		CustomizeDiff: resourceGithubRepositoryRulesetDiff,
 
 		Schema: map[string]*schema.Schema{
 			"name": {
@@ -792,7 +793,7 @@ func resourceGithubRepositoryRulesetImport(ctx context.Context, d *schema.Resour
 	return []*schema.ResourceData{d}, nil
 }
 
-func resourceGithubRepositoryRulesetValidate(ctx context.Context, d *schema.ResourceDiff, meta any) error {
+func resourceGithubRepositoryRulesetDiff(ctx context.Context, d *schema.ResourceDiff, meta any) error {
 	err := validateRulesetConditions(ctx, d, false)
 	if err != nil {
 		return err