knative
/
func
mirror of https://github.com/knative/func.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: repo add skips root (#1577)

This commit is contained in:
Luke Kingland 2023-02-22 05:40:27 +09:00 committed by GitHub
parent 726b566f83
commit 91c95a711e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/filesystem/filesystem.go
View File

@ -252,18 +252,14 @@ func (m maskingFS) Readlink(link string) (string, error) {
// CopyFromFS copies files from the `src` dir on the accessor Filesystem to local filesystem into `dest` dir. // CopyFromFS copies files from the `src` dir on the accessor Filesystem to local filesystem into `dest` dir.
// The src path uses slashes as their separator. // The src path uses slashes as their separator.
// The dest path uses OS specific separator. // The dest path uses OS specific separator.
func CopyFromFS(src, dest string, accessor Filesystem) (err error) { func CopyFromFS(root, dest string, fsys Filesystem) (err error) {
// Walks the filesystem rooted at root.
return fs.WalkDir(accessor, src, func(path string, de fs.DirEntry, err error) error { return fs.WalkDir(fsys, root, func(path string, de fs.DirEntry, err error) error {
if err != nil { if err != nil {
return err return err
} }
if path == src { p, err := filepath.Rel(filepath.FromSlash(root), filepath.FromSlash(path))
return nil
}
p, err := filepath.Rel(filepath.FromSlash(src), filepath.FromSlash(path))
if err != nil { if err != nil {
return err return err
} }
@ -280,7 +276,7 @@ func CopyFromFS(src, dest string, accessor Filesystem) (err error) {
return os.MkdirAll(dest, 0755) return os.MkdirAll(dest, 0755)
case de.Type()&fs.ModeSymlink != 0: case de.Type()&fs.ModeSymlink != 0:
var symlinkTarget string var symlinkTarget string
symlinkTarget, err = accessor.Readlink(path) symlinkTarget, err = fsys.Readlink(path)
if err != nil { if err != nil {
return err return err
} }
@ -296,7 +292,7 @@ func CopyFromFS(src, dest string, accessor Filesystem) (err error) {
} }
defer destFile.Close() defer destFile.Close()
srcFile, err := accessor.Open(path) srcFile, err := fsys.Open(path)
if err != nil { if err != nil {
return err return err
} }

4
pkg/functions/repository.go
View File

@ -498,7 +498,7 @@ func (r *Repository) Runtime(name string) (runtime Runtime, err error) {
} }
// Write all files in the repository to the given path. // Write all files in the repository to the given path.
func (r *Repository) Write(path string) (err error) { func (r *Repository) Write(dest string) (err error) {
if r.fs == nil { if r.fs == nil {
return errors.New("the write operation is not supported on this repo") return errors.New("the write operation is not supported on this repo")
} }
@ -533,7 +533,7 @@ func (r *Repository) Write(path string) (err error) {
} }
fs = filesystem.NewBillyFilesystem(wt.Filesystem) fs = filesystem.NewBillyFilesystem(wt.Filesystem)
} }
return filesystem.CopyFromFS(".", path, fs) return filesystem.CopyFromFS(".", dest, fs)
} }
// URL attempts to read the remote git origin URL of the repository. Best // URL attempts to read the remote git origin URL of the repository. Best