Merge pull request #2264 from pratikjagrut/gh.action

fix: bump up golangci-lint version

Author: FabianKramm

.github/workflows/lint.yaml

@@ -17,11 +17,13 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.18
+      - uses: actions/checkout@v3
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@v3.2.0
         with:
-          version: v1.45.2
           args:
             -v
             --config=.golangci.yml

cmd/root.go

@@ -4,17 +4,18 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"io/ioutil"
+	"os"
+	"strings"
+	"sync"
+	"time"
+
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader"
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/expression"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/devspace/env"
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/loft-sh/devspace/pkg/util/message"
-	"io/ioutil"
-	"os"
-	"strings"
-	"sync"
-	"time"
 
 	"github.com/loft-sh/devspace/pkg/devspace/hook"
 	"github.com/loft-sh/devspace/pkg/util/interrupt"
@@ -191,7 +192,7 @@ func BuildRoot(f factory.Factory, excludePlugins bool) *cobra.Command {
 	// This check is necessary to avoid process loops where a variable inside
 	// the devspace.yaml would execute another devspace command which would again
 	// load the config and execute DevSpace config parsing etc.
-	if os.Getenv(expression.DEVSPACE_SKIP_PRELOAD_ENV) == "" {
+	if os.Getenv(expression.DevSpaceSkipPreloadEnv) == "" {
 		rawConfig, err = parseConfig(f)
 		if err != nil {
 			f.GetLog().Debugf("error parsing raw config: %v", err)

pkg/devspace/config/loader/variable/command_variable.go

@@ -3,11 +3,12 @@ package variable
 import (
 	"bytes"
 	"context"
+	"os"
+	"strings"
+
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/expression"
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine"
 	"mvdan.cc/sh/v3/expand"
-	"os"
-	"strings"
 
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/util/command"
@@ -55,7 +56,7 @@ func execCommand(ctx context.Context, varName string, definition *latest.Variabl
 	stdErrWriter := &bytes.Buffer{}
 	var err error
 	envVars := []string{}
-	envVars = append(envVars, expression.DEVSPACE_SKIP_PRELOAD_ENV+"=true")
+	envVars = append(envVars, expression.DevSpaceSkipPreloadEnv+"=true")
 	envVars = append(envVars, os.Environ()...)
 	if args == nil {
 		err = engine.ExecuteSimpleShellCommand(ctx, dir, expand.ListEnviron(envVars...), writer, stdErrWriter, nil, cmd)

pkg/devspace/config/loader/variable/default_variable.go

@@ -2,11 +2,12 @@ package variable
 
 import (
 	"context"
-	"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
-	"github.com/sirupsen/logrus"
 	"os"
 	"strconv"
 
+	"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
+	"github.com/sirupsen/logrus"
+
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/util/log"
 )
@@ -24,7 +25,6 @@ func NewDefaultVariable(name string, workingDirectory string, localCache localca
 type defaultVariable struct {
 	name             string
 	workingDirectory string
-	dry              bool
 	localCache       localcache.Cache
 	log              log.Logger
 }

pkg/devspace/config/loader/variable/expression/expression.go

@@ -4,24 +4,25 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine"
-	"github.com/loft-sh/devspace/pkg/devspace/pipeline/env"
-	"github.com/loft-sh/devspace/pkg/util/yamlutil"
-	"mvdan.cc/sh/v3/expand"
-	"mvdan.cc/sh/v3/interp"
 	"os"
 	"os/exec"
 	"regexp"
 	"strconv"
 	"strings"
 
+	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine"
+	"github.com/loft-sh/devspace/pkg/devspace/pipeline/env"
+	"github.com/loft-sh/devspace/pkg/util/yamlutil"
+	"mvdan.cc/sh/v3/expand"
+	"mvdan.cc/sh/v3/interp"
+
 	"github.com/loft-sh/devspace/pkg/devspace/deploy/deployer/kubectl/walk"
 )
 
 // ExpressionMatchRegex is the regex to check if a value matches the devspace var format
 var ExpressionMatchRegex = regexp.MustCompile(`(?ms)^\$\#?\!?\((.+)\)$`)
 
-const DEVSPACE_SKIP_PRELOAD_ENV = "DEVSPACE_SKIP_PRELOAD"
+const DevSpaceSkipPreloadEnv = "DEVSPACE_SKIP_PRELOAD"
 
 func expressionMatchFn(key, value string) bool {
 	return ExpressionMatchRegex.MatchString(value)
@@ -99,7 +100,7 @@ func ResolveExpressions(ctx context.Context, value, dir string, variables map[st
 		stderr := &bytes.Buffer{}
 
 		envVars := []string{}
-		envVars = append(envVars, DEVSPACE_SKIP_PRELOAD_ENV+"=true")
+		envVars = append(envVars, DevSpaceSkipPreloadEnv+"=true")
 		envVars = append(envVars, os.Environ()...)
 		err := engine.ExecuteSimpleShellCommand(ctx, dir, env.NewVariableEnvProvider(expand.ListEnviron(envVars...), vars), stdout, stderr, nil, match[1], os.Args[1:]...)
 		if err != nil {

pkg/devspace/helm/v3/client.go

@@ -87,12 +87,12 @@ func (c *client) InstallChart(ctx devspacecontext.Context, releaseName string, r
 		// log into OCI registry if specified
 		if strings.HasPrefix(chartName, "oci://") {
 			if helmConfig.Chart.Username != "" && helmConfig.Chart.Password != "" {
-				chartNameUrl, err := url.Parse(chartName)
+				chartNameURL, err := url.Parse(chartName)
 				if err != nil {
 					return nil, errors.Wrap(err, "chartName malformed for oci registry")
 				}
 
-				_, err = c.genericHelm.Exec(ctx, []string{"registry", "login", chartNameUrl.Hostname(), "--username", helmConfig.Chart.Username, "--password", helmConfig.Chart.Password})
+				_, err = c.genericHelm.Exec(ctx, []string{"registry", "login", chartNameURL.Hostname(), "--username", helmConfig.Chart.Username, "--password", helmConfig.Chart.Password})
 				if err != nil {
 					return nil, errors.Wrap(err, "login oci registry")
 				}