oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-02-13 19:16:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix github-json output option (#967)

Browse Source 
* Fix "bad output format" for `github-json` output

Signed-off-by: Steven Maude <git@stevenmaude.co.uk>

* Update formats in README

Signed-off-by: Steven Maude <git@stevenmaude.co.uk>

* Run `make lint-fix`

Signed-off-by: Steven Maude <git@stevenmaude.co.uk>
This commit is contained in:
Steven Maude 2022-05-05 01:25:40 +01:00 committed by GitHub
parent ab289933da
commit 8b6c576d78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -160,6 +160,7 @@ Where the `formats` available are:
- `cyclonedx-json`: A JSON report conforming to the [CycloneDX 1.4 specification](https://cyclonedx.org/specification/overview/). - `cyclonedx-json`: A JSON report conforming to the [CycloneDX 1.4 specification](https://cyclonedx.org/specification/overview/).
- `spdx-tag-value`: A tag-value formatted report conforming to the [SPDX 2.2 specification](https://spdx.github.io/spdx-spec/). - `spdx-tag-value`: A tag-value formatted report conforming to the [SPDX 2.2 specification](https://spdx.github.io/spdx-spec/).
- `spdx-json`: A JSON report conforming to the [SPDX 2.2 JSON Schema](https://github.com/spdx/spdx-spec/blob/v2.2/schemas/spdx-schema.json). - `spdx-json`: A JSON report conforming to the [SPDX 2.2 JSON Schema](https://github.com/spdx/spdx-spec/blob/v2.2/schemas/spdx-schema.json).
- `github`: A JSON report conforming to GitHub's dependency snapshot format.
- `table`: A columnar summary (default). - `table`: A columnar summary (default).
#### Multiple outputs #### Multiple outputs

2
syft/formats.go
View File

@ -74,7 +74,7 @@ func FormatByName(name string) sbom.Format {
return FormatByID(cyclonedxxml.ID) return FormatByID(cyclonedxxml.ID)
case "cyclonedxjson": case "cyclonedxjson":
return FormatByID(cyclonedxjson.ID) return FormatByID(cyclonedxjson.ID)
case "github": case "github", "githubjson":
return FormatByID(github.ID) return FormatByID(github.ID)
case "spdx", "spdxtv", "spdxtagvalue": case "spdx", "spdxtv", "spdxtagvalue":
return FormatByID(spdx22tagvalue.ID) return FormatByID(spdx22tagvalue.ID)

12
syft/formats_test.go
View File

@ -8,6 +8,7 @@ import (
"github.com/anchore/syft/internal/formats/cyclonedxjson" "github.com/anchore/syft/internal/formats/cyclonedxjson"
"github.com/anchore/syft/internal/formats/cyclonedxxml" "github.com/anchore/syft/internal/formats/cyclonedxxml"
"github.com/anchore/syft/internal/formats/github"
"github.com/anchore/syft/internal/formats/spdx22json" "github.com/anchore/syft/internal/formats/spdx22json"
"github.com/anchore/syft/internal/formats/spdx22tagvalue" "github.com/anchore/syft/internal/formats/spdx22tagvalue"
"github.com/anchore/syft/internal/formats/syftjson" "github.com/anchore/syft/internal/formats/syftjson"
@ -169,6 +170,17 @@ func TestFormatByName(t *testing.T) {
name: "syft-json", name: "syft-json",
want: syftjson.ID, want: syftjson.ID,
}, },
// GitHub JSON
{
name: "github",
want: github.ID,
},
{
name: "github-json",
want: github.ID,
},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {