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

update requires to use list; remove field #1234

Merged
merged 2 commits into from
Sep 30, 2022
Merged

update requires to use list; remove field #1234

merged 2 commits into from
Sep 30, 2022

Conversation

spiffcs
Copy link
Contributor

@spiffcs spiffcs commented Sep 29, 2022

Incorrect data type being used for requires. Was string ==> now slice of string.

BuildRequires was also not a part of the conan.lock spec anymore so removing

Signed-off-by: Christopher Phillips [email protected]

Signed-off-by: Christopher Phillips <[email protected]>
@spiffcs spiffcs added the bug Something isn't working label Sep 29, 2022
@github-actions
Copy link

github-actions bot commented Sep 29, 2022

Benchmark Test Results

Benchmark results from the latest changes vs base branch
name                                                       old time/op    new time/op    delta
ImagePackageCatalogers/alpmdb-cataloger-2                    13.7ms ± 7%    11.5ms ± 0%  -15.78%  (p=0.008 n=5+5)
ImagePackageCatalogers/ruby-gemspec-cataloger-2              1.70ms ±13%    1.34ms ±10%  -21.59%  (p=0.008 n=5+5)
ImagePackageCatalogers/python-package-cataloger-2            3.93ms ± 3%    3.26ms ± 1%  -17.14%  (p=0.008 n=5+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2    1.28ms ± 4%    1.07ms ± 0%  -16.62%  (p=0.008 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         905µs ± 2%     743µs ± 0%  -17.98%  (p=0.008 n=5+5)
ImagePackageCatalogers/dpkgdb-cataloger-2                    1.07ms ± 3%    0.88ms ± 1%  -17.77%  (p=0.008 n=5+5)
ImagePackageCatalogers/rpm-db-cataloger-2                    1.52ms ± 2%    1.26ms ± 0%  -16.87%  (p=0.008 n=5+5)
ImagePackageCatalogers/java-cataloger-2                      17.2ms ± 3%    14.3ms ± 1%  -17.13%  (p=0.008 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                     1.50ms ± 5%    1.23ms ± 1%  -18.07%  (p=0.008 n=5+5)
ImagePackageCatalogers/go-module-binary-cataloger-2          2.70µs ± 4%    2.19µs ± 1%  -18.96%  (p=0.008 n=5+5)
ImagePackageCatalogers/dotnet-deps-cataloger-2               1.76ms ± 4%    1.34ms ± 1%  -23.56%  (p=0.008 n=5+5)
ImagePackageCatalogers/portage-cataloger-2                    892µs ± 2%     703µs ± 1%  -21.19%  (p=0.008 n=5+5)

name                                                       old alloc/op   new alloc/op   delta
ImagePackageCatalogers/alpmdb-cataloger-2                    5.26MB ± 0%    5.26MB ± 0%     ~     (p=0.421 n=5+5)
ImagePackageCatalogers/ruby-gemspec-cataloger-2               202kB ± 0%     202kB ± 0%   +0.08%  (p=0.008 n=5+5)
ImagePackageCatalogers/python-package-cataloger-2             945kB ± 0%     945kB ± 0%     ~     (p=0.310 n=5+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2     214kB ± 0%     214kB ± 0%     ~     (p=0.841 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         158kB ± 0%     158kB ± 0%     ~     (p=1.000 n=5+5)
ImagePackageCatalogers/dpkgdb-cataloger-2                     203kB ± 0%     203kB ± 0%     ~     (p=0.151 n=5+5)
ImagePackageCatalogers/rpm-db-cataloger-2                     301kB ± 0%     302kB ± 0%   +0.21%  (p=0.008 n=5+5)
ImagePackageCatalogers/java-cataloger-2                      3.44MB ± 0%    3.44MB ± 0%     ~     (p=0.151 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                     1.25MB ± 0%    1.25MB ± 0%     ~     (p=0.333 n=5+5)
ImagePackageCatalogers/go-module-binary-cataloger-2            672B ± 0%      672B ± 0%     ~     (all equal)
ImagePackageCatalogers/dotnet-deps-cataloger-2                369kB ± 0%     369kB ± 0%     ~     (p=0.222 n=5+5)
ImagePackageCatalogers/portage-cataloger-2                    136kB ± 0%     136kB ± 0%     ~     (p=0.690 n=5+5)

name                                                       old allocs/op  new allocs/op  delta
ImagePackageCatalogers/alpmdb-cataloger-2                     85.7k ± 0%     85.7k ± 0%     ~     (p=0.333 n=5+4)
ImagePackageCatalogers/ruby-gemspec-cataloger-2               4.25k ± 0%     4.25k ± 0%     ~     (all equal)
ImagePackageCatalogers/python-package-cataloger-2             16.6k ± 0%     16.6k ± 0%     ~     (p=0.921 n=4+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2     5.53k ± 0%     5.53k ± 0%     ~     (p=0.437 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         3.32k ± 0%     3.32k ± 0%     ~     (p=1.000 n=5+5)
ImagePackageCatalogers/dpkgdb-cataloger-2                     4.60k ± 0%     4.60k ± 0%     ~     (all equal)
ImagePackageCatalogers/rpm-db-cataloger-2                     8.13k ± 0%     8.13k ± 0%     ~     (all equal)
ImagePackageCatalogers/java-cataloger-2                       57.6k ± 0%     57.5k ± 0%     ~     (p=0.095 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                      5.43k ± 0%     5.43k ± 0%     ~     (p=1.000 n=5+5)
ImagePackageCatalogers/go-module-binary-cataloger-2            15.0 ± 0%      15.0 ± 0%     ~     (all equal)
ImagePackageCatalogers/dotnet-deps-cataloger-2                7.27k ± 0%     7.27k ± 0%     ~     (all equal)
ImagePackageCatalogers/portage-cataloger-2                    3.59k ± 0%     3.59k ± 0%     ~     (p=1.000 n=5+4)

Copy link
Contributor

@wagoodman wagoodman left a comment

Choose a reason for hiding this comment

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

The json schema will need to be bumped too. If there hasn't been a release yet then you can use the same version and you just need to regenerate.

@spiffcs
Copy link
Contributor Author

spiffcs commented Sep 30, 2022

The json schema will need to be bumped too. If there hasn't been a release yet then you can use the same version and you just need to regenerate.

This is just for deserializing the conan.lock. We're not putting this field yet into the metadata since it contains information that is not self-descriptive to the package. We could use this data to possibly build relationships.

example

"0": {
    "ref": "firstp/v0.1.0",
	"requires": ["1"],
},
"1": {
    "ref":"requiredbyfirst/v0.1.0",
    "requires":[],
}

@spiffcs spiffcs merged commit dd7c654 into main Sep 30, 2022
@spiffcs spiffcs deleted the conan-lock-bug branch September 30, 2022 15:57
spiffcs added a commit that referenced this pull request Oct 13, 2022
* main: (45 commits)
  feat: add RelationshipsBySourceOwnership to syft json output (#1248)
  fix: reset merged package into map; (#1258)
  refactor: Remove experimental Anchore Enterprise upload functionality (#1257)
  Update syft bootstrap tools to latest versions. (#1254)
  Update Stereoscope to d24c9d626b33fa720210b007a20767801827b532 (#1253)
  Update syft bootstrap tools to latest versions. (#1244)
  fix apkdb checksum representation (#1247)
  feat: add identifiable field to source object (#1243)
  feat: attest support for Singularity images (#1201)
  Update syft bootstrap tools to latest versions. (#1239)
  Update Stereoscope to 1b1b744a919964f38d14e1416fb3f25221b761ce (#1240)
  fix: Follow symlinks when searching for globs in all-layers scope (#1221)
  update requires to use list; remove field (#1234)
  Add Conan (C/C++) conan.lock file support (#1230)
  add sequence diagrams and flesh out TODO notes (#1233)
  Do not fail if unable to parse `.rpm` file (#1232)
  fix: support exclude patterns on Windows (#1228)
  Update syft bootstrap tools to latest versions. (#1225)
  Update Stereoscope to 56552770e555d764ea72b99d3c810326b27ead4a (#1224)
  Update syft bootstrap tools to latest versions. (#1223)
  ...

Signed-off-by: Christopher Phillips <[email protected]>
aiwantaozi pushed a commit to aiwantaozi/syft that referenced this pull request Oct 20, 2022
spiffcs added a commit that referenced this pull request Oct 21, 2022
spiffcs added a commit that referenced this pull request Oct 21, 2022
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
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