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

Feature: Add conan detector that parses conan.lock files of conan package manager version 1.x #692

Merged

melotic merged 14 commits into microsoft:main from ashokgowtham:ashokgowtham/add-conan-detector

Aug 9, 2023

Contributor

ashokgowtham commented Aug 2, 2023

This PR adds support for identifying components from conan.lock files created by conan package manager.

Doesn't require conan package manager to have been installed.

ashokgowtham requested a review from a team as a code owner

August 2, 2023 19:02

ashokgowtham requested a review from Omotola

August 2, 2023 19:02

Contributor Author

ashokgowtham commented Aug 2, 2023

@microsoft-github-policy-service agree

ashokgowtham force-pushed the ashokgowtham/add-conan-detector branch from d9583c0 to bb789ba Compare

August 2, 2023 19:07

melotic reviewed

View reviewed changes

docs/detectors/conan.md Outdated Show resolved Hide resolved

melotic reviewed

View reviewed changes

docs/detectors/conan.md Outdated Show resolved Hide resolved

melotic reviewed

View reviewed changes

src/Microsoft.ComponentDetection.Detectors/conan/ConanLockComponentDetector.cs Outdated Show resolved Hide resolved

melotic reviewed

View reviewed changes

src/Microsoft.ComponentDetection.Detectors/conan/ConanLockComponentDetector.cs Outdated Show resolved Hide resolved

melotic reviewed

View reviewed changes

src/Microsoft.ComponentDetection.Detectors/conan/ConanLockComponentDetector.cs Outdated Show resolved Hide resolved

melotic reviewed

View reviewed changes

src/Microsoft.ComponentDetection.Detectors/conan/ConanLockComponentDetector.cs Show resolved Hide resolved

melotic reviewed

View reviewed changes

src/Microsoft.ComponentDetection.Detectors/conan/ConanLockComponentDetector.cs Outdated Show resolved Hide resolved

melotic reviewed

View reviewed changes

src/Microsoft.ComponentDetection.Detectors/conan/Contracts/ConanLock.cs Outdated Show resolved Hide resolved

melotic reviewed

View reviewed changes

src/Microsoft.ComponentDetection.Detectors/conan/Contracts/ConanLockGraph.cs Outdated Show resolved Hide resolved

melotic reviewed

View reviewed changes

src/Microsoft.ComponentDetection.Detectors/conan/Contracts/ConanLockNode.cs Outdated Show resolved Hide resolved

melotic reviewed

View reviewed changes

test/Microsoft.ComponentDetection.Detectors.Tests/ConanLockComponentDetectorTests.cs Outdated Show resolved Hide resolved

melotic reviewed

View reviewed changes

test/Microsoft.ComponentDetection.Detectors.Tests/ConanLockComponentDetectorTests.cs Outdated Show resolved Hide resolved

Member

melotic commented Aug 2, 2023

Thanks for the contribution @ashokgowtham! Some minor code review comments and this looks good to go :)

melotic added version:minor type:feature labels

melotic reviewed

View reviewed changes

src/Microsoft.ComponentDetection.Detectors/conan/ConanLockComponentDetector.cs Outdated Show resolved Hide resolved

melotic approved these changes

View reviewed changes

ashokgowtham force-pushed the ashokgowtham/add-conan-detector branch from 1728762 to d0bfe90 Compare

August 4, 2023 16:31

ashokgowtham and others added 8 commits

August 4, 2023 22:01


          Add necessary types for Conan packages in contracts

357f553


          Add logic for identifying conan components from conan.lock file.

b0c4938


          Avoid identifying current module as a dependency when processing cona…

2e6999d

…n.lock files


          Handle edge cases and version constraints when processing conan.lock …

830ab00

…files. Add docs and verification test sample files.


          Update docs/detectors/conan.md

7e49552

Co-authored-by: Justin Perez <justinmp@vt.edu>


          Update docs/detectors/conan.md

56f86de

Co-authored-by: Justin Perez <justinmp@vt.edu>


          Address code review feedbacks

d437264


          Use HashSets for contains() check

a2f195f

ashokgowtham added 2 commits

August 4, 2023 22:01


          Remove conan.lock file version constraint, though tested with 0.4 ver…

ff6ce34

…sion of lock file only


          Handle an edge case of root node being null in conan.lock file.

4e8851b

ashokgowtham force-pushed the ashokgowtham/add-conan-detector branch from d0bfe90 to 4e8851b Compare

August 4, 2023 16:31

melotic reviewed

View reviewed changes

test/Microsoft.ComponentDetection.Detectors.Tests/ConanLockComponentDetectorTests.cs Outdated Show resolved Hide resolved

melotic reviewed

View reviewed changes

test/Microsoft.ComponentDetection.Detectors.Tests/ConanLockComponentDetectorTests.cs Outdated Show resolved Hide resolved

melotic reviewed

View reviewed changes

test/Microsoft.ComponentDetection.Detectors.Tests/ConanLockComponentDetectorTests.cs Outdated Show resolved Hide resolved

ashokgowtham and others added 3 commits

August 5, 2023 10:18


          Update test/Microsoft.ComponentDetection.Detectors.Tests/ConanLockCom…

1172a93

…ponentDetectorTests.cs

Co-authored-by: Justin Perez <justinmp@vt.edu>


          Update test/Microsoft.ComponentDetection.Detectors.Tests/ConanLockCom…

468abe6

…ponentDetectorTests.cs

Co-authored-by: Justin Perez <justinmp@vt.edu>


          Update test/Microsoft.ComponentDetection.Detectors.Tests/ConanLockCom…

6126c35

…ponentDetectorTests.cs

Co-authored-by: Justin Perez <justinmp@vt.edu>

Contributor Author

ashokgowtham commented Aug 8, 2023

@Omotola Can you help merge this PR or let me know if you have any suggestions

melotic approved these changes

View reviewed changes

Member

melotic commented Aug 8, 2023

There are some build errors, then we can merge this.

https://github.com/microsoft/component-detection/actions/runs/5768854806/job/15718475416?pr=692


          Fix formatting issues

e5c4cb9

Contributor Author

ashokgowtham commented Aug 9, 2023

Fixed the formatting issue

melotic merged commit 9de5ba4 into microsoft:main

20 checks passed

github-actions bot commented Aug 9, 2023

👋 Hi! It looks like you modified some files in the Detectors folder.
You may need to bump the detector versions if any of the following scenarios apply:

The detector detects more or fewer components than before
The detector generates different parent/child graph relationships than before
The detector generates different devDependencies values than before

If none of the above scenarios apply, feel free to ignore this comment 🙂

ashokgowtham deleted the ashokgowtham/add-conan-detector branch

August 16, 2023 04:12

JamieMagee mentioned this pull request

Add smoke test for conan #762

Open

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type:feature version:minor