Merge pull request #48672 from dixudx/resolve_hard_coded_path_sep_atomic

Automatic merge from submit-queue (batch tested with PRs 48672, 47140, 48709, 48786, 48757) use built-in path separator instead of hard coded **What this PR does / why we need it**: We should use built-in path separator to avoid hard coded strings. **Which issue this PR fixes** : **Special notes for your reviewer**: **Release note**: ```release-note None ```

Merge pull request #48672 from dixudx/resolve_hard_coded_path_sep_atomic
65b48aae · Kubernetes Submit Queue · GitHub · 8e5584fe · a76ccf5a · 65b48aae
Commit 65b48aae authored Jul 12, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 7 deletions

atomic_writer.go pkg/volume/util/atomic_writer.go +3 -7

No files found.
--- a/pkg/volume/util/atomic_writer.go
+++ b/pkg/volume/util/atomic_writer.go
@@ -311,11 +311,7 @@ func (w *AtomicWriter) pathsToRemove(payload map[string]FileProjection) (sets.St
 		}

 		relativePath := strings.TrimPrefix(path, w.targetDir)
-		if runtime.GOOS == "windows" {
-			relativePath = strings.TrimPrefix(relativePath, "\\")
-		} else {
-			relativePath = strings.TrimPrefix(relativePath, "/")
-		}
+		relativePath = strings.TrimPrefix(relativePath, string(os.PathSeparator))
 		if strings.HasPrefix(relativePath, "..") {
 			return nil
 		}
@@ -339,7 +335,7 @@ func (w *AtomicWriter) pathsToRemove(payload map[string]FileProjection) (sets.St
 		for subPath := file; subPath != ""; {
 			newPaths.Insert(subPath)
 			subPath, _ = filepath.Split(subPath)
-			subPath = strings.TrimSuffix(subPath, "/")
+			subPath = strings.TrimSuffix(subPath, string(os.PathSeparator))
 		}
 	}
 	glog.V(5).Infof("%s: new paths:       %+v", w.targetDir, newPaths.List())
@@ -424,7 +420,7 @@ func (w *AtomicWriter) createUserVisibleFiles(payload map[string]FileProjection)
 			// Since filepath.Split leaves a trailing path separator, in this
 			// example, dir = "foo/".  In order to calculate the number of
 			// subdirectories, we must subtract 1 from the number returned by split.
-			subDirs = len(strings.Split(dir, "/")) - 1
+			subDirs = len(strings.Split(dir, string(os.PathSeparator))) - 1
 			err := os.MkdirAll(path.Join(w.targetDir, dir), os.ModePerm)
 			if err != nil {
 				return err