Reimplement support retrieving workspace of path dependencies in cargo #10629
+489
−2
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
Jefffrey
commented
Sep 18, 2024
| return nil | ||
| end | ||
|
|
||
| parent_dirs = current_dir.scan("/").length |
There was a problem hiding this comment.
Previously did current_dir.scan("/").length - 1 here which was root cause of error that caused regression, fixed to not do this subtraction
Comment on lines
+257
to
+258
| # To avoid accidentally breaking backward compatibility, we don't throw errors | ||
| return nil |
There was a problem hiding this comment.
To avoid any other regressions, relax this to not throw error
Comment on lines
+276
to
+277
| # To avoid accidentally breaking backward compatibility, we don't throw errors | ||
| nil |
Comment on lines
+746
to
+779
| context "with a workspace root containing a path dependency to a member" do | ||
| before do | ||
| stub_request(:get, url + "?ref=sha") | ||
| .with(headers: { "Authorization" => "token token" }) | ||
| .to_return( | ||
| status: 200, | ||
| body: fixture("github", "contents_cargo_without_lockfile.json"), | ||
| headers: json_header | ||
| ) | ||
| stub_request(:get, url + "Cargo.toml?ref=sha") | ||
| .with(headers: { "Authorization" => "token token" }) | ||
| .to_return( | ||
| status: 200, | ||
| body: fixture("github", "path_dependency_in_workspace_root", | ||
| "contents_cargo_manifest_workspace.json"), | ||
| headers: json_header | ||
| ) | ||
| stub_request(:get, url + "child/Cargo.toml?ref=sha") | ||
| .with(headers: { "Authorization" => "token token" }) | ||
| .to_return( | ||
| status: 200, | ||
| body: fixture("github", "path_dependency_in_workspace_root", | ||
| "contents_cargo_manifest_child.json"), | ||
| headers: json_header | ||
| ) | ||
| end | ||
|
|
||
| it "fetches the dependencies successfully" do | ||
| expect(file_fetcher_instance.files.map(&:name)) | ||
| .to match_array(%w(.cargo/config.toml Cargo.toml child/Cargo.toml)) | ||
| expect(file_fetcher_instance.files.map(&:path)) | ||
| .to match_array(%w(/.cargo/config.toml /Cargo.toml /child/Cargo.toml)) | ||
| end | ||
| end |
There was a problem hiding this comment.
Based on https://github.com/Jefffrey/dependabot-cargo-test-2
Where the scenario is having a workspace, where in the workspace root it specifies members via path dependencies. Looks like this test case was absent before, so adding to prevent further regressions
|
Thanks @Jefffrey , we'll try to get this tested and merged on our end |
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.
What are you trying to accomplish?
Reattempting #10550 after it was reverted in #10599 due to regression, see #10584
Anything you want to highlight for special attention from reviewers?
Changes are largely the same as #10550, with some changes:
How will you know you've accomplished your goal?
Unit tests passed. Also ran dry run against the repos that were listed as affected in #10584
Both executed successfully.
Checklist