refactor(workflow): decodeSettings returns a typed value
This commit is contained in:
1 parent
c5b8de3071
commit
c86368369f
3 files changed
+26
-25
No files matched your search
@@ -38,8 +38,8 @@ type handoffSettings struct {
|
||||
// newHandoffStage requeues the task under another workflow: the same task,
|
||||
// not a child run, so its history stays in one place.
|
||||
func newHandoffStage(settings yaml.Node) (Stage, error) {
|
||||
var s handoffSettings
|
||||
if err := decodeSettings(HandoffStepName, settings, &s); err != nil {
|
||||
s, err := decodeSettings[handoffSettings](HandoffStepName, settings)
|
||||
if err != nil {
|
||||
return Stage{}, err
|
||||
}
|
||||
if strings.TrimSpace(s.Workflow) == "" {
|
||||
@@ -63,8 +63,8 @@ type approveSettings struct {
|
||||
// newApproveStage delivers the plan to the decision surfaces and waits: the
|
||||
// task parks in waiting_human until an operator approves or rejects it.
|
||||
func newApproveStage(settings yaml.Node) (Stage, error) {
|
||||
var s approveSettings
|
||||
if err := decodeSettings(ApproveStepName, settings, &s); err != nil {
|
||||
s, err := decodeSettings[approveSettings](ApproveStepName, settings)
|
||||
if err != nil {
|
||||
return Stage{}, err
|
||||
}
|
||||
if strings.TrimSpace(s.Plan) == "" || strings.TrimSpace(s.Then) == "" {
|
||||
@@ -95,8 +95,8 @@ type commentSettings struct {
|
||||
}
|
||||
|
||||
func newCommentStage(settings yaml.Node) (Stage, error) {
|
||||
var s commentSettings
|
||||
if err := decodeSettings(CommentStepName, settings, &s); err != nil {
|
||||
s, err := decodeSettings[commentSettings](CommentStepName, settings)
|
||||
if err != nil {
|
||||
return Stage{}, err
|
||||
}
|
||||
if strings.TrimSpace(s.Body) == "" {
|
||||
@@ -208,14 +208,14 @@ func controlTarget(step StepRecord) (string, bool, error) {
|
||||
var target string
|
||||
switch step.Type {
|
||||
case HandoffStepName:
|
||||
var s handoffSettings
|
||||
if err := decodeSettings(HandoffStepName, step.Settings, &s); err != nil {
|
||||
s, err := decodeSettings[handoffSettings](HandoffStepName, step.Settings)
|
||||
if err != nil {
|
||||
return "", false, err
|
||||
}
|
||||
target = strings.TrimSpace(s.Workflow)
|
||||
case ApproveStepName:
|
||||
var s approveSettings
|
||||
if err := decodeSettings(ApproveStepName, step.Settings, &s); err != nil {
|
||||
s, err := decodeSettings[approveSettings](ApproveStepName, step.Settings)
|
||||
if err != nil {
|
||||
return "", false, err
|
||||
}
|
||||
target = strings.TrimSpace(s.Then)
|
||||
|
||||
@@ -38,14 +38,15 @@ func RepoStepTypes() []StepType {
|
||||
}
|
||||
|
||||
// decodeSettings decodes optional settings strictly.
|
||||
func decodeSettings(step string, settings yaml.Node, into any) error {
|
||||
func decodeSettings[T any](step string, settings yaml.Node) (T, error) {
|
||||
var s T
|
||||
if settings.Kind == 0 {
|
||||
return nil
|
||||
return s, nil
|
||||
}
|
||||
if err := settings.Decode(into); err != nil {
|
||||
return fmt.Errorf("%s: %w", step, err)
|
||||
if err := settings.Decode(&s); err != nil {
|
||||
return s, fmt.Errorf("%s: %w", step, err)
|
||||
}
|
||||
return nil
|
||||
return s, nil
|
||||
}
|
||||
|
||||
type repoPrepareSettings struct {
|
||||
@@ -55,8 +56,8 @@ type repoPrepareSettings struct {
|
||||
}
|
||||
|
||||
func newRepoPrepareStage(settings yaml.Node) (Stage, error) {
|
||||
var s repoPrepareSettings
|
||||
if err := decodeSettings(RepoPrepareStepName, settings, &s); err != nil {
|
||||
s, err := decodeSettings[repoPrepareSettings](RepoPrepareStepName, settings)
|
||||
if err != nil {
|
||||
return Stage{}, err
|
||||
}
|
||||
var stage Stage
|
||||
@@ -84,8 +85,8 @@ type repoCommitSettings struct {
|
||||
}
|
||||
|
||||
func newRepoCommitStage(settings yaml.Node) (Stage, error) {
|
||||
var s repoCommitSettings
|
||||
if err := decodeSettings(RepoCommitStepName, settings, &s); err != nil {
|
||||
s, err := decodeSettings[repoCommitSettings](RepoCommitStepName, settings)
|
||||
if err != nil {
|
||||
return Stage{}, err
|
||||
}
|
||||
if strings.TrimSpace(s.Message) == "" {
|
||||
@@ -135,8 +136,8 @@ type repoOpenPRSettings struct {
|
||||
}
|
||||
|
||||
func newRepoOpenPRStage(settings yaml.Node) (Stage, error) {
|
||||
var s repoOpenPRSettings
|
||||
if err := decodeSettings(RepoOpenPRStepName, settings, &s); err != nil {
|
||||
s, err := decodeSettings[repoOpenPRSettings](RepoOpenPRStepName, settings)
|
||||
if err != nil {
|
||||
return Stage{}, err
|
||||
}
|
||||
body := func(tc *TaskContext) string {
|
||||
@@ -162,8 +163,8 @@ type gateRepositorySettings struct {
|
||||
// newGateRepositoryStage runs the repository's gate commands in the worktree.
|
||||
// Its summary is the test command's output, so a later step can quote it.
|
||||
func newGateRepositoryStage(settings yaml.Node) (Stage, error) {
|
||||
var s gateRepositorySettings
|
||||
if err := decodeSettings(GateRepositoryName, settings, &s); err != nil {
|
||||
s, err := decodeSettings[gateRepositorySettings](GateRepositoryName, settings)
|
||||
if err != nil {
|
||||
return Stage{}, err
|
||||
}
|
||||
switch {
|
||||
|
||||
@@ -69,8 +69,8 @@ type reviewReplySettings struct {
|
||||
// thread when it has one, clears the consumed payload so a resumed run cannot
|
||||
// address it twice, and returns the task to pr_open.
|
||||
func newReviewReplyStage(settings yaml.Node) (Stage, error) {
|
||||
var s reviewReplySettings
|
||||
if err := decodeSettings(ReviewReplyStepName, settings, &s); err != nil {
|
||||
s, err := decodeSettings[reviewReplySettings](ReviewReplyStepName, settings)
|
||||
if err != nil {
|
||||
return Stage{}, err
|
||||
}
|
||||
if strings.TrimSpace(s.Body) == "" {
|
||||
|
||||
Reference in new issue
Block a user