V6.4.0 all security prs

.github/workflows/e2e-tests.yaml

@@ -24,8 +24,8 @@ jobs:
     strategy:
       matrix:
         kubernetes_version:
-          - v1.27.3
-          - v1.28.0
+          - v1.35.0
+          - v1.34.3
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: Checkout repo
@@ -36,11 +36,11 @@ jobs:
       with:
         version: ${{ matrix.kubernetes_version }}
 
-    # Creates KinD with using k8s versions from the matrix above
-    - name: Set up kind with K8s version v1.22.4
+    # Creates kind using the Kubernetes versions from the matrix above
+    - name: Set up kind cluster
       uses: engineerd/setup-kind@v0.5.0
       with:
-        version: "v0.20.0"
+        version: "v0.31.0"
         image: kindest/node:${{ matrix.kubernetes_version }}
 
     - name: Testing kind cluster set-up
@@ -53,8 +53,8 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "1.24"
-        
+        go-version: "1.25"
+
     - name: Build devspacehelper
       run: |
         mkdir -p ~/.devspace/devspacehelper/latest

.github/workflows/lint.yaml

@@ -17,13 +17,14 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
-      - uses: actions/checkout@v3
+          go-version: "1.25"
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v3.2.0
+        uses: golangci/golangci-lint-action@v7
         with:
+          version: v2.11.4
           args:
             -v
             --config=.golangci.yml

.github/workflows/npm.yaml

@@ -12,10 +12,10 @@ jobs:
   linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           registry-url: https://registry.npmjs.org/
       - run: |
           npm install -g
@@ -35,10 +35,10 @@ jobs:
   windows:
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           registry-url: https://registry.npmjs.org/
       - run: |
           npm install -g

.github/workflows/release.yaml

@@ -61,7 +61,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.25"
       - id: get_version
         run: |
           RELEASE_VERSION=$(echo $GITHUB_REF | sed -nE 's!refs/tags/!!p')

.github/workflows/unit-tests.yaml

@@ -29,7 +29,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.24"
+          go-version: "1.25"
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v1
@@ -40,12 +40,12 @@ jobs:
   test-unit-windows:
     runs-on: windows-latest
     name: unit-test-windows-latest
-    
+
     steps:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.24"
+          go-version: "1.25"
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v1

.golangci.yml

@@ -1,33 +1,29 @@
+version: "2"
+
 run:
   timeout: 10m
 
-issues:
-  exclude-dirs:
-  - hack/
-  - docs/
-
 linters:
-  disable-all:  true
+  default: none
   enable:
     # - deadcode # deprecated https://github.com/golangci/golangci-lint/issues/1841
-    - gosimple
     - govet
     - ineffassign
     - misspell
     - unused
     # - varcheck # deprecated https://github.com/golangci/golangci-lint/issues/1841
-    - staticcheck
+    - staticcheck # includes gosimple and stylecheck in v2
     - errcheck
     # - goimports
     - dupl
     - nakedret
-    - stylecheck
     # - gofmt
     # - golint
     # - structcheck # deprecated https://github.com/golangci/golangci-lint/issues/1841
-
-linters-settings:
-  gofmt:
-    simplify: true
-  dupl:
-    threshold: 400
+  settings:
+    dupl:
+      threshold: 400
+  exclusions:
+    paths:
+      - hack/
+      - docs/

cmd/init.go

@@ -130,16 +130,16 @@ func (cmd *InitCmd) Run(f factory.Factory) error {
 	}
 
 	// Delete config & overwrite config
-	os.RemoveAll(".devspace")
+	_ = os.RemoveAll(".devspace")
 
 	// Delete configs path
-	os.Remove(constants.DefaultConfigsPath)
+	_ = os.Remove(constants.DefaultConfigsPath)
 
 	// Delete config & overwrite config
-	os.Remove(constants.DefaultConfigPath)
+	_ = os.Remove(constants.DefaultConfigPath)
 
 	// Delete config & overwrite config
-	os.Remove(constants.DefaultVarsPath)
+	_ = os.Remove(constants.DefaultVarsPath)
 
 	// Execute plugin hook
 	err = hook.ExecuteHooks(nil, nil, "init")
@@ -202,7 +202,7 @@ func (cmd *InitCmd) initDevspace(f factory.Factory, configLoader loader.ConfigLo
 	var config *latest.Config
 
 	// create kubectl client
-	client, err := f.NewKubeClientFromContext(cmd.GlobalFlags.KubeContext, cmd.GlobalFlags.Namespace)
+	client, err := f.NewKubeClientFromContext(cmd.KubeContext, cmd.Namespace)
 	if err == nil {
 		configInterface, err := configLoader.Load(context.TODO(), client, &loader.ConfigOptions{}, cmd.log)
 		if err == nil {
@@ -789,15 +789,12 @@ func (cmd *InitCmd) render(f factory.Factory, config *latest.Config) (string, er
 	// Save temporary file to render it
 	renderPath := loader.ConfigPath("render.yaml")
 	err := loader.Save(renderPath, config)
-	defer os.Remove(renderPath)
+	defer os.Remove(renderPath) //nolint:errcheck
 	if err != nil {
 		return "", errors.Wrap(err, "temp render.yaml")
 	}
 
-	silent := true
-	if cmd.Debug {
-		silent = false
-	}
+	silent := !cmd.Debug
 	// Use the render command to render it.
 	writer := &bytes.Buffer{}
 	renderCmd := &RunPipelineCmd{
@@ -858,7 +855,7 @@ func appendToIgnoreFile(ignoreFile, content string) error {
 				return errors.Errorf("Error writing file %s: %v", ignoreFile, err)
 			}
 
-			defer file.Close()
+			defer file.Close() //nolint:errcheck
 			if _, err = file.WriteString(content); err != nil {
 				return errors.Errorf("Error writing file %s: %v", ignoreFile, err)
 			}

cmd/run_pipeline.go

@@ -100,28 +100,29 @@ func (cmd *RunPipelineCmd) AddPipelineFlags(f factory.Factory, command *cobra.Co
 				usage = "Flag " + pipelineFlag.Name
 			}
 
-			if pipelineFlag.Type == "" || pipelineFlag.Type == latest.PipelineFlagTypeBoolean {
+			switch pipelineFlag.Type {
+			case "", latest.PipelineFlagTypeBoolean:
 				val, err := pipelinepkg.GetDefaultValue(pipelineFlag)
 				if err != nil {
 					f.GetLog().Errorf("Error parsing default value for flag %s: %#v is not a boolean", pipelineFlag.Name, pipelineFlag.Default)
 				}
 
 				command.Flags().BoolP(pipelineFlag.Name, pipelineFlag.Short, val.(bool), usage)
-			} else if pipelineFlag.Type == latest.PipelineFlagTypeString {
+			case latest.PipelineFlagTypeString:
 				val, err := pipelinepkg.GetDefaultValue(pipelineFlag)
 				if err != nil {
 					f.GetLog().Errorf("Error parsing default value for flag %s: %#v is not a string", pipelineFlag.Name, pipelineFlag.Default)
 				}
 
 				command.Flags().StringP(pipelineFlag.Name, pipelineFlag.Short, val.(string), usage)
-			} else if pipelineFlag.Type == latest.PipelineFlagTypeInteger {
+			case latest.PipelineFlagTypeInteger:
 				val, err := pipelinepkg.GetDefaultValue(pipelineFlag)
 				if err != nil {
 					f.GetLog().Errorf("Error parsing default value for flag %s: %#v is not an integer", pipelineFlag.Name, pipelineFlag.Default)
 				}
 
 				command.Flags().IntP(pipelineFlag.Name, pipelineFlag.Short, val.(int), usage)
-			} else if pipelineFlag.Type == latest.PipelineFlagTypeStringArray {
+			case latest.PipelineFlagTypeStringArray:
 				val, err := pipelinepkg.GetDefaultValue(pipelineFlag)
 				if err != nil {
 					f.GetLog().Errorf("Error parsing default value for flag %s: %#v is not a string array", pipelineFlag.Name, pipelineFlag.Default)
@@ -467,11 +468,11 @@ func runPipeline(ctx devspacecontext.Context, args []string, options *CommandOpt
 
 	// get a stdout writer
 	stdoutWriter := ctx.Log().Writer(ctx.Log().GetLevel(), true)
-	defer stdoutWriter.Close()
+	defer stdoutWriter.Close() //nolint:errcheck
 
 	// get a stderr writer
 	stderrWriter := ctx.Log().Writer(logrus.WarnLevel, true)
-	defer stderrWriter.Close()
+	defer stderrWriter.Close() //nolint:errcheck
 
 	// start pipeline
 	err = pipe.Run(ctx.WithLogger(log.NewStreamLoggerWithFormat(stdoutWriter, stderrWriter, ctx.Log().GetLevel(), log.TimeFormat)), args)

cmd/sync.go

@@ -47,10 +47,11 @@ type SyncCmd struct {
 
 	InitialSync string
 
-	NoWatch               bool
-	DownloadOnInitialSync bool
-	DownloadOnly          bool
-	UploadOnly            bool
+	NoWatch                      bool
+	DownloadOnInitialSync        bool
+	downloadOnInitialSyncChanged bool
+	DownloadOnly                 bool
+	UploadOnly                   bool
 
 	// used for testing to allow interruption
 	Ctx context.Context
@@ -79,6 +80,7 @@ devspace sync --path=.:/app --pod=my-pod --container=my-container
 			// Print upgrade message if new version available
 			upgrade.PrintUpgradeMessage(f.GetLog())
 			plugin.SetPluginCommand(cobraCmd, args)
+			cmd.downloadOnInitialSyncChanged = cobraCmd.Flags().Changed("download-on-initial-sync")
 			return cmd.Run(f)
 		},
 	}
@@ -125,7 +127,7 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {
 	if cmd.ConfigPath != "" {
 		_, err := os.Stat(cmd.ConfigPath)
 		if err != nil {
-			return errors.Errorf("--config is specified, but config %s cannot be loaded: %v", cmd.GlobalFlags.ConfigPath, err)
+			return errors.Errorf("--config is specified, but config %s cannot be loaded: %v", cmd.ConfigPath, err)
 		}
 	}
 
@@ -139,7 +141,7 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {
 		return err
 	}
 	if configLoader.Exists() {
-		if cmd.GlobalFlags.ConfigPath != "" {
+		if cmd.ConfigPath != "" {
 			configExists, err := configLoader.SetDevSpaceRoot(logger)
 			if err != nil {
 				return err
@@ -170,7 +172,7 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {
 	}
 
 	var configInterface config.Config
-	if configLoader.Exists() && cmd.GlobalFlags.ConfigPath != "" {
+	if configLoader.Exists() && cmd.ConfigPath != "" {
 		configInterface, err = configLoader.LoadWithCache(context.Background(), localCache, client, configOptions, logger)
 		if err != nil {
 			return err
@@ -208,7 +210,7 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {
 		devPod:     &latest.DevPod{},
 		syncConfig: &latest.SyncConfig{},
 	}
-	if cmd.GlobalFlags.ConfigPath != "" && configInterface != nil {
+	if cmd.ConfigPath != "" && configInterface != nil {
 		devSection := configInterface.Config().Dev
 		syncConfigs := []nameConfig{}
 		for _, v := range devSection {
@@ -224,7 +226,7 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {
 			})
 		}
 		if len(syncConfigs) == 0 {
-			return fmt.Errorf("no sync config found in %s", cmd.GlobalFlags.ConfigPath)
+			return fmt.Errorf("no sync config found in %s", cmd.ConfigPath)
 		}
 
 		// Check which sync config should be used
@@ -329,10 +331,12 @@ func (cmd *SyncCmd) applyFlagsToSyncConfig(syncConfig *latest.SyncConfig, option
 		options = options.WithNamespace(cmd.Namespace)
 	}
 
-	if cmd.DownloadOnInitialSync {
-		syncConfig.InitialSync = latest.InitialSyncStrategyPreferLocal
-	} else {
-		syncConfig.InitialSync = latest.InitialSyncStrategyMirrorLocal
+	if cmd.downloadOnInitialSyncChanged || syncConfig.InitialSync == "" {
+		if cmd.DownloadOnInitialSync {
+			syncConfig.InitialSync = latest.InitialSyncStrategyPreferLocal
+		} else {
+			syncConfig.InitialSync = latest.InitialSyncStrategyMirrorLocal
+		}
 	}
 
 	if cmd.InitialSync != "" {

cmd/ui.go

@@ -4,20 +4,18 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/loft-sh/devspace/helper/util/port"
-	"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
-	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
-	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	"io"
 	"net/http"
 	"time"
 
-	"github.com/loft-sh/devspace/pkg/devspace/hook"
-
+	"github.com/loft-sh/devspace/cmd/flags"
+	"github.com/loft-sh/devspace/helper/util/port"
 	config2 "github.com/loft-sh/devspace/pkg/devspace/config"
+	"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
+	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
+	"github.com/loft-sh/devspace/pkg/devspace/hook"
+	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	"github.com/loft-sh/devspace/pkg/devspace/plugin"
-
-	"github.com/loft-sh/devspace/cmd/flags"
 	"github.com/loft-sh/devspace/pkg/devspace/server"
 	"github.com/loft-sh/devspace/pkg/util/factory"
 	"github.com/loft-sh/devspace/pkg/util/log"
@@ -107,7 +105,7 @@ func (cmd *UICmd) RunUI(f factory.Factory) error {
 					continue
 				}
 
-				defer response.Body.Close()
+				defer response.Body.Close() //nolint:errcheck
 				contents, err := io.ReadAll(response.Body)
 				if err != nil {
 					checkPort++