grim/convey

move the config code out to it's own function

2021-12-23, Gary Kramlich
2372326b8e83
Parents eff7fbacd5ee
Children f3f0021b39e0
move the config code out to it's own function
1 files changed, 16 insertions(+), 7 deletions(-)
  • +16 -7
    runner/cmd.go
    • --- a/runner/cmd.go Thu Dec 23 15:17:04 2021 -0600
    +++ b/runner/cmd.go Thu Dec 23 16:07:04 2021 -0600
    @@ -76,34 +76,43 @@
    }
    }
    -func (c *RunnerCmd) Run(g *globals.Globals) error {
    - logging.Setup(g.Color, g.Verbose)
    -
    +func (c *RunnerCmd) loadConfig() (string, *config.Config, error) {
    cfg, err := config.LoadFile(c.ConfigFile)
    if err != nil {
    - return err
    + return "", nil, err
    }
    err = cfg.Valid()
    if err != nil {
    - return fmt.Errorf("config is invalid: %s", err)
    + return "", nil, fmt.Errorf("config is invalid: %s", err)
    }
    err = cfg.HasPlans(c.Plans)
    if err != nil {
    - return err
    + return "", nil, err
    }
    configPath, _ := filepath.Split(c.ConfigFile)
    if configPath == "" {
    cwd, err := os.Getwd()
    if err != nil {
    - return err
    + return "", nil, err
    }
    configPath = cwd
    }
    + return configPath, cfg, nil
    +}
    +
    +func (c *RunnerCmd) Run(g *globals.Globals) error {
    + logging.Setup(g.Color, g.Verbose)
    +
    + configPath, cfg, err := c.loadConfig()
    + if err != nil {
    + return err
    + }
    +
    rt := c.Runtime(configPath, cfg)
    defer rt.Shutdown()