kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #1979 from marcosnils/fix/fs_read_file

Browse Source 
Fixes hang errors when incorrectly using files as  dagger.#FS on client filesystem
This commit is contained in:
Marcos Nils
2022-04-01 15:17:50 -03:00
committed by GitHub
parent b482c19b7c 7ffbef33b5
commit d00fbff9d5
4 changed files with 61 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plan/task/clientfilesystemread.go
View File

@@ -18,8 +18,7 @@ func init() {
Register("ClientFilesystemRead", func() Task { return &clientFilesystemReadTask{} })
}
type clientFilesystemReadTask struct {
}
type clientFilesystemReadTask struct{}
func (t clientFilesystemReadTask) PreRun(_ context.Context, pctx *plancontext.Context, v *compiler.Value) error {
path, err := t.parsePath(v)
@@ -27,8 +26,15 @@ func (t clientFilesystemReadTask) PreRun(_ context.Context, pctx *plancontext.Co
return err
}
if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
isFS := plancontext.IsFSValue(v.Lookup("contents"))
switch pi, err := os.Stat(path); {
case errors.Is(err, os.ErrNotExist):
return fmt.Errorf("path %q does not exist", path)
case !pi.IsDir() && isFS:
return fmt.Errorf("path %q is not a directory", path)
case pi.IsDir() && !isFS:
return fmt.Errorf("path %q cannot be a directory", path)
}
if plancontext.IsFSValue(v.Lookup("contents")) {