Use GitAlg.findFilesContaining in ScannerAlg
#3215
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #3215 +/- ##
==========================================
- Coverage 91.12% 91.06% -0.07%
==========================================
Files 163 163
Lines 3404 3391 -13
Branches 311 308 -3
==========================================
- Hits 3102 3088 -14
- Misses 302 303 +1 ☔ View full report in Codecov by Sentry. |
This implements the idea mentioned in #2994 (comment) `ScannerAlg` now uses `GitAlg.findFilesContaining` instead of our own `FileAlg.findFiles` to find files that contain versions and groupIds. This simplifies `findPathsContaining` because we do not need the gitignore dependency anymore to skip files that are ignored by Git since `git grep`, which is used by `GitAlg.findFilesContaining`, does this automatically for us. The biggest impact of this change in the code base is in the tests. `EditAlgTest` and `RewriteTest` now need to actually execute `git grep` to find files that should be edited. For this, the `execCommands` flag is used (#3005) and Git repositories are created for these tests. One advantage of this change is that we mock less and the `MockState` traces are closer to what Steward is actually doing in production.
fthomas
force-pushed
the
topic/use-git-grep-in-scanner
branch
from
5386042
to
c5589ff
Compare
fthomas
commented
Nov 17, 2023
| @@ -67,6 +67,10 @@ jobs: | |||
| - name: Check that workflows are up to date | |||
| run: sbt githubWorkflowCheck | |||
|
|
|||
| - uses: coursier/setup-action@v1 | |||
| with: | |||
| apps: scalafmt | |||
There was a problem hiding this comment.
This is needed since RewriteTest."applyUpdate with scalafmt update" now actually executes scalafmt.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This implements the idea mentioned in #2994 (comment)
ScannerAlgnow usesGitAlg.findFilesContaininginstead of our ownFileAlg.findFilesto find files that contain versions and groupIds. This simplifiesfindPathsContainingbecause we do not need the gitignore dependency anymore to skip files that are ignored by Git sincegit grep, which is used byGitAlg.findFilesContaining, does this automatically for us.The biggest impact of this change in the code base is in the tests.
EditAlgTestandRewriteTestnow need to actually executegit grepto find files that should be edited. For this, theexecCommandsflag is used (#3005) and Git repositories are created for these tests. One advantage of this change is that we mock less and theMockStatetraces are closer to what Steward is actually doing in production.