refactor: move println to command

This commit is contained in:
franklin 2021-03-25 12:34:17 +01:00
parent c688b1fc86
commit c25a726102
2 changed files with 9 additions and 11 deletions

View File

@ -9,10 +9,6 @@ import (
"github.com/foomo/squadron"
)
func init() {
configCmd.Flags().StringSliceVarP(&flagFiles, "file", "f", []string{}, "specify alternative squadron files (default squadron.yaml)")
}
var (
configCmd = &cobra.Command{
Use: "config",
@ -30,5 +26,10 @@ func config(l *logrus.Entry, cwd string, files []string) error {
if err != nil {
return err
}
return sq.Config()
cf, err := sq.Config()
if err != nil {
return err
}
fmt.Println(cf)
return nil
}

View File

@ -75,15 +75,12 @@ func (sq Squadron) Units() map[string]Unit {
return sq.c.Units
}
func (sq Squadron) Config() error {
func (sq Squadron) Config() (string, error) {
bs, err := yaml.Marshal(sq.c)
if err != nil {
return err
return "", err
}
if _, err := os.Stdout.WriteString(string(bs)); err != nil {
return err
}
return nil
return string(bs), nil
}
func (sq Squadron) Generate(units map[string]Unit) error {