diff --git a/cmd/convert.go b/cmd/convert.go index 898227bc..f9d6d867 100644 --- a/cmd/convert.go +++ b/cmd/convert.go @@ -133,7 +133,12 @@ var convertCmd = &cobra.Command{ } app.ValidateFlags(args, cmd, &ConvertOpt) - app.ValidateComposeFile(&ConvertOpt) + + // Since ValidateComposeFiles returns an error, let's validate it and output the error appropriately if the validation fails + err := app.ValidateComposeFile(&ConvertOpt) + if err != nil { + log.Fatalf("Error validating compose file: %v", err) + } }, Run: func(cmd *cobra.Command, args []string) { diff --git a/pkg/app/app.go b/pkg/app/app.go index 918f66f9..ab3de927 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -146,18 +146,18 @@ func ValidateFlags(args []string, cmd *cobra.Command, opt *kobject.ConvertOption // ValidateComposeFile validates the compose file provided for conversion func ValidateComposeFile(opt *kobject.ConvertOptions) error { if len(opt.InputFiles) == 0 { + // Go through a range of "default" file names to see if tany ofthem exist in the current directory for _, name := range DefaultComposeFiles { _, err := os.Stat(name) if err != nil { log.Debugf("'%s' not found: %v", name, err) - return err } else { opt.InputFiles = []string{name} return nil } } - - log.Fatal("No 'docker-compose' file found") + // Return an error message that no compose or docker-compose yaml files were found + return fmt.Errorf("No compose or docker-compose yaml file found in the current directory") } return nil }