feat: add nowatch to sync

Author: FabianKramm

cmd/sync.go

@@ -45,8 +45,6 @@ type SyncCmd struct {
 
 	InitialSync string
 
-	Verbose bool
-
 	NoWatch               bool
 	DownloadOnInitialSync bool
 	DownloadOnly          bool
@@ -97,7 +95,6 @@ devspace sync --container-path=/my-path
 	syncCmd.Flags().StringVar(&cmd.InitialSync, "initial-sync", "", "The initial sync strategy to use (mirrorLocal, mirrorRemote, preferLocal, preferRemote, preferNewest, keepAll)")
 
 	syncCmd.Flags().BoolVar(&cmd.NoWatch, "no-watch", false, "Synchronizes local and remote and then stops")
-	syncCmd.Flags().BoolVar(&cmd.Verbose, "verbose", false, "Shows every file that is synced")
 
 	syncCmd.Flags().BoolVar(&cmd.UploadOnly, "upload-only", false, "If set DevSpace will only upload files")
 	syncCmd.Flags().BoolVar(&cmd.DownloadOnly, "download-only", false, "If set DevSpace will only download files")
@@ -275,7 +272,7 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {
 
 	// Start sync
 	options = options.WithSkipInitContainers(true)
-	return sync.StartSyncFromCmd(ctx, targetselector.NewTargetSelector(options), syncConfig.devPod.Name, syncConfig.syncConfig, cmd.NoWatch, cmd.Verbose)
+	return sync.StartSyncFromCmd(ctx, targetselector.NewTargetSelector(options), syncConfig.devPod.Name, syncConfig.syncConfig, cmd.NoWatch)
 }
 
 func fromSyncConfig(devPod *latest.DevPod, containerName string, sc *latest.SyncConfig) (nameConfig, error) {

pkg/devspace/config/versions/latest/schema.go

@@ -810,8 +810,9 @@ type SyncConfig struct {
 	InitialSync          InitialSyncStrategy  `yaml:"initialSync,omitempty" json:"initialSync,omitempty"`
 	InitialSyncCompareBy InitialSyncCompareBy `yaml:"initialSyncCompareBy,omitempty" json:"initialSyncCompareBy,omitempty"`
 
-	DisableDownload *bool `yaml:"disableDownload,omitempty" json:"disableDownload,omitempty"`
-	DisableUpload   *bool `yaml:"disableUpload,omitempty" json:"disableUpload,omitempty"`
+	DisableDownload bool `yaml:"disableDownload,omitempty" json:"disableDownload,omitempty"`
+	DisableUpload   bool `yaml:"disableUpload,omitempty" json:"disableUpload,omitempty"`
+	NoWatch         bool `yaml:"noWatch,omitempty" json:"noWatch,omitempty"`
 
 	Polling bool `yaml:"polling,omitempty" json:"polling,omitempty"`
 

pkg/devspace/services/sync/sync.go

@@ -1,6 +1,7 @@
 package sync
 
 import (
+	"context"
 	"fmt"
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
@@ -12,7 +13,7 @@ import (
 )
 
 // StartSyncFromCmd starts a new sync from command
-func StartSyncFromCmd(ctx *devspacecontext.Context, selector targetselector.TargetSelector, name string, syncConfig *latest.SyncConfig, noWatch, verbose bool) error {
+func StartSyncFromCmd(ctx *devspacecontext.Context, selector targetselector.TargetSelector, name string, syncConfig *latest.SyncConfig, noWatch bool) error {
 	ctx, parent := ctx.WithNewTomb()
 	options := &Options{
 		Name:           name,
@@ -21,7 +22,7 @@ func StartSyncFromCmd(ctx *devspacecontext.Context, selector targetselector.Targ
 		RestartOnError: true,
 		SyncLog:        ctx.Log,
 
-		Verbose: verbose,
+		Verbose: ctx.Log.GetLevel() == logrus.DebugLevel,
 	}
 
 	// Start the tomb
@@ -69,9 +70,22 @@ func StartSync(ctx *devspacecontext.Context, devPod *latest.DevPod, selector tar
 	loader.EachDevContainer(devPod, func(devContainer *latest.DevContainer) bool {
 		for i, syncConfig := range devContainer.Sync {
 			// start a new go routine in the tomb
-			initDoneArray = append(initDoneArray, parent.NotifyGo(func() error {
-				return startSync(ctx, devPod.Name, string(devContainer.Arch), syncConfig, selector.WithContainer(devContainer.Container), parent)
-			}))
+			s := syncConfig
+			var cancel context.CancelFunc
+			if s.NoWatch {
+				var cancelCtx context.Context
+				cancelCtx, cancel = context.WithCancel(ctx.Context)
+				defer cancel()
+				ctx = ctx.WithContext(cancelCtx)
+			}
+			initDone := parent.NotifyGo(func() error {
+				if cancel != nil {
+					defer cancel()
+				}
+
+				return startSync(ctx, devPod.Name, string(devContainer.Arch), s, selector.WithContainer(devContainer.Container), parent)
+			})
+			initDoneArray = append(initDoneArray, initDone)
 
 			// every five we wait
 			if i%5 == 0 {