fix: use recently-added ConnectRPC20 compat variant #85
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
Signed-off-by: Cian Johnston <[email protected]>
johnstcn
commented
Jul 4, 2024
|
|
||
| require ( | ||
| cdr.dev/slog v1.6.2-0.20240126064726-20367d4aede6 | ||
| github.com/coder/coder/v2 v2.12.0 | ||
| github.com/coder/coder/v2 v2.10.1-0.20240703121105-f6639b788f7b |
johnstcn
commented
Jul 4, 2024
| @@ -4,11 +4,11 @@ go 1.22.4 | |||
|
|
|||
| // There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here: | |||
| // https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main | |||
| replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20240530071520-1ac63d3a4ee3 | |||
| replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20240702054557-aa558fbe5374 | |||
There was a problem hiding this comment.
copied from coder/coder go.mod
spikecurtis
approved these changes
Jul 8, 2024
| if err != nil { | ||
| logger.Error(ctx, "connect err", slog.Error(err)) | ||
| continue | ||
| } | ||
| conn = c.DRPCConn() |
There was a problem hiding this comment.
client.ConnectRPC20 returns the equivalent to the arpc below. Grabbing the underlying Conn and then recreating the RPC client isn't necessary and breaks the type-checking that should prevent you from using RPCs that aren't present in v2.0 of the Agent API
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.
Use the compat method added in coder/coder#13778
This should allow using the newer endpoint with Coder version 2.9.