refactor: remove dev.sync[*].onDownload option

Author: FabianKramm

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

@@ -818,8 +818,7 @@ type SyncConfig struct {
 	WaitInitialSync *bool            `yaml:"waitInitialSync,omitempty" json:"waitInitialSync,omitempty"`
 	BandwidthLimits *BandwidthLimits `yaml:"bandwidthLimits,omitempty" json:"bandwidthLimits,omitempty"`
 
-	OnUpload   *SyncOnUpload   `yaml:"onUpload,omitempty" json:"onUpload,omitempty"`
-	OnDownload *SyncOnDownload `yaml:"onDownload,omitempty" json:"onDownload,omitempty"`
+	OnUpload *SyncOnUpload `yaml:"onUpload,omitempty" json:"onUpload,omitempty"`
 }
 
 type ContainerArchitecture string

pkg/devspace/config/versions/v1beta11/upgrade.go

@@ -644,8 +644,6 @@ func (c *Config) mergeDevConfig(log log.Logger) (map[string]*next.DevPod, error)
 			DisableUpload:        syncConfig.DisableUpload,
 			Polling:              syncConfig.Polling,
 			WaitInitialSync:      syncConfig.WaitInitialSync,
-			OnUpload:             nil,
-			OnDownload:           nil,
 		}
 		syncPath := "."
 		if syncConfig.LocalSubPath != "" {
@@ -704,31 +702,7 @@ func (c *Config) mergeDevConfig(log log.Logger) (map[string]*next.DevPod, error)
 			}
 		}
 		if syncConfig.OnDownload != nil {
-			nextSyncConfig.OnDownload = &next.SyncOnDownload{}
-			if syncConfig.OnDownload.ExecLocal != nil {
-				nextSyncConfig.OnDownload.ExecLocal = &next.SyncExecCommand{
-					Command: syncConfig.OnDownload.ExecLocal.Command,
-					Args:    syncConfig.OnDownload.ExecLocal.Args,
-				}
-				if syncConfig.OnDownload.ExecLocal.OnBatch != nil {
-					nextSyncConfig.OnDownload.ExecLocal.OnBatch = &next.SyncCommand{
-						Command: syncConfig.OnDownload.ExecLocal.OnBatch.Command,
-						Args:    syncConfig.OnDownload.ExecLocal.OnBatch.Args,
-					}
-				}
-				if syncConfig.OnDownload.ExecLocal.OnDirCreate != nil {
-					nextSyncConfig.OnDownload.ExecLocal.OnDirCreate = &next.SyncCommand{
-						Command: syncConfig.OnDownload.ExecLocal.OnDirCreate.Command,
-						Args:    syncConfig.OnDownload.ExecLocal.OnDirCreate.Args,
-					}
-				}
-				if syncConfig.OnDownload.ExecLocal.OnFileChange != nil {
-					nextSyncConfig.OnDownload.ExecLocal.OnFileChange = &next.SyncCommand{
-						Command: syncConfig.OnDownload.ExecLocal.OnFileChange.Command,
-						Args:    syncConfig.OnDownload.ExecLocal.OnFileChange.Args,
-					}
-				}
-			}
+			log.Warnf("dev.sync[*].onDownload is not supported anymore in DevSpace v6, please use dev.sync[*].onUpload.exec instead")
 		}
 
 		devContainer.Sync = append(devContainer.Sync, nextSyncConfig)

pkg/devspace/services/sync/controller.go

@@ -369,15 +369,6 @@ func (c *controller) initClient(ctx *devspacecontext.Context, pod *v1.Pod, arch,
 		options.Exec = syncConfig.OnUpload.Exec
 	}
 
-	// Add onDownload hooks
-	if syncConfig.OnDownload != nil && syncConfig.OnDownload.ExecLocal != nil {
-		fileCmd, fileArgs, dirCmd, dirArgs := getSyncCommands(syncConfig.OnDownload.ExecLocal)
-		options.FileChangeCmd = fileCmd
-		options.FileChangeArgs = fileArgs
-		options.DirCreateCmd = dirCmd
-		options.DirCreateArgs = dirArgs
-	}
-
 	if len(syncConfig.ExcludePaths) > 0 {
 		options.ExcludePaths = syncConfig.ExcludePaths
 	}

pkg/devspace/sync/sync.go

@@ -37,12 +37,6 @@ type Options struct {
 
 	RestartContainer bool
 
-	FileChangeCmd  string
-	FileChangeArgs []string
-
-	DirCreateCmd  string
-	DirCreateArgs []string
-
 	UploadBatchCmd  string
 	UploadBatchArgs []string
 

pkg/devspace/sync/tar.go

@@ -3,7 +3,6 @@ package sync
 import (
 	"archive/tar"
 	"compress/gzip"
-	"github.com/loft-sh/devspace/pkg/util/command"
 	"github.com/loft-sh/devspace/pkg/util/fsutil"
 	"io"
 	"io/ioutil"
@@ -154,23 +153,6 @@ func (u *Unarchiver) untarNext(destPath string, tarReader *tar.Reader) (bool, er
 	// Set mod time correctly
 	_ = os.Chtimes(outFileName, time.Now(), header.ModTime)
 
-	// Execute command if defined
-	if u.syncConfig.Options.FileChangeCmd != "" {
-		cmdArgs := make([]string, 0, len(u.syncConfig.Options.FileChangeArgs))
-		for _, arg := range u.syncConfig.Options.FileChangeArgs {
-			if arg == "{}" {
-				cmdArgs = append(cmdArgs, outFileName)
-			} else {
-				cmdArgs = append(cmdArgs, arg)
-			}
-		}
-
-		out, err := command.CombinedOutput(u.syncConfig.ctx, u.syncConfig.LocalPath, u.syncConfig.Options.FileChangeCmd, cmdArgs...)
-		if err != nil {
-			return false, errors.Errorf("Error executing command '%s %s': %s => %v", u.syncConfig.Options.FileChangeCmd, strings.Join(cmdArgs, " "), string(out), err)
-		}
-	}
-
 	// Update fileMap so that upstream does not upload the file
 	u.syncConfig.fileIndex.fileMap[relativePath] = &FileInformation{
 		Name:        relativePath,
@@ -201,22 +183,6 @@ func (u *Unarchiver) createAllFolders(name string, perm os.FileMode) error {
 
 			return errors.Errorf("Error creating %s: %v", dirToCreate, err)
 		}
-
-		if u.syncConfig.Options.DirCreateCmd != "" {
-			cmdArgs := make([]string, 0, len(u.syncConfig.Options.DirCreateArgs))
-			for _, arg := range u.syncConfig.Options.DirCreateArgs {
-				if arg == "{}" {
-					cmdArgs = append(cmdArgs, dirToCreate)
-				} else {
-					cmdArgs = append(cmdArgs, arg)
-				}
-			}
-
-			out, err := command.CombinedOutput(u.syncConfig.ctx, u.syncConfig.LocalPath, u.syncConfig.Options.DirCreateCmd, cmdArgs...)
-			if err != nil {
-				return errors.Errorf("Error executing command '%s %s': %s => %v", u.syncConfig.Options.DirCreateCmd, strings.Join(cmdArgs, " "), string(out), err)
-			}
-		}
 	}
 
 	return nil