Skip to content

feat: add AgentAPI using DRPC #10811

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

Merged
merged 12 commits into from
Dec 18, 2023
Merged

feat: add AgentAPI using DRPC #10811

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0ab8976
feat: add AgentAPI using DRPC
deansheather Nov 21, 2023
35c9874
feat: add AgentAPI DRPC endpoint
deansheather Nov 21, 2023
111c3ad
feat: implement rest of agent API RPC handlers
deansheather Nov 21, 2023
ea6374b
fixup! feat: implement rest of agent API RPC handlers
deansheather Nov 21, 2023
58b42cd
fixup! feat: implement rest of agent API RPC handlers
deansheather Nov 21, 2023
49a2314
chore: move agentapi to new package
deansheather Nov 27, 2023
3c8b0a8
comments
deansheather Nov 27, 2023
7f7d701
progress
deansheather Nov 28, 2023
48efd40
Merge branch 'main' into dean/agent-api
deansheather Dec 5, 2023
d866761
fixup! Merge branch 'main' into dean/agent-api
deansheather Dec 5, 2023
920fad1
fixup! Merge branch 'main' into dean/agent-api
deansheather Dec 5, 2023
cc152b5
Merge branch 'main' of github.com:coder/coder into agent-api
spikecurtis Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
progress
  • Loading branch information
@deansheather
deansheather committed Nov 28, 2023
commit 7f7d7016828476136c9d00822c09f58d6318e0cb
3 changes: 1 addition & 2 deletions coderd/agentapi/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/coder/coder/v2/coderd/httpapi"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/tailnet"
tailnetproto "github.com/coder/coder/v2/tailnet/proto"
)

type ManifestAPI struct {
Expand Down Expand Up @@ -144,7 +143,7 @@ func (a *ManifestAPI) GetManifest(ctx context.Context, _ *agentproto.GetManifest
DisableDirectConnections: a.DisableDirectConnections,
DerpForceWebsockets: a.DerpForceWebSockets,

DerpMap: tailnetproto.DERPMapToProto(a.DerpMapFn()),
DerpMap: tailnet.DERPMapToProto(a.DerpMapFn()),
Scripts: agentproto.DBAgentScriptsToProto(scripts),
Apps: apps,
Metadata: agentproto.DBAgentMetadataToProtoDescription(metadata),
Expand Down
2 changes: 1 addition & 1 deletion coderd/agentapi/tailnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (a *TailnetAPI) StreamDERPMaps(_ *tailnetproto.StreamDERPMapsRequest, strea
for {
derpMap := a.DerpMapFn()
if lastDERPMap == nil || !tailnet.CompareDERPMaps(lastDERPMap, derpMap) {
protoDERPMap := tailnetproto.DERPMapToProto(derpMap)
protoDERPMap := tailnet.DERPMapToProto(derpMap)
err := stream.Send(protoDERPMap)
if err != nil {
return xerrors.Errorf("send derp map: %w", err)
Expand Down
5 changes: 2 additions & 3 deletions coderd/workspaceagents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ import (
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/codersdk/agentsdk"
"github.com/coder/coder/v2/tailnet"
tailnetproto "github.com/coder/coder/v2/tailnet/proto"
)

// @Summary Get workspace agent by ID
Expand Down Expand Up @@ -157,7 +156,7 @@ func (api *API) workspaceAgentRPC(rw http.ResponseWriter, r *http.Request) {
resource, err := api.Database.GetWorkspaceResourceByID(ctx, workspaceAgent.ResourceID)
if err != nil {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: "Failed to accept websocket.",
Message: "Internal error fetching workspace agent resource.",
Detail: err.Error(),
})
return
Expand Down Expand Up @@ -495,7 +494,7 @@ func (api *API) workspaceAgentManifest(rw http.ResponseWriter, r *http.Request)
AgentID: workspaceAgent.ID,
Apps: apps,
Scripts: scripts,
DERPMap: tailnetproto.DERPMapFromProto(manifest.DerpMap),
DERPMap: tailnet.DERPMapFromProto(manifest.DerpMap),
DERPForceWebSockets: manifest.DerpForceWebsockets,
GitAuthConfigs: int(manifest.GitAuthConfigs),
EnvironmentVariables: manifest.EnvironmentVariables,
Expand Down
2 changes: 1 addition & 1 deletion tailnet/convert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func TestDERPMap(t *testing.T) {
require.NoError(t, err)

derpMap := &tailcfg.DERPMap{}
err = json.Unmarshal([]byte(tailscaleDERPMap), derpMap)
err = json.Unmarshal(tailscaleDERPMap, derpMap)
require.NoError(t, err)

// The tailscale DERPMap doesn't have HomeParams.
Expand Down