feat: coder-attach: add support for external workspaces #19178
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,326 @@ | ||||||
| package cli | ||||||
|
|
||||||
| import ( | ||||||
| "fmt" | ||||||
| "strings" | ||||||
|
|
||||||
| "golang.org/x/xerrors" | ||||||
|
|
||||||
| "github.com/google/uuid" | ||||||
kacpersaw marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
|
||||||
| "github.com/coder/coder/v2/cli/cliui" | ||||||
| "github.com/coder/coder/v2/codersdk" | ||||||
| "github.com/coder/pretty" | ||||||
| "github.com/coder/serpent" | ||||||
| ) | ||||||
|
|
||||||
| type externalAgent struct { | ||||||
| AgentName string `json:"-"` | ||||||
| AuthType string `json:"auth_type"` | ||||||
| AuthToken string `json:"auth_token"` | ||||||
| InitScript string `json:"init_script"` | ||||||
| } | ||||||
|
|
||||||
| func (r *RootCmd) externalWorkspaces() *serpent.Command { | ||||||
| orgContext := NewOrganizationContext() | ||||||
|
|
||||||
| cmd := &serpent.Command{ | ||||||
| Use: "external-workspaces [subcommand]", | ||||||
| Short: "External workspace related commands", | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| Handler: func(inv *serpent.Invocation) error { | ||||||
| return inv.Command.HelpHandler(inv) | ||||||
| }, | ||||||
| Children: []*serpent.Command{ | ||||||
| r.externalWorkspaceCreate(), | ||||||
| r.externalWorkspaceAgentInstructions(), | ||||||
| r.externalWorkspaceList(), | ||||||
| }, | ||||||
| } | ||||||
|
|
||||||
| orgContext.AttachOptions(cmd) | ||||||
| return cmd | ||||||
| } | ||||||
|
|
||||||
| // externalWorkspaceCreate extends `coder create` to create an external workspace. | ||||||
| func (r *RootCmd) externalWorkspaceCreate() *serpent.Command { | ||||||
| var ( | ||||||
| orgContext = NewOrganizationContext() | ||||||
| client = new(codersdk.Client) | ||||||
| ) | ||||||
|
|
||||||
| cmd := r.create() | ||||||
| cmd.Use = "create [workspace]" | ||||||
| cmd.Short = "Create a new external workspace" | ||||||
| cmd.Middleware = serpent.Chain( | ||||||
| cmd.Middleware, | ||||||
| r.InitClient(client), | ||||||
| serpent.RequireNArgs(1), | ||||||
| ) | ||||||
|
|
||||||
| createHandler := cmd.Handler | ||||||
| cmd.Handler = func(inv *serpent.Invocation) error { | ||||||
| workspaceName := inv.Args[0] | ||||||
| templateVersion := inv.ParsedFlags().Lookup("template-version") | ||||||
| templateName := inv.ParsedFlags().Lookup("template") | ||||||
| if templateName == nil || templateName.Value.String() == "" { | ||||||
| return xerrors.Errorf("template name is required for external workspace creation. Use --template=<template_name>") | ||||||
| } | ||||||
|
|
||||||
| organization, err := orgContext.Selected(inv, client) | ||||||
| if err != nil { | ||||||
| return xerrors.Errorf("get current organization: %w", err) | ||||||
| } | ||||||
|
|
||||||
| template, err := client.TemplateByName(inv.Context(), organization.ID, templateName.Value.String()) | ||||||
| if err != nil { | ||||||
| return xerrors.Errorf("get template by name: %w", err) | ||||||
| } | ||||||
|
There was a problem hiding this comment. A lot of these queries are going to be repeated by the original handler, could we change the workspace, workspaceBuild, err := createHandler(ctx, inv, createOptions{
beforeCreate: func(ctx context.Context, template codersdk.Template, ...) error {},
}) |
||||||
|
|
||||||
| var resources []codersdk.WorkspaceResource | ||||||
| var templateVersionID uuid.UUID | ||||||
| if templateVersion == nil || templateVersion.Value.String() == "" { | ||||||
| templateVersionID = template.ActiveVersionID | ||||||
| } else { | ||||||
| version, err := client.TemplateVersionByName(inv.Context(), template.ID, templateVersion.Value.String()) | ||||||
| if err != nil { | ||||||
| return xerrors.Errorf("get template version by name: %w", err) | ||||||
| } | ||||||
| templateVersionID = version.ID | ||||||
| } | ||||||
|
|
||||||
| resources, err = client.TemplateVersionResources(inv.Context(), templateVersionID) | ||||||
| if err != nil { | ||||||
| return xerrors.Errorf("get template version resources: %w", err) | ||||||
| } | ||||||
| if len(resources) == 0 { | ||||||
| return xerrors.Errorf("no resources found for template version %q", templateVersion.Value.String()) | ||||||
| } | ||||||
|
|
||||||
| var hasExternalAgent bool | ||||||
| for _, resource := range resources { | ||||||
| if resource.Type == "coder_external_agent" { | ||||||
| hasExternalAgent = true | ||||||
| break | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| if !hasExternalAgent { | ||||||
| return xerrors.Errorf("template version %q does not have an external agent. Only templates with external agents can be used for external workspace creation", templateVersion.Value.String()) | ||||||
| } | ||||||
|
|
||||||
| err = createHandler(inv) | ||||||
| if err != nil { | ||||||
| return err | ||||||
| } | ||||||
|
|
||||||
| workspace, err := client.WorkspaceByOwnerAndName(inv.Context(), codersdk.Me, workspaceName, codersdk.WorkspaceOptions{}) | ||||||
| if err != nil { | ||||||
| return xerrors.Errorf("get workspace by name: %w", err) | ||||||
| } | ||||||
|
|
||||||
| externalAgents, err := fetchExternalAgents(inv, client, workspace, workspace.LatestBuild.Resources) | ||||||
| if err != nil { | ||||||
| return xerrors.Errorf("fetch external agents: %w", err) | ||||||
| } | ||||||
|
|
||||||
| return printExternalAgents(inv, workspace.Name, externalAgents) | ||||||
| } | ||||||
| return cmd | ||||||
| } | ||||||
|
|
||||||
| // externalWorkspaceAgentInstructions prints the instructions for an external agent. | ||||||
| func (r *RootCmd) externalWorkspaceAgentInstructions() *serpent.Command { | ||||||
| client := new(codersdk.Client) | ||||||
| formatter := cliui.NewOutputFormatter( | ||||||
| cliui.ChangeFormatterData(cliui.TextFormat(), func(data any) (any, error) { | ||||||
| agent, ok := data.(externalAgent) | ||||||
| if !ok { | ||||||
| return "", xerrors.Errorf("expected externalAgent, got %T", data) | ||||||
| } | ||||||
|
|
||||||
| var output strings.Builder | ||||||
| _, _ = output.WriteString(fmt.Sprintf("Please run the following commands to attach agent %s:\n", cliui.Keyword(agent.AgentName))) | ||||||
| _, _ = output.WriteString(fmt.Sprintf("%s\n", pretty.Sprint(cliui.DefaultStyles.Code, fmt.Sprintf("export CODER_AGENT_TOKEN=%s", agent.AuthToken)))) | ||||||
| _, _ = output.WriteString(pretty.Sprint(cliui.DefaultStyles.Code, fmt.Sprintf("curl -fsSL %s | sh", agent.InitScript))) | ||||||
|
|
||||||
| return output.String(), nil | ||||||
| }), | ||||||
|
There was a problem hiding this comment. This chunk of code seems to be used multiple times, can you not reuse |
||||||
| cliui.JSONFormat(), | ||||||
| ) | ||||||
|
|
||||||
| cmd := &serpent.Command{ | ||||||
| Use: "agent-instructions [workspace name] [agent name]", | ||||||
|
There was a problem hiding this comment. Other commands use |
||||||
| Short: "Get the instructions for an external agent", | ||||||
| Middleware: serpent.Chain(r.InitClient(client), serpent.RequireNArgs(2)), | ||||||
| Handler: func(inv *serpent.Invocation) error { | ||||||
| workspaceName := inv.Args[0] | ||||||
| agentName := inv.Args[1] | ||||||
|
|
||||||
| workspace, err := client.WorkspaceByOwnerAndName(inv.Context(), codersdk.Me, workspaceName, codersdk.WorkspaceOptions{}) | ||||||
| if err != nil { | ||||||
| return xerrors.Errorf("get workspace by name: %w", err) | ||||||
| } | ||||||
|
|
||||||
| credential, err := client.WorkspaceExternalAgentCredential(inv.Context(), workspace.ID, agentName) | ||||||
| if err != nil { | ||||||
| return xerrors.Errorf("get external agent token for agent %q: %w", agentName, err) | ||||||
| } | ||||||
|
|
||||||
| var agent codersdk.WorkspaceAgent | ||||||
| for _, resource := range workspace.LatestBuild.Resources { | ||||||
| for _, a := range resource.Agents { | ||||||
| if a.Name == agentName { | ||||||
| agent = a | ||||||
| break | ||||||
| } | ||||||
| } | ||||||
| if agent.ID != uuid.Nil { | ||||||
| break | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| initScriptURL := fmt.Sprintf("%s/api/v2/init-script", client.URL) | ||||||
| if agent.OperatingSystem != "linux" || agent.Architecture != "amd64" { | ||||||
| initScriptURL = fmt.Sprintf("%s/api/v2/init-script?os=%s&arch=%s", client.URL, agent.OperatingSystem, agent.Architecture) | ||||||
| } | ||||||
|
|
||||||
| agentInfo := externalAgent{ | ||||||
| AgentName: agentName, | ||||||
| AuthType: "token", | ||||||
| AuthToken: credential.AgentToken, | ||||||
| InitScript: initScriptURL, | ||||||
| } | ||||||
|
|
||||||
| out, err := formatter.Format(inv.Context(), agentInfo) | ||||||
| if err != nil { | ||||||
| return err | ||||||
| } | ||||||
|
|
||||||
| _, err = fmt.Fprintln(inv.Stdout, out) | ||||||
| return err | ||||||
| }, | ||||||
| } | ||||||
|
|
||||||
| formatter.AttachOptions(&cmd.Options) | ||||||
| return cmd | ||||||
| } | ||||||
|
|
||||||
| func (r *RootCmd) externalWorkspaceList() *serpent.Command { | ||||||
| var ( | ||||||
| filter cliui.WorkspaceFilter | ||||||
| formatter = cliui.NewOutputFormatter( | ||||||
| cliui.TableFormat( | ||||||
| []workspaceListRow{}, | ||||||
| []string{ | ||||||
| "workspace", | ||||||
| "template", | ||||||
| "status", | ||||||
| "healthy", | ||||||
| "last built", | ||||||
| "current version", | ||||||
| "outdated", | ||||||
| }, | ||||||
| ), | ||||||
| cliui.JSONFormat(), | ||||||
| ) | ||||||
| ) | ||||||
| client := new(codersdk.Client) | ||||||
| cmd := &serpent.Command{ | ||||||
| Annotations: workspaceCommand, | ||||||
| Use: "list", | ||||||
| Short: "List external workspaces", | ||||||
| Aliases: []string{"ls"}, | ||||||
| Middleware: serpent.Chain( | ||||||
| serpent.RequireNArgs(0), | ||||||
| r.InitClient(client), | ||||||
| ), | ||||||
| Handler: func(inv *serpent.Invocation) error { | ||||||
| baseFilter := filter.Filter() | ||||||
|
|
||||||
| if baseFilter.FilterQuery == "" { | ||||||
| baseFilter.FilterQuery = "has-external-agent:true" | ||||||
| } else { | ||||||
| baseFilter.FilterQuery += " has-external-agent:true" | ||||||
| } | ||||||
|
|
||||||
| res, err := queryConvertWorkspaces(inv.Context(), client, baseFilter, workspaceListRowFromWorkspace) | ||||||
| if err != nil { | ||||||
| return err | ||||||
| } | ||||||
|
|
||||||
| if len(res) == 0 && formatter.FormatID() != cliui.JSONFormat().ID() { | ||||||
| pretty.Fprintf(inv.Stderr, cliui.DefaultStyles.Prompt, "No workspaces found! Create one:\n") | ||||||
| _, _ = fmt.Fprintln(inv.Stderr) | ||||||
| _, _ = fmt.Fprintln(inv.Stderr, " "+pretty.Sprint(cliui.DefaultStyles.Code, "coder external-workspaces create <name>")) | ||||||
| _, _ = fmt.Fprintln(inv.Stderr) | ||||||
| return nil | ||||||
| } | ||||||
|
|
||||||
| out, err := formatter.Format(inv.Context(), res) | ||||||
| if err != nil { | ||||||
| return err | ||||||
| } | ||||||
|
|
||||||
| _, err = fmt.Fprintln(inv.Stdout, out) | ||||||
| return err | ||||||
| }, | ||||||
| } | ||||||
| filter.AttachOptions(&cmd.Options) | ||||||
| formatter.AttachOptions(&cmd.Options) | ||||||
| return cmd | ||||||
| } | ||||||
|
|
||||||
| // fetchExternalAgents fetches the external agents for a workspace. | ||||||
| func fetchExternalAgents(inv *serpent.Invocation, client *codersdk.Client, workspace codersdk.Workspace, resources []codersdk.WorkspaceResource) ([]externalAgent, error) { | ||||||
| if len(resources) == 0 { | ||||||
| return nil, xerrors.Errorf("no resources found for workspace") | ||||||
| } | ||||||
|
|
||||||
| var externalAgents []externalAgent | ||||||
|
|
||||||
| for _, resource := range resources { | ||||||
| if resource.Type != "coder_external_agent" || len(resource.Agents) == 0 { | ||||||
| continue | ||||||
| } | ||||||
|
|
||||||
| agent := resource.Agents[0] | ||||||
| credential, err := client.WorkspaceExternalAgentCredential(inv.Context(), workspace.ID, agent.Name) | ||||||
| if err != nil { | ||||||
| return nil, xerrors.Errorf("get external agent token for agent %q: %w", agent.Name, err) | ||||||
| } | ||||||
|
|
||||||
| initScriptURL := fmt.Sprintf("%s/api/v2/init-script", client.URL) | ||||||
| if agent.OperatingSystem != "linux" || agent.Architecture != "amd64" { | ||||||
| initScriptURL = fmt.Sprintf("%s/api/v2/init-script?os=%s&arch=%s", client.URL, agent.OperatingSystem, agent.Architecture) | ||||||
| } | ||||||
|
|
||||||
| externalAgents = append(externalAgents, externalAgent{ | ||||||
| AgentName: agent.Name, | ||||||
| AuthType: "token", | ||||||
| AuthToken: credential.AgentToken, | ||||||
| InitScript: initScriptURL, | ||||||
| }) | ||||||
| } | ||||||
|
|
||||||
| return externalAgents, nil | ||||||
| } | ||||||
|
|
||||||
| // printExternalAgents prints the instructions for an external agent. | ||||||
| func printExternalAgents(inv *serpent.Invocation, workspaceName string, externalAgents []externalAgent) error { | ||||||
| _, _ = fmt.Fprintf(inv.Stdout, "\nPlease run the following commands to attach external agent to the workspace %s:\n\n", cliui.Keyword(workspaceName)) | ||||||
|
|
||||||
| for i, agent := range externalAgents { | ||||||
| if len(externalAgents) > 1 { | ||||||
| _, _ = fmt.Fprintf(inv.Stdout, "For agent %s:\n", cliui.Keyword(agent.AgentName)) | ||||||
| } | ||||||
|
|
||||||
| _, _ = fmt.Fprintf(inv.Stdout, "%s\n", pretty.Sprint(cliui.DefaultStyles.Code, fmt.Sprintf("export CODER_AGENT_TOKEN=%s", agent.AuthToken))) | ||||||
| _, _ = fmt.Fprintf(inv.Stdout, "%s\n", pretty.Sprint(cliui.DefaultStyles.Code, fmt.Sprintf("curl -fsSL %s | sh", agent.InitScript))) | ||||||
|
|
||||||
| if i < len(externalAgents)-1 { | ||||||
| _, _ = fmt.Fprintf(inv.Stdout, "\n") | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| return nil | ||||||
| } | ||||||
Oops, something went wrong.
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.
nit: Maybe this should be
externalworkspaces.gotoo