Move fs.AbsolutePath to turbopath.AbsolutePath
#1779
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@nathanhammond is attempting to deploy a commit to the Vercel Team on Vercel. A member of the Team first needs to authorize it. |
nathanhammond
commented
Aug 26, 2022
Comment on lines
+11
to
+52
| // dirPermissions are the default permission bits we apply to directories. | ||
| const dirPermissions = os.ModeDir | 0775 | ||
|
|
||
| // ensureDir ensures that the directory of the given file has been created. | ||
| func ensureDir(filename string) error { | ||
| dir := filepath.Dir(filename) | ||
| err := os.MkdirAll(dir, dirPermissions) | ||
| if err != nil && fileExists(dir) { | ||
| // It looks like this is a file and not a directory. Attempt to remove it; this can | ||
| // happen in some cases if you change a rule from outputting a file to a directory. | ||
| log.Printf("Attempting to remove file %s; a subdirectory is required", dir) | ||
| if err2 := os.Remove(dir); err2 == nil { | ||
| err = os.MkdirAll(dir, dirPermissions) | ||
| } else { | ||
| return err | ||
| } | ||
| } | ||
| return err | ||
| } | ||
|
|
||
| var nonRelativeSentinel string = ".." + string(filepath.Separator) | ||
|
|
||
| // dirContainsPath returns true if the path 'target' is contained within 'dir' | ||
| // Expects both paths to be absolute and does not verify that either path exists. | ||
| func dirContainsPath(dir string, target string) (bool, error) { | ||
| // In Go, filepath.Rel can return a path that starts with "../" or equivalent. | ||
| // Checking filesystem-level contains can get extremely complicated | ||
| // (see https://github.com/golang/dep/blob/f13583b555deaa6742f141a9c1185af947720d60/internal/fs/fs.go#L33) | ||
| // As a compromise, rely on the stdlib to generate a relative path and then check | ||
| // if the first step is "../". | ||
| rel, err := filepath.Rel(dir, target) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
| return !strings.HasPrefix(rel, nonRelativeSentinel), nil | ||
| } | ||
|
|
||
| // fileExists returns true if the given path exists and is a file. | ||
| func fileExists(filename string) bool { | ||
| info, err := os.Lstat(filename) | ||
| return err == nil && !info.IsDir() | ||
| } |
There was a problem hiding this comment.
These are duplicated utils from fs/fs.go (with the caveat of being unexported). They will be cleaned up in a followup PR.
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
gsoltis
approved these changes
Aug 26, 2022
mehulkar
approved these changes
Aug 26, 2022
There isn't one. That's next step. |
f730a37 to
dc93689
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR does a few things:
fs.AbsolutePathtoturbopath.AbsolutePath.fsintoturbopath/absolute_path.goto prevent cycles. These will be removed in a followup commit.\b(fs\.)?AbsolutePath\b=>turbopath.AbsolutePath. (excluding the turbopath folder)The goal here is to make what are sweeping changes to the codebase still feel as incremental as possible. The next increment is
turbopath.AbsolutePathtoturbopath.AbsoluteSystemPathby combining the files and fixing the expectations of method calls throughout the codebase.