fix: Correctly boxes max_file_size as an int and addresses the schema.Set type mismatch with restricted_file_extensions

Author: nickfloyd

github/resource_github_organization_ruleset_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func TestGithubOrganizationRulesets(t *testing.T) {
@@ -589,7 +590,7 @@ func TestOrganizationPushRulesetSupport(t *testing.T) {
 		},
 		"max_file_size": []interface{}{
 			map[string]interface{}{
-				"max_file_size": float64(10485760), // 10MB
+				"max_file_size": 10485760, // 10MB
 			},
 		},
 		"max_file_path_length": []interface{}{
@@ -599,7 +600,9 @@ func TestOrganizationPushRulesetSupport(t *testing.T) {
 		},
 		"file_extension_restriction": []interface{}{
 			map[string]interface{}{
-				"restricted_file_extensions": []interface{}{".exe", ".bat", ".sh", ".ps1"},
+				"restricted_file_extensions": schema.NewSet(schema.HashString, []interface{}{
+					".exe", ".bat", ".sh", ".ps1",
+				}),
 			},
 		},
 	}

github/respository_rules_utils.go

@@ -444,7 +444,7 @@ func expandRules(input []interface{}, org bool) []*github.RepositoryRule {
 	// max_file_size rule
 	if v, ok := rulesMap["max_file_size"].([]interface{}); ok && len(v) != 0 {
 		maxFileSizeMap := v[0].(map[string]interface{})
-		maxFileSize := int64(maxFileSizeMap["max_file_size"].(float64))
+		maxFileSize := int64(maxFileSizeMap["max_file_size"].(int))
 		params := &github.RuleMaxFileSizeParameters{
 			MaxFileSize: maxFileSize,
 		}
@@ -467,13 +467,19 @@ func expandRules(input []interface{}, org bool) []*github.RepositoryRule {
 	if v, ok := rulesMap["file_extension_restriction"].([]interface{}); ok && len(v) != 0 {
 		fileExtensionRestrictionMap := v[0].(map[string]interface{})
 		restrictedFileExtensions := make([]string, 0)
-		for _, extension := range fileExtensionRestrictionMap["restricted_file_extensions"].([]interface{}) {
+
+		// Handle schema.TypeSet
+		extensionSet := fileExtensionRestrictionMap["restricted_file_extensions"].(*schema.Set)
+		for _, extension := range extensionSet.List() {
 			restrictedFileExtensions = append(restrictedFileExtensions, extension.(string))
 		}
-		params := &github.RuleFileExtensionRestrictionParameters{
-			RestrictedFileExtensions: restrictedFileExtensions,
+
+		if len(restrictedFileExtensions) > 0 {
+			params := &github.RuleFileExtensionRestrictionParameters{
+				RestrictedFileExtensions: restrictedFileExtensions,
+			}
+			rulesSlice = append(rulesSlice, github.NewFileExtensionRestrictionRule(params))
 		}
-		rulesSlice = append(rulesSlice, github.NewFileExtensionRestrictionRule(params))
 	}
 
 	return rulesSlice

github/respository_rules_utils_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/google/go-github/v67/github"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func TestFlattenRulesHandlesUnknownTypes(t *testing.T) {
@@ -255,7 +256,7 @@ func TestMaxFilePathLengthWithOtherRules(t *testing.T) {
 		},
 		"max_file_size": []interface{}{
 			map[string]interface{}{
-				"max_file_size": float64(1048576), // 1MB
+				"max_file_size": 1048576, // 1MB
 			},
 		},
 	}
@@ -349,7 +350,7 @@ func TestCompletePushRulesetSupport(t *testing.T) {
 		},
 		"max_file_size": []interface{}{
 			map[string]interface{}{
-				"max_file_size": float64(5242880), // 5MB
+				"max_file_size": 5242880, // 5MB
 			},
 		},
 		"max_file_path_length": []interface{}{
@@ -359,7 +360,9 @@ func TestCompletePushRulesetSupport(t *testing.T) {
 		},
 		"file_extension_restriction": []interface{}{
 			map[string]interface{}{
-				"restricted_file_extensions": []interface{}{".exe", ".bat", ".sh"},
+				"restricted_file_extensions": schema.NewSet(schema.HashString, []interface{}{
+					".exe", ".bat", ".sh",
+				}),
 			},
 		},
 	}