mirror of
https://github.com/anchore/syft.git
synced 2026-06-17 17:58:26 +02:00
fix: catalog uv PEP 723 script lockfiles (*.py.lock) (#4950)
Signed-off-by: Kursat Topcuoglu <7313835+ktopcuoglu@users.noreply.github.com> Co-authored-by: Kursat Topcuoglu <7313835+ktopcuoglu@users.noreply.github.com>
This commit is contained in:
parent
6a27678036
commit
00ca43d24a
@ -113,6 +113,7 @@ catalogers:
|
|||||||
method: glob # AUTO-GENERATED
|
method: glob # AUTO-GENERATED
|
||||||
criteria: # AUTO-GENERATED
|
criteria: # AUTO-GENERATED
|
||||||
- '**/uv.lock'
|
- '**/uv.lock'
|
||||||
|
- '**/*.py.lock'
|
||||||
metadata_types: # AUTO-GENERATED
|
metadata_types: # AUTO-GENERATED
|
||||||
- pkg.PythonUvLockEntry
|
- pkg.PythonUvLockEntry
|
||||||
package_types: # AUTO-GENERATED
|
package_types: # AUTO-GENERATED
|
||||||
|
|||||||
@ -23,7 +23,10 @@ func NewPackageCataloger(cfg CatalogerConfig) pkg.Cataloger {
|
|||||||
WithParserByGlobs(poetryLockParser.parsePoetryLock, "**/poetry.lock").
|
WithParserByGlobs(poetryLockParser.parsePoetryLock, "**/poetry.lock").
|
||||||
WithParserByGlobs(pipfileLockParser.parsePipfileLock, "**/Pipfile.lock").
|
WithParserByGlobs(pipfileLockParser.parsePipfileLock, "**/Pipfile.lock").
|
||||||
WithParserByGlobs(setupFileParser.parseSetupFile, "**/setup.py").
|
WithParserByGlobs(setupFileParser.parseSetupFile, "**/setup.py").
|
||||||
WithParserByGlobs(uvLockParser.parseUvLock, "**/uv.lock").
|
// uv lock files are named "uv.lock", but PEP 723 script lock files
|
||||||
|
// (created by "uv lock --script <name>.py") are named "<name>.py.lock"
|
||||||
|
// and use the same format, so catalog both.
|
||||||
|
WithParserByGlobs(uvLockParser.parseUvLock, "**/uv.lock", "**/*.py.lock").
|
||||||
WithParserByGlobs(pdmLockParser.parsePdmLock, "**/pdm.lock")
|
WithParserByGlobs(pdmLockParser.parsePdmLock, "**/pdm.lock")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -501,6 +501,7 @@ func Test_IndexCataloger_Globs(t *testing.T) {
|
|||||||
"src/poetry.lock",
|
"src/poetry.lock",
|
||||||
"src/Pipfile.lock",
|
"src/Pipfile.lock",
|
||||||
"src/uv.lock",
|
"src/uv.lock",
|
||||||
|
"src/script.py.lock",
|
||||||
"src/pdm.lock",
|
"src/pdm.lock",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
1
syft/pkg/cataloger/python/testdata/glob-paths/src/script.py.lock
vendored
Normal file
1
syft/pkg/cataloger/python/testdata/glob-paths/src/script.py.lock
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
bogus
|
||||||
Loading…
x
Reference in New Issue
Block a user