Support repository_property in push rulesets

Author: Moser-ss

github/resource_github_organization_ruleset.go

@@ -12,6 +12,7 @@ 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"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
@@ -30,7 +31,7 @@ func resourceGithubOrganizationRuleset() *schema.Resource {
 
 		SchemaVersion: 1,
 
-		CustomizeDiff: resourceGithubOrganizationRulesetDiff,
+	CustomizeDiff: resourceGithubOrganizationRulesetDiff,
 
 		Schema: map[string]*schema.Schema{
 			"name": {

github/resource_github_repository_ruleset.go

@@ -12,6 +12,7 @@ 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"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
@@ -104,7 +105,7 @@ func resourceGithubRepositoryRuleset() *schema.Resource {
 					Schema: map[string]*schema.Schema{
 						"ref_name": {
 							Type:     schema.TypeList,
-							Required: true,
+							Optional: true,
 							MaxItems: 1,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{

github/util_ruleset_validation.go

@@ -171,11 +171,26 @@ func validateConditionsFieldForBranchAndTagTargets(ctx context.Context, target g
 		return fmt.Errorf("ref_name must be set for %s target", target)
 	}
 
-	// Repository rulesets don't have repository_name or repository_id, only org rulesets do.
+	// Repository rulesets don't have repository_name, repository_id, or repository_property - only org rulesets do.
 	if isOrg {
-		if (conditions["repository_name"] == nil || len(conditions["repository_name"].([]any)) == 0) && (conditions["repository_id"] == nil || len(conditions["repository_id"].([]any)) == 0) {
-			tflog.Debug(ctx, fmt.Sprintf("Missing repository_name or repository_id for %s target", target), map[string]any{"target": target})
-			return fmt.Errorf("either repository_name or repository_id must be set for %s target", target)
+		hasRepoName := conditions["repository_name"] != nil && len(conditions["repository_name"].([]any)) > 0
+		hasRepoId := conditions["repository_id"] != nil && len(conditions["repository_id"].([]any)) > 0
+		hasRepoProp := conditions["repository_property"] != nil && len(conditions["repository_property"].([]any)) > 0
+
+		repoTargetingCount := 0
+		if hasRepoName {
+			repoTargetingCount++
+		}
+		if hasRepoId {
+			repoTargetingCount++
+		}
+		if hasRepoProp {
+			repoTargetingCount++
+		}
+
+		if repoTargetingCount != 1 {
+			tflog.Debug(ctx, fmt.Sprintf("Invalid repository targeting for %s target", target), map[string]any{"target": target})
+			return fmt.Errorf("exactly one of repository_name, repository_id, or repository_property must be set for %s target", target)
 		}
 	}
 	tflog.Debug(ctx, fmt.Sprintf("Conditions validation passed for %s target", target))