Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update field plurality of 8.0.0 schema before release #1820

Merged
merged 2 commits into from
May 16, 2023

Conversation

spiffcs
Copy link
Contributor

@spiffcs spiffcs commented May 16, 2023

To keep things consistent across the schema we want Locations and URLs to be plural fields now that they are fields on the License struct

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
@spiffcs spiffcs added the bug Something isn't working label May 16, 2023
@github-actions
Copy link

github-actions bot commented May 16, 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-2fb3306.txt │%0A                                                          │            sec/op            │%0AImagePackageCatalogers/alpmdb-cataloger-2                                   11.79m ±  1%25%0AImagePackageCatalogers/apkdb-cataloger-2                                    679.6µ ±  1%25%0AImagePackageCatalogers/binary-cataloger-2                                   213.7µ ±  0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                   538.9µ ±  1%25%0AImagePackageCatalogers/dotnet-deps-cataloger-2                              1.197m ±  2%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                         92.65µ ±  1%25%0AImagePackageCatalogers/java-cataloger-2                                     13.20m ± 12%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                     91.88µ ±  1%25%0AImagePackageCatalogers/javascript-package-cataloger-2                       369.7µ ±  5%25%0AImagePackageCatalogers/nix-store-cataloger-2                                267.0µ ±  3%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                   758.8µ ±  1%25%0AImagePackageCatalogers/portage-cataloger-2                                  438.9µ ±  3%25%0AImagePackageCatalogers/python-package-cataloger-2                           3.194m ±  2%25%0AImagePackageCatalogers/r-package-cataloger-2                                181.4µ ±  1%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                   464.8µ ±  2%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                             845.6µ ±  2%25%0AImagePackageCatalogers/sbom-cataloger-2                                     117.6µ ±  1%25%0Ageomean                                                                     584.7µ%0A%0A                                                          │ ./.tmp/benchmark-2fb3306.txt │%0A                                                          │             B/op             │%0AImagePackageCatalogers/alpmdb-cataloger-2                                   5.128Mi ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                    205.1Ki ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                   32.08Ki ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                   169.1Ki ± 0%25%0AImagePackageCatalogers/dotnet-deps-cataloger-2                              404.2Ki ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                         10.06Ki ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                     2.828Mi ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                     8.750Ki ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                       101.1Ki ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                49.15Ki ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                   186.5Ki ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                  120.0Ki ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                           1.004Mi ± 0%25%0AImagePackageCatalogers/r-package-cataloger-2                                53.36Ki ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                   181.1Ki ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                             144.5Ki ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                     14.21Ki ± 0%25%0Ageomean                                                                     133.5Ki%0A%0A                                                          │ ./.tmp/benchmark-2fb3306.txt │%0A                                                          │          allocs/op           │%0AImagePackageCatalogers/alpmdb-cataloger-2                                    87.75k ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                     4.180k ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                     896.0 ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                    3.000k ± 0%25%0AImagePackageCatalogers/dotnet-deps-cataloger-2                               6.338k ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                           281.0 ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                      39.81k ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                       228.0 ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                        1.404k ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                  895.0 ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                    4.079k ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                   2.267k ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                            16.44k ± 0%25%0AImagePackageCatalogers/r-package-cataloger-2                                  928.0 ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                    3.989k ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                              2.447k ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                       394.0 ± 0%25%0Ageomean                                                                      2.593k

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
Copy link
Contributor

@kzantow kzantow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@spiffcs spiffcs merged commit 4601ca3 into main May 16, 2023
9 checks passed
@spiffcs spiffcs deleted the license-model-plural-fields branch May 16, 2023 17:05
spiffcs added a commit that referenced this pull request May 18, 2023
* main: (32 commits)
  chore(deps): bump github.com/google/go-containerregistry (#1823)
  chore(deps): bump github.com/sirupsen/logrus from 1.9.0 to 1.9.1 (#1822)
  chore(deps): bump github.com/docker/docker (#1824)
  fix: update field plurality of 8.0.0 schema before release (#1820)
  fix: update cataloger to check for expressions before split (#1819)
  feat: update syft license concept to complex struct (#1743)
  fix: cyclonedx depends-on relationship inverted (#1816)
  fix: retain sbom cataloger relationships (#1509)
  feat: warn if parsing newer SBOM (#1810)
  feat: Add R cataloger (#1790)
  update cosign to v2 release (different go module) (#1805)
  fix: Reduce log spam on unknown relationship type (#1797)
  chore(deps): update bootstrap tools to latest versions (#1807)
  chore(deps): bump golang.org/x/net from 0.9.0 to 0.10.0 (#1802)
  chore(deps): bump github.com/docker/docker (#1795)
  chore(deps): bump github.com/google/go-containerregistry (#1796)
  chore(deps): update bootstrap tools to latest versions (#1792)
  Print package list when extra packages found (#1791)
  chore(deps): update bootstrap tools to latest versions (#1786)
  chore(deps): bump golang.org/x/term from 0.7.0 to 0.8.0 (#1787)
  ...

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
)

to keep things consistent across the schema we want Locations and URLs to be plural fields now that they are fields on the License struct
---------

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
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.

None yet

2 participants