Fixes and tests for ingredientcall end-to-end #3575
Conversation
# Conflicts: # pkg/buildscript/unmarshal_buildexpression.go
| for _, glob := range globs { | ||
| files, err := filepath.Glob(glob) | ||
| files, err := doublestar.Glob(fs, glob) |
There was a problem hiding this comment.
filepath.Glob() does not support double star globs (ie. */**) nor specifying the working directory. This library addresses both limitations.
| // Ensure the overall hash is consistently calculated | ||
| sort.Slice(hashedFiles, func(i, j int) bool { return hashedFiles[i].Path < hashedFiles[j].Path }) | ||
| h := xxhash.New() | ||
| for _, f := range hashedFiles { | ||
| fmt.Fprintf(h, "%016x", f.Hash) | ||
| } |
There was a problem hiding this comment.
Changed it to calculate the overall hash based on a sorted slice of all the individual hashes for all files. This way we get the same hash even if the files are sorted differently, or more importantly (what I ran into); if the patterns are different but produce the same result.
internal/archiver/archiver.go
Outdated
| Target string | ||
| } | ||
|
|
||
| func CreateTgz(filepath string, fileMaps []FileMap) error { |
There was a problem hiding this comment.
Archiver supports creating archives, but its API is pointlessly convoluted. This package is just a wrapper that doesn't require us to write so much boilerplate just to create a simple archive.
| @@ -172,7 +175,8 @@ func unmarshalValue(path []string, valueInterface interface{}) (*value, error) { | |||
| result.List = &values | |||
|
|
|||
| case string: | |||
| if sliceutils.Contains(path, ctxIn) || strings.HasPrefix(v, "$") { | |||
| parentNode, hasParentNode := sliceutils.GetString(path, -2) | |||
| for _, fileMap := range fileMaps { | ||
| source := fileMap.Source | ||
| if !filepath.IsAbs(source) { | ||
| source = filepath.Join(workDir, source) |
There was a problem hiding this comment.
From reading the code in this file it's not clear to me why we're appending the source path to the workDir rather than just using the absolute path here.
There was a problem hiding this comment.
I don't follow, this is what is making the path absolute. Are you seeing another absolute path value that I can use?
There was a problem hiding this comment.
Ahh okay, maybe a comment on the FileMap struct would help here? I was expecting to see a call to filepath.Abs if the path isn't absolute but if that's how the file map is constructed it makes sense as well.
There was a problem hiding this comment.
filepath.Abs() I believe works with the working directory, which is a global so something we want to avoid. I'll add a comment to clarify. Fwiw the reason the paths are relative is to facilitate archiving, otherwise the archives also have absolute paths in them, ie. rather than having setup.py at the root of the archive it'd be at c:\Users\Runner~1\ etc. (oddly specific example that totally does not indicate I struggled with this..).
No description provided.