From 34b9ec1c4c9ab2bb016800fa19a96cfd60d0168a Mon Sep 17 00:00:00 2001 From: Erin Call Date: Thu, 26 Dec 2019 10:47:42 -0800 Subject: [PATCH 1/7] Run the Help step by default [#15] --- internal/helm/plan.go | 2 +- internal/helm/plan_test.go | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/internal/helm/plan.go b/internal/helm/plan.go index 1d4ced9..d5c8835 100644 --- a/internal/helm/plan.go +++ b/internal/helm/plan.go @@ -72,7 +72,7 @@ func determineSteps(cfg Config) *func(Config) []Step { case "delete": return &uninstall default: - panic("not implemented") + return &help } } } diff --git a/internal/helm/plan_test.go b/internal/helm/plan_test.go index e5a1a96..eebf51b 100644 --- a/internal/helm/plan_test.go +++ b/internal/helm/plan_test.go @@ -255,3 +255,10 @@ func (suite *PlanTestSuite) TestDeterminePlanHelpCommand() { stepsMaker := determineSteps(cfg) suite.Same(&help, stepsMaker) } + +func (suite *PlanTestSuite) TestDeterminePlanHelpOnUnknown() { + cfg := Config{} + + stepsMaker := determineSteps(cfg) + suite.Same(&help, stepsMaker) +} From 6d28b7b28ad52596e953594a42bfbf329ba05640 Mon Sep 17 00:00:00 2001 From: Erin Call Date: Thu, 26 Dec 2019 11:29:33 -0800 Subject: [PATCH 2/7] Return an error on unknown commands [#15] I'm probably overthinking this--explicitly calling help is a strange and unusual case--but it doesn't really hurt, so I'm going for it. --- internal/helm/plan.go | 1 + internal/helm/plan_test.go | 8 +------- internal/run/config.go | 1 + internal/run/help.go | 11 +++++++++-- internal/run/help_test.go | 32 +++++++++++++++++++++++++++----- 5 files changed, 39 insertions(+), 14 deletions(-) diff --git a/internal/helm/plan.go b/internal/helm/plan.go index d5c8835..0f32c1e 100644 --- a/internal/helm/plan.go +++ b/internal/helm/plan.go @@ -26,6 +26,7 @@ func NewPlan(cfg Config) (*Plan, error) { p := Plan{ cfg: cfg, runCfg: run.Config{ + HelmCommand: string(cfg.Command), Debug: cfg.Debug, KubeConfig: cfg.KubeConfig, Values: cfg.Values, diff --git a/internal/helm/plan_test.go b/internal/helm/plan_test.go index eebf51b..cf3871d 100644 --- a/internal/helm/plan_test.go +++ b/internal/helm/plan_test.go @@ -40,6 +40,7 @@ func (suite *PlanTestSuite) TestNewPlan() { } runCfg := run.Config{ + HelmCommand: "help", Debug: false, KubeConfig: "/branch/.sfere/profig", Values: "steadfastness,forthrightness", @@ -255,10 +256,3 @@ func (suite *PlanTestSuite) TestDeterminePlanHelpCommand() { stepsMaker := determineSteps(cfg) suite.Same(&help, stepsMaker) } - -func (suite *PlanTestSuite) TestDeterminePlanHelpOnUnknown() { - cfg := Config{} - - stepsMaker := determineSteps(cfg) - suite.Same(&help, stepsMaker) -} diff --git a/internal/run/config.go b/internal/run/config.go index 09b9642..3d5b3f9 100644 --- a/internal/run/config.go +++ b/internal/run/config.go @@ -6,6 +6,7 @@ import ( // Config contains configuration applicable to all helm commands type Config struct { + HelmCommand string Debug bool KubeConfig string Values string diff --git a/internal/run/help.go b/internal/run/help.go index 8597815..a4a116e 100644 --- a/internal/run/help.go +++ b/internal/run/help.go @@ -10,8 +10,15 @@ type Help struct { } // Execute executes the `helm help` command. -func (h *Help) Execute(_ Config) error { - return h.cmd.Run() +func (h *Help) Execute(cfg Config) error { + if err := h.cmd.Run(); err != nil { + return fmt.Errorf("while running '%s': %w", h.cmd.String(), err) + } + + if cfg.HelmCommand == "help" { + return nil + } + return fmt.Errorf("unknown command '%s'", cfg.HelmCommand) } // Prepare gets the Help ready to execute. diff --git a/internal/run/help_test.go b/internal/run/help_test.go index 1824578..ecca2bb 100644 --- a/internal/run/help_test.go +++ b/internal/run/help_test.go @@ -38,9 +38,6 @@ func (suite *HelpTestSuite) TestPrepare() { Stdout(&stdout) mCmd.EXPECT(). Stderr(&stderr) - mCmd.EXPECT(). - Run(). - Times(1) cfg := Config{ Stdout: &stdout, @@ -49,8 +46,33 @@ func (suite *HelpTestSuite) TestPrepare() { h := Help{} err := h.Prepare(cfg) - suite.Require().Nil(err) - h.Execute(cfg) + suite.NoError(err) +} + +func (suite *HelpTestSuite) TestExecute() { + ctrl := gomock.NewController(suite.T()) + defer ctrl.Finish() + mCmd := NewMockcmd(ctrl) + originalCommand := command + command = func(_ string, _ ...string) cmd { + return mCmd + } + defer func() { command = originalCommand }() + + mCmd.EXPECT(). + Run(). + Times(2) + + cfg := Config{ + HelmCommand: "help", + } + help := Help{ + cmd: mCmd, + } + suite.NoError(help.Execute(cfg)) + + cfg.HelmCommand = "get down on friday" + suite.EqualError(help.Execute(cfg), "unknown command 'get down on friday'") } func (suite *HelpTestSuite) TestPrepareDebugFlag() { From 41e9e42239ac7aa5785ab80859eddf2d0a13812d Mon Sep 17 00:00:00 2001 From: Erin Call Date: Thu, 26 Dec 2019 11:31:45 -0800 Subject: [PATCH 3/7] Emit a trailing newline on execution error [#15] Just something I noticed while testing the help command's error case. --- cmd/drone-helm/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/drone-helm/main.go b/cmd/drone-helm/main.go index 61673b2..3ca31dd 100644 --- a/cmd/drone-helm/main.go +++ b/cmd/drone-helm/main.go @@ -28,7 +28,7 @@ func main() { // Expect the plan to go off the rails if err != nil { - fmt.Fprintf(os.Stderr, err.Error()) + fmt.Fprintf(os.Stderr, "%s\n", err.Error()) // Throw away the plan os.Exit(1) } From 167b53691b9eed6f1446c643fe2217aa0f0617f5 Mon Sep 17 00:00:00 2001 From: Erin Call Date: Thu, 26 Dec 2019 12:23:56 -0800 Subject: [PATCH 4/7] Put HelmCommand in Help, not run.Config [#15] --- internal/helm/plan.go | 5 +++-- internal/helm/plan_test.go | 1 - internal/run/config.go | 1 - internal/run/help.go | 7 ++++--- internal/run/help_test.go | 9 ++++----- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/internal/helm/plan.go b/internal/helm/plan.go index 72fd48a..a82ffea 100644 --- a/internal/helm/plan.go +++ b/internal/helm/plan.go @@ -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} } diff --git a/internal/helm/plan_test.go b/internal/helm/plan_test.go index fc70ec9..ce5311a 100644 --- a/internal/helm/plan_test.go +++ b/internal/helm/plan_test.go @@ -43,7 +43,6 @@ func (suite *PlanTestSuite) TestNewPlan() { } runCfg := run.Config{ - HelmCommand: "help", Debug: false, Values: "steadfastness,forthrightness", StringValues: "tensile_strength,flexibility", diff --git a/internal/run/config.go b/internal/run/config.go index 25fcd6f..4f9b99a 100644 --- a/internal/run/config.go +++ b/internal/run/config.go @@ -6,7 +6,6 @@ import ( // Config contains configuration applicable to all helm commands type Config struct { - HelmCommand string Debug bool Values string StringValues string diff --git a/internal/run/help.go b/internal/run/help.go index a4a116e..f2d6c59 100644 --- a/internal/run/help.go +++ b/internal/run/help.go @@ -6,7 +6,8 @@ import ( // Help is a step in a helm Plan that calls `helm help`. type Help struct { - cmd cmd + HelmCommand string + cmd cmd } // Execute executes the `helm help` command. @@ -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. diff --git a/internal/run/help_test.go b/internal/run/help_test.go index ecca2bb..19c49d2 100644 --- a/internal/run/help_test.go +++ b/internal/run/help_test.go @@ -63,15 +63,14 @@ func (suite *HelpTestSuite) TestExecute() { Run(). Times(2) - cfg := Config{ - HelmCommand: "help", - } + cfg := Config{} help := Help{ - cmd: mCmd, + 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'") } From 181165cc51eab5c815dd8e5938d76a7f6359583a Mon Sep 17 00:00:00 2001 From: Erin Call Date: Fri, 27 Dec 2019 15:06:32 -0800 Subject: [PATCH 5/7] Call `helm dependency update` when so instructed [#25] As with Lint, I have no idea whether the --namespace flag actually matters here. I don't think it will hurt, though! --- docs/parameter_reference.md | 2 +- internal/helm/plan.go | 25 +++++-- internal/helm/plan_test.go | 48 ++++++++++++- internal/run/depupdate.go | 44 ++++++++++++ internal/run/depupdate_test.go | 128 +++++++++++++++++++++++++++++++++ 5 files changed, 241 insertions(+), 6 deletions(-) create mode 100644 internal/run/depupdate.go create mode 100644 internal/run/depupdate_test.go diff --git a/docs/parameter_reference.md b/docs/parameter_reference.md index 07d8107..a5e02d6 100644 --- a/docs/parameter_reference.md +++ b/docs/parameter_reference.md @@ -4,7 +4,7 @@ | Param name | Type | Purpose | |---------------------|-----------------|---------| | helm_command | string | Indicates the operation to perform. Recommended, but not required. Valid options are `upgrade`, `uninstall`, `lint`, and `help`. | -| update_dependencies | boolean | Calls `helm dependency update` before running the main command. **Not currently implemented**; see [#25](https://github.com/pelotech/drone-helm3/issues/25).| +| update_dependencies | boolean | Calls `helm dependency update` before running the main command.| | helm_repos | list\ | Calls `helm repo add $repo` before running the main command. Each string should be formatted as `repo_name=https://repo.url/`. **Not currently implemented**; see [#26](https://github.com/pelotech/drone-helm3/issues/26). | | namespace | string | Kubernetes namespace to use for this operation. | | prefix | string | Expect environment variables to be prefixed with the given string. For more details, see "Using the prefix setting" below. **Not currently implemented**; see [#19](https://github.com/pelotech/drone-helm3/issues/19). | diff --git a/internal/helm/plan.go b/internal/helm/plan.go index e6c8721..ad2e5ae 100644 --- a/internal/helm/plan.go +++ b/internal/helm/plan.go @@ -96,7 +96,9 @@ func (p *Plan) Execute() error { var upgrade = func(cfg Config) []Step { steps := initKube(cfg) - + if cfg.UpdateDependencies { + steps = append(steps, depUpdate(cfg)...) + } steps = append(steps, &run.Upgrade{ Chart: cfg.Chart, Release: cfg.Release, @@ -113,6 +115,9 @@ var upgrade = func(cfg Config) []Step { var uninstall = func(cfg Config) []Step { steps := initKube(cfg) + if cfg.UpdateDependencies { + steps = append(steps, depUpdate(cfg)...) + } steps = append(steps, &run.Uninstall{ Release: cfg.Release, DryRun: cfg.DryRun, @@ -122,11 +127,15 @@ var uninstall = func(cfg Config) []Step { } var lint = func(cfg Config) []Step { - lint := &run.Lint{ - Chart: cfg.Chart, + steps := make([]Step, 0) + if cfg.UpdateDependencies { + steps = append(steps, depUpdate(cfg)...) } + steps = append(steps, &run.Lint{ + Chart: cfg.Chart, + }) - return []Step{lint} + return steps } var help = func(cfg Config) []Step { @@ -147,3 +156,11 @@ func initKube(cfg Config) []Step { }, } } + +func depUpdate(cfg Config) []Step { + return []Step{ + &run.DepUpdate{ + Chart: cfg.Chart, + }, + } +} diff --git a/internal/helm/plan_test.go b/internal/helm/plan_test.go index 4808aef..2cdde5c 100644 --- a/internal/helm/plan_test.go +++ b/internal/helm/plan_test.go @@ -167,7 +167,17 @@ func (suite *PlanTestSuite) TestUpgrade() { suite.Equal(expected, upgrade) } -func (suite *PlanTestSuite) TestDel() { +func (suite *PlanTestSuite) TestUpgradeWithUpdateDependencies() { + cfg := Config{ + UpdateDependencies: true, + } + steps := upgrade(cfg) + suite.Require().Equal(3, len(steps), "upgrade should have a third step when DepUpdate is true") + suite.IsType(&run.InitKube{}, steps[0]) + suite.IsType(&run.DepUpdate{}, steps[1]) +} + +func (suite *PlanTestSuite) TestUninstall() { cfg := Config{ KubeToken: "b2YgbXkgYWZmZWN0aW9u", SkipTLSVerify: true, @@ -205,6 +215,16 @@ func (suite *PlanTestSuite) TestDel() { suite.Equal(expected, actual) } +func (suite *PlanTestSuite) TestUninstallWithUpdateDependencies() { + cfg := Config{ + UpdateDependencies: true, + } + steps := uninstall(cfg) + suite.Require().Equal(3, len(steps), "uninstall should have a third step when DepUpdate is true") + suite.IsType(&run.InitKube{}, steps[0]) + suite.IsType(&run.DepUpdate{}, steps[1]) +} + func (suite *PlanTestSuite) TestInitKube() { cfg := Config{ KubeToken: "cXVlZXIgY2hhcmFjdGVyCg==", @@ -231,6 +251,23 @@ func (suite *PlanTestSuite) TestInitKube() { suite.Equal(expected, init) } +func (suite *PlanTestSuite) TestDepUpdate() { + cfg := Config{ + UpdateDependencies: true, + Chart: "scatterplot", + } + + steps := depUpdate(cfg) + suite.Require().Equal(1, len(steps), "depUpdate should return one step") + suite.Require().IsType(&run.DepUpdate{}, steps[0]) + update, _ := steps[0].(*run.DepUpdate) + + expected := &run.DepUpdate{ + Chart: "scatterplot", + } + suite.Equal(expected, update) +} + func (suite *PlanTestSuite) TestLint() { cfg := Config{ Chart: "./flow", @@ -245,6 +282,15 @@ func (suite *PlanTestSuite) TestLint() { suite.Equal(want, steps[0]) } +func (suite *PlanTestSuite) TestLintWithUpdateDependencies() { + cfg := Config{ + UpdateDependencies: true, + } + steps := lint(cfg) + suite.Require().Equal(2, len(steps), "lint should have a second step when DepUpdate is true") + suite.IsType(&run.DepUpdate{}, steps[0]) +} + func (suite *PlanTestSuite) TestDeterminePlanUpgradeCommand() { cfg := Config{ Command: "upgrade", diff --git a/internal/run/depupdate.go b/internal/run/depupdate.go new file mode 100644 index 0000000..a9b6c91 --- /dev/null +++ b/internal/run/depupdate.go @@ -0,0 +1,44 @@ +package run + +import ( + "fmt" +) + +// DepUpdate is an execution step that calls `helm dependency update` when executed. +type DepUpdate struct { + Chart string + cmd cmd +} + +// Execute executes the `helm upgrade` command. +func (d *DepUpdate) Execute(_ Config) error { + return d.cmd.Run() +} + +// Prepare gets the DepUpdate ready to execute. +func (d *DepUpdate) Prepare(cfg Config) error { + if d.Chart == "" { + return fmt.Errorf("chart is required") + } + + args := make([]string, 0) + + if cfg.Namespace != "" { + args = append(args, "--namespace", cfg.Namespace) + } + if cfg.Debug { + args = append(args, "--debug") + } + + args = append(args, "dependency", "update", d.Chart) + + d.cmd = command(helmBin, args...) + d.cmd.Stdout(cfg.Stdout) + d.cmd.Stderr(cfg.Stderr) + + if cfg.Debug { + fmt.Fprintf(cfg.Stderr, "Generated command: '%s'\n", d.cmd.String()) + } + + return nil +} diff --git a/internal/run/depupdate_test.go b/internal/run/depupdate_test.go new file mode 100644 index 0000000..315b351 --- /dev/null +++ b/internal/run/depupdate_test.go @@ -0,0 +1,128 @@ +package run + +import ( + "fmt" + "github.com/golang/mock/gomock" + "github.com/stretchr/testify/suite" + "strings" + "testing" +) + +type DepUpdateTestSuite struct { + suite.Suite + ctrl *gomock.Controller + mockCmd *Mockcmd + originalCommand func(string, ...string) cmd +} + +func (suite *DepUpdateTestSuite) BeforeTest(_, _ string) { + suite.ctrl = gomock.NewController(suite.T()) + suite.mockCmd = NewMockcmd(suite.ctrl) + + suite.originalCommand = command + command = func(path string, args ...string) cmd { return suite.mockCmd } +} + +func (suite *DepUpdateTestSuite) AfterTest(_, _ string) { + command = suite.originalCommand +} + +func TestDepUpdateTestSuite(t *testing.T) { + suite.Run(t, new(DepUpdateTestSuite)) +} + +func (suite *DepUpdateTestSuite) TestPrepareAndExecute() { + defer suite.ctrl.Finish() + + stdout := strings.Builder{} + stderr := strings.Builder{} + cfg := Config{ + Stdout: &stdout, + Stderr: &stderr, + } + + command = func(path string, args ...string) cmd { + suite.Equal(helmBin, path) + suite.Equal([]string{"dependency", "update", "your_top_songs_2019"}, args) + + return suite.mockCmd + } + suite.mockCmd.EXPECT(). + Stdout(&stdout) + suite.mockCmd.EXPECT(). + Stderr(&stderr) + suite.mockCmd.EXPECT(). + Run(). + Times(1) + + d := DepUpdate{ + Chart: "your_top_songs_2019", + } + + suite.Require().NoError(d.Prepare(cfg)) + suite.NoError(d.Execute(cfg)) +} + +func (suite *DepUpdateTestSuite) TestPrepareNamespaceFlag() { + defer suite.ctrl.Finish() + + cfg := Config{ + Namespace: "spotify", + } + + command = func(path string, args ...string) cmd { + suite.Equal([]string{"--namespace", "spotify", "dependency", "update", "your_top_songs_2019"}, args) + + return suite.mockCmd + } + suite.mockCmd.EXPECT().Stdout(gomock.Any()).AnyTimes() + suite.mockCmd.EXPECT().Stderr(gomock.Any()).AnyTimes() + + d := DepUpdate{ + Chart: "your_top_songs_2019", + } + + suite.Require().NoError(d.Prepare(cfg)) +} + +func (suite *DepUpdateTestSuite) TestPrepareDebugFlag() { + defer suite.ctrl.Finish() + + stdout := strings.Builder{} + stderr := strings.Builder{} + cfg := Config{ + Debug: true, + Stdout: &stdout, + Stderr: &stderr, + } + + command = func(path string, args ...string) cmd { + suite.mockCmd.EXPECT(). + String(). + Return(fmt.Sprintf("%s %s", path, strings.Join(args, " "))) + + return suite.mockCmd + } + suite.mockCmd.EXPECT().Stdout(gomock.Any()).AnyTimes() + suite.mockCmd.EXPECT().Stderr(gomock.Any()).AnyTimes() + + d := DepUpdate{ + Chart: "your_top_songs_2019", + } + + suite.Require().NoError(d.Prepare(cfg)) + + want := fmt.Sprintf("Generated command: '%s --debug dependency update your_top_songs_2019'\n", helmBin) + suite.Equal(want, stderr.String()) + suite.Equal("", stdout.String()) +} + +func (suite *DepUpdateTestSuite) TestPrepareChartRequired() { + d := DepUpdate{} + + suite.mockCmd.EXPECT().Stdout(gomock.Any()).AnyTimes() + suite.mockCmd.EXPECT().Stderr(gomock.Any()).AnyTimes() + + err := d.Prepare(Config{}) + suite.EqualError(err, "chart is required") +} From 89ec9425b0938fd5b49344d245f05e63d84296af Mon Sep 17 00:00:00 2001 From: Erin Call Date: Fri, 27 Dec 2019 15:44:09 -0800 Subject: [PATCH 6/7] Mention the chart param for uninstalls [#25] --- docs/parameter_reference.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/parameter_reference.md b/docs/parameter_reference.md index a5e02d6..0073ddf 100644 --- a/docs/parameter_reference.md +++ b/docs/parameter_reference.md @@ -58,6 +58,7 @@ Uninstallations are triggered when the `helm_command` setting is "uninstall" or | dry_run | boolean | | Pass `--dry-run` to `helm uninstall`. | | timeout | duration | | Timeout for any *individual* Kubernetes operation. The uninstallation's full runtime may exceed this duration. | | skip_tls_verify | boolean | | Connect to the Kubernetes cluster without checking for a valid TLS certificate. Not recommended in production. | +| chart | string | | Required when the global `update_dependencies` parameter is true. No effect otherwise. | ### Where to put settings From d5a59590a129514340007bc06214ad297949e895 Mon Sep 17 00:00:00 2001 From: Erin Call Date: Fri, 27 Dec 2019 16:18:10 -0800 Subject: [PATCH 7/7] Shim bare numbers into duration strings [#39] Helm2's --timeout took a number of seconds, rather than the ParseDuration-compatible string that helm3 uses. For backward- compatibility, update a bare number into a duration string. --- docs/parameter_reference.md | 1 + internal/helm/config.go | 7 +++++++ internal/helm/config_test.go | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/docs/parameter_reference.md b/docs/parameter_reference.md index 07d8107..c11aac5 100644 --- a/docs/parameter_reference.md +++ b/docs/parameter_reference.md @@ -67,6 +67,7 @@ Any setting (with the exception of `prefix`; [see below](#user-content-using-the * Booleans can be yaml's `true` and `false` literals or the strings `"true"` and `"false"`. * Durations are strings formatted with the syntax accepted by [golang's ParseDuration function](https://golang.org/pkg/time/#ParseDuration) (e.g. 5m30s) + * For backward-compatibility with drone-helm, a duration can also be an integer, in which case it will be interpreted to mean seconds. * List\s can be a yaml sequence or a comma-separated string. All of the following are equivalent: diff --git a/internal/helm/config.go b/internal/helm/config.go index 987b6de..cf351ae 100644 --- a/internal/helm/config.go +++ b/internal/helm/config.go @@ -4,8 +4,11 @@ import ( "fmt" "github.com/kelseyhightower/envconfig" "io" + "regexp" ) +var justNumbers = regexp.MustCompile(`^\d+$`) + // The Config struct captures the `settings` and `environment` blocks in the application's drone // config. Configuration in drone's `settings` block arrives as uppercase env vars matching the // config key, prefixed with `PLUGIN_`. Config from the `environment` block is uppercased, but does @@ -62,6 +65,10 @@ func NewConfig(stdout, stderr io.Writer) (*Config, error) { } } + if justNumbers.MatchString(cfg.Timeout) { + cfg.Timeout = fmt.Sprintf("%ss", cfg.Timeout) + } + if cfg.Debug && cfg.Stderr != nil { cfg.logDebug() } diff --git a/internal/helm/config_test.go b/internal/helm/config_test.go index 3ca2f91..f39dd0c 100644 --- a/internal/helm/config_test.go +++ b/internal/helm/config_test.go @@ -106,6 +106,13 @@ func (suite *ConfigTestSuite) TestNewConfigWithConflictingVariables() { suite.Equal("2m30s", cfg.Timeout) } +func (suite *ConfigTestSuite) TestNewConfigInfersNumbersAreSeconds() { + suite.setenv("PLUGIN_TIMEOUT", "42") + cfg, err := NewConfig(&strings.Builder{}, &strings.Builder{}) + suite.Require().NoError(err) + suite.Equal("42s", cfg.Timeout) +} + func (suite *ConfigTestSuite) TestNewConfigSetsWriters() { stdout := &strings.Builder{} stderr := &strings.Builder{}