-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Benji Visser <[email protected]>
- Loading branch information
Showing
4 changed files
with
101 additions
and
100 deletions.
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
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 |
|---|---|---|
|
|
@@ -73,54 +73,56 @@ func addPython34Matches(t *testing.T, theResult *match.Matches) { | |
| Eol: "2020-09-13", | ||
| }, | ||
| }) | ||
| theResult.Add(match.Match{ | ||
| Package: pkg.Package{ | ||
| Name: "python", | ||
| ID: "5f9c938f5ff241bf", | ||
| Version: "3.4.10", | ||
| Type: syftPkg.BinaryPkg, | ||
| Language: "", | ||
| PURL: "pkg:generic/[email protected]", | ||
| }, | ||
| Cycle: eol.Cycle{ | ||
| ProductName: "Python", | ||
| ReleaseCycle: "3.4", | ||
| Eol: "2019-03-18", | ||
| }, | ||
| }) | ||
| theResult.Add(match.Match{ | ||
| Package: pkg.Package{ | ||
| Name: "python", | ||
| ID: "2ba17cf1680ce4f2", | ||
| Version: "2.7.13", | ||
| Type: syftPkg.BinaryPkg, | ||
| Language: "", | ||
| PURL: "pkg:generic/[email protected]", | ||
| }, | ||
| Cycle: eol.Cycle{ | ||
| ProductName: "Python", | ||
| ReleaseCycle: "2.7", | ||
| Eol: "2020-01-01", | ||
| }, | ||
| }) | ||
| // TODO: tracking issue https://github.com/anchore/syft/issues/2153 | ||
| // theResult.Add(match.Match{ | ||
| // Package: pkg.Package{ | ||
| // Name: "python", | ||
| // ID: "5f9c938f5ff241bf", | ||
| // Version: "3.4.10", | ||
| // Type: syftPkg.BinaryPkg, | ||
| // Language: "", | ||
| // PURL: "pkg:generic/[email protected]", | ||
| // }, | ||
| // Cycle: eol.Cycle{ | ||
| // ProductName: "Python", | ||
| // ReleaseCycle: "3.4", | ||
| // Eol: "2019-03-18", | ||
| // }, | ||
| // }) | ||
| // theResult.Add(match.Match{ | ||
| // Package: pkg.Package{ | ||
| // Name: "python", | ||
| // ID: "2ba17cf1680ce4f2", | ||
| // Version: "2.7.13", | ||
| // Type: syftPkg.BinaryPkg, | ||
| // Language: "", | ||
| // PURL: "pkg:generic/[email protected]", | ||
| // }, | ||
| // Cycle: eol.Cycle{ | ||
| // ProductName: "Python", | ||
| // ReleaseCycle: "2.7", | ||
| // Eol: "2020-01-01", | ||
| // }, | ||
| // }) | ||
| } | ||
|
|
||
| func addGolang115Matches(t *testing.T, theResult *match.Matches) { | ||
| theResult.Add(match.Match{ | ||
| Package: pkg.Package{ | ||
| Name: "python", | ||
| ID: "2ba17cf1680ce4f2", | ||
| Version: "2.7.16", | ||
| Type: syftPkg.BinaryPkg, | ||
| Language: "", | ||
| PURL: "pkg:generic/[email protected]", | ||
| }, | ||
| Cycle: eol.Cycle{ | ||
| ProductName: "Python", | ||
| ReleaseCycle: "2.7", | ||
| Eol: "2020-01-01", | ||
| }, | ||
| }) | ||
| // TODO: tracking issue https://github.com/anchore/syft/issues/2153 | ||
| // theResult.Add(match.Match{ | ||
| // Package: pkg.Package{ | ||
| // Name: "python", | ||
| // ID: "2ba17cf1680ce4f2", | ||
| // Version: "2.7.16", | ||
| // Type: syftPkg.BinaryPkg, | ||
| // Language: "", | ||
| // PURL: "pkg:generic/[email protected]", | ||
| // }, | ||
| // Cycle: eol.Cycle{ | ||
| // ProductName: "Python", | ||
| // ReleaseCycle: "2.7", | ||
| // Eol: "2020-01-01", | ||
| // }, | ||
| // }) | ||
| theResult.Add(match.Match{ | ||
| Package: pkg.Package{ | ||
| Name: "go", | ||
|
|
@@ -148,30 +150,30 @@ func addPostgres9Matches(t *testing.T, theResult *match.Matches) { | |
| PURL: "pkg:deb/debian/[email protected]+1?arch=amd64&distro=debian-9", | ||
| }, | ||
| Cycle: eol.Cycle{ | ||
| ProductName: "PostgreSQL", | ||
|
|
||
| ProductName: "PostgreSQL", | ||
| ReleaseCycle: "9.6", | ||
| Eol: "2021-11-11", | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func addElaticsearch6Matches(t *testing.T, theResult *match.Matches) { | ||
| theResult.Add(match.Match{ | ||
| Package: pkg.Package{ | ||
| Name: "python", | ||
| ID: "2ba17cf1680ce4f2", | ||
| Version: "2.7.5", | ||
| Type: syftPkg.BinaryPkg, | ||
| Language: "", | ||
| PURL: "pkg:generic/[email protected]", | ||
| }, | ||
| Cycle: eol.Cycle{ | ||
| ProductName: "Python", | ||
| ReleaseCycle: "2.7", | ||
| Eol: "2020-01-01", | ||
| }, | ||
| }) | ||
| // TODO: tracking issue https://github.com/anchore/syft/issues/2153 | ||
| // theResult.Add(match.Match{ | ||
| // Package: pkg.Package{ | ||
| // Name: "python", | ||
| // ID: "2ba17cf1680ce4f2", | ||
| // Version: "2.7.5", | ||
| // Type: syftPkg.BinaryPkg, | ||
| // Language: "", | ||
| // PURL: "pkg:generic/[email protected]", | ||
| // }, | ||
| // Cycle: eol.Cycle{ | ||
| // ProductName: "Python", | ||
| // ReleaseCycle: "2.7", | ||
| // Eol: "2020-01-01", | ||
| // }, | ||
| // }) | ||
| theResult.Add(match.Match{ | ||
| Package: pkg.Package{ | ||
| Name: "elasticsearch", | ||
|
|
@@ -238,21 +240,22 @@ func addFedora29Matches(t *testing.T, theResult *match.Matches) { | |
| Eol: "2019-11-26", | ||
| }, | ||
| }) | ||
| theResult.Add(match.Match{ | ||
| Package: pkg.Package{ | ||
| Name: "python", | ||
| ID: "2ba17cf1680ce4f2", | ||
| Version: "3.7.2", | ||
| Type: syftPkg.BinaryPkg, | ||
| Language: "", | ||
| PURL: "pkg:generic/[email protected]", | ||
| }, | ||
| Cycle: eol.Cycle{ | ||
| ProductName: "Python", | ||
| ReleaseCycle: "3.7", | ||
| Eol: "2023-06-27", | ||
| }, | ||
| }) | ||
| // requires this PR to be merged first https://github.com/endoflife-date/endoflife.date/pull/3570 | ||
| // theResult.Add(match.Match{ | ||
| // Package: pkg.Package{ | ||
| // Name: "python", | ||
| // ID: "2ba17cf1680ce4f2", | ||
| // Version: "3.7.2", | ||
| // Type: syftPkg.BinaryPkg, | ||
| // Language: "", | ||
| // PURL: "pkg:generic/[email protected]", | ||
| // }, | ||
| // Cycle: eol.Cycle{ | ||
| // ProductName: "Python", | ||
| // ReleaseCycle: "3.7", | ||
| // Eol: "2023-06-27", | ||
| // }, | ||
| // }) | ||
| } | ||
|
|
||
| func TestMatchByImage(t *testing.T) { | ||
|
|
||