Merge pull request #1111 from Juneezee/refactor/simplify-fs-copycontents

openshift-merge-robot · web-flow · commit 305ff8966f5d · 2023-03-14T14:05:26.000-04:00
refactor(fs): simplify CopyContents
diff --git a/pkg/util/fs/fs.go b/pkg/util/fs/fs.go
@@ -287,12 +287,7 @@ func (h *fs) CopyContents(src, dest string, isIgnored func(path string) bool) (e
 	if err = os.MkdirAll(dest, sourceinfo.Mode()); err != nil {
 		return err
 	}
-	directory, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer directory.Close()
-	objects, err := directory.Readdir(-1)
+	objects, err := os.ReadDir(src)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -287,12 +287,7 @@ func (h *fs) CopyContents(src, dest string, isIgnored func(path string) bool) (e`
`287`	`287`	`if err = os.MkdirAll(dest, sourceinfo.Mode()); err != nil {`
`288`	`288`	`return err`
`289`	`289`	`}`
`290`		`- directory, err := os.Open(src)`
`291`		`- if err != nil {`
`292`		`- return err`
`293`		`- }`
`294`		`- defer directory.Close()`
`295`		`- objects, err := directory.Readdir(-1)`
	`290`	`+ objects, err := os.ReadDir(src)`
`296`	`291`	`if err != nil {`
`297`	`292`	`return err`
`298`	`293`	`}`