Fixed type conversion for allowed_merge_methods

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

Author: deiga

github/util_rules.go

@@ -39,20 +39,17 @@ func toInt64(v any) int64 {
 	}
 }
 
-func toPullRequestMergeMethods(input []string) []github.PullRequestMergeMethod {
-	mergeMethods := make([]github.PullRequestMergeMethod, 0)
-	for _, method := range input {
-		switch method {
-		case "merge":
-			mergeMethods = append(mergeMethods, github.PullRequestMergeMethodMerge)
-		case "rebase":
-			mergeMethods = append(mergeMethods, github.PullRequestMergeMethodRebase)
-		case "squash":
-			mergeMethods = append(mergeMethods, github.PullRequestMergeMethodSquash)
-		}
+func toPullRequestMergeMethods(input any) []github.PullRequestMergeMethod {
+	value, ok := input.([]any)
+	if !ok || value == nil || len(value) == 0 {
+		log.Printf("[DEBUG] No allowed merge methods provided, using default: %#v", input)
+		return DEFAULT_PULL_REQUEST_MERGE_METHODS
 	}
-	if len(mergeMethods) == 0 {
-		mergeMethods = append(mergeMethods, github.PullRequestMergeMethodMerge) // We need to send at least one method to the API. Defaulting to merge.
+	mergeMethods := make([]github.PullRequestMergeMethod, 0, len(value))
+	for _, item := range value {
+		if method, ok := item.(string); ok {
+			mergeMethods = append(mergeMethods, github.PullRequestMergeMethod(method))
+		}
 	}
 	return mergeMethods
 }
@@ -317,18 +314,14 @@ func expandRules(input []any, org bool) *github.RepositoryRulesetRules {
 	if v, ok := rulesMap["pull_request"].([]any); ok && len(v) != 0 {
 		pullRequestMap := v[0].(map[string]any)
 		allowedMergeMethods := pullRequestMap["allowed_merge_methods"]
-		if allowedMergeMethods != nil {
-			allowedMergeMethods = toPullRequestMergeMethods(allowedMergeMethods.([]string))
-		} else {
-			allowedMergeMethods = DEFAULT_PULL_REQUEST_MERGE_METHODS
-		}
+
 		params := &github.PullRequestRuleParameters{
 			DismissStaleReviewsOnPush:      pullRequestMap["dismiss_stale_reviews_on_push"].(bool),
 			RequireCodeOwnerReview:         pullRequestMap["require_code_owner_review"].(bool),
 			RequireLastPushApproval:        pullRequestMap["require_last_push_approval"].(bool),
 			RequiredApprovingReviewCount:   toInt(pullRequestMap["required_approving_review_count"]),
 			RequiredReviewThreadResolution: pullRequestMap["required_review_thread_resolution"].(bool),
-			AllowedMergeMethods:            allowedMergeMethods.([]github.PullRequestMergeMethod),
+			AllowedMergeMethods:            toPullRequestMergeMethods(allowedMergeMethods),
 		}
 		rulesetRules.PullRequest = params
 	}