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.

Sign up for GitHub

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

Jump to bottom

feat(cli): add mage command to update golden integration test files #4380

Merged
merged 3 commits into from
May 16, 2023
Merged

feat(cli): add mage command to update golden integration test files #4380

merged 3 commits into from
May 16, 2023

Conversation

DmitriyLewen
Copy link
Contributor

@DmitriyLewen DmitriyLewen commented May 15, 2023 •
edited
Loading

Description

Add mage command to update golden integration test files

Related PRs

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@DmitriyLewen DmitriyLewen marked this pull request as ready for review May 15, 2023 10:11
@DmitriyLewen DmitriyLewen requested a review from knqyf263 as a code owner May 15, 2023 10:11
knqyf263
knqyf263 reviewed May 15, 2023
View reviewed changes
Copy link
Collaborator

@knqyf263 knqyf263 left a comment

Choose a reason for hiding this comment

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

LGTM. I left a nitpicking comment.

integration/testdata/conda-spdx.json.golden Outdated
{"spdxVersion":"SPDX-2.3","dataLicense":"CC0-1.0","SPDXID":"SPDXRef-DOCUMENT","name":"testdata/fixtures/fs/conda","documentNamespace":"http://aquasecurity.github.io/trivy/filesystem/testdata/fixtures/fs/conda-567b8a08-dba6-4dfc-9dac-d1f357f80b02","creationInfo":{"licenseListVersion":"","creators":["Organization: aquasecurity","Tool: trivy-dev"],"created":"2023-05-15T09:49:59Z"},"packages":[{"name":"conda-pkg","SPDXID":"SPDXRef-Application-ee5ef1aa4ac89125","downloadLocation":"NONE","sourceInfo":"Conda","copyrightText":"","primaryPackagePurpose":"APPLICATION"},{"name":"openssl","SPDXID":"SPDXRef-Package-b1088cb4090e3a55","versionInfo":"1.1.1q","supplier":"NOASSERTION","downloadLocation":"NONE","licenseConcluded":"OpenSSL","licenseDeclared":"OpenSSL","copyrightText":"","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:conda/openssl@1.1.1q"}],"primaryPackagePurpose":"LIBRARY","files":[{"fileName":"miniconda3/envs/testenv/conda-meta/openssl-1.1.1q-h7f8727e_0.json","SPDXID":"SPDXRef-File-600e5e0110a84891","checksums":[{"algorithm":"SHA1","checksumValue":"237db0da53131e4548cb1181337fa0f420299e1f"}],"copyrightText":""}]},{"name":"pip","SPDXID":"SPDXRef-Package-6b677e82217fb5bd","versionInfo":"22.2.2","supplier":"NOASSERTION","downloadLocation":"NONE","licenseConcluded":"MIT","licenseDeclared":"MIT","copyrightText":"","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:conda/pip@22.2.2"}],"primaryPackagePurpose":"LIBRARY","files":[{"fileName":"miniconda3/envs/testenv/conda-meta/pip-22.2.2-py38h06a4308_0.json","SPDXID":"SPDXRef-File-7eb62e2a3edddc0a","checksums":[{"algorithm":"SHA1","checksumValue":"a6a2db7668f1ad541d704369fc66c96a4415aa24"}],"copyrightText":""}]},{"name":"testdata/fixtures/fs/conda","SPDXID":"SPDXRef-Filesystem-6e0ac6a0fab50ab4","downloadLocation":"NONE","copyrightText":"","attributionTexts":["SchemaVersion: 2"],"primaryPackagePurpose":"SOURCE"}],"relationships":[{"spdxElementId":"SPDXRef-DOCUMENT","relatedSpdxElement":"SPDXRef-Filesystem-6e0ac6a0fab50ab4","relationshipType":"DESCRIBES"},{"spdxElementId":"SPDXRef-Filesystem-6e0ac6a0fab50ab4","relatedSpdxElement":"SPDXRef-Application-ee5ef1aa4ac89125","relationshipType":"CONTAINS"},{"spdxElementId":"SPDXRef-Application-ee5ef1aa4ac89125","relatedSpdxElement":"SPDXRef-Package-b1088cb4090e3a55","relationshipType":"CONTAINS"},{"spdxElementId":"SPDXRef-Application-ee5ef1aa4ac89125","relatedSpdxElement":"SPDXRef-Package-6b677e82217fb5bd","relationshipType":"CONTAINS"}]}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we format this golden file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I created #4404 for that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have updated this file in b15b5b1

@knqyf263 knqyf263 merged commit d298415 into aquasecurity:main May 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@knqyf263 knqyf263 knqyf263 approved these changes

Assignees

@DmitriyLewen DmitriyLewen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DmitriyLewen @knqyf263