Move away from using package level vars

Only use them inside the `Execute` otherwise it is super annoying to test and understand what is happening

pkg/move/atomic.go

@@ -7,18 +7,18 @@ import (
 	"github.com/spf13/afero"
 )
 
-func atomic(copy copyFunc) copyFunc {
+func atomic(work string, copy copyFunc) copyFunc {
 	return func(fs afero.Afero, from, to string) (err error) {
 		logrus.Infof("Setting up atomic operation from %s to %s", from, to)
 
-		err = fs.RemoveAll(workFolder)
+		err = fs.RemoveAll(work)
 		if err != nil {
 			logrus.Errorf("Failed initial cleanup of workdir: %v", err)
 
 			return err
 		}
 
-		err = fs.MkdirAll(workFolder, os.ModePerm)
+		err = fs.MkdirAll(work, os.ModePerm)
 		if err != nil {
 			logrus.Errorf("Failed to create the base workdir: %v", err)
 
@@ -27,27 +27,27 @@ func atomic(copy copyFunc) copyFunc {
 
 		defer func() {
 			if err != nil {
-				if cleanupErr := fs.RemoveAll(workFolder); cleanupErr != nil {
+				if cleanupErr := fs.RemoveAll(work); cleanupErr != nil {
 					logrus.Errorf("Failed cleanup of workdir after failure: %v", err)
 				}
 			}
 		}()
 
-		err = copy(fs, from, workFolder)
+		err = copy(fs, from, work)
 		if err != nil {
 			logrus.Errorf("Error copying folder: %v", err)
 
 			return err
 		}
 
-		err = fs.Rename(workFolder, to)
+		err = fs.Rename(work, to)
 		if err != nil {
 			logrus.Errorf("Error moving folder: %v", err)
 
 			return err
 		}
 
-		logrus.Infof("Successfully finalized atomic operation from %s to %s", workFolder, to)
+		logrus.Infof("Successfully finalized atomic operation from %s to %s", work, to)
 
 		return nil
 	}

pkg/move/atomic_test.go

@@ -37,6 +37,7 @@ func mockCopyFuncWithAtomicCheck(t *testing.T, isSuccessful bool) copyFunc {
 func TestAtomic(t *testing.T) {
 	source := "/source"
 	target := "/target"
+	work := "/work"
 
 	t.Run("success -> target is present", func(t *testing.T) {
 		fs := afero.Afero{Fs: afero.NewMemMapFs()}
@@ -45,7 +46,7 @@ func TestAtomic(t *testing.T) {
 		err := fs.MkdirAll(source, 0755)
 		assert.NoError(t, err)
 
-		atomicCopy := atomic(mockCopyFuncWithAtomicCheck(t, true))
+		atomicCopy := atomic(work, mockCopyFuncWithAtomicCheck(t, true))
 
 		err = atomicCopy(fs, source, target)
 		assert.NoError(t, err)
@@ -66,9 +67,8 @@ func TestAtomic(t *testing.T) {
 	})
 	t.Run("fail -> target is not present", func(t *testing.T) {
 		fs := afero.Afero{Fs: afero.NewMemMapFs()}
-		workFolder = "/work"
 
-		atomicCopy := atomic(mockCopyFuncWithAtomicCheck(t, false))
+		atomicCopy := atomic(work, mockCopyFuncWithAtomicCheck(t, false))
 
 		err := atomicCopy(fs, source, target)
 		assert.Error(t, err)

pkg/move/cmd.go

@@ -42,7 +42,7 @@ func Execute(fs afero.Afero) error {
 	}
 
 	if workFolder != "" {
-		copy = atomic(copy)
+		copy = atomic(workFolder, copy)
 	}
 
 	return copy(fs, sourceFolder, targetFolder)