From 1e9cce7d3643fd8339ad015fdf689e4ede93010e Mon Sep 17 00:00:00 2001 From: Anton Bretting Date: Sat, 17 Sep 2022 10:52:51 +0200 Subject: [PATCH] Fix lint errors Signed-off-by: Anton Bretting --- pkg/app/app_apply_hooks_test.go | 7 ++++--- pkg/state/state.go | 12 +++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkg/app/app_apply_hooks_test.go b/pkg/app/app_apply_hooks_test.go index bb6875d0..abd57676 100644 --- a/pkg/app/app_apply_hooks_test.go +++ b/pkg/app/app_apply_hooks_test.go @@ -8,14 +8,15 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/stretchr/testify/require" + "github.com/variantdev/vals" + "k8s.io/utils/pointer" + "github.com/helmfile/helmfile/pkg/event" "github.com/helmfile/helmfile/pkg/exectest" "github.com/helmfile/helmfile/pkg/helmexec" "github.com/helmfile/helmfile/pkg/state" "github.com/helmfile/helmfile/pkg/testhelper" - "github.com/stretchr/testify/require" - "github.com/variantdev/vals" - "k8s.io/utils/pointer" ) func TestApply_hooks(t *testing.T) { diff --git a/pkg/state/state.go b/pkg/state/state.go index dcbb8460..97d921ae 100644 --- a/pkg/state/state.go +++ b/pkg/state/state.go @@ -18,6 +18,11 @@ import ( "text/template" "github.com/imdario/mergo" + "github.com/tatsushid/go-prettytable" + "github.com/variantdev/chartify" + "github.com/variantdev/vals" + "go.uber.org/zap" + "gopkg.in/yaml.v2" "github.com/helmfile/helmfile/pkg/environment" "github.com/helmfile/helmfile/pkg/event" @@ -25,12 +30,6 @@ import ( "github.com/helmfile/helmfile/pkg/helmexec" "github.com/helmfile/helmfile/pkg/remote" "github.com/helmfile/helmfile/pkg/tmpl" - - "github.com/tatsushid/go-prettytable" - "github.com/variantdev/chartify" - "github.com/variantdev/vals" - "go.uber.org/zap" - "gopkg.in/yaml.v2" ) const ( @@ -2257,7 +2256,6 @@ func (st *HelmState) TriggerPreapplyEvent(r *ReleaseSpec, helmfileCommand string } func (st *HelmState) triggerReleaseEvent(evt string, evtErr error, r *ReleaseSpec, helmfileCmd string) (bool, error) { - bus := &event.Bus{ Hooks: r.Hooks, StateFilePath: st.FilePath,