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

Adding metadata fields when parsing yarn.lock and poetry.lock #2350

Merged
merged 10 commits into from
Feb 2, 2024
Merged

Adding metadata fields when parsing yarn.lock and poetry.lock #2350

merged 10 commits into from
Feb 2, 2024

Conversation

TupleType
Copy link
Contributor

@TupleType TupleType commented Nov 22, 2023

  • Adding the resolved and integrity fields of yarn.lock to the parsed metadata. This addition is similar to the metadata added when parsing package-lock.json.
  • Adding the Index field to metadeta when parsing poetry.lock similarly to the existing Pipfile metadata.

…etadata. This addition is similar to the metadata added when parsing package-lock.json.

Signed-off-by: asi-cider <88270351+asi-cider@users.noreply.github.com>
@github-actions github-actions bot added the json-schema Changes the json schema label Nov 22, 2023
Signed-off-by: asi-cider <88270351+asi-cider@users.noreply.github.com>
… to the existing Pipfile metadata

Signed-off-by: asi-cider <88270351+asi-cider@users.noreply.github.com>
@TupleType TupleType changed the title Add resolved and integrity field to metadate when parsing yarn.lock Adding metadata fields when parsing yarn.lock and poetry.lock Nov 26, 2023
Signed-off-by: asi-cider <88270351+asi-cider@users.noreply.github.com>
@TupleType
Copy link
Contributor Author

Hey, @westonsteimel @wagoodman @spiffcs
Could you please review my PR?
Thank you in advance!

@spiffcs
Copy link
Contributor

spiffcs commented Feb 2, 2024

Thanks for the nudge @asi-cider! I've got a couple things I'm looking at today but will try to make some time to clean this up and get the conflicts resolved for a first review

@wagoodman wagoodman self-assigned this Feb 2, 2024
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
@wagoodman wagoodman added the enhancement New feature or request label Feb 2, 2024
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
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.

Thanks for the addition! 🙌

@wagoodman wagoodman enabled auto-merge (squash) February 2, 2024 19:45
@wagoodman wagoodman merged commit 98de2e2 into anchore:main Feb 2, 2024
11 checks passed
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
…e#2350)

* Adding the resolved and integrity fields of yarn.lock to the parsed metadata. This addition is similar to the metadata added when parsing package-lock.json.

Signed-off-by: asi-cider <88270351+asi-cider@users.noreply.github.com>

* fix comment

Signed-off-by: asi-cider <88270351+asi-cider@users.noreply.github.com>

* Adding the Index field to metadeta when parsing poetry.lock similarly to the existing Pipfile metadata

Signed-off-by: asi-cider <88270351+asi-cider@users.noreply.github.com>

* fixing struct accoding to tests

Signed-off-by: asi-cider <88270351+asi-cider@users.noreply.github.com>

* remove old schema change

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

* remove empty constants

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

* re-generate JSON schema

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

* update document ref

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

* fix linting

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

---------

Signed-off-by: asi-cider <88270351+asi-cider@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Co-authored-by: Alex Goodman <wagoodman@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request json-schema Changes the json schema
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants