Skip to content

refactor: improve overlayFS errors #17808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 14, 2025
Merged

refactor: improve overlayFS errors #17808

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1f2c0d
refactor: improve overlayFS errors
aslilac May 13, 2025
20263c6
revert calls
aslilac May 13, 2025
d4206d3
use the fs package functions rather than methods
aslilac May 13, 2025
fdd6a43
🧖‍♀️
aslilac May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
🧖‍♀️
  • Loading branch information
@aslilac
aslilac committed May 13, 2025
commit fdd6a43d9809660f828c2545dd3e6d65cdaf8301
26 changes: 8 additions & 18 deletions coderd/files/overlay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,35 +27,25 @@ func NewOverlayFS(baseFS fs.FS, overlays []Overlay) fs.FS {
}
}

func (f overlayFS) Open(p string) (fs.File, error) {
func (f overlayFS) target(p string) fs.FS {
target := f.baseFS
for _, overlay := range f.overlays {
if strings.HasPrefix(path.Clean(p), overlay.Path) {
target = overlay.FS
break
}
}
return target.Open(p)
return target
}

func (f overlayFS) Open(p string) (fs.File, error) {
return f.target(p).Open(p)
}

func (f overlayFS) ReadDir(p string) ([]fs.DirEntry, error) {
target := f.baseFS
for _, overlay := range f.overlays {
if strings.HasPrefix(path.Clean(p), overlay.Path) {
target = overlay.FS
break
}
}
return fs.ReadDir(target, p)
return fs.ReadDir(f.target(p), p)
}

func (f overlayFS) ReadFile(p string) ([]byte, error) {
target := f.baseFS
for _, overlay := range f.overlays {
if strings.HasPrefix(path.Clean(p), overlay.Path) {
target = overlay.FS
break
}
}
return fs.ReadFile(target, p)
return fs.ReadFile(f.target(p), p)
}
Loading