fix(phases): add error handling for phase registration
- RegisterPhase now returns error for nil phases and duplicates - main.go checks all RegisterPhase calls for errors - prevents silent failures during phase setup
- commit
- 7d997b9bba45c985f3bcf07d1a37bc818184501f
- author
- bnema · · 2025-10-26 11:23 UTC
- parent
- 2436595
- signature
- unsigned
2 files · +30 -9
M cmd/archup-installer/main.go +17 -8
| @@ -60,14 +60,23 @@ func main() { | |||
| 60 | 60 | orchestrator := phases.NewOrchestrator(cfg, config.DefaultLogPath) | |
| 61 | 61 | ||
| 62 | 62 | // Register all phases with logger | |
| 63 | - | orchestrator.RegisterPhase(phases.NewBootstrapPhase(cfg, log)) | |
| 64 | - | orchestrator.RegisterPhase(phases.NewPreflightPhase(cfg, log)) | |
| 65 | - | orchestrator.RegisterPhase(phases.NewPartitioningPhase(cfg, log)) | |
| 66 | - | orchestrator.RegisterPhase(phases.NewBaseInstallPhase(cfg, log)) | |
| 67 | - | orchestrator.RegisterPhase(phases.NewConfigPhase(cfg, log)) | |
| 68 | - | orchestrator.RegisterPhase(phases.NewBootPhase(cfg, log)) | |
| 69 | - | orchestrator.RegisterPhase(phases.NewReposPhase(cfg, log)) | |
| 70 | - | orchestrator.RegisterPhase(phases.NewPostInstallPhase(cfg, log)) | |
| 63 | + | phasesToRegister := []phases.Phase{ | |
| 64 | + | phases.NewBootstrapPhase(cfg, log), | |
| 65 | + | phases.NewPreflightPhase(cfg, log), | |
| 66 | + | phases.NewPartitioningPhase(cfg, log), | |
| 67 | + | phases.NewBaseInstallPhase(cfg, log), | |
| 68 | + | phases.NewConfigPhase(cfg, log), | |
| 69 | + | phases.NewBootPhase(cfg, log), | |
| 70 | + | phases.NewReposPhase(cfg, log), | |
| 71 | + | phases.NewPostInstallPhase(cfg, log), | |
| 72 | + | } | |
| 73 | + | ||
| 74 | + | for _, phase := range phasesToRegister { | |
| 75 | + | if err := orchestrator.RegisterPhase(phase); err != nil { | |
| 76 | + | fmt.Fprintf(os.Stderr, "Failed to register phase: %v\n", err) | |
| 77 | + | os.Exit(1) | |
| 78 | + | } | |
| 79 | + | } | |
| 71 | 80 | ||
| 72 | 81 | // Create UI model | |
| 73 | 82 | model := ui.NewModel(orchestrator, cfg, version) | |
| @@ -60,14 +60,23 @@ func main() { | |||||
| 60 | orchestrator := phases.NewOrchestrator(cfg, config.DefaultLogPath) | 60 | orchestrator := phases.NewOrchestrator(cfg, config.DefaultLogPath) | ||
| 61 | 61 | ||||
| 62 | // Register all phases with logger | 62 | // Register all phases with logger | ||
| 63 | - | orchestrator.RegisterPhase(phases.NewBootstrapPhase(cfg, log)) | 63 | + | phasesToRegister := []phases.Phase{ |
| 64 | - | orchestrator.RegisterPhase(phases.NewPreflightPhase(cfg, log)) | 64 | + | phases.NewBootstrapPhase(cfg, log), |
| 65 | - | orchestrator.RegisterPhase(phases.NewPartitioningPhase(cfg, log)) | 65 | + | phases.NewPreflightPhase(cfg, log), |
| 66 | - | orchestrator.RegisterPhase(phases.NewBaseInstallPhase(cfg, log)) | 66 | + | phases.NewPartitioningPhase(cfg, log), |
| 67 | - | orchestrator.RegisterPhase(phases.NewConfigPhase(cfg, log)) | 67 | + | phases.NewBaseInstallPhase(cfg, log), |
| 68 | - | orchestrator.RegisterPhase(phases.NewBootPhase(cfg, log)) | 68 | + | phases.NewConfigPhase(cfg, log), |
| 69 | - | orchestrator.RegisterPhase(phases.NewReposPhase(cfg, log)) | 69 | + | phases.NewBootPhase(cfg, log), |
| 70 | - | orchestrator.RegisterPhase(phases.NewPostInstallPhase(cfg, log)) | 70 | + | phases.NewReposPhase(cfg, log), |
| 71 | + | phases.NewPostInstallPhase(cfg, log), | |||
| 72 | + | } | |||
| 73 | + | ||||
| 74 | + | for _, phase := range phasesToRegister { | |||
| 75 | + | if err := orchestrator.RegisterPhase(phase); err != nil { | |||
| 76 | + | fmt.Fprintf(os.Stderr, "Failed to register phase: %v\n", err) | |||
| 77 | + | os.Exit(1) | |||
| 78 | + | } | |||
| 79 | + | } | |||
| 71 | 80 | ||||
| 72 | // Create UI model | 81 | // Create UI model | ||
| 73 | model := ui.NewModel(orchestrator, cfg, version) | 82 | model := ui.NewModel(orchestrator, cfg, version) | ||
M internal/phases/orchestrator.go +13 -1
| @@ -27,8 +27,20 @@ func NewOrchestrator(cfg *config.Config, logPath string) *Orchestrator { | |||
| 27 | 27 | } | |
| 28 | 28 | ||
| 29 | 29 | // RegisterPhase adds a phase to the execution sequence | |
| 30 | - | func (o *Orchestrator) RegisterPhase(phase Phase) { | |
| 30 | + | func (o *Orchestrator) RegisterPhase(phase Phase) error { | |
| 31 | + | if phase == nil { | |
| 32 | + | return fmt.Errorf("cannot register nil phase") | |
| 33 | + | } | |
| 34 | + | ||
| 35 | + | // Check for duplicate phase names | |
| 36 | + | for _, p := range o.phases { | |
| 37 | + | if p.Name() == phase.Name() { | |
| 38 | + | return fmt.Errorf("phase %s already registered", phase.Name()) | |
| 39 | + | } | |
| 40 | + | } | |
| 41 | + | ||
| 31 | 42 | o.phases = append(o.phases, phase) | |
| 43 | + | return nil | |
| 32 | 44 | } | |
| 33 | 45 | ||
| 34 | 46 | // Phases returns all registered phases | |
| @@ -27,8 +27,20 @@ func NewOrchestrator(cfg *config.Config, logPath string) *Orchestrator { | |||||
| 27 | } | 27 | } | ||
| 28 | 28 | ||||
| 29 | // RegisterPhase adds a phase to the execution sequence | 29 | // RegisterPhase adds a phase to the execution sequence | ||
| 30 | - | func (o *Orchestrator) RegisterPhase(phase Phase) { | 30 | + | func (o *Orchestrator) RegisterPhase(phase Phase) error { |
| 31 | + | if phase == nil { | |||
| 32 | + | return fmt.Errorf("cannot register nil phase") | |||
| 33 | + | } | |||
| 34 | + | ||||
| 35 | + | // Check for duplicate phase names | |||
| 36 | + | for _, p := range o.phases { | |||
| 37 | + | if p.Name() == phase.Name() { | |||
| 38 | + | return fmt.Errorf("phase %s already registered", phase.Name()) | |||
| 39 | + | } | |||
| 40 | + | } | |||
| 41 | + | ||||
| 31 | o.phases = append(o.phases, phase) | 42 | o.phases = append(o.phases, phase) | ||
| 43 | + | return nil | |||
| 32 | } | 44 | } | ||
| 33 | 45 | ||||
| 34 | // Phases returns all registered phases | 46 | // Phases returns all registered phases | ||