feat: Integrate workspace agent into coderd #398
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,65 @@ | ||
| package cli | ||
|
|
||
| import ( | ||
| "io" | ||
|
|
||
| "github.com/coder/coder/agent" | ||
| "github.com/coder/coder/peer" | ||
| "github.com/coder/coder/peerbroker" | ||
| "github.com/pion/webrtc/v3" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| func ssh() *cobra.Command { | ||
| return &cobra.Command{ | ||
| Use: "ssh", | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| client, err := createClient(cmd) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| organization, err := currentOrganization(cmd, client) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| history, err := client.WorkspaceHistory(cmd.Context(), "", "kyle", "") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| resources, err := client.WorkspaceProvisionJobResources(cmd.Context(), organization.Name, history.ProvisionJobID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| for _, resource := range resources { | ||
| if resource.Agent == nil { | ||
| continue | ||
| } | ||
| wagent, err := client.WorkspaceAgentConnect(cmd.Context(), organization.Name, history.ProvisionJobID, resource.ID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| stream, err := wagent.NegotiateConnection(cmd.Context()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| conn, err := peerbroker.Dial(stream, []webrtc.ICEServer{{ | ||
| URLs: []string{"stun:stun.l.google.com:19302"}, | ||
| }}, &peer.ConnOptions{ | ||
| // Logger: slog.Make(sloghuman.Sink(cmd.OutOrStdout())).Leveled(slog.LevelDebug), | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| sshConn, err := agent.DialSSH(conn) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| go func() { | ||
| _, _ = io.Copy(cmd.OutOrStdout(), sshConn) | ||
| }() | ||
| _, _ = io.Copy(sshConn, cmd.InOrStdin()) | ||
| } | ||
| return nil | ||
| }, | ||
| } | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| package cli | ||
|
|
||
| import ( | ||
| "net/url" | ||
| "os" | ||
|
|
||
| "cdr.dev/slog" | ||
| "cdr.dev/slog/sloggers/sloghuman" | ||
| "github.com/powersj/whatsthis/pkg/cloud" | ||
| "github.com/spf13/cobra" | ||
| "golang.org/x/xerrors" | ||
|
|
||
| "github.com/coder/coder/agent" | ||
| "github.com/coder/coder/codersdk" | ||
| "github.com/coder/coder/peer" | ||
| ) | ||
|
|
||
| func workspaceAgent() *cobra.Command { | ||
| return &cobra.Command{ | ||
| Use: "agent", | ||
|
There was a problem hiding this comment. Having the |
||
| // This command isn't useful for users, and seems | ||
| // more likely to confuse. | ||
| Hidden: true, | ||
|
Comment on lines
+21
to
+23
|
||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| coderURLRaw, exists := os.LookupEnv("CODER_URL") | ||
| if !exists { | ||
| return xerrors.New("CODER_URL must be set") | ||
| } | ||
| coderURL, err := url.Parse(coderURLRaw) | ||
| if err != nil { | ||
| return xerrors.Errorf("parse %q: %w", coderURLRaw, err) | ||
| } | ||
| client := codersdk.New(coderURL) | ||
| sessionToken, exists := os.LookupEnv("CODER_TOKEN") | ||
| if !exists { | ||
| probe, err := cloud.New() | ||
| if err != nil { | ||
| return xerrors.Errorf("probe cloud: %w", err) | ||
| } | ||
| if !probe.Detected { | ||
| return xerrors.Errorf("no valid authentication method found; set \"CODER_TOKEN\"") | ||
| } | ||
| switch { | ||
| case probe.GCP(): | ||
| response, err := client.AuthenticateWorkspaceAgentUsingGoogleCloudIdentity(cmd.Context(), "", nil) | ||
| if err != nil { | ||
| return xerrors.Errorf("authenticate workspace with gcp: %w", err) | ||
| } | ||
| sessionToken = response.SessionToken | ||
| default: | ||
| return xerrors.Errorf("%q authentication not supported; set \"CODER_TOKEN\" instead", probe.Name) | ||
| } | ||
| } | ||
| client.SessionToken = sessionToken | ||
| closer := agent.New(client.WorkspaceAgentServe, &peer.ConnOptions{ | ||
| Logger: slog.Make(sloghuman.Sink(cmd.OutOrStdout())).Leveled(slog.LevelDebug), | ||
| }) | ||
| <-cmd.Context().Done() | ||
| return closer.Close() | ||
| }, | ||
| } | ||
| } | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I understand correctly, it seems like the log level for this has changed - I wonder if that could be related to the test failure here: https://github.com/coder/coder/runs/5416391323?check_suite_focus=true#step:7:168
(thinking maybe this change increases the verbosity of logs, and one of those more-verbose logs is what gets emitted after the test is complete).