Merge pull request #1892 from FabianKramm/master

fix: fixed persist paths not working in AWS

Author: FabianKramm

.github/workflows/e2e-tests.yaml

@@ -55,4 +55,4 @@ jobs:
     - name: e2e test
       working-directory: ./e2e
       run: |
-        go test -v -ginkgo.v     
+        go test -v -ginkgo.v -timeout 3600s

cmd/attach.go

@@ -7,7 +7,6 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/plugin"
 	"github.com/loft-sh/devspace/pkg/devspace/services/targetselector"
 	"github.com/loft-sh/devspace/pkg/util/factory"
-	"github.com/loft-sh/devspace/pkg/util/ptr"
 	"github.com/pkg/errors"
 
 	"github.com/spf13/cobra"
@@ -99,18 +98,16 @@ func (cmd *AttachCmd) Run(f factory.Factory, cobraCmd *cobra.Command, args []str
 		return err
 	}
 
-	// Build params
-	options := targetselector.NewOptionsFromFlags(cmd.Container, cmd.LabelSelector, cmd.Namespace, cmd.Pod, cmd.Pick)
-
 	// get image selector if specified
 	imageSelector, err := getImageSelector(client, configLoader, configOptions, cmd.Image, cmd.ImageSelector, log)
 	if err != nil {
 		return err
 	}
 
-	// set image selector
-	options.ImageSelector = imageSelector
-	options.Wait = ptr.Bool(false)
+	// Build params
+	options := targetselector.NewOptionsFromFlags(cmd.Container, cmd.LabelSelector, imageSelector, cmd.Namespace, cmd.Pod).
+		WithPick(cmd.Pick).
+		WithWait(false)
 
 	// Start attach
 	return f.NewServicesClient(nil, nil, client, log).StartAttach(options, make(chan error))

cmd/dev.go

@@ -2,6 +2,8 @@ package cmd
 
 import (
 	"fmt"
+	"github.com/loft-sh/devspace/pkg/devspace/kubectl/selector"
+	"github.com/loft-sh/devspace/pkg/util/stringutil"
 	"io"
 	"os"
 	"os/exec"
@@ -10,7 +12,6 @@ import (
 	"time"
 
 	runtimevar "github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/runtime"
-	"github.com/loft-sh/devspace/pkg/devspace/imageselector"
 	"github.com/loft-sh/devspace/pkg/util/command"
 
 	"github.com/loft-sh/devspace/pkg/devspace/config"
@@ -624,24 +625,24 @@ func (cmd *DevCmd) startOutput(configInterface config.Config, dependencies []typ
 				}
 				return 0, nil
 			} else {
-				selectorOptions := targetselector.NewDefaultOptions().ApplyCmdParameter("", "", cmd.Namespace, "")
+				selectorOptions := targetselector.NewEmptyOptions().
+					WithContainerFilter(selector.FilterNonRunningContainers).
+					WithPick(true).
+					WithNamespace(cmd.Namespace)
 				if config.Dev.Terminal != nil {
-					selectorOptions = selectorOptions.ApplyConfigParameter(config.Dev.Terminal.LabelSelector, config.Dev.Terminal.Namespace, config.Dev.Terminal.ContainerName, "")
-				}
+					var imageSelectors []string
+					if config.Dev.Terminal.ImageSelector != "" {
+						imageSelector, err := runtimevar.NewRuntimeResolver(true).FillRuntimeVariablesAsImageSelector(config.Dev.Terminal.ImageSelector, configInterface, dependencies)
+						if err != nil {
+							return 0, err
+						}
 
-				var imageSelectors []imageselector.ImageSelector
-				if config.Dev.Terminal != nil && config.Dev.Terminal.ImageSelector != "" {
-					imageSelector, err := runtimevar.NewRuntimeResolver(true).FillRuntimeVariablesAsImageSelector(config.Dev.Terminal.ImageSelector, configInterface, dependencies)
-					if err != nil {
-						return 0, err
+						imageSelectors = []string{imageSelector.Image}
 					}
-
-					imageSelectors = append(imageSelectors, *imageSelector)
+					selectorOptions = selectorOptions.ApplyConfigParameter(config.Dev.Terminal.ContainerName, config.Dev.Terminal.LabelSelector, imageSelectors, config.Dev.Terminal.Namespace, "")
 				}
 
 				cmd.log.Info("Terminal: Waiting for containers to start...")
-				selectorOptions.ImageSelector = imageSelectors
-
 				code, err := servicesClient.StartTerminal(selectorOptions, args, cmd.WorkingDirectory, exitChan, true, cmd.TerminalReconnect, stdout, stderr, stdin)
 				if services.IsUnexpectedExitCode(code) {
 					cmd.log.Warnf("Command terminated with exit code %d", code)
@@ -758,7 +759,7 @@ func GetPaths(config *latest.Config) []string {
 		}
 	}
 
-	return removeDuplicates(paths)
+	return stringutil.RemoveDuplicates(paths)
 }
 
 func (cmd *DevCmd) loadConfig(configOptions *loader.ConfigOptions) (config.Config, error) {
@@ -823,25 +824,6 @@ func defaultStdStreams(stdout io.Writer, stderr io.Writer, stdin io.Reader) (io.
 	return stdout, stderr, stdin
 }
 
-func removeDuplicates(arr []string) []string {
-	newArr := []string{}
-	for _, v := range arr {
-		if !contains(newArr, v) {
-			newArr = append(newArr, v)
-		}
-	}
-	return newArr
-}
-
-func contains(haystack []string, needle string) bool {
-	for _, v := range haystack {
-		if v == needle {
-			return true
-		}
-	}
-	return false
-}
-
 func updateLastKubeContext(configLoader loader.ConfigLoader, client kubectl.Client, generatedConfig *generated.Config) error {
 	// Update generated if we deploy the application
 	if generatedConfig != nil {

cmd/enter.go

@@ -117,17 +117,15 @@ func (cmd *EnterCmd) Run(f factory.Factory, cobraCmd *cobra.Command, args []stri
 		return err
 	}
 
-	// Build params
-	selectorOptions := targetselector.NewOptionsFromFlags(cmd.Container, cmd.LabelSelector, cmd.Namespace, cmd.Pod, cmd.Pick)
-
 	// get image selector if specified
 	imageSelector, err := getImageSelector(client, configLoader, configOptions, cmd.Image, cmd.ImageSelector, logger)
 	if err != nil {
 		return err
 	}
 
-	// set image selector
-	selectorOptions.ImageSelector = imageSelector
+	// Build params
+	selectorOptions := targetselector.NewOptionsFromFlags(cmd.Container, cmd.LabelSelector, imageSelector, cmd.Namespace, cmd.Pod).
+		WithPick(cmd.Pick)
 
 	// Start terminal
 	stdout, stderr, stdin := defaultStdStreams(cmd.Stdout, cmd.Stderr, cmd.Stdin)

cmd/logs.go

@@ -116,17 +116,15 @@ func (cmd *LogsCmd) RunLogs(f factory.Factory) error {
 		return err
 	}
 
-	// Build options
-	options := targetselector.NewOptionsFromFlags(cmd.Container, cmd.LabelSelector, cmd.Namespace, cmd.Pod, cmd.Pick)
-
 	// get image selector if specified
 	imageSelector, err := getImageSelector(client, configLoader, configOptions, cmd.Image, cmd.ImageSelector, log)
 	if err != nil {
 		return err
 	}
 
-	// set image selector
-	options.ImageSelector = imageSelector
+	// Build options
+	options := targetselector.NewOptionsFromFlags(cmd.Container, cmd.LabelSelector, imageSelector, cmd.Namespace, cmd.Pod).
+		WithPick(cmd.Pick)
 
 	// Start terminal
 	err = f.NewServicesClient(nil, nil, client, log).StartLogs(options, cmd.Follow, int64(cmd.LastAmountOfLines), cmd.Wait)
@@ -137,8 +135,8 @@ func (cmd *LogsCmd) RunLogs(f factory.Factory) error {
 	return nil
 }
 
-func getImageSelector(client kubectl.Client, configLoader loader.ConfigLoader, configOptions *loader.ConfigOptions, image, imageSelector string, log log.Logger) ([]imageselector.ImageSelector, error) {
-	var imageSelectors []imageselector.ImageSelector
+func getImageSelector(client kubectl.Client, configLoader loader.ConfigLoader, configOptions *loader.ConfigOptions, image, imageSelector string, log log.Logger) ([]string, error) {
+	var imageSelectors []string
 	if imageSelector != "" {
 		var (
 			err          error
@@ -166,7 +164,7 @@ func getImageSelector(client kubectl.Client, configLoader loader.ConfigLoader, c
 			return nil, err
 		}
 
-		imageSelectors = append(imageSelectors, *resolved)
+		imageSelectors = append(imageSelectors, resolved.Image)
 	} else if image != "" {
 		log.Warnf("Flag --image is deprecated, please use --image-selector instead")
 
@@ -193,7 +191,7 @@ func getImageSelector(client kubectl.Client, configLoader loader.ConfigLoader, c
 			return nil, fmt.Errorf("couldn't find an image with name %s in devspace config", image)
 		}
 
-		imageSelectors = append(imageSelectors, *imageSelector)
+		imageSelectors = append(imageSelectors, imageSelector.Image)
 	}
 
 	return imageSelectors, nil

cmd/restart.go

@@ -3,19 +3,15 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"github.com/loft-sh/devspace/cmd/flags"
 	runtimevar "github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/runtime"
-	"github.com/loft-sh/devspace/pkg/devspace/imageselector"
-
 	"github.com/loft-sh/devspace/pkg/devspace/dependency"
 	"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/pkg/devspace/services/inject"
 	"github.com/loft-sh/devspace/pkg/devspace/services/targetselector"
 	"github.com/loft-sh/devspace/pkg/util/factory"
-	"github.com/loft-sh/devspace/pkg/util/ptr"
-
-	"github.com/loft-sh/devspace/cmd/flags"
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/pkg/errors"
 
@@ -85,7 +81,7 @@ func (cmd *RestartCmd) Run(f factory.Factory) error {
 			return errors.Wrap(err, "create kube client")
 		}
 
-		return restartContainer(client, targetselector.NewOptionsFromFlags(cmd.Container, cmd.LabelSelector, cmd.Namespace, cmd.Pod, cmd.Pick), cmd.log)
+		return restartContainer(client, targetselector.NewOptionsFromFlags(cmd.Container, cmd.LabelSelector, nil, cmd.Namespace, cmd.Pod).WithPick(cmd.Pick), cmd.log)
 	}
 
 	log.StartFileLogging()
@@ -149,17 +145,19 @@ func (cmd *RestartCmd) Run(f factory.Factory) error {
 		}
 
 		// create target selector options
-		options := targetselector.NewOptionsFromFlags("", "", cmd.Namespace, "", cmd.Pick).ApplyConfigParameter(syncPath.LabelSelector, syncPath.Namespace, syncPath.ContainerName, "")
-		options.ImageSelector = []imageselector.ImageSelector{}
+		var imageSelector []string
 		if syncPath.ImageSelector != "" {
-			imageSelector, err := runtimevar.NewRuntimeResolver(true).FillRuntimeVariablesAsImageSelector(syncPath.ImageSelector, configInterface, dep)
+			imageSelectorObject, err := runtimevar.NewRuntimeResolver(true).FillRuntimeVariablesAsImageSelector(syncPath.ImageSelector, configInterface, dep)
 			if err != nil {
 				return err
 			}
 
-			options.ImageSelector = append(options.ImageSelector, *imageSelector)
+			imageSelector = []string{imageSelectorObject.Image}
 		}
 
+		options := targetselector.NewOptionsFromFlags("", "", nil, cmd.Namespace, "").
+			WithPick(cmd.Pick).
+			ApplyConfigParameter(syncPath.ContainerName, syncPath.LabelSelector, imageSelector, syncPath.Namespace, "")
 		err = restartContainer(client, options, cmd.log)
 		if err != nil {
 			return err
@@ -179,8 +177,8 @@ func (cmd *RestartCmd) Run(f factory.Factory) error {
 }
 
 func restartContainer(client kubectl.Client, options targetselector.Options, log log.Logger) error {
-	options.Wait = ptr.Bool(false)
-	container, err := targetselector.NewTargetSelector(client).SelectSingleContainer(context.TODO(), options, log)
+	options = options.WithWait(false)
+	container, err := targetselector.GlobalTargetSelector.SelectSingleContainer(context.TODO(), client, options, log)
 	if err != nil {
 		return errors.Errorf("Error selecting pod: %v", err)
 	}

cmd/sync.go

@@ -180,17 +180,16 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {
 		return err
 	}
 
-	// Build params
-	options := targetselector.NewOptionsFromFlags(cmd.Container, cmd.LabelSelector, cmd.Namespace, cmd.Pod, cmd.Pick)
 	// get image selector if specified
 	imageSelector, err := getImageSelector(client, configLoader, configOptions, "", cmd.ImageSelector, logger)
 	if err != nil {
 		return err
 	}
 
-	// set image selector
-	options.ImageSelector = imageSelector
-	options.Wait = &cmd.Wait
+	// Build params
+	options := targetselector.NewOptionsFromFlags(cmd.Container, cmd.LabelSelector, imageSelector, cmd.Namespace, cmd.Pod).
+		WithPick(cmd.Pick).
+		WithWait(cmd.Wait)
 
 	if cmd.DownloadOnly && cmd.UploadOnly {
 		return errors.New("--upload-only cannot be used together with --download-only")
@@ -253,9 +252,8 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {
 		return errors.Wrap(err, "apply flags to sync config")
 	}
 
-	options = options.ApplyConfigParameter(syncConfig.LabelSelector, syncConfig.Namespace, syncConfig.ContainerName, "")
-
 	// Start sync
+	options = options.ApplyConfigParameter(syncConfig.ContainerName, syncConfig.LabelSelector, nil, syncConfig.Namespace, "")
 	return f.NewServicesClient(configInterface, nil, client, logger).StartSyncFromCmd(options, syncConfig, cmd.Interrupt, cmd.NoWatch, cmd.Verbose)
 }
 

docs/pages/configuration/development/replace-pods.mdx

@@ -251,7 +251,7 @@ dev:
     persistPaths:
     - path: /app
       # Optional path on the persistent volume to mount
-      # volumePath: /my-volume/app
+      # volumePath: my-volume/app
       # Optional name of the container to persist this path
       # containerName: my-container
 ```
@@ -292,13 +292,13 @@ dev:
   - imageSelector: my-image/frontend
     persistPaths:
     - path: /app
-      volumePath: /app
+      volumePath: app
     persistenceOptions:
       name: my-pvc
   - imageSelector: my-image/backend
     persistPaths:
     - path: /backend
-      volumePath: /app
+      volumePath: app
     persistenceOptions:
       name: my-pvc
       readOnly: true

docs/pages/configuration/reference.mdx

@@ -356,7 +356,7 @@ replacePods:                              # struct[] | Which pods should be repl
   replaceImage: ""                        # string   | The image that should be used for the pod
   persistPaths:                           # struct[] | Paths that should get persisted in the replaced pod
   - path: /app                            # string   | The container path that should get persisted
-    volumePath: /my-volume/app            # string   | Optional path on the persistent volume to mount
+    volumePath: my-volume/app             # string   | Optional path on the persistent volume to mount
     containerName: ""                     # string   | Optional container name in the replaced pod to persist the path
     readOnly: false                       # bool     | If the path should get mounted read only
     skipPopulate: false                   # bool     | If true, devspace will not try to pre-populate the path

docs/versioned_docs/version-5.17/configuration/development/replace-pods.mdx

@@ -251,7 +251,7 @@ dev:
     persistPaths:
     - path: /app
       # Optional path on the persistent volume to mount
-      # volumePath: /my-volume/app
+      # volumePath: my-volume/app
       # Optional name of the container to persist this path
       # containerName: my-container
 ```
@@ -281,13 +281,13 @@ dev:
   - imageSelector: my-image/frontend
     persistPaths:
     - path: /app
-      volumePath: /app
+      volumePath: app
     persistenceOptions:
       name: my-pvc
   - imageSelector: my-image/backend
     persistPaths:
     - path: /backend
-      volumePath: /app
+      volumePath: app
     persistenceOptions:
       name: my-pvc
       readOnly: true