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

Refactor rover dev for use with rover lsp #2170

Draft
wants to merge 60 commits into
base: language-server
Choose a base branch
from
Draft

Refactor rover dev for use with rover lsp #2170

wants to merge 60 commits into from

Conversation

dylan-apollo
Copy link
Member

@dylan-apollo dylan-apollo commented Sep 23, 2024 •
edited
Loading

WIP refactor—lots of TODO: in the code.

Broad strokes, this PR:

  1. Removes the multi-terminal mode from rover dev again, along with all IPC, leader/follower stuff, etc.
  2. Consolidates how composition works with a new Composer struct
  3. Adds some type safety around fully resolved supergraph yamls (that should be contributed to apollo-federation-types eventually)
  4. Extracts all the rover dev file/introspection watcher stuff into a new Watcher struct which is re-used by rover lsp
  5. Adds supergraph.yaml file watching for both rover dev and rover lsp, so changing federation versions/subgraphs auto-recomposes and updates the file/introspection watchers

loshz and others added 30 commits September 24, 2024 10:49
@loshz
add run composition tests (#2171)
7d1628e 
Add unit tests for the `RunComposition` handler.
@loshz
add subgraph watcher handle tests (#2172)
64b0272 
Add tests for `SubgraphWatcher` handle events.
@dotdat
Fix integration tests against the [supergraph-demo (#2175)
dfc0d25 
Fixes tests against the [supergraph demo
repo](https://github.com/apollographql/supergraph-demo). In the previous
iteration, the federation version resolver defaulted to the
`FederationVersion::LatestFedTwo` when it should have been
`FederationVersion::LatestFedOne`
@loshz
add tests for subgraph watchers parsing (#2177)
d911423
@dylan-apollo
PoC of LSP in Rover
baf6827
@trevor-scheer @dylan-apollo
update als
34b9d37
@trevor-scheer @dylan-apollo
release: v0.27.0-alpha.0
ac3933c
@trevor-scheer @dylan-apollo
only build lsp mod with composition-js enabled
5e79607
@trevor-scheer @dylan-apollo
security + openssl fixes
e7d219e
@dylan-apollo
Fix federation version from supergraph.yaml
558743f
@dylan-apollo
Remove multi-terminal session support
853ece1
@dylan-apollo
Remove ipc & more multi-terminal leftovers
84c08bb
@dylan-apollo
Clean up more ipc residue
bf20d84
@dylan-apollo
More renaming, remove shutdown event / ctrl-c handling since the stan…
a2a9859 
…dard handling now works (no ipc)
@dylan-apollo
Remove more leader/follower terminology, ditch now-useless leader mes…
6409205 
…sages, stop double-printing
@dylan-apollo
Refactor supergraph resolution to make it more type-safe.
9ff1a56 
Compose a single time at startup instead of adding/removing subgraphs from subgraph watchers.
@dylan-apollo
Start moving some fields into Composer
37188a8
@dylan-apollo
Extract the composition logic from do_compose into Composer
1267370
@dylan-apollo
Simplify subgraph messages, use Tokio channels, finish getting rid of…
5614e22 
… `dev::protocol`
@dylan-apollo
Don't exit early if first composition fails
ef18924
@dylan-apollo
Move all subgraph watching logic into new Watcher struct
6fc355e
@dylan-apollo
Convert LSP to use new Watcher struct
9f03068
@dylan-apollo
Fix test compilation
7ab0c9e
@dylan-apollo
Set root URI for LSP
0835025
@dylan-apollo
Reduce file watcher debounce to speed up LSP feedback
52d1f2d
@dylan-apollo
Recompose when supergraph.yaml changes (doesn't _use_ the changes y…
a9802d9 
…et, though)
@dylan-apollo
Unbound the notification sender, so that lots of subgraphs don't bloc…
ce8d7ac 
…k things up
@dylan-apollo
Compose with a new version, when updated in supergraph.yaml
6dd2b30
@dylan-apollo
Use clap option for composition override instead of manual check
42f3ebe
@dylan-apollo
Fix some tests
6962831
dylan-apollo and others added 17 commits September 26, 2024 10:37
@dylan-apollo
Removed federation version from _sometimes_ being included in _succes…
3d67be8 
…s_ outputs only.
@dylan-apollo
Use a helper function to update subgraphs in Composer
95bcd05
@dylan-apollo
Break watcher event handling into its own function
38b4361
@dylan-apollo
Move subgraph resolution into its own function for reuse later
7409c9d
@dylan-apollo
Simplify resolve_subgraph error handling
b08e9b0
@dylan-apollo
Move routing_url check into resolve_subgraph
2186485
@dylan-apollo
Finish resolve_subgraph refactor
e1b6ced
@dylan-apollo
Add/remove subgraphs from composition when supergraph.yaml changes.…
a5fee2f 
… Doesn't spawn new watchers yet.
@dylan-apollo
Update watchers (and LSP) when adding/removing subgraphs
cf28427
@dylan-apollo
Use published version of apollo-language-server
ca8c960
@dylan-apollo
Turn off federation module when composition-js is disabled
0bb2414
@dylan-apollo
Report more errors up through events, reduce verbosity of rover dev…
acc4c6b 
… when recomposing.
@dylan-apollo
Add a TODO about not failing on startup in LSP
b6c62bb
@dylan-apollo
Hide rover lsp from rover --help
181e5fa
@dylan-apollo
release: v0.27.0-alpha.1
2fe4da6
@aaronArinder @dylan-apollo
fix(openssl): downgrade openssl-src (#2174)
7a30b10 
```
 aaronarinder@Aarons-MBP  ~/apollo/rover   dylan/language-server+dev  cargo update openssl-src -
-precise 300.3.1+3.3.1
    Updating crates.io index
 Downgrading openssl-src v300.3.2+3.3.2 -> v300.3.1+3.3.1
```
@dylan-apollo
Default fed version to 1 (#2175)
483ce42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dylan-apollo @loshz @dotdat @trevor-scheer @aaronArinder