Merge pull request #288 from helmfile/update_golang_lint

update golang lint

.github/workflows/lint.yaml

@@ -25,4 +25,4 @@ jobs:
       - name: Golangci lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.46.2
+          version: v1.48.0

.golangci.yaml

@@ -62,6 +62,12 @@ output:
 
 # all available settings of specific linters
 linters-settings:
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/helmfile/helmfile)
+
   errcheck:
     # report about not checking of errors in type assetions: `a := b.(MyStruct)`;
     # default is false: such cases aren't reported by default.
@@ -278,6 +284,7 @@ linters:
     - unparam
     - unused
     - whitespace
+    - gci
   # don't enable:
   # - deadcode
   # - gochecknoglobals

cmd/apply.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewApplyCmd returns apply subcmd

cmd/build.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewBuildCmd returns build subcmd

cmd/cache.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 func NewCacheInfoSubcommand(cacheImpl *config.CacheImpl) *cobra.Command {

cmd/charts.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewChartsCmd returns charts subcmd

cmd/delete.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewDeleteCmd returns delete subcmd

cmd/deps.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewDepsCmd returns deps subcmd

cmd/destroy.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewDestroyCmd returns destroy subcmd

cmd/diff.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewDiffCmd returns diff subcmd

cmd/fetch.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewFetchCmd returns diff subcmd

cmd/lint.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewLintCmd returns lint subcmd

cmd/list.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewListCmd returns list subcmd

cmd/repos.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewReposCmd returns repos subcmd

cmd/root.go

@@ -4,14 +4,15 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/helmfile/helmfile/pkg/app"
-	"github.com/helmfile/helmfile/pkg/app/version"
-	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/urfave/cli"
 	"go.uber.org/zap"
+
+	"github.com/helmfile/helmfile/pkg/app"
+	"github.com/helmfile/helmfile/pkg/app/version"
+	"github.com/helmfile/helmfile/pkg/config"
+	"github.com/helmfile/helmfile/pkg/helmexec"
 )
 
 var logger *zap.SugaredLogger

cmd/status.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewStatusCmd returns status subcmd

cmd/sync.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewSyncCmd returns sync subcmd

cmd/template.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewTemplateCmd returm template subcmd

cmd/test.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewTestCmd returns test subcmd

cmd/version.go

@@ -3,8 +3,9 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/helmfile/helmfile/pkg/app/version"
 	"github.com/spf13/cobra"
+
+	"github.com/helmfile/helmfile/pkg/app/version"
 )
 
 // NewVersionCmd returns version subcmd

cmd/write-values.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/helmfile/helmfile/pkg/app"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/spf13/cobra"
 )
 
 // NewWriteValuesCmd returns write subcmd

main.go

@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/urfave/cli"
+
 	"github.com/helmfile/helmfile/cmd"
 	"github.com/helmfile/helmfile/pkg/config"
-	"github.com/urfave/cli"
 )
 
 func warning(format string, v ...interface{}) {

pkg/app/app.go

@@ -13,13 +13,14 @@ import (
 	"syscall"
 	"text/tabwriter"
 
+	"github.com/variantdev/vals"
+	"go.uber.org/zap"
+
 	"github.com/helmfile/helmfile/pkg/argparser"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/plugins"
 	"github.com/helmfile/helmfile/pkg/remote"
 	"github.com/helmfile/helmfile/pkg/state"
-	"github.com/variantdev/vals"
-	"go.uber.org/zap"
 )
 
 // App is the main application object.
@@ -920,6 +921,7 @@ func printBatches(batches [][]state.Release) string {
 	return buf.String()
 }
 
+// nolint: unparam
 func withDAG(templated *state.HelmState, helm helmexec.Interface, logger *zap.SugaredLogger, opts state.PlanOptions, converge func(*state.HelmState, helmexec.Interface) (bool, []error)) (bool, []error) {
 	batches, err := templated.PlanReleases(opts)
 	if err != nil {

pkg/app/app_apply_nokubectx_test.go

@@ -9,10 +9,11 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/variantdev/vals"
+
 	"github.com/helmfile/helmfile/pkg/exectest"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/testhelper"
-	"github.com/variantdev/vals"
 )
 
 func TestApply_3(t *testing.T) {

pkg/app/app_apply_test.go

@@ -9,10 +9,11 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/variantdev/vals"
+
 	"github.com/helmfile/helmfile/pkg/exectest"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/testhelper"
-	"github.com/variantdev/vals"
 )
 
 func TestApply_2(t *testing.T) {

pkg/app/app_diff_test.go

@@ -9,11 +9,12 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/stretchr/testify/require"
+	"github.com/variantdev/vals"
+
 	"github.com/helmfile/helmfile/pkg/exectest"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/testhelper"
-	"github.com/stretchr/testify/require"
-	"github.com/variantdev/vals"
 )
 
 func TestDiffWithNeeds(t *testing.T) {

pkg/app/app_lint_test.go

@@ -11,11 +11,12 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/stretchr/testify/require"
+	"github.com/variantdev/vals"
+
 	"github.com/helmfile/helmfile/pkg/exectest"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/testhelper"
-	"github.com/stretchr/testify/require"
-	"github.com/variantdev/vals"
 )
 
 func TestLint(t *testing.T) {

pkg/app/app_sync_test.go

@@ -9,10 +9,11 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/variantdev/vals"
+
 	"github.com/helmfile/helmfile/pkg/exectest"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/testhelper"
-	"github.com/variantdev/vals"
 )
 
 func TestSync(t *testing.T) {

pkg/app/app_template_test.go

@@ -11,11 +11,12 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/stretchr/testify/require"
+	"github.com/variantdev/vals"
+
 	"github.com/helmfile/helmfile/pkg/exectest"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/testhelper"
-	"github.com/stretchr/testify/require"
-	"github.com/variantdev/vals"
 )
 
 func TestTemplate(t *testing.T) {

pkg/app/app_test.go

@@ -15,22 +15,17 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/helmfile/helmfile/pkg/envvar"
-
-	"github.com/helmfile/helmfile/pkg/remote"
-	"github.com/helmfile/helmfile/pkg/testutil"
-
 	"github.com/stretchr/testify/assert"
-
-	"github.com/helmfile/helmfile/pkg/exectest"
-
 	"github.com/variantdev/vals"
+	"go.uber.org/zap"
 
+	"github.com/helmfile/helmfile/pkg/envvar"
+	"github.com/helmfile/helmfile/pkg/exectest"
 	"github.com/helmfile/helmfile/pkg/helmexec"
+	"github.com/helmfile/helmfile/pkg/remote"
 	"github.com/helmfile/helmfile/pkg/state"
 	"github.com/helmfile/helmfile/pkg/testhelper"
-
+	"github.com/helmfile/helmfile/pkg/testutil"
-	"go.uber.org/zap"
 )
 
 func appWithFs(app *App, files map[string]string) *App {

pkg/app/constants_test.go

@@ -5,8 +5,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/helmfile/helmfile/pkg/envvar"
 	"github.com/stretchr/testify/require"
+
+	"github.com/helmfile/helmfile/pkg/envvar"
 )
 
 // TestIsExplicitSelectorInheritanceEnabled tests the isExplicitSelectorInheritanceEnabled function

pkg/app/desired_state_file_loader.go

@@ -6,13 +6,14 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/imdario/mergo"
+	"github.com/variantdev/vals"
+	"go.uber.org/zap"
+
 	"github.com/helmfile/helmfile/pkg/environment"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/remote"
 	"github.com/helmfile/helmfile/pkg/state"
-	"github.com/imdario/mergo"
-	"github.com/variantdev/vals"
-	"go.uber.org/zap"
 )
 
 const (

pkg/app/destroy_nokubectx_test.go

@@ -8,10 +8,11 @@ import (
 	"sync"
 	"testing"
 
+	"github.com/variantdev/vals"
+
 	"github.com/helmfile/helmfile/pkg/exectest"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/testhelper"
-	"github.com/variantdev/vals"
 )
 
 func TestDestroy_2(t *testing.T) {

pkg/app/destroy_test.go

@@ -8,11 +8,12 @@ import (
 	"sync"
 	"testing"
 
+	"github.com/variantdev/vals"
+	"go.uber.org/zap"
+
 	"github.com/helmfile/helmfile/pkg/exectest"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/testhelper"
-	"github.com/variantdev/vals"
-	"go.uber.org/zap"
 )
 
 const (

pkg/app/diff_nokubectx_test.go

@@ -9,10 +9,11 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/variantdev/vals"
+
 	"github.com/helmfile/helmfile/pkg/exectest"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/testhelper"
-	"github.com/variantdev/vals"
 )
 
 func TestDiff_2(t *testing.T) {

pkg/app/diff_test.go

@@ -9,11 +9,12 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/variantdev/vals"
+	"go.uber.org/zap"
+
 	"github.com/helmfile/helmfile/pkg/exectest"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/testhelper"
-	"github.com/variantdev/vals"
-	"go.uber.org/zap"
 )
 
 type diffConfig struct {

pkg/app/load_opts.go

@@ -1,8 +1,9 @@
 package app
 
 import (
-	"github.com/helmfile/helmfile/pkg/state"
 	"gopkg.in/yaml.v2"
+
+	"github.com/helmfile/helmfile/pkg/state"
 )
 
 type LoadOpts struct {

pkg/app/two_pass_renderer.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/google/go-cmp/cmp"
+
 	"github.com/helmfile/helmfile/pkg/environment"
 	"github.com/helmfile/helmfile/pkg/state"
 	"github.com/helmfile/helmfile/pkg/tmpl"

pkg/app/two_pass_renderer_test.go

@@ -5,15 +5,15 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/helmfile/helmfile/pkg/remote"
+	"gopkg.in/yaml.v2"
 
 	"github.com/helmfile/helmfile/pkg/helmexec"
+	"github.com/helmfile/helmfile/pkg/remote"
 	"github.com/helmfile/helmfile/pkg/state"
 	"github.com/helmfile/helmfile/pkg/testhelper"
-
-	"gopkg.in/yaml.v2"
 )
 
+// nolint: unparam
 func makeLoader(files map[string]string, env string) (*desiredStateLoader, *testhelper.TestFs) {
 	testfs := testhelper.NewTestFs(files)
 	logger := helmexec.NewLogger(os.Stdout, "debug")

pkg/argparser/args_test.go

@@ -4,8 +4,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/helmfile/helmfile/pkg/state"
 	"github.com/stretchr/testify/require"
+
+	"github.com/helmfile/helmfile/pkg/state"
 )
 
 // TestGetArgs tests the GetArgs function

pkg/config/global.go

@@ -4,9 +4,10 @@ import (
 	"errors"
 	"os"
 
-	"github.com/helmfile/helmfile/pkg/state"
 	"go.uber.org/zap"
 	"golang.org/x/term"
+
+	"github.com/helmfile/helmfile/pkg/state"
 )
 
 // GlobalOptions is the global configuration for the Helmfile CLI.

pkg/config/test.go

@@ -1,8 +1,9 @@
 package config
 
 import (
-	"github.com/helmfile/helmfile/pkg/state"
 	"github.com/spf13/cobra"
+
+	"github.com/helmfile/helmfile/pkg/state"
 )
 
 // TestOptions is the options for the build command

pkg/environment/environment.go

@@ -1,9 +1,10 @@
 package environment
 
 import (
-	"github.com/helmfile/helmfile/pkg/maputil"
 	"github.com/imdario/mergo"
 	"gopkg.in/yaml.v2"
+
+	"github.com/helmfile/helmfile/pkg/maputil"
 )
 
 type Environment struct {

pkg/event/bus.go

@@ -4,10 +4,11 @@ import (
 	"fmt"
 	"strings"
 
+	"go.uber.org/zap"
+
 	"github.com/helmfile/helmfile/pkg/environment"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/tmpl"
-	"go.uber.org/zap"
 )
 
 type Hook struct {

pkg/event/bus_test.go

@@ -5,9 +5,10 @@ import (
 	"io"
 	"testing"
 
-	"github.com/helmfile/helmfile/pkg/environment"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest/observer"
+
+	"github.com/helmfile/helmfile/pkg/environment"
 )
 
 type runner struct {

pkg/exectest/helm.go

@@ -7,6 +7,7 @@ import (
 	"sync"
 
 	"github.com/Masterminds/semver/v3"
+
 	"github.com/helmfile/helmfile/pkg/helmexec"
 )
 

pkg/helmexec/exec.go

@@ -12,9 +12,10 @@ import (
 	"sync"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/helmfile/helmfile/pkg/envvar"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
+
+	"github.com/helmfile/helmfile/pkg/envvar"
 )
 
 type decryptedSecret struct {

pkg/helmexec/exec_test.go

@@ -11,11 +11,11 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/google/go-cmp/cmp"
-	"github.com/helmfile/helmfile/pkg/envvar"
-
 	"github.com/Masterminds/semver/v3"
+	"github.com/google/go-cmp/cmp"
 	"go.uber.org/zap"
+
+	"github.com/helmfile/helmfile/pkg/envvar"
 )
 
 // Mocking the command-line runner

pkg/remote/remote.go

@@ -12,10 +12,11 @@ import (
 
 	"github.com/hashicorp/go-getter"
 	"github.com/hashicorp/go-getter/helper/url"
-	"github.com/helmfile/helmfile/pkg/envvar"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v2"
+
+	"github.com/helmfile/helmfile/pkg/envvar"
 )
 
 var disableInsecureFeatures bool

pkg/remote/remote_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/testhelper"
 )

pkg/state/chart_dependency.go

@@ -9,11 +9,12 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	goversion "github.com/hashicorp/go-version"
-	"github.com/helmfile/helmfile/pkg/app/version"
-	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/r3labs/diff"
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v2"
+
+	"github.com/helmfile/helmfile/pkg/app/version"
+	"github.com/helmfile/helmfile/pkg/helmexec"
 )
 
 type ChartMeta struct {
@@ -97,6 +98,7 @@ type ResolvedDependencies struct {
 	deps map[string][]ResolvedChartDependency
 }
 
+// nolint: unparam
 func (d *ResolvedDependencies) add(dep ResolvedChartDependency) error {
 	deps := d.deps[dep.ChartName]
 	if deps == nil {

pkg/state/create.go

@@ -7,15 +7,15 @@ import (
 	"io"
 	"os"
 
-	"github.com/helmfile/helmfile/pkg/helmexec"
-	"github.com/helmfile/helmfile/pkg/remote"
-
-	"github.com/helmfile/helmfile/pkg/environment"
-	"github.com/helmfile/helmfile/pkg/maputil"
 	"github.com/imdario/mergo"
 	"github.com/variantdev/vals"
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v2"
+
+	"github.com/helmfile/helmfile/pkg/environment"
+	"github.com/helmfile/helmfile/pkg/helmexec"
+	"github.com/helmfile/helmfile/pkg/maputil"
+	"github.com/helmfile/helmfile/pkg/remote"
 )
 
 const (
@@ -221,6 +221,7 @@ func (c *StateCreator) loadBases(envValues *environment.Environment, st *HelmSta
 	return layers[0], nil
 }
 
+// nolint: unparam
 func (c *StateCreator) loadEnvValues(st *HelmState, name string, failOnMissingEnv bool, ctxEnv *environment.Environment, readFile func(string) ([]byte, error), glob func(string) ([]string, error)) (*environment.Environment, error) {
 	envVals := map[string]interface{}{}
 	envSpec, ok := st.Environments[name]

pkg/state/create_test.go

@@ -6,13 +6,12 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/helmfile/helmfile/pkg/environment"
+	"github.com/stretchr/testify/require"
-	"github.com/helmfile/helmfile/pkg/remote"
-
-	"github.com/helmfile/helmfile/pkg/testhelper"
 	"go.uber.org/zap"
 
-	"github.com/stretchr/testify/require"
+	"github.com/helmfile/helmfile/pkg/environment"
+	"github.com/helmfile/helmfile/pkg/remote"
+	"github.com/helmfile/helmfile/pkg/testhelper"
 )
 
 func createFromYaml(content []byte, file string, env string, logger *zap.SugaredLogger) (*HelmState, error) {

pkg/state/envvals_loader.go

@@ -4,13 +4,14 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/imdario/mergo"
+	"go.uber.org/zap"
+	"gopkg.in/yaml.v2"
+
 	"github.com/helmfile/helmfile/pkg/environment"
 	"github.com/helmfile/helmfile/pkg/maputil"
 	"github.com/helmfile/helmfile/pkg/remote"
 	"github.com/helmfile/helmfile/pkg/tmpl"
-	"github.com/imdario/mergo"
-	"go.uber.org/zap"
-	"gopkg.in/yaml.v2"
 )
 
 type EnvironmentValuesLoader struct {

pkg/state/envvals_loader_test.go

@@ -6,8 +6,9 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/helmfile/helmfile/pkg/remote"
 	"go.uber.org/zap"
+
+	"github.com/helmfile/helmfile/pkg/remote"
 )
 
 func newLoader() *EnvironmentValuesLoader {

pkg/state/helmx.go

@@ -5,9 +5,10 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/variantdev/chartify"
+
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/remote"
-	"github.com/variantdev/chartify"
 )
 
 type Dependency struct {
@@ -16,6 +17,7 @@ type Dependency struct {
 	Alias   string `yaml:"alias"`
 }
 
+// nolint: unparam
 func (st *HelmState) appendHelmXFlags(flags []string, release *ReleaseSpec) ([]string, error) {
 	for _, adopt := range release.Adopt {
 		flags = append(flags, "--adopt", adopt)

pkg/state/release.go

@@ -3,8 +3,9 @@ package state
 import (
 	"fmt"
 
-	"github.com/helmfile/helmfile/pkg/tmpl"
 	"gopkg.in/yaml.v2"
+
+	"github.com/helmfile/helmfile/pkg/tmpl"
 )
 
 func (r ReleaseSpec) ExecuteTemplateExpressions(renderer *tmpl.FileRenderer) (*ReleaseSpec, error) {

pkg/state/state.go

@@ -18,18 +18,17 @@ 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"
 	"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/vals"
-	"go.uber.org/zap"
-	"gopkg.in/yaml.v2"
 )
 
 const (
@@ -1301,6 +1300,7 @@ func (st *HelmState) PrepareCharts(helm helmexec.Interface, dir string, concurre
 	return temp, nil
 }
 
+// nolint: unparam
 func (st *HelmState) runHelmDepBuilds(helm helmexec.Interface, concurrency int, builds []*chartPrepareResult) error {
 	// NOTES:
 	// 1. `helm dep build` fails when it was run concurrency on the same chart.

pkg/state/state_exec_tmpl.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/helmfile/helmfile/pkg/tmpl"
 	"gopkg.in/yaml.v2"
+
+	"github.com/helmfile/helmfile/pkg/tmpl"
 )
 
 func (st *HelmState) Values() map[string]interface{} {

pkg/state/state_exec_tmpl_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/go-test/deep"
+
 	"github.com/helmfile/helmfile/pkg/environment"
 )
 

pkg/state/state_gogetter_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	"github.com/helmfile/helmfile/pkg/helmexec"
 )
 

pkg/state/state_run.go

@@ -7,8 +7,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/variantdev/dag/pkg/dag"
+
+	"github.com/helmfile/helmfile/pkg/helmexec"
 )
 
 type result struct {
@@ -55,6 +56,7 @@ func (st *HelmState) scatterGatherReleases(helm helmexec.Interface, concurrency
 	return st.iterateOnReleases(helm, concurrency, st.Releases, do)
 }
 
+// nolint: unparam
 func (st *HelmState) iterateOnReleases(helm helmexec.Interface, concurrency int, inputs []ReleaseSpec,
 	do func(ReleaseSpec, int) error) []error {
 	var errs []error

pkg/state/state_test.go

@@ -8,10 +8,11 @@ import (
 	"testing"
 
 	"github.com/Masterminds/semver/v3"
+	"github.com/variantdev/vals"
+
 	"github.com/helmfile/helmfile/pkg/exectest"
 	"github.com/helmfile/helmfile/pkg/helmexec"
 	"github.com/helmfile/helmfile/pkg/testhelper"
-	"github.com/variantdev/vals"
 )
 
 var logger = helmexec.NewLogger(os.Stdout, "warn")
@@ -1841,6 +1842,7 @@ func TestHelmState_UpdateDeps(t *testing.T) {
 		if err != nil {
 			return "", err
 		}
+		// nolint: unparam
 		helm.UpdateDepsCallbacks[generatedDir] = func(chart string) error {
 			content := []byte(`dependencies:
 - name: envoy

pkg/state/temp.go

@@ -9,8 +9,9 @@ import (
 	"strings"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/helmfile/helmfile/pkg/envvar"
 	"k8s.io/apimachinery/pkg/util/rand"
+
+	"github.com/helmfile/helmfile/pkg/envvar"
 )
 
 func createTempValuesFile(release *ReleaseSpec, data interface{}) (*os.File, error) {
@@ -30,7 +31,7 @@ func createTempValuesFile(release *ReleaseSpec, data interface{}) (*os.File, err
 func tempValuesFilePath(release *ReleaseSpec, data interface{}) (*string, error) {
 	id, err := generateValuesID(release, data)
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 
 	workDir := os.Getenv(envvar.TempDir)
@@ -40,14 +41,14 @@ func tempValuesFilePath(release *ReleaseSpec, data interface{}) (*string, error)
 		err = os.MkdirAll(workDir, os.FileMode(0700))
 	}
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 
 	d := filepath.Join(workDir, id)
 
 	_, err = os.Stat(d)
 	if err != nil && !errors.Is(err, os.ErrNotExist) {
-		panic(err)
+		return nil, err
 	}
 
 	return &d, nil

pkg/tmpl/context_funcs.go

@@ -14,9 +14,10 @@ import (
 	"text/template"
 
 	"github.com/ghodss/yaml"
+	"golang.org/x/sync/errgroup"
+
 	"github.com/helmfile/helmfile/pkg/envvar"
 	"github.com/helmfile/helmfile/pkg/helmexec"
-	"golang.org/x/sync/errgroup"
 )
 
 type Values = map[string]interface{}

pkg/tmpl/expand_secret_ref.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/helmfile/helmfile/pkg/plugins"
 	"github.com/variantdev/vals"
+
+	"github.com/helmfile/helmfile/pkg/plugins"
 )
 
 // to generate mock run mockgen -source=expand_secret_ref.go -destination=expand_secrets_mock.go -package=tmpl

pkg/tmpl/expand_secret_ref_test.go

@@ -2,11 +2,10 @@ package tmpl
 
 import (
 	"errors"
+	"testing"
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
-
-	"testing"
 )
 
 func Test_fetchSecretValue(t *testing.T) {

pkg/tmpl/expand_secrets_mock.go

@@ -4,8 +4,9 @@
 package tmpl
 
 import (
-	gomock "github.com/golang/mock/gomock"
 	reflect "reflect"
+
+	gomock "github.com/golang/mock/gomock"
 )
 
 // MockvalClient is a mock of valClient interface

pkg/tmpl/file_renderer.go

@@ -2,9 +2,8 @@ package tmpl
 
 import (
 	"bytes"
-	"os"
-
 	"fmt"
+	"os"
 	"strings"
 )
 

test/diff-yamls/diff-yamls.go

@@ -137,6 +137,7 @@ type meta struct {
 	namespace  string
 }
 
+// nolint: unparam
 func (res resource) getMeta() (meta, error) {
 	if len(res) == 0 {
 		return meta{}, nil

test/e2e/template/helmfile/tmpl_test.go

@@ -6,8 +6,9 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/helmfile/helmfile/pkg/tmpl"
 	"github.com/stretchr/testify/require"
+
+	"github.com/helmfile/helmfile/pkg/tmpl"
 )
 
 type tmplTestCase struct {

test/yamldiff/yamldiff.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-
 	"strings"
 
 	"github.com/jessevdk/go-flags"