fix: avoid skipping symlinked directories during initial upload

Signed-off-by: Russell Centanni <[email protected]>

Author: lizardruss

pkg/devspace/hook/download.go

@@ -6,13 +6,14 @@ import (
 	"compress/gzip"
 	"context"
 	"fmt"
-	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
 	"io"
 	"os"
 	"path"
 	"path/filepath"
 	"strings"
 
+	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
+
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl/selector"
@@ -146,7 +147,7 @@ func untarAll(reader io.Reader, destDir, prefix string, log logpkg.Logger) error
 			continue
 		}
 
-		if mode&os.ModeSymlink != 0 {
+		if mode&os.ModeSymlink == os.ModeSymlink {
 			if !symlinkWarningPrinted {
 				symlinkWarningPrinted = true
 				log.Warnf("warning: skipping symlink: %q -> %q\n", destFileName, header.Linkname)

pkg/devspace/hook/upload.go

@@ -4,13 +4,14 @@ import (
 	"archive/tar"
 	"compress/gzip"
 	"context"
-	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
-	"github.com/loft-sh/devspace/pkg/util/fsutil"
 	"io"
 	"os"
 	"path"
 	"path/filepath"
 
+	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
+	"github.com/loft-sh/devspace/pkg/util/fsutil"
+
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl/selector"
@@ -141,7 +142,7 @@ func recursiveTar(srcBase, srcFile, destBase, destFile string, tw *tar.Writer) e
 				}
 			}
 			return nil
-		} else if stat.Mode()&os.ModeSymlink != 0 {
+		} else if stat.Mode()&os.ModeSymlink == os.ModeSymlink {
 			//case soft link
 			hdr, _ := tar.FileInfoHeader(stat, fpath)
 			target, err := os.Readlink(fpath)

pkg/devspace/sync/evaluater.go

@@ -1,9 +1,10 @@
 package sync
 
 import (
+	"os"
+
 	"github.com/loft-sh/devspace/helper/remote"
 	"github.com/loft-sh/devspace/pkg/util/log"
-	"os"
 )
 
 // s.fileIndex needs to be locked before this function is called
@@ -132,7 +133,7 @@ func shouldRemoveLocal(absFilepath string, fileInformation *FileInformation, s *
 		}
 
 		return false
-	} else if stat.Mode()&os.ModeSymlink != 0 {
+	} else if stat.Mode()&os.ModeSymlink == os.ModeSymlink {
 		return true
 	}
 

pkg/devspace/sync/initial.go

@@ -236,7 +236,7 @@ func (i *initialSyncer) deltaState(remoteState map[string]*FileInformation, loca
 			delete(remoteState, relativePath)
 
 			// should this directory be added?
-			if !ignore && stat.Files == 0 {
+			if !ignore && stat.Files != 0 {
 				i.o.FileIndex.Lock()
 				action := i.decide(stat, strategy)
 				i.o.FileIndex.Unlock()
@@ -291,7 +291,7 @@ func (i *initialSyncer) CalculateLocalState(absPath string, localState map[strin
 	if !ignore {
 		// Retrieve the real stat instead of the symlink one
 		lstat, err := os.Lstat(absPath)
-		if err == nil && lstat.Mode()&os.ModeSymlink != 0 {
+		if err == nil && lstat.Mode()&os.ModeSymlink == os.ModeSymlink {
 			// Get real path
 			targetPath, err := filepath.EvalSymlinks(absPath)
 			if err != nil {
@@ -329,7 +329,7 @@ func (i *initialSyncer) CalculateLocalState(absPath string, localState map[strin
 			Size:           stat.Size(),
 			Mode:           stat.Mode(),
 			IsDirectory:    false,
-			IsSymbolicLink: stat.Mode()&os.ModeSymlink != 0,
+			IsSymbolicLink: stat.Mode()&os.ModeSymlink == os.ModeSymlink,
 			ResolvedLink:   isSymlink,
 		}
 	}
@@ -353,7 +353,7 @@ func (i *initialSyncer) calculateLocalDirState(absPath string, stat os.FileInfo,
 			Size:           stat.Size(),
 			Mode:           stat.Mode(),
 			IsDirectory:    true,
-			IsSymbolicLink: stat.Mode()&os.ModeSymlink != 0,
+			IsSymbolicLink: stat.Mode()&os.ModeSymlink == os.ModeSymlink,
 			ResolvedLink:   isSymlink,
 			Files:          len(files),
 		}

pkg/devspace/sync/tar.go

@@ -3,7 +3,6 @@ package sync
 import (
 	"archive/tar"
 	"compress/gzip"
-	"github.com/loft-sh/devspace/pkg/util/fsutil"
 	"io"
 	"os"
 	"path"
@@ -12,6 +11,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/loft-sh/devspace/pkg/util/fsutil"
+
 	"github.com/loft-sh/devspace/helper/server/ignoreparser"
 
 	"github.com/loft-sh/devspace/pkg/util/log"
@@ -376,7 +377,7 @@ func fillGo18FileTypeBits(mode int64, fi os.FileInfo) int64 {
 		mode |= modeISREG
 	case fi.IsDir():
 		mode |= modeISDIR
-	case fm&os.ModeSymlink != 0:
+	case fm&os.ModeSymlink == os.ModeSymlink:
 		mode |= modeISLNK
 	case fm&os.ModeDevice != 0:
 		if fm&os.ModeCharDevice != 0 {

pkg/devspace/sync/upstream.go

@@ -505,7 +505,7 @@ func (u *upstream) evaluateChange(relativePath, fullPath string) ([]*FileInforma
 	// if File / Folder does not exist, we create a new remove change
 	// Check if symbolic link
 	lstat, err := os.Lstat(fullPath)
-	if err == nil && lstat.Mode()&os.ModeSymlink != 0 {
+	if err == nil && lstat.Mode()&os.ModeSymlink == os.ModeSymlink {
 		_, symlinkExists := u.sync.upstream.symlinks[fullPath]
 
 		// Add symlink to map
@@ -539,7 +539,7 @@ func (u *upstream) evaluateChange(relativePath, fullPath string) ([]*FileInforma
 		Size:           stat.Size(),
 		Mode:           stat.Mode(),
 		IsDirectory:    stat.IsDir(),
-		IsSymbolicLink: stat.Mode()&os.ModeSymlink != 0,
+		IsSymbolicLink: stat.Mode()&os.ModeSymlink == os.ModeSymlink,
 	}
 
 	// should we upload the file?