Skip to content

fix: SPDX license values and download location#2007

Merged
kzantow merged 3 commits into
mainfrom
fix/spdx-license-values
Aug 8, 2023
Merged

fix: SPDX license values and download location#2007
kzantow merged 3 commits into
mainfrom
fix/spdx-license-values

Conversation

@kzantow
Copy link
Copy Markdown
Contributor

@kzantow kzantow commented Aug 8, 2023

I noticed that we are using parts of the LicenseRef- ID for the other license value, which has had unsupported SPDXID characters swapped to dashes. This PR corrects that issue as well as an omitted PackageDownloadLocation, which was producing invalid SPDX documents. Additionally, this enables the SPDX tool validator failures to fail CLI tests.

kzantow added 2 commits August 8, 2023 13:05
Signed-off-by: Keith Zantow <kzantow@gmail.com>
Signed-off-by: Keith Zantow <kzantow@gmail.com>
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Aug 8, 2023

Benchmark Test Results

Benchmark results from the latest changes vs base branch
goos: linux%0Agoarch: amd64%0Apkg: github.com/anchore/syft/test/integration%0Acpu: Intel(R) Xeon(R) Platinum 8370C CPU @ 2.80GHz%0A                                                              │ ./.tmp/benchmark-e15aa08.txt │%0A                                                              │            sec/op            │%0AImagePackageCatalogers/alpmdb-cataloger-2                                       12.19m ±  1%25%0AImagePackageCatalogers/apkdb-cataloger-2                                        670.6µ ±  2%25%0AImagePackageCatalogers/binary-cataloger-2                                       206.9µ ±  1%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                       571.8µ ±  2%25%0AImagePackageCatalogers/dotnet-portable-executable-cataloger-2                   20.89µ ±  1%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                             93.58µ ±  1%25%0AImagePackageCatalogers/java-cataloger-2                                         13.26m ±  1%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                         91.15µ ± 13%25%0AImagePackageCatalogers/javascript-package-cataloger-2                           351.6µ ±  1%25%0AImagePackageCatalogers/nix-store-cataloger-2                                    256.7µ ±  2%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                       748.2µ ±  2%25%0AImagePackageCatalogers/portage-cataloger-2                                      426.3µ ±  2%25%0AImagePackageCatalogers/python-package-cataloger-2                               3.231m ±  1%25%0AImagePackageCatalogers/r-package-cataloger-2                                    180.1µ ±  1%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                       492.5µ ±  2%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                                 850.0µ ±  2%25%0AImagePackageCatalogers/sbom-cataloger-2                                         116.6µ ±  1%25%0Ageomean                                                                         460.3µ%0A%0A                                                              │ ./.tmp/benchmark-e15aa08.txt │%0A                                                              │             B/op             │%0AImagePackageCatalogers/alpmdb-cataloger-2                                       5.144Mi ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                        205.2Ki ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                       30.53Ki ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                       172.7Ki ± 0%25%0AImagePackageCatalogers/dotnet-portable-executable-cataloger-2                   3.697Ki ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                             9.906Ki ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                         2.845Mi ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                         8.594Ki ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                           94.30Ki ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                    49.33Ki ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                       186.4Ki ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                      120.2Ki ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                               1.004Mi ± 0%25%0AImagePackageCatalogers/r-package-cataloger-2                                    53.30Ki ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                       181.5Ki ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                                 144.2Ki ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                         14.21Ki ± 0%25%0Ageomean                                                                         100.6Ki%0A%0A                                                              │ ./.tmp/benchmark-e15aa08.txt │%0A                                                              │          allocs/op           │%0AImagePackageCatalogers/alpmdb-cataloger-2                                        88.14k ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                         4.190k ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                         848.0 ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                        3.145k ± 0%25%0AImagePackageCatalogers/dotnet-portable-executable-cataloger-2                     132.0 ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                               281.0 ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                          40.20k ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                           228.0 ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                            1.342k ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                      898.0 ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                        4.079k ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                       2.272k ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                                16.44k ± 0%25%0AImagePackageCatalogers/r-package-cataloger-2                                      929.0 ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                        3.992k ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                                  2.447k ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                           394.0 ± 0%25%0Ageomean                                                                          2.062k

Signed-off-by: Keith Zantow <kzantow@gmail.com>
@kzantow kzantow requested a review from a team August 8, 2023 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants