-
Notifications
You must be signed in to change notification settings - Fork 511
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: trim path from deps.json in portable way (#2674)
* fix: trim path from deps.json in portable way Previously, the path trimming regex would leave leading path separator in place on Windows. Probably a better long term fix is to a library path operation. Signed-off-by: Will Murphy <will.murphy@anchore.com>
- Loading branch information
1 parent
5ef83fd
commit 3ad91f2
Showing
2 changed files
with
41 additions
and
1 deletion.
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
package dotnet | ||
|
||
import ( | ||
"github.com/stretchr/testify/assert" | ||
"testing" | ||
) | ||
|
||
func Test_getDepsJSONFilePrefix(t *testing.T) { | ||
tests := []struct { | ||
name string | ||
path string | ||
want string | ||
}{ | ||
{ | ||
name: "windows-style full path", | ||
path: `C:\Code\Projects\My-Project\My.Rest.Project.deps.json`, | ||
want: "My.Rest.Project", | ||
}, | ||
{ | ||
name: "leading backslash", | ||
path: `\My.Project.deps.json`, | ||
want: "My.Project", | ||
}, | ||
{ | ||
name: "unix-style path with lots of prefixes", | ||
path: "/my/cool/project/cool-project.deps.json", | ||
want: "cool-project", | ||
}, | ||
{ | ||
name: "unix-style relative path", | ||
path: "cool-project/my-dotnet-project.deps.json", | ||
want: "my-dotnet-project", | ||
}, | ||
} | ||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
assert.Equalf(t, tt.want, getDepsJSONFilePrefix(tt.path), "getDepsJSONFilePrefix(%v)", tt.path) | ||
}) | ||
} | ||
} |