Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions pkg/workflow/add_comment.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ func (c *Compiler) parseCommentsConfig(outputMap map[string]any) *AddCommentsCon
return nil
}

addCommentLog.Print("Parsing add-comment configuration")

// Get config data for pre-processing before YAML unmarshaling
configData, _ := outputMap["add-comment"].(map[string]any)

Expand All @@ -53,20 +51,21 @@ func (c *Compiler) parseCommentsConfig(outputMap map[string]any) *AddCommentsCon
return nil
}

// Unmarshal into typed config struct
var config AddCommentsConfig
if err := unmarshalConfig(outputMap, "add-comment", &config, addCommentLog); err != nil {
config := parseConfigScaffold(outputMap, "add-comment", addCommentLog, func(err error) *AddCommentsConfig {
addCommentLog.Printf("Failed to unmarshal config: %v", err)
// For backward compatibility, handle nil/empty config
config = AddCommentsConfig{}
return &AddCommentsConfig{}
})
if config == nil {
return nil
}

// Set default max if not specified
if config.Max == nil {
config.Max = defaultIntStr(1)
}

return &config
return config
}

// buildAddCommentPermissions computes the permissions for the add_comment job based on config.
Expand Down
13 changes: 6 additions & 7 deletions pkg/workflow/add_reviewer.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ func (c *Compiler) parseAddReviewerConfig(outputMap map[string]any) *AddReviewer
return nil
}

addReviewerLog.Print("Parsing add-reviewer configuration")

// Get config data for pre-processing before YAML unmarshaling
configData, _ := outputMap["add-reviewer"].(map[string]any)

Expand All @@ -46,12 +44,13 @@ func (c *Compiler) parseAddReviewerConfig(outputMap map[string]any) *AddReviewer
return nil
}

// Unmarshal into typed config struct
var config AddReviewerConfig
if err := unmarshalConfig(outputMap, "add-reviewer", &config, addReviewerLog); err != nil {
config := parseConfigScaffold(outputMap, "add-reviewer", addReviewerLog, func(err error) *AddReviewerConfig {
addReviewerLog.Printf("Failed to unmarshal config: %v", err)
// For backward compatibility, handle nil/empty config
config = AddReviewerConfig{}
return &AddReviewerConfig{}
})
if config == nil {
return nil
}

// Set default max if not specified
Expand All @@ -61,5 +60,5 @@ func (c *Compiler) parseAddReviewerConfig(outputMap map[string]any) *AddReviewer

addReviewerLog.Printf("Parsed add-reviewer config: allowed_reviewers=%d, target=%s", len(config.Reviewers), config.Target)

return &config
return config
}
14 changes: 6 additions & 8 deletions pkg/workflow/close_entity_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,9 @@ type CloseEntityJobParams struct {
func (c *Compiler) parseCloseEntityConfig(outputMap map[string]any, params CloseEntityJobParams, logger *logger.Logger) *CloseEntityConfig {
// Check if the key exists
if _, exists := outputMap[params.ConfigKey]; !exists {
logger.Printf("No configuration found for %s", params.ConfigKey)
return nil
}

logger.Printf("Parsing %s configuration", params.ConfigKey)

// Get config data for pre-processing before YAML unmarshaling
configData, _ := outputMap[params.ConfigKey].(map[string]any)

Expand All @@ -105,12 +102,13 @@ func (c *Compiler) parseCloseEntityConfig(outputMap map[string]any, params Close
return nil
}

// Unmarshal into typed config struct
var config CloseEntityConfig
if err := unmarshalConfig(outputMap, params.ConfigKey, &config, logger); err != nil {
config := parseConfigScaffold(outputMap, params.ConfigKey, logger, func(err error) *CloseEntityConfig {
logger.Printf("Failed to unmarshal config: %v", err)
// For backward compatibility, handle nil/empty config
config = CloseEntityConfig{}
return &CloseEntityConfig{}
})
if config == nil {
return nil
}

// Set default max if not specified
Expand All @@ -121,7 +119,7 @@ func (c *Compiler) parseCloseEntityConfig(outputMap map[string]any, params Close

logger.Printf("Parsed %s configuration: max=%s, target=%s", params.ConfigKey, *config.Max, config.Target)

return &config
return config
}

// closeEntityDefinition holds all parameters for a close entity type
Expand Down
13 changes: 6 additions & 7 deletions pkg/workflow/create_discussion.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ func (c *Compiler) parseDiscussionsConfig(outputMap map[string]any) *CreateDiscu
return nil
}

discussionLog.Print("Parsing create-discussion configuration")

// Get the config data to check for special cases before unmarshaling
configData, _ := outputMap["create-discussion"].(map[string]any)

Expand All @@ -56,12 +54,13 @@ func (c *Compiler) parseDiscussionsConfig(outputMap map[string]any) *CreateDiscu
return nil
}

// Unmarshal into typed config struct
var config CreateDiscussionsConfig
if err := unmarshalConfig(outputMap, "create-discussion", &config, discussionLog); err != nil {
config := parseConfigScaffold(outputMap, "create-discussion", discussionLog, func(err error) *CreateDiscussionsConfig {
discussionLog.Printf("Failed to unmarshal config: %v", err)
// For backward compatibility, handle nil/empty config
config = CreateDiscussionsConfig{}
return &CreateDiscussionsConfig{}
})
if config == nil {
return nil
}

// Set default max if not specified
Expand Down Expand Up @@ -120,7 +119,7 @@ func (c *Compiler) parseDiscussionsConfig(outputMap map[string]any) *CreateDiscu
discussionLog.Printf("Fallback to issue configured: %t", *config.FallbackToIssue)
}

return &config
return config
}

// Returns normalized category (or original if it's a category ID)
Expand Down
13 changes: 6 additions & 7 deletions pkg/workflow/create_issue.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ func (c *Compiler) parseIssuesConfig(outputMap map[string]any) *CreateIssuesConf
return nil
}

createIssueLog.Print("Parsing create-issue configuration")

// Get the config data to check for special cases before unmarshaling
configData, _ := outputMap["create-issue"].(map[string]any)

Expand All @@ -55,12 +53,13 @@ func (c *Compiler) parseIssuesConfig(outputMap map[string]any) *CreateIssuesConf
return nil
}

// Unmarshal into typed config struct
var config CreateIssuesConfig
if err := unmarshalConfig(outputMap, "create-issue", &config, createIssueLog); err != nil {
config := parseConfigScaffold(outputMap, "create-issue", createIssueLog, func(err error) *CreateIssuesConfig {
createIssueLog.Printf("Failed to unmarshal config: %v", err)
// For backward compatibility, handle nil/empty config
config = CreateIssuesConfig{}
return &CreateIssuesConfig{}
})
if config == nil {
return nil
}

// Handle single string assignee (YAML unmarshaling won't convert string to []string)
Expand All @@ -85,7 +84,7 @@ func (c *Compiler) parseIssuesConfig(outputMap map[string]any) *CreateIssuesConf
createIssueLog.Printf("Issue expiration configured: %d hours", config.Expires)
}

return &config
return config
}

// hasCopilotAssignee checks if "copilot" is in the assignees list
Expand Down
13 changes: 6 additions & 7 deletions pkg/workflow/create_pull_request.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ func (c *Compiler) parsePullRequestsConfig(outputMap map[string]any) *CreatePull
return nil
}

createPRLog.Print("Parsing create-pull-request configuration")

// Get the config data to check for special cases before unmarshaling
configData, _ := outputMap["create-pull-request"].(map[string]any)

Expand Down Expand Up @@ -129,12 +127,13 @@ func (c *Compiler) parsePullRequestsConfig(outputMap map[string]any) *CreatePull
return nil
}

// Unmarshal into typed config struct
var config CreatePullRequestsConfig
if err := unmarshalConfig(outputMap, "create-pull-request", &config, createPRLog); err != nil {
config := parseConfigScaffold(outputMap, "create-pull-request", createPRLog, func(err error) *CreatePullRequestsConfig {
createPRLog.Printf("Failed to unmarshal config: %v", err)
// For backward compatibility, handle nil/empty config
config = CreatePullRequestsConfig{}
return &CreatePullRequestsConfig{}
})
if config == nil {
return nil
}

// Log expires if configured
Expand All @@ -153,5 +152,5 @@ func (c *Compiler) parsePullRequestsConfig(outputMap map[string]any) *CreatePull
createPRLog.Printf("Pull request max count configured: %s", *config.Max)
}

return &config
return config
}
Loading