Skip to content
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

Do not prepend paths starting with ~ or variable reference #1905

Merged
merged 3 commits into from
Nov 15, 2024
Merged

Do not prepend paths starting with ~ or variable reference #1905

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a84a92a
Do not prepend paths starting with ~ or variable reference
andrewnester Nov 15, 2024
e82f5a5
fix
andrewnester Nov 15, 2024
66afae2
fix
andrewnester Nov 15, 2024
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
5 changes: 5 additions & 0 deletions bundle/config/mutator/prepend_workspace_prefix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ func (m *prependWorkspacePrefix) Apply(ctx context.Context, b *bundle.Bundle) di
}

for _, prefix := range skipPrefixes {
// Skip prefixing if the path does not start with /, it might be variable reference or smth else.
if !strings.HasPrefix(path, "/") {
return pv, nil
}

andrewnester marked this conversation as resolved.
Show resolved Hide resolved
if strings.HasPrefix(path, prefix) {
return pv, nil
}
Expand Down
8 changes: 8 additions & 0 deletions bundle/config/mutator/prepend_workspace_prefix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ func TestPrependWorkspacePrefix(t *testing.T) {
path: "/Volumes/Users/test",
expected: "/Volumes/Users/test",
},
{
path: "~/test",
expected: "~/test",
},
{
path: "${workspace.file_path}/test",
expected: "${workspace.file_path}/test",
},
}

for _, tc := range testCases {
Expand Down
Loading