oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-18 17:03:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix linting issue

Browse Source
This commit is contained in:
Alex Goodman 2020-07-10 07:45:13 -04:00
parent 15ff94b56b
commit 502e2afd06
No known key found for this signature in database
GPG Key ID: 86E2870463D5E890
2 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
imgbom/cataloger/java/java_manifest.go
View File

@ -66,6 +66,42 @@ func parseJavaManifest(reader io.Reader) (*pkg.JavaManifest, error) {
return &manifest, nil
}
func selectName(manifest *pkg.JavaManifest, filenameObj archiveFilename) string {
var name string
switch {
case filenameObj.name() != "":
name = filenameObj.name()
case manifest.Name != "":
// Manifest original spec...
name = manifest.Name
case manifest.Extra["Bundle-Name"] != "":
// BND tooling...
name = manifest.Extra["Bundle-Name"]
case manifest.Extra["Short-Name"] != "":
// Jenkins...
name = manifest.Extra["Short-Name"]
case manifest.Extra["Extension-Name"] != "":
// Jenkins...
name = manifest.Extra["Extension-Name"]
}
return name
}
func selectVersion(manifest *pkg.JavaManifest, filenameObj archiveFilename) string {
var version string
switch {
case manifest.ImplVersion != "":
version = manifest.ImplVersion
case filenameObj.version() != "":
version = filenameObj.version()
case manifest.SpecVersion != "":
version = manifest.SpecVersion
case manifest.Extra["Plugin-Version"] != "":
version = manifest.Extra["Plugin-Version"]
}
return version
}
func newPackageFromJavaManifest(virtualPath, archivePath string, fileManifest file.ZipManifest) (*pkg.Package, error) {
// search and parse java manifest files
manifestMatches := fileManifest.GlobMatch(manifestPath)
@ -91,39 +127,9 @@ func newPackageFromJavaManifest(virtualPath, archivePath string, fileManifest fi
filenameObj := newJavaArchiveFilename(virtualPath)
var name string
switch {
case filenameObj.name() != "":
name = filenameObj.name()
case manifest.Name != "":
// Manifest original spec...
name = manifest.Name
case manifest.Extra["Bundle-Name"] != "":
// BND tooling...
name = manifest.Extra["Bundle-Name"]
case manifest.Extra["Short-Name"] != "":
// Jenkins...
name = manifest.Extra["Short-Name"]
case manifest.Extra["Extension-Name"] != "":
// Jenkins...
name = manifest.Extra["Extension-Name"]
}
var version string
switch {
case manifest.ImplVersion != "":
version = manifest.ImplVersion
case filenameObj.version() != "":
version = filenameObj.version()
case manifest.SpecVersion != "":
version = manifest.SpecVersion
case manifest.Extra["Plugin-Version"] != "":
name = manifest.Extra["Plugin-Version"]
}
return &pkg.Package{
Name: name,
Version: version,
Name: selectName(manifest, filenameObj),
Version: selectVersion(manifest, filenameObj),
Language: pkg.Java,
Metadata: pkg.JavaMetadata{
Manifest: manifest,

2
imgbom/cataloger/java/java_manifest_test.go
View File

@ -58,7 +58,7 @@ func TestParseJavaManifest(t *testing.T) {
fixture: "test-fixtures/manifest/version-with-date",
expected: pkg.JavaManifest{
ManifestVersion: "1.0",
ImplVersion: "1.3", // ensure the date is stripped off during processing
ImplVersion: "1.3", // ensure the date is stripped off during processing
},
},
}