Fix panic on init failure like conflicting import

mumoshu · Feb 13, 2021 · 4f4dc7a · 4f4dc7a
1 parent 5ca020a
commit 4f4dc7a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/app/load.go b/pkg/app/load.go
@@ -398,7 +398,7 @@ func newApp(app *App, cc *HCL2Config, importDir func(string) (*App, error)) (*Ap
 	for _, g := range globals {
 		merged, err := mergeParamsAndOpts(g, root)
 		if err != nil {
-			return nil, fmt.Errorf("merging globals: %w", err)
+			return app, fmt.Errorf("merging globals: %w", err)
 		}
 
 		root = *merged

diff --git a/variant.go b/variant.go
@@ -428,7 +428,11 @@ func getMergedParamsAndOpts(
 func (m *Main) initApp(setup app.Setup) (*app.App, error) {
 	ap, err := app.New(setup)
 	if err != nil {
-		ap.PrintError(err)
+		if ap == nil {
+			fmt.Fprintf(os.Stderr, "%+v\n", err)
+		} else {
+			ap.PrintError(err)
+		}
 
 		//nolint:wrapcheck
 		return nil, err