flatten conditions for repository_property and fix schemas

Author: Moser-ss

examples/github_organization_ruleset/main.tf

@@ -113,12 +113,10 @@ func resourceGithubOrganizationRuleset() *schema.Resource {
 							},
 						},
 						"repository_property": {
-							Type:         schema.TypeList,
-							Optional:     true,
-							MaxItems:     1,
-							ExactlyOneOf: []string{"conditions.0.repository_id"},
-							AtLeastOneOf: []string{"conditions.0.repository_id"},
-							Description:  "Conditions to target repositories by property ",
+							Type:        schema.TypeList,
+							Optional:    true,
+							MaxItems:    1,
+							Description: "Conditions to target repositories by property ",
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"include": {
@@ -143,6 +141,7 @@ func resourceGithubOrganizationRuleset() *schema.Resource {
 												},
 												"source": {
 													Type:        schema.TypeString,
+													Optional:    true,
 													Description: "The source of the repository property. Defaults to 'custom' if not specified.Can be one of: custom, system",
 													Default:     "custom",
 												},
@@ -168,24 +167,27 @@ func resourceGithubOrganizationRuleset() *schema.Resource {
 							AtLeastOneOf: []string{"conditions.0.repository_id"},
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
-
-									"name": {
-										Type:        schema.TypeString,
+									"include": {
+										Type:        schema.TypeList,
 										Required:    true,
-										Description: "The name of the repository property to target",
+										Description: "Array of repository names or patterns to include. One of these patterns must match for the condition to pass. Also accepts `~ALL` to include all repositories.",
+										Elem: &schema.Schema{
+											Type: schema.TypeString,
+										},
 									},
-									"property_values": {
+									"exclude": {
 										Type:        schema.TypeList,
 										Required:    true,
-										Description: "The values to match for the repository property.",
+										Description: "Array of repository names or patterns to exclude. The condition will not pass if any of these patterns match.",
 										Elem: &schema.Schema{
 											Type: schema.TypeString,
 										},
 									},
-									"source": {
-										Type:        schema.TypeString,
-										Description: "The source of the repository property. Defaults to 'custom' if not specified.Can be one of: custom, system",
-										Default:     "custom",
+									"protected": {
+										Type:        schema.TypeBool,
+										Optional:    true,
+										Default:     false,
+										Description: "Whether renaming of target repositories is prevented.",
 									},
 								},
 							},

github/resource_github_organization_ruleset.go

@@ -226,6 +226,15 @@ func flattenConditions(conditions *github.RulesetConditions, org bool) []interfa
 		if conditions.RepositoryID != nil {
 			conditionsMap["repository_id"] = conditions.RepositoryID.RepositoryIDs
 		}
+		if conditions.RepositoryProperty != nil {
+			repositoryPropertySlice := make([]map[string]interface{}, 0)
+
+			repositoryPropertySlice = append(repositoryPropertySlice, map[string]interface{}{
+				"include": conditions.RepositoryProperty.Include,
+				"exclude": conditions.RepositoryProperty.Exclude,
+			})
+			conditionsMap["repository_property"] = repositoryPropertySlice
+		}
 	}
 
 	return []interface{}{conditionsMap}