synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-09 11:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: modify workspacesdk to ask for tailnet API 2.0 (#13684)

Browse Source 
#13617 bumped the Agent/Tailnet API minor version because it adds telemetry features.  However, we don't actually use the protocol features yet, so it's a bit obnoxious for our CLI client to ask for the newest API version.

This is particularly true of the CLI client, since that's distributed separately, so if an end user installs the latest CLI client and their organization hasn't fully upgraded, then it will fail to connect.

Since we have a release coming up and the telemetry stuff won't make it, I think we should roll back to version 2.0 until we actually implement the telemetry stuff. That way the newest release (2.13) will work with Coder servers all the way back to 2.9.
This commit is contained in:
Spike Curtis
2024-06-27 15:38:21 +04:00
committed by GitHub
parent 5b59f2880f
commit c94b5188bd
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
codersdk/workspacesdk/workspacesdk.go
View File

@ -21,7 +21,6 @@ import (
"cdr.dev/slog" "cdr.dev/slog"
"github.com/coder/coder/v2/codersdk" "github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/tailnet" "github.com/coder/coder/v2/tailnet"
"github.com/coder/coder/v2/tailnet/proto"
) )
// AgentIP is a static IPv6 address with the Tailscale prefix that is used to route // AgentIP is a static IPv6 address with the Tailscale prefix that is used to route
@ -241,7 +240,15 @@ func (c *Client) DialAgent(dialCtx context.Context, agentID uuid.UUID, options *
return nil, xerrors.Errorf("parse url: %w", err) return nil, xerrors.Errorf("parse url: %w", err)
} }
q := coordinateURL.Query() q := coordinateURL.Query()
q.Add("version", proto.CurrentVersion.String()) // TODO (ethanndickson) - the current version includes 2 additions we don't currently use:
//
// 2.1 GetAnnouncementBanners on the Agent API (version locked to Tailnet API)
// 2.2 PostTelemetry on the Tailnet API
//
// So, asking for API 2.2 just makes us incompatible back level servers, for no real benefit.
// As a temporary measure, we'll specifically ask for API version 2.0 until we implement sending
// telemetry.
q.Add("version", "2.0")
coordinateURL.RawQuery = q.Encode() coordinateURL.RawQuery = q.Encode()
connector := runTailnetAPIConnector(ctx, options.Logger, connector := runTailnetAPIConnector(ctx, options.Logger,