deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

bug: fixes bug with error out with using kompose convert with no -f (#1725)

Browse Source 
#### What type of PR is this?

<!--
Add one of the following kinds:
/kind cleanup
/kind documentation
/kind feature
-->

/kind bug

Fixes a validation bug where if you do not provide a compose.yaml or
docker-compose.yaml it will nil point error out rather than have an
appropriate "file not found" output.

#### Which issue(s) this PR fixes:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->

Closes https://github.com/kubernetes/kompose/issues/1719

#### Special notes for your reviewer:

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
This commit is contained in:
Charlie Drage 2023-10-06 13:34:44 -04:00 committed by GitHub
parent a04ecdb9e8
commit c0e0393bbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/convert.go
View File

@ -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) {

6
pkg/app/app.go
View File

@ -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
}