Skip to content

Commit 4f4dc7a

Browse files
committed
Fix panic on init failure like conflicting import
1 parent 5ca020a commit 4f4dc7a

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

pkg/app/load.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ func newApp(app *App, cc *HCL2Config, importDir func(string) (*App, error)) (*Ap
398398
for _, g := range globals {
399399
merged, err := mergeParamsAndOpts(g, root)
400400
if err != nil {
401-
return nil, fmt.Errorf("merging globals: %w", err)
401+
return app, fmt.Errorf("merging globals: %w", err)
402402
}
403403

404404
root = *merged

variant.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,11 @@ func getMergedParamsAndOpts(
428428
func (m *Main) initApp(setup app.Setup) (*app.App, error) {
429429
ap, err := app.New(setup)
430430
if err != nil {
431-
ap.PrintError(err)
431+
if ap == nil {
432+
fmt.Fprintf(os.Stderr, "%+v\n", err)
433+
} else {
434+
ap.PrintError(err)
435+
}
432436

433437
//nolint:wrapcheck
434438
return nil, err

0 commit comments

Comments
 (0)