Uh oh!
There was an error while loading. Please reload this page.
Fix a bug in artifacts where glob was applied on non-abs path - #2540
Merged
Conversation
denik
requested review from
andrewnester, anton-107, pietern and shreyas-goenka
as code ownersMarch 20, 2025 15:58
denikforce-pushed
the
denik/artifacts-double-test
branch
from
March 20, 2025 15:59
f5d4b5f to
bcc702bComparedenikforce-pushed
the
denik/artifacts-double-test
branch
from
March 20, 2025 16:01
bcc702b to
1a8dc5dComparedenik
enabled auto-merge
March 20, 2025 16:34
| cmdio.LogString(ctx, fmt.Sprintf("Uploading %s...", relPath)) | ||
| cmdio.LogString(ctx, fmt.Sprintf("Uploading %s...", source)) | ||
| errs.Go(func() error { | ||
| return UploadFile(errCtx, source, u.client) |
Contributor
There was a problem hiding this comment.
Before UploadFile was taking absolute path if I'm not mistaken and now it takes normalised one (relative + forward slashes). How does it make UploadFile open the file later for upload?
| func (b *Bundle) NormalizePath(path string) (string, error) { | ||
| var err error | ||
| if filepath.IsAbs(path) { |
Contributor
There was a problem hiding this comment.
Not entirely sure about making absolute paths relative ones. Some of the code (like UploadFile for artifacts or some dashboard code later) relies on such paths to be absolute
Bug introduced in #2526.
denik
marked this pull request as draft
March 20, 2025 21:01
auto-merge was automatically disabled
March 20, 2025 21:01
Pull request was converted to draft
denikforce-pushed
the
denik/artifacts-double-test
branch
from
March 20, 2025 21:42
585171b to
2e1ba04Comparedenik
marked this pull request as ready for review
March 21, 2025 09:32
| } | ||
| func expandGlobs(ctx context.Context, b *bundle.Bundle, name string) diag.Diagnostics { | ||
| err := b.Config.MarkMutatorEntry(ctx) |
Contributor
There was a problem hiding this comment.
Why not just make it a mutator again and rely on bundle.Apply? What's the benefit of having function like this now?
andrewnester
approved these changes
Mar 21, 2025
pietern
reviewed
Mar 25, 2025
| my_prebuilt_whl: | ||
| type: whl | ||
| files: | ||
| - source: prebuilt/other_test_code-0.0.1-py3-none-any.whl |
| @@ -0,0 +1,6 @@ | |||
| Badness = 'Uploading the same wheel twice' | |||
Contributor
There was a problem hiding this comment.
I don't see this in the output.
ContributorAuthor
There was a problem hiding this comment.
Good catch, seems like I copy-pasted test.toml. #2559
denik added a commit
that referenced
this pull request
May 20, 2026
## Changes Bug introduced in #2526. When calling expandGlobs as a function without mutator entry/exit copy, we did not copy typed structure into dynamic structure. Thus expandGlobs saw an old version of config, without absolute paths introduced by code before it. Since it calls filepath.Glob which depends on CWD, it stopped doing the matching. ## Tests New regression test to catch this issues.
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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Changes
Bug introduced in #2526.
When calling expandGlobs as a function without mutator entry/exit copy, we did not copy typed structure into dynamic structure. Thus expandGlobs saw an old version of config, without absolute paths introduced by code before it. Since it calls filepath.Glob which depends on CWD, it stopped doing the matching.
Tests
New regression test to catch this issues.