internal/gps: update stripVendor functions

Signed-off-by: Ibrahim AshShohail <[email protected]>

Author: ibrasho

internal/gps/prune.go

@@ -218,11 +218,7 @@ func pruneNonGoFiles(baseDir string, logger *log.Logger) error {
 		return errors.Wrap(err, "could not prune non-Go files")
 	}
 
-	if err := deleteFiles(files); err != nil {
-		return err
-	}
-
-	return nil
+	return deleteFiles(files)
 }
 
 // calculateNonGoFiles returns a list of all non-Go files within baseDir.
@@ -283,11 +279,7 @@ func pruneGoTestFiles(baseDir string, logger *log.Logger) error {
 		return errors.Wrap(err, "could not prune Go test files")
 	}
 
-	if err := deleteFiles(files); err != nil {
-		return err
-	}
-
-	return nil
+	return deleteFiles(files)
 }
 
 // calculateGoTestFiles walks over baseDir and returns a list of all

internal/gps/strip_vendor.go

@@ -16,29 +16,27 @@ func stripVendor(path string, info os.FileInfo, err error) error {
 		return err
 	}
 
-	if info.Name() == "vendor" {
-		if _, err := os.Lstat(path); err != nil {
+	// Skip anything not named vendor
+	if info.Name() != "vendor" {
+		return nil
+	}
+
+	// If the file is a symlink to a directory, delete the symlink.
+	if (info.Mode() & os.ModeSymlink) != 0 {
+		realInfo, err := os.Stat(path)
+		if err != nil {
 			return err
 		}
-
-		if (info.Mode() & os.ModeSymlink) != 0 {
-			realInfo, err := os.Stat(path)
-			if err != nil {
-				return err
-			}
-			if realInfo.IsDir() {
-				return os.Remove(path)
-			}
+		if realInfo.IsDir() {
+			return os.Remove(path)
 		}
+	}
 
-		if info.IsDir() {
-			if err := removeAll(path); err != nil {
-				return err
-			}
-			return filepath.SkipDir
+	if info.IsDir() {
+		if err := removeAll(path); err != nil {
+			return err
 		}
-
-		return nil
+		return filepath.SkipDir
 	}
 
 	return nil

internal/gps/strip_vendor_windows.go

@@ -14,38 +14,38 @@ func stripVendor(path string, info os.FileInfo, err error) error {
 		return err
 	}
 
-	if info.Name() == "vendor" {
-		if _, err := os.Lstat(path); err == nil {
-			symlink := (info.Mode() & os.ModeSymlink) != 0
-			dir := info.IsDir()
-
-			switch {
-			case symlink && dir:
-				// This could be a windows junction directory. Support for these in the
-				// standard library is spotty, and we could easily delete an important
-				// folder if we called os.Remove or os.RemoveAll. Just skip these.
-				//
-				// TODO: If we could distinguish between junctions and Windows symlinks,
-				// we might be able to safely delete symlinks, even though junctions are
-				// dangerous.
-				return filepath.SkipDir
-
-			case symlink:
-				realInfo, err := os.Stat(path)
-				if err != nil {
-					return err
-				}
-				if realInfo.IsDir() {
-					return os.Remove(path)
-				}
-
-			case dir:
-				if err := removeAll(path); err != nil {
-					return err
-				}
-				return filepath.SkipDir
-			}
+	if info.Name() != "vendor" {
+		return nil
+	}
+
+	symlink := (info.Mode() & os.ModeSymlink) != 0
+	dir := info.IsDir()
+
+	switch {
+	case symlink && dir:
+		// This could be a windows junction directory. Support for these in the
+		// standard library is spotty, and we could easily delete an important
+		// folder if we called os.Remove or os.RemoveAll. Just skip these.
+		//
+		// TODO: If we could distinguish between junctions and Windows symlinks,
+		// we might be able to safely delete symlinks, even though junctions are
+		// dangerous.
+		return filepath.SkipDir
+
+	case symlink:
+		realInfo, err := os.Stat(path)
+		if err != nil {
+			return err
+		}
+		if realInfo.IsDir() {
+			return os.Remove(path)
+		}
+
+	case dir:
+		if err := removeAll(path); err != nil {
+			return err
 		}
+		return filepath.SkipDir
 	}
 
 	return nil