Put HelmCommand in Help, not run.Config [#15]

This commit is contained in:
Erin Call 2019-12-26 12:23:56 -08:00
parent b1899dee56
commit 167b53691b
No known key found for this signature in database
GPG key ID: 4071FF6C15B8DAD1
5 changed files with 11 additions and 12 deletions

View file

@ -29,7 +29,6 @@ func NewPlan(cfg Config) (*Plan, error) {
p := Plan{
cfg: cfg,
runCfg: run.Config{
HelmCommand: string(cfg.Command),
Debug: cfg.Debug,
Values: cfg.Values,
StringValues: cfg.StringValues,
@ -132,7 +131,9 @@ var lint = func(cfg Config) []Step {
}
var help = func(cfg Config) []Step {
help := &run.Help{}
help := &run.Help{
HelmCommand: cfg.Command,
}
return []Step{help}
}

View file

@ -43,7 +43,6 @@ func (suite *PlanTestSuite) TestNewPlan() {
}
runCfg := run.Config{
HelmCommand: "help",
Debug: false,
Values: "steadfastness,forthrightness",
StringValues: "tensile_strength,flexibility",

View file

@ -6,7 +6,6 @@ import (
// Config contains configuration applicable to all helm commands
type Config struct {
HelmCommand string
Debug bool
Values string
StringValues string

View file

@ -6,6 +6,7 @@ import (
// Help is a step in a helm Plan that calls `helm help`.
type Help struct {
HelmCommand string
cmd cmd
}
@ -15,10 +16,10 @@ func (h *Help) Execute(cfg Config) error {
return fmt.Errorf("while running '%s': %w", h.cmd.String(), err)
}
if cfg.HelmCommand == "help" {
if h.HelmCommand == "help" {
return nil
}
return fmt.Errorf("unknown command '%s'", cfg.HelmCommand)
return fmt.Errorf("unknown command '%s'", h.HelmCommand)
}
// Prepare gets the Help ready to execute.

View file

@ -63,15 +63,14 @@ func (suite *HelpTestSuite) TestExecute() {
Run().
Times(2)
cfg := Config{
HelmCommand: "help",
}
cfg := Config{}
help := Help{
HelmCommand: "help",
cmd: mCmd,
}
suite.NoError(help.Execute(cfg))
cfg.HelmCommand = "get down on friday"
help.HelmCommand = "get down on friday"
suite.EqualError(help.Execute(cfg), "unknown command 'get down on friday'")
}