chore: sync vendor/zoekt with upstream sourcegraph/zoekt#1140
Conversation
Bumps the vendor/zoekt submodule to pull in 108 upstream commits from sourcegraph/zoekt. See sourcebot-dev/zoekt#10. The -shard_prefix flag on zoekt-git-index was renamed upstream to -shard_prefix_override; the backend indexer is updated accordingly. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This comment has been minimized.
This comment has been minimized.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
|
Caution Review failedThe pull request is closed. ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (1)
WalkthroughUpdated vendored zoekt to a new upstream commit, changed the backend Changes
Sequence Diagram(s)(omitted) Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related PRs
Suggested reviewers
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@vendor/zoekt`:
- Line 1: Update the vendor/zoekt submodule reference from the feature-branch
commit 8566836f to the merge commit on sourcebot-dev/zoekt@main once PR `#10`
merges: fetch origin for the sourcebot-dev/zoekt remote, identify the new merge
commit on main, update the submodule at vendor/zoekt to point at that merge
commit (e.g., git fetch && git checkout <merge-commit> inside vendor/zoekt),
then stage and commit the change to the superproject so vendor/zoekt points to
the merged commit before merging this PR.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: a9d7dc4b-608a-411e-b17c-e913eac49e22
📒 Files selected for processing (3)
CHANGELOG.mdpackages/backend/src/zoekt.tsvendor/zoekt
Adds the new Meta message, Q.meta field, and Repository.metadata map that upstream zoekt added in sourcegraph/zoekt#962 and #979. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
sourcebot-dev/zoekt#10 merged as da9bf1a3. Updating the submodule pointer from the feature-branch tip (8566836f) to the merge commit on main so vendor/zoekt tracks the canonical history before merging. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore: bump vendor/zoekt to include CodeQL security fixes Pulls in sourcebot-dev/zoekt#13 (open), which resolves all open CodeQL security alerts on the zoekt repo: - go/clear-text-logging (high) in gitindex/clone.go - go/incorrect-integer-conversion (high) in api.go and zoekt-sourcegraph-indexserver/sg.go - actions/missing-workflow-permissions (medium x8) in ci.yml and buf-breaking-check.yml - actions/untrusted-checkout/high (high) in semgrep.yml Also carries through the dependency bumps from sourcebot-dev/zoekt#11 and #12 (go-git 5.18.0, grpc 1.80.0, otel 1.43.0) that were merged after #1140 so weren't included when main shipped the original zoekt sync. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: repoint vendor/zoekt at sourcebot-dev/zoekt@main merge commit sourcebot-dev/zoekt#13 merged as 7c6c629f. Updating the submodule pointer from the feature-branch tip (945c3e96) to the merge commit on main so vendor/zoekt tracks canonical history before merging. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: repoint vendor/zoekt at upstream-ancestry merge commit sourcebot-dev/zoekt#10 was squash-merged into zoekt@main, which flattened the merge commit and left GitHub reporting the fork as 108 commits behind sourcegraph/zoekt:main even though all upstream content was present. Fixed by performing a 'git merge -s ours upstream/main' on zoekt@main: this records upstream/main as a second parent without changing any files, restoring the ancestry link. Bumping this submodule pointer from 7c6c629f (the previous main tip) to df983ea1 (the new merge-ours commit). The vendored tree content is byte-identical to 7c6c629f; only the commit graph is different. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Summary
vendor/zoektsubmodule to pull in 108 upstream commits fromsourcegraph/zoekt(first upstream sync on the fork). See the companion PR: chore: sync with upstream sourcegraph/zoekt zoekt#10.zoekt-git-indexflag-shard_prefix→-shard_prefix_overrideinpackages/backend/src/zoekt.tsto match the upstream rename (Add ShardPrefixOverride to support custom shard naming sourcegraph/zoekt#1005).Important
The zoekt reference in this PR currently points at the feature branch HEAD of sourcebot-dev/zoekt#10 (commit
8566836f). Once that PR is merged intosourcebot-dev/zoekt@main, this submodule pointer must be re-pinned to the resulting merge commit before this PR lands.Test plan
make zoektbuilds all zoekt binaries against the upgraded source.yarn workspace @sourcebot/backend buildandyarn workspace @sourcebot/web buildcompile cleanly.1_3_v16.00000.zoektwith the new-shard_prefix_overrideflag./api/searchreturns expected results end-to-end via gRPC against the upgradedzoekt-webserver(verified with alang:typescriptquery and a plain text query; 3490 matches over 396 files forsourcebot).X-TENANT-IDheader still works.Summary by CodeRabbit
New Features
Chores