From 94e50698e7876af0caa5c1729cf44c6895ccb39b Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Thu, 10 Mar 2022 18:54:40 +0000 Subject: [PATCH 01/37] Add templates --- .gitignore | 5 + .goreleaser.yml | 2 +- .vscode/settings.json | 3 +- Makefile | 6 +- cli/cliui/cliui.go | 37 ++ cli/cliui/prompt.go | 107 ++++ cli/cliui/prompt_test.go | 43 ++ cli/login.go | 43 +- cli/projectcreate.go | 62 +-- cli/workspaceagent.go | 38 +- cmd/cliui/main.go | 48 ++ cmd/templater/main.go | 352 +++++++++++++ coderd/templates.go | 10 + coderd/tunnel/tunnel.go | 104 ++++ coderd/tunnel/tunnel_test.go | 50 ++ coderd/workspaceresourceauth_test.go | 18 +- coderd/workspaceresources.go | 11 + coderd/workspaces.go | 1 + database/query.sql | 4 +- database/query.sql.go | 2 + go.mod | 93 +++- go.sum | 712 ++++++++++++++++++++++++-- provisioner/terraform/provision.go | 34 +- provisionersdk/agent.go | 13 +- provisionersdk/archive.go | 56 ++ pty/ptytest/ptytest.go | 2 +- template/gcp-linux/gcp-linux.json | 86 ++++ template/gcp-linux/gcp-linux.md | 5 + template/gcp-linux/gcp-linux.tf | 73 +++ template/gcp-windows/gcp-windows.json | 86 ++++ template/gcp-windows/gcp-windows.md | 5 + template/gcp-windows/gcp-windows.tf | 76 +++ template/template.go | 31 ++ template/template_test.go | 12 + 34 files changed, 2087 insertions(+), 143 deletions(-) create mode 100644 cli/cliui/cliui.go create mode 100644 cli/cliui/prompt.go create mode 100644 cli/cliui/prompt_test.go create mode 100644 cmd/cliui/main.go create mode 100644 cmd/templater/main.go create mode 100644 coderd/templates.go create mode 100644 coderd/tunnel/tunnel.go create mode 100644 coderd/tunnel/tunnel_test.go create mode 100644 provisionersdk/archive.go create mode 100644 template/gcp-linux/gcp-linux.json create mode 100644 template/gcp-linux/gcp-linux.md create mode 100644 template/gcp-linux/gcp-linux.tf create mode 100644 template/gcp-windows/gcp-windows.json create mode 100644 template/gcp-windows/gcp-windows.md create mode 100644 template/gcp-windows/gcp-windows.tf create mode 100644 template/template.go create mode 100644 template/template_test.go diff --git a/.gitignore b/.gitignore index 7bf2c49778065..a48e0a99e2160 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,8 @@ coverage/ # Build dist/ site/out/ + +*.tfstate +*.tfplan +*.lock.hcl +.terraform/ diff --git a/.goreleaser.yml b/.goreleaser.yml index da84a309fda0f..bcb2f7ead8a98 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -20,7 +20,7 @@ builds: hooks: # The "trimprefix" appends ".exe" on Windows. post: | - cp {{.Path}} site/out/bin/coder_{{ .Os }}_{{ .Arch }}{{ trimprefix .Name "coder" }} + cp {{.Path}} site/out/bin/coder-{{ .Os }}-{{ .Arch }}{{ trimprefix .Name "coder" }} - id: coder dir: cmd/coder diff --git a/.vscode/settings.json b/.vscode/settings.json index a503c49b57bc2..f7106302a001c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,7 +8,7 @@ "go.coverOnSave": true, // The codersdk is used by coderd another other packages extensively. // To reduce redundancy in tests, it's covered by other packages. - "go.testFlags": ["-coverpkg=./.,github.com/coder/coder/codersdk"], + "go.testFlags": ["-short", "-coverpkg=./.,github.com/coder/coder/codersdk"], "go.coverageDecorator": { "type": "gutter", "coveredHighlightColor": "rgba(64,128,128,0.5)", @@ -27,6 +27,7 @@ ] }, "cSpell.words": [ + "cliui", "coderd", "coderdtest", "codersdk", diff --git a/Makefile b/Makefile index c157c2aed21a1..5e8f623e5d506 100644 --- a/Makefile +++ b/Makefile @@ -92,4 +92,8 @@ site/out: snapshot: goreleaser release --snapshot --rm-dist -.PHONY: snapshot \ No newline at end of file +.PHONY: snapshot + +template/%s: + + # Embed Terraform for each platform. \ No newline at end of file diff --git a/cli/cliui/cliui.go b/cli/cliui/cliui.go new file mode 100644 index 0000000000000..4a59f81b4a7ad --- /dev/null +++ b/cli/cliui/cliui.go @@ -0,0 +1,37 @@ +package cliui + +import ( + "errors" + + "github.com/charmbracelet/charm/ui/common" + "github.com/charmbracelet/lipgloss" +) + +var ( + Canceled = errors.New("canceled") + + defaultStyles = common.DefaultStyles() +) + +type Validate func(string) error + +// ValidateNotEmpty is a helper function to disallow empty inputs! +func ValidateNotEmpty(s string) error { + if s == "" { + return errors.New("Must be provided!") + } + return nil +} + +// Styles compose visual elements of the UI! +var Styles = struct { + Field, + Prompt, + FocusedPrompt, + Logo lipgloss.Style +}{ + Field: defaultStyles.Code.Foreground(lipgloss.AdaptiveColor{Light: "#000000", Dark: "#FFFFFF"}), + Prompt: defaultStyles.Prompt.Foreground(lipgloss.AdaptiveColor{Light: "#9B9B9B", Dark: "#5C5C5C"}), + FocusedPrompt: defaultStyles.FocusedPrompt.Foreground(lipgloss.Color("#651fff")), + Logo: defaultStyles.Logo.SetString("Coder"), +} diff --git a/cli/cliui/prompt.go b/cli/cliui/prompt.go new file mode 100644 index 0000000000000..44ed1926834ec --- /dev/null +++ b/cli/cliui/prompt.go @@ -0,0 +1,107 @@ +package cliui + +import ( + "strings" + + "github.com/charmbracelet/bubbles/textinput" + tea "github.com/charmbracelet/bubbletea" + "github.com/spf13/cobra" +) + +type PromptOptions struct { + Prompt string + Default string + CharLimit int + Validate Validate + EchoMode textinput.EchoMode + EchoCharacter rune + IsConfirm bool +} + +func Prompt(cmd *cobra.Command, opts PromptOptions) (string, error) { + input := &input{ + opts: opts, + model: textinput.New(), + } + input.model.Prompt = opts.Prompt + " " + input.model.Placeholder = opts.Default + input.model.CharLimit = opts.CharLimit + input.model.EchoCharacter = opts.EchoCharacter + input.model.EchoMode = opts.EchoMode + input.model.Focus() + + program := tea.NewProgram(input, tea.WithInput(cmd.InOrStdin()), tea.WithOutput(cmd.OutOrStdout())) + err := program.Start() + if err != nil { + return "", err + } + if input.canceled { + return "", Canceled + } + if opts.IsConfirm && !strings.EqualFold(input.model.Value(), "yes") { + return "", Canceled + } + return input.model.Value(), nil +} + +type input struct { + opts PromptOptions + model textinput.Model + err string + canceled bool +} + +func (i *input) Init() tea.Cmd { + return textinput.Blink +} + +func (i *input) Update(msg tea.Msg) (tea.Model, tea.Cmd) { + var cmd tea.Cmd + switch msg := msg.(type) { + case tea.KeyMsg: + switch msg.Type { + case tea.KeyEnter: + // Apply the default placeholder value. + if i.model.Value() == "" && i.model.Placeholder != "" { + i.model.SetValue(i.model.Placeholder) + } + + // Validate the value. + if i.opts.Validate != nil { + err := i.opts.Validate(i.model.Value()) + if err != nil { + i.err = err.Error() + return i, nil + } + } + i.err = "" + i.model.SetCursorMode(textinput.CursorHide) + + return i, tea.Quit + case tea.KeyCtrlC, tea.KeyEsc: + i.canceled = true + i.model.SetCursorMode(textinput.CursorHide) + return i, tea.Quit + } + + // We handle errors just like any other message + case error: + i.err = msg.Error() + return i, nil + } + + i.model, cmd = i.model.Update(msg) + return i, cmd +} + +func (i *input) View() string { + prompt := Styles.FocusedPrompt + if i.model.CursorMode() == textinput.CursorHide { + prompt = Styles.Prompt + } + validate := "" + if i.err != "" { + validate = "\n" + defaultStyles.Error.Render("▲ "+i.err) + } + return prompt.String() + i.model.View() + "\n" + validate +} diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go new file mode 100644 index 0000000000000..7dc67ca71eae2 --- /dev/null +++ b/cli/cliui/prompt_test.go @@ -0,0 +1,43 @@ +package cliui_test + +import ( + "fmt" + "testing" + + "github.com/coder/coder/cli/cliui" + "github.com/coder/coder/pty/ptytest" + "github.com/spf13/cobra" + "github.com/stretchr/testify/require" + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m) +} + +func TestPrompt(t *testing.T) { + t.Parallel() + t.Run("Success", func(t *testing.T) { + ptty := ptytest.New(t) + ch := make(chan string, 0) + go func() { + resp, err := prompt(ptty, cliui.PromptOptions{ + Prompt: "Example", + }) + require.NoError(t, err) + fmt.Printf("We got it!\n") + ch <- resp + }() + ptty.ExpectMatch("Example") + ptty.WriteLine("hello") + resp := <-ch + require.Equal(t, "hello", resp) + }) +} + +func prompt(ptty *ptytest.PTY, opts cliui.PromptOptions) (string, error) { + cmd := &cobra.Command{} + cmd.SetOutput(ptty.Output()) + cmd.SetIn(ptty.Input()) + return cliui.Prompt(cmd, opts) +} diff --git a/cli/login.go b/cli/login.go index c924958e7cafa..84626af2533ee 100644 --- a/cli/login.go +++ b/cli/login.go @@ -1,6 +1,7 @@ package cli import ( + "errors" "fmt" "io/ioutil" "net/url" @@ -9,6 +10,7 @@ import ( "runtime" "strings" + "github.com/charmbracelet/bubbles/textinput" "github.com/fatih/color" "github.com/go-playground/validator/v10" "github.com/manifoldco/promptui" @@ -16,6 +18,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/xerrors" + "github.com/coder/coder/cli/cliui" "github.com/coder/coder/coderd" "github.com/coder/coder/codersdk" ) @@ -69,36 +72,34 @@ func login() *cobra.Command { } _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s Your Coder deployment hasn't been set up!\n", caret) - _, err := prompt(cmd, &promptui.Prompt{ - Label: "Would you like to create the first user?", + _, err := cliui.Prompt(cmd, cliui.PromptOptions{ + Prompt: "Would you like to create the first user?", + Default: "yes", IsConfirm: true, - Default: "y", }) + if errors.Is(err, cliui.Canceled) { + return nil + } if err != nil { - return xerrors.Errorf("create user prompt: %w", err) + return err } currentUser, err := user.Current() if err != nil { return xerrors.Errorf("get current user: %w", err) } - username, err := prompt(cmd, &promptui.Prompt{ - Label: "What username would you like?", + username, err := cliui.Prompt(cmd, cliui.PromptOptions{ + Prompt: "What " + cliui.Styles.Field.Render("username") + " would you like?", Default: currentUser.Username, }) - if err != nil { - return xerrors.Errorf("pick username prompt: %w", err) + if errors.Is(err, cliui.Canceled) { + return nil } - - organization, err := prompt(cmd, &promptui.Prompt{ - Label: "What is the name of your organization?", - Default: "acme-corp", - }) if err != nil { - return xerrors.Errorf("pick organization prompt: %w", err) + return xerrors.Errorf("pick username prompt: %w", err) } - email, err := prompt(cmd, &promptui.Prompt{ - Label: "What's your email?", + email, err := cliui.Prompt(cmd, cliui.PromptOptions{ + Prompt: "What's your " + cliui.Styles.Field.Render("email") + "?", Validate: func(s string) error { err := validator.New().Var(s, "email") if err != nil { @@ -111,9 +112,11 @@ func login() *cobra.Command { return xerrors.Errorf("specify email prompt: %w", err) } - password, err := prompt(cmd, &promptui.Prompt{ - Label: "Enter a password:", - Mask: '*', + password, err := cliui.Prompt(cmd, cliui.PromptOptions{ + Prompt: "Enter a " + cliui.Styles.Field.Render("password") + ":", + EchoMode: textinput.EchoPassword, + EchoCharacter: '*', + Validate: cliui.ValidateNotEmpty, }) if err != nil { return xerrors.Errorf("specify password prompt: %w", err) @@ -122,8 +125,8 @@ func login() *cobra.Command { _, err = client.CreateFirstUser(cmd.Context(), coderd.CreateFirstUserRequest{ Email: email, Username: username, + Organization: username, Password: password, - Organization: organization, }) if err != nil { return xerrors.Errorf("create initial user: %w", err) diff --git a/cli/projectcreate.go b/cli/projectcreate.go index b4d7ee46e3443..45ad1590d7948 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -1,11 +1,8 @@ package cli import ( - "archive/tar" - "bytes" "errors" "fmt" - "io" "os" "path/filepath" "time" @@ -21,6 +18,7 @@ import ( "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/provisionerd" + "github.com/coder/coder/provisionersdk" ) func projectCreate() *cobra.Command { @@ -71,13 +69,6 @@ func projectCreate() *cobra.Command { if err != nil { return err } - project, err := client.CreateProject(cmd.Context(), organization.ID, coderd.CreateProjectRequest{ - Name: name, - VersionID: job.ID, - }) - if err != nil { - return err - } _, err = prompt(cmd, &promptui.Prompt{ Label: "Create project?", @@ -91,6 +82,14 @@ func projectCreate() *cobra.Command { return err } + project, err := client.CreateProject(cmd.Context(), organization.ID, coderd.CreateProjectRequest{ + Name: name, + VersionID: job.ID, + }) + if err != nil { + return err + } + _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s The %s project has been created!\n", caret, color.HiCyanString(project.Name)) _, err = prompt(cmd, &promptui.Prompt{ Label: "Create a new workspace?", @@ -129,7 +128,7 @@ func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, o spin.Start() defer spin.Stop() - tarData, err := tarDirectory(directory) + tarData, err := provisionersdk.Tar(directory) if err != nil { return nil, err } @@ -217,44 +216,3 @@ func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, o } return &version, displayProjectImportInfo(cmd, parameterSchemas, parameterValues, resources) } - -func tarDirectory(directory string) ([]byte, error) { - var buffer bytes.Buffer - tarWriter := tar.NewWriter(&buffer) - err := filepath.Walk(directory, func(file string, fileInfo os.FileInfo, err error) error { - if err != nil { - return err - } - header, err := tar.FileInfoHeader(fileInfo, file) - if err != nil { - return err - } - rel, err := filepath.Rel(directory, file) - if err != nil { - return err - } - header.Name = rel - if err := tarWriter.WriteHeader(header); err != nil { - return err - } - if fileInfo.IsDir() { - return nil - } - data, err := os.Open(file) - if err != nil { - return err - } - if _, err := io.Copy(tarWriter, data); err != nil { - return err - } - return data.Close() - }) - if err != nil { - return nil, err - } - err = tarWriter.Flush() - if err != nil { - return nil, err - } - return buffer.Bytes(), nil -} diff --git a/cli/workspaceagent.go b/cli/workspaceagent.go index e8dc4e2da2487..a5004f672dfd4 100644 --- a/cli/workspaceagent.go +++ b/cli/workspaceagent.go @@ -4,12 +4,14 @@ import ( "net/url" "os" - "github.com/powersj/whatsthis/pkg/cloud" + "cdr.dev/slog" + "cdr.dev/slog/sloggers/sloghuman" "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 { @@ -30,26 +32,28 @@ func workspaceAgent() *cobra.Command { client := codersdk.New(coderURL) sessionToken, exists := os.LookupEnv("CODER_TOKEN") if !exists { - probe, err := cloud.New() + // 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.AuthWorkspaceGoogleInstanceIdentity(cmd.Context(), "", nil) 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.AuthWorkspaceGoogleInstanceIdentity(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) + 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.ListenWorkspaceAgent, nil) + closer := agent.New(client.ListenWorkspaceAgent, &peer.ConnOptions{ + Logger: slog.Make(sloghuman.Sink(cmd.OutOrStdout())), + }) <-cmd.Context().Done() return closer.Close() }, diff --git a/cmd/cliui/main.go b/cmd/cliui/main.go new file mode 100644 index 0000000000000..43a814be77f4e --- /dev/null +++ b/cmd/cliui/main.go @@ -0,0 +1,48 @@ +package main + +import ( + "errors" + "fmt" + "os" + "strings" + + "github.com/coder/coder/cli/cliui" + "github.com/spf13/cobra" +) + +func main() { + root := &cobra.Command{ + Use: "cliui", + Short: "Used for visually testing UI components for the CLI.", + } + + root.AddCommand(&cobra.Command{ + Use: "prompt", + RunE: func(cmd *cobra.Command, args []string) error { + _, err := cliui.Prompt(cmd, cliui.PromptOptions{ + Prompt: "What is our " + cliui.Styles.Field.Render("company name") + "?", + Default: "acme-corp", + Validate: func(s string) error { + if !strings.EqualFold(s, "coder") { + return errors.New("Err... nope!") + } + return nil + }, + }) + if errors.Is(err, cliui.Canceled) { + return nil + } + if err != nil { + return err + } + fmt.Printf("You got it!\n") + return nil + }, + }) + + err := root.Execute() + if err != nil { + fmt.Println(err.Error()) + os.Exit(1) + } +} diff --git a/cmd/templater/main.go b/cmd/templater/main.go new file mode 100644 index 0000000000000..cf9e10873708b --- /dev/null +++ b/cmd/templater/main.go @@ -0,0 +1,352 @@ +package main + +import ( + "context" + "encoding/json" + "fmt" + "io" + "io/ioutil" + "net" + "net/http/httptest" + "net/url" + "os" + "path/filepath" + "sort" + "strings" + "time" + + "cdr.dev/slog" + "cdr.dev/slog/sloggers/sloghuman" + "github.com/coder/coder/coderd" + "github.com/coder/coder/coderd/tunnel" + "github.com/coder/coder/codersdk" + "github.com/coder/coder/database" + "github.com/coder/coder/database/databasefake" + "github.com/coder/coder/provisioner/terraform" + "github.com/coder/coder/provisionerd" + "github.com/coder/coder/provisionersdk" + "github.com/coder/coder/provisionersdk/proto" + "github.com/google/uuid" + "github.com/spf13/cobra" + "golang.org/x/xerrors" + "google.golang.org/api/idtoken" + + "github.com/gohugoio/hugo/parser/pageparser" +) + +func main() { + var rawParameters []string + cmd := &cobra.Command{ + Use: "templater", + RunE: func(cmd *cobra.Command, args []string) error { + parameters := make([]coderd.CreateParameterRequest, 0) + for _, parameter := range rawParameters { + parts := strings.SplitN(parameter, "=", 2) + parameters = append(parameters, coderd.CreateParameterRequest{ + Name: parts[0], + SourceValue: parts[1], + SourceScheme: database.ParameterSourceSchemeData, + DestinationScheme: database.ParameterDestinationSchemeProvisionerVariable, + }) + } + return parse(cmd, args, parameters) + }, + } + cmd.Flags().StringArrayVarP(&rawParameters, "parameter", "p", []string{}, "Specify parameters to pass in a template.") + err := cmd.Execute() + if err != nil { + panic(err) + } +} + +func parse(cmd *cobra.Command, args []string, parameters []coderd.CreateParameterRequest) error { + srv := httptest.NewUnstartedServer(nil) + srv.Config.BaseContext = func(_ net.Listener) context.Context { + return cmd.Context() + } + srv.Start() + serverURL, err := url.Parse(srv.URL) + if err != nil { + return err + } + accessURL, errCh, err := tunnel.New(cmd.Context(), srv.URL) + go func() { + err := <-errCh + if err != nil { + panic(err) + } + }() + accessURLParsed, err := url.Parse(accessURL) + if err != nil { + return err + } + var closeWait func() + validator, err := idtoken.NewValidator(cmd.Context()) + if err != nil { + return err + } + logger := slog.Make(sloghuman.Sink(cmd.OutOrStdout())) + srv.Config.Handler, closeWait = coderd.New(&coderd.Options{ + AccessURL: accessURLParsed, + Logger: logger, + Database: databasefake.New(), + Pubsub: database.NewPubsubInMemory(), + GoogleTokenValidator: validator, + }) + + client := codersdk.New(serverURL) + daemonClose, err := newProvisionerDaemon(cmd.Context(), client, logger) + if err != nil { + return err + } + defer daemonClose.Close() + + created, err := client.CreateFirstUser(cmd.Context(), coderd.CreateFirstUserRequest{ + Email: "templater@coder.com", + Username: "templater", + Organization: "templater", + Password: "insecure", + }) + if err != nil { + return err + } + auth, err := client.LoginWithPassword(cmd.Context(), coderd.LoginWithPasswordRequest{ + Email: "templater@coder.com", + Password: "insecure", + }) + if err != nil { + return err + } + client.SessionToken = auth.SessionToken + + dir, err := os.Getwd() + if err != nil { + return err + } + content, err := provisionersdk.Tar(dir) + if err != nil { + return err + } + resp, err := client.Upload(cmd.Context(), codersdk.ContentTypeTar, content) + if err != nil { + return err + } + + before := time.Now() + version, err := client.CreateProjectVersion(cmd.Context(), created.OrganizationID, coderd.CreateProjectVersionRequest{ + ProjectID: nil, + StorageMethod: database.ProvisionerStorageMethodFile, + StorageSource: resp.Hash, + Provisioner: database.ProvisionerTypeTerraform, + ParameterValues: parameters, + }) + if err != nil { + return err + } + logs, err := client.ProjectVersionLogsAfter(cmd.Context(), version.ID, before) + if err != nil { + return err + } + for { + log, ok := <-logs + if !ok { + break + } + fmt.Printf("terraform (%s): %s\n", log.Level, log.Output) + } + version, err = client.ProjectVersion(cmd.Context(), version.ID) + if err != nil { + return err + } + if version.Job.Status != coderd.ProvisionerJobSucceeded { + return xerrors.Errorf("Job wasn't successful, it was %q. Check the logs!", version.Job.Status) + } + + schemas, err := client.ProjectVersionSchema(cmd.Context(), version.ID) + if err != nil { + return err + } + resources, err := client.ProjectVersionResources(cmd.Context(), version.ID) + if err != nil { + return err + } + + readme, err := os.OpenFile(filepath.Base(dir)+".md", os.O_RDONLY, 0600) + if err != nil { + return err + } + defer readme.Close() + frontMatter, err := pageparser.ParseFrontMatterAndContent(readme) + if err != nil { + return err + } + name, exists := frontMatter.FrontMatter["name"] + if !exists { + return xerrors.New("front matter must contain name") + } + description, exists := frontMatter.FrontMatter["description"] + if !exists { + return xerrors.Errorf("front matter must contain description") + } + + for index, resource := range resources { + resource.ID = uuid.UUID{} + resource.JobID = uuid.UUID{} + resource.CreatedAt = time.Time{} + + if resource.Agent != nil { + resource.Agent.ID = uuid.UUID{} + resource.Agent.ResourceID = uuid.UUID{} + resource.Agent.CreatedAt = time.Time{} + } + resources[index] = resource + } + + for index, schema := range schemas { + schema.ID = uuid.UUID{} + schema.JobID = uuid.UUID{} + schema.CreatedAt = time.Time{} + schemas[index] = schema + } + sort.Slice(resources, func(i, j int) bool { + return resources[i].Name < resources[j].Name + }) + sort.Slice(schemas, func(i, j int) bool { + return schemas[i].Name < schemas[j].Name + }) + + template := coderd.Template{ + ID: filepath.Base(dir), + Name: name.(string), + Description: description.(string), + ProjectVersionParameterSchema: schemas, + Resources: resources, + } + + data, err := json.MarshalIndent(template, "", "\t") + if err != nil { + return err + } + os.WriteFile(filepath.Base(dir)+".json", data, 0600) + + project, err := client.CreateProject(cmd.Context(), created.OrganizationID, coderd.CreateProjectRequest{ + Name: "test", + VersionID: version.ID, + }) + if err != nil { + return err + } + + workspace, err := client.CreateWorkspace(cmd.Context(), created.UserID, coderd.CreateWorkspaceRequest{ + ProjectID: project.ID, + Name: "example", + }) + if err != nil { + return err + } + + build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + ProjectVersionID: version.ID, + Transition: database.WorkspaceTransitionStart, + }) + if err != nil { + return err + } + logs, err = client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before) + if err != nil { + return err + } + for { + log, ok := <-logs + if !ok { + break + } + fmt.Printf("terraform (%s): %s\n", log.Level, log.Output) + } + + resources, err = client.WorkspaceResourcesByBuild(cmd.Context(), build.ID) + if err != nil { + return err + } + for _, resource := range resources { + if resource.Agent == nil { + continue + } + err = awaitAgent(cmd.Context(), client, resource) + if err != nil { + return err + } + } + + build, err = client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + ProjectVersionID: version.ID, + Transition: database.WorkspaceTransitionDelete, + }) + if err != nil { + return err + } + logs, err = client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before) + if err != nil { + return err + } + for { + log, ok := <-logs + if !ok { + break + } + fmt.Printf("terraform (%s): %s\n", log.Level, log.Output) + } + + daemonClose.Close() + srv.Close() + closeWait() + return nil +} + +func awaitAgent(ctx context.Context, client *codersdk.Client, resource coderd.WorkspaceResource) error { + ticker := time.NewTicker(time.Second) + defer ticker.Stop() + for { + select { + case <-ctx.Done(): + return ctx.Err() + case <-ticker.C: + resource, err := client.WorkspaceResource(ctx, resource.ID) + if err != nil { + return err + } + if resource.Agent.UpdatedAt.IsZero() { + continue + } + return nil + } + } +} + +func newProvisionerDaemon(ctx context.Context, client *codersdk.Client, logger slog.Logger) (io.Closer, error) { + terraformClient, terraformServer := provisionersdk.TransportPipe() + go func() { + err := terraform.Serve(ctx, &terraform.ServeOptions{ + ServeOptions: &provisionersdk.ServeOptions{ + Listener: terraformServer, + }, + Logger: logger, + }) + if err != nil { + panic(err) + } + }() + tempDir, err := ioutil.TempDir("", "provisionerd") + if err != nil { + return nil, err + } + return provisionerd.New(client.ListenProvisionerDaemon, &provisionerd.Options{ + Logger: logger, + PollInterval: 50 * time.Millisecond, + UpdateInterval: 500 * time.Millisecond, + Provisioners: provisionerd.Provisioners{ + string(database.ProvisionerTypeTerraform): proto.NewDRPCProvisionerClient(provisionersdk.Conn(terraformClient)), + }, + WorkDirectory: tempDir, + }), nil +} diff --git a/coderd/templates.go b/coderd/templates.go new file mode 100644 index 0000000000000..b58e5c20978a5 --- /dev/null +++ b/coderd/templates.go @@ -0,0 +1,10 @@ +package coderd + +type Template struct { + ID string + Name string + Description string + + ProjectVersionParameterSchema []ProjectVersionParameterSchema `json:"schema"` + Resources []WorkspaceResource `json:"resources"` +} diff --git a/coderd/tunnel/tunnel.go b/coderd/tunnel/tunnel.go new file mode 100644 index 0000000000000..715311ee18a29 --- /dev/null +++ b/coderd/tunnel/tunnel.go @@ -0,0 +1,104 @@ +package tunnel + +import ( + "context" + "encoding/json" + "flag" + "net/http" + "os" + "strings" + "time" + + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel" + "github.com/cloudflare/cloudflared/connection" + "github.com/google/uuid" + "github.com/pkg/errors" + "github.com/rs/zerolog" + "github.com/urfave/cli/v2" +) + +// New creates a new tunnel pointing at the URL provided. +// Once created, it returns the external hostname that will resolve to it. +// +// The tunnel will exit when the context provided is cancelled. +// +// Upstream connection occurs async through Cloudflare, so the error channel +// will only be executed if the tunnel has failed after numerous attempts. +func New(ctx context.Context, url string) (string, <-chan error, error) { + httpTimeout := time.Second * 30 + client := http.Client{ + Transport: &http.Transport{ + TLSHandshakeTimeout: httpTimeout, + ResponseHeaderTimeout: httpTimeout, + }, + Timeout: httpTimeout, + } + + // Taken from: + // https://github.com/cloudflare/cloudflared/blob/22cd8ceb8cf279afc1c412ae7f98308ffcfdd298/cmd/cloudflared/tunnel/quick_tunnel.go#L38 + resp, err := client.Post("https://api.trycloudflare.com/tunnel", "application/json", nil) + if err != nil { + return "", nil, errors.Wrap(err, "failed to request quick Tunnel") + } + defer resp.Body.Close() + + var data quickTunnelResponse + if err := json.NewDecoder(resp.Body).Decode(&data); err != nil { + return "", nil, errors.Wrap(err, "failed to unmarshal quick Tunnel") + } + + tunnelID, err := uuid.Parse(data.Result.ID) + if err != nil { + return "", nil, errors.Wrap(err, "failed to parse quick Tunnel ID") + } + + credentials := connection.Credentials{ + AccountTag: data.Result.AccountTag, + TunnelSecret: data.Result.Secret, + TunnelID: tunnelID, + } + + namedTunnel := &connection.NamedTunnelProperties{ + Credentials: credentials, + QuickTunnelUrl: data.Result.Hostname, + } + + set := flag.NewFlagSet("", 0) + set.String("protocol", "", "") + set.String("url", "", "") + set.Int("retries", 5, "") + appCtx := cli.NewContext(&cli.App{}, set, nil) + appCtx.Context = ctx + appCtx.Set("url", url) + appCtx.Set("protocol", "quic") + logger := zerolog.New(os.Stdout).Level(zerolog.Disabled) + errCh := make(chan error, 1) + go func() { + err := tunnel.StartServer(appCtx, &cliutil.BuildInfo{}, namedTunnel, &logger, false) + errCh <- err + }() + if !strings.HasPrefix(data.Result.Hostname, "https://") { + data.Result.Hostname = "https://" + data.Result.Hostname + } + return data.Result.Hostname, errCh, nil +} + +type quickTunnelResponse struct { + Success bool + Result quickTunnel + Errors []quickTunnelError +} + +type quickTunnelError struct { + Code int + Message string +} + +type quickTunnel struct { + ID string `json:"id"` + Name string `json:"name"` + Hostname string `json:"hostname"` + AccountTag string `json:"account_tag"` + Secret []byte `json:"secret"` +} diff --git a/coderd/tunnel/tunnel_test.go b/coderd/tunnel/tunnel_test.go new file mode 100644 index 0000000000000..b1d5716e6f080 --- /dev/null +++ b/coderd/tunnel/tunnel_test.go @@ -0,0 +1,50 @@ +package tunnel_test + +import ( + "context" + "net" + "net/http" + "net/http/httptest" + "testing" + "time" + + "github.com/coder/coder/coderd/tunnel" + "github.com/stretchr/testify/require" + "golang.org/x/xerrors" +) + +// The tunnel leaks a few goroutines that aren't impactful to production scenarios. +// func TestMain(m *testing.M) { +// goleak.VerifyTestMain(m) +// } + +func TestTunnel(t *testing.T) { + t.Parallel() + if testing.Short() { + t.Skip() + return + } + + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusOK) + })) + t.Cleanup(srv.Close) + + ctx, cancelFunc := context.WithCancel(context.Background()) + defer cancelFunc() + url, _, err := tunnel.New(ctx, srv.URL) + require.NoError(t, err) + + require.Eventually(t, func() bool { + req, err := http.NewRequestWithContext(ctx, "GET", url, nil) + require.NoError(t, err) + res, err := http.DefaultClient.Do(req) + var dnsErr *net.DNSError + // The name might take a bit to resolve! + if xerrors.As(err, &dnsErr) { + return false + } + require.NoError(t, err) + return res.StatusCode == http.StatusOK + }, time.Minute, 3*time.Second) +} diff --git a/coderd/workspaceresourceauth_test.go b/coderd/workspaceresourceauth_test.go index 5e1b643c93f7c..17e23493a02c3 100644 --- a/coderd/workspaceresourceauth_test.go +++ b/coderd/workspaceresourceauth_test.go @@ -69,8 +69,22 @@ func TestPostWorkspaceAuthGoogleInstanceIdentity(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) coderdtest.NewProvisionerDaemon(t, client) version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, &echo.Responses{ - Parse: echo.ParseComplete, - ProvisionDryRun: echo.ProvisionComplete, + Parse: echo.ParseComplete, + ProvisionDryRun: []*proto.Provision_Response{{ + Type: &proto.Provision_Response_Complete{ + Complete: &proto.Provision_Complete{ + Resources: []*proto.Resource{{ + Name: "somename", + Type: "someinstance", + Agent: &proto.Agent{ + Auth: &proto.Agent_GoogleInstanceIdentity{ + GoogleInstanceIdentity: &proto.GoogleInstanceIdentityAuth{}, + }, + }, + }}, + }, + }, + }}, Provision: []*proto.Provision_Response{{ Type: &proto.Provision_Response_Complete{ Complete: &proto.Provision_Complete{ diff --git a/coderd/workspaceresources.go b/coderd/workspaceresources.go index f753a5f477ddb..7dfdbc3701802 100644 --- a/coderd/workspaceresources.go +++ b/coderd/workspaceresources.go @@ -8,6 +8,7 @@ import ( "net/http" "time" + "cdr.dev/slog" "github.com/go-chi/render" "github.com/google/uuid" "github.com/hashicorp/yamux" @@ -163,6 +164,16 @@ func (api *api) workspaceAgentListen(rw http.ResponseWriter, r *http.Request) { }) return } + resource, err := api.Database.GetWorkspaceResourceByID(r.Context(), agent.ResourceID) + if err != nil { + httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{ + Message: fmt.Sprintf("accept websocket: %s", err), + }) + return + } + + api.Logger.Info(r.Context(), "accepting agent", slog.F("resource", resource), slog.F("agent", agent)) + defer func() { _ = conn.Close(websocket.StatusNormalClosure, "") }() diff --git a/coderd/workspaces.go b/coderd/workspaces.go index ad89e67fc99d4..cb16105135c6f 100644 --- a/coderd/workspaces.go +++ b/coderd/workspaces.go @@ -189,6 +189,7 @@ func (api *api) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) { ProjectVersionID: projectVersion.ID, BeforeID: priorHistoryID, Name: namesgenerator.GetRandomName(1), + ProvisionerState: priorHistory.ProvisionerState, Initiator: apiKey.UserID, Transition: createBuild.Transition, JobID: provisionerJob.ID, diff --git a/database/query.sql b/database/query.sql index 18aa7f1c9b625..daf2f0e72e6d9 100644 --- a/database/query.sql +++ b/database/query.sql @@ -250,7 +250,9 @@ SELECT FROM workspace_agent WHERE - auth_token = $1; + auth_token = $1 +ORDER BY + created_at DESC; -- name: GetWorkspaceAgentByInstanceID :one SELECT diff --git a/database/query.sql.go b/database/query.sql.go index 57dbc7e4af671..4868214668ae9 100644 --- a/database/query.sql.go +++ b/database/query.sql.go @@ -904,6 +904,8 @@ FROM workspace_agent WHERE auth_token = $1 +ORDER BY + created_at DESC ` func (q *sqlQuerier) GetWorkspaceAgentByAuthToken(ctx context.Context, authToken uuid.UUID) (WorkspaceAgent, error) { diff --git a/go.mod b/go.mod index f4f47a4d27e22..cbca3e44e9332 100644 --- a/go.mod +++ b/go.mod @@ -17,10 +17,25 @@ replace github.com/chzyer/readline => github.com/kylecarbs/readline v0.0.0-20220 // opencensus-go leaks a goroutine by default. replace go.opencensus.io => github.com/kylecarbs/opencensus-go v0.23.1-0.20220307014935-4d0325a68f8b +// These are to allow embedding the cloudflared quick-tunnel CLI. +// Required until https://github.com/cloudflare/cloudflared/pull/597 is merged. +replace github.com/cloudflare/cloudflared => github.com/kylecarbs/cloudflared v0.0.0-20220309211552-7f1fc77731ce + +replace github.com/urfave/cli/v2 => github.com/ipostelnik/cli/v2 v2.3.1-0.20210324024421-b6ea8234fe3d + +replace github.com/lucas-clemente/quic-go => github.com/chungthuang/quic-go v0.24.1-0.20220110095058-981dc498cb62 + +replace github.com/rivo/tview => github.com/kylecarbs/tview v0.0.0-20220309202238-8464256e10a1 + require ( cdr.dev/slog v1.4.1 cloud.google.com/go/compute v1.5.0 github.com/briandowns/spinner v1.18.1 + github.com/charmbracelet/bubbles v0.10.3 + github.com/charmbracelet/bubbletea v0.20.0 + github.com/charmbracelet/charm v0.10.3 + github.com/charmbracelet/lipgloss v0.5.0 + github.com/cloudflare/cloudflared v0.0.0-20220308214351-5352b3cf0489 github.com/coder/retry v1.3.0 github.com/creack/pty v1.1.17 github.com/fatih/color v1.13.0 @@ -28,6 +43,7 @@ require ( github.com/go-chi/chi/v5 v5.0.7 github.com/go-chi/render v1.0.1 github.com/go-playground/validator/v10 v10.10.0 + github.com/gohugoio/hugo v0.93.3 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang-migrate/migrate/v4 v4.15.1 github.com/google/uuid v1.3.0 @@ -49,12 +65,14 @@ require ( github.com/pion/transport v0.13.0 github.com/pion/webrtc/v3 v3.1.24 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 - github.com/powersj/whatsthis v1.3.0 + github.com/pkg/errors v0.9.1 github.com/quasilyte/go-ruleguard/dsl v0.3.17 + github.com/rs/zerolog v1.20.0 github.com/spf13/cobra v1.3.0 - github.com/stretchr/testify v1.7.0 + github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942 github.com/tabbed/pqtype v0.1.1 github.com/unrolled/secure v1.10.0 + github.com/urfave/cli/v2 v2.3.0 github.com/xlab/treeprint v1.1.0 go.uber.org/atomic v1.9.0 go.uber.org/goleak v1.1.12 @@ -70,15 +88,30 @@ require ( require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/BurntSushi/toml v0.3.1 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect github.com/agext/levenshtein v1.2.3 // indirect github.com/alecthomas/chroma v0.10.0 // indirect github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect + github.com/apparentlymart/go-cidr v1.1.0 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect + github.com/atotto/clipboard v0.1.4 // indirect + github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.1.2 // indirect + github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/cheekybits/genny v1.0.0 // indirect github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect + github.com/clbanning/mxj/v2 v2.5.5 // indirect + github.com/cloudflare/brotli-go v0.0.0-20191101163834-d34379f7ff93 // indirect + github.com/cloudflare/golibs v0.0.0-20170913112048-333127dbecfc // indirect + github.com/containerd/console v1.0.3 // indirect github.com/containerd/continuity v0.2.2 // indirect + github.com/coredns/caddy v1.1.1 // indirect + github.com/coredns/coredns v1.8.7 // indirect + github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dhui/dktest v0.3.9 // indirect github.com/dlclark/regexp2 v1.4.0 // indirect @@ -87,29 +120,65 @@ require ( github.com/docker/docker v20.10.12+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.4.0 // indirect + github.com/facebookgo/grace v0.0.0-20180706040059-75cf19382434 // indirect + github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect + github.com/francoispqt/gojay v1.2.13 // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/gdamore/encoding v1.0.0 // indirect + github.com/gdamore/tcell v1.3.0 // indirect + github.com/getsentry/raven-go v0.0.0-20180517221441-ed7bcb39ff10 // indirect github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect + github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect + github.com/gobwas/glob v0.2.3 // indirect + github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58 // indirect + github.com/gobwas/pool v0.2.1 // indirect + github.com/gobwas/ws v1.0.4 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-cmp v0.5.7 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/gorilla/mux v1.8.0 // indirect + github.com/gorilla/websocket v1.5.0 // indirect + github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/hcl/v2 v2.11.1 // indirect github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect github.com/juju/ansiterm v0.0.0-20210929141451-8b71cc96ebdc // indirect github.com/klauspost/compress v1.14.3 // indirect github.com/leodido/go-urn v1.2.1 // indirect + github.com/lucas-clemente/quic-go v0.24.0 // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/lunixbochs/vtclean v1.0.0 // indirect + github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect + github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect + github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 // indirect github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-runewidth v0.0.13 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/miekg/dns v1.1.45 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect + github.com/muesli/reflow v0.3.0 // indirect + github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739 // indirect + github.com/niklasfasching/go-org v1.6.0 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/onsi/ginkgo v1.16.5 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opencontainers/runc v1.1.0 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect + github.com/pelletier/go-toml/v2 v2.0.0-beta.6 // indirect github.com/pion/dtls/v2 v2.1.3 // indirect github.com/pion/ice/v2 v2.2.1 // indirect github.com/pion/interceptor v0.1.7 // indirect @@ -123,9 +192,19 @@ require ( github.com/pion/stun v0.3.5 // indirect github.com/pion/turn/v2 v2.0.8 // indirect github.com/pion/udp v0.1.1 // indirect - github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect + github.com/prometheus/client_golang v1.11.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.32.1 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/rivo/tview v0.0.0-20200712113419-c65badfc3d92 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect + github.com/spf13/afero v1.8.1 // indirect + github.com/spf13/cast v1.4.1 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect @@ -133,12 +212,20 @@ require ( github.com/zclconf/go-cty v1.10.0 // indirect github.com/zeebo/errs v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect + golang.org/x/mod v0.5.1 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect + golang.org/x/tools v0.1.9 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf // indirect google.golang.org/grpc v1.44.0 // indirect + gopkg.in/coreos/go-oidc.v2 v2.2.1 // indirect + gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect + gopkg.in/square/go-jose.v2 v2.6.0 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + zombiezen.com/go/capnproto2 v2.18.0+incompatible // indirect ) diff --git a/go.sum b/go.sum index 23ef4331601af..d04f771880e21 100644 --- a/go.sum +++ b/go.sum @@ -1,24 +1,32 @@ bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= +bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM= cdr.dev/slog v1.4.1 h1:Q8+X63m8/WB4geelMTDO8t4CTwVh1f7+5Cxi7kS/SZg= cdr.dev/slog v1.4.1/go.mod h1:O76C6gZJxa5HK1SXMrjd48V2kJxYZKFRTcFfn/V9OhA= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.55.0/go.mod h1:ZHmoY+/lIMNkN2+fBmuTiqZ4inFhvQad8ft7MT8IV5Y= cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.58.0/go.mod h1:W+9FnSUw6nhVwXlFcp1eL+krq5+HQUJeUogSeJZZiWg= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= @@ -46,8 +54,9 @@ cloud.google.com/go/compute v1.5.0 h1:b1zWmYuuHz7gO9kDcM/EpHGr06UgsYNRpNJzI2kFiL cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/firestore v1.2.0/go.mod h1:iISCjWnTpnoJT1R287xRdjvQHJrxQOpeah4phb5D3h0= cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= +cloud.google.com/go/iam v0.2.0/go.mod h1:BCK88+tmjAwnZYfOSizmKCTSFjJHCa18t3DpdGEY13Y= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -57,32 +66,83 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.9.0/go.mod h1:m+/etGaqZbylxaNT876QGXqEHp4PR2Rq5GMqICWb9bU= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= +contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= +contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= +contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= +dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= +dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= +dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= +github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod h1:SY08giD/XbhTz07tJdpw1SoxQXHPN30+DI3Z04SYqyg= +github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= +github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v61.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-service-bus-go v0.10.1/go.mod h1:E/FOceuKAFUfpbIJDKWz/May6guE+eGibfGT6q+n1to= +github.com/Azure/azure-storage-blob-go v0.9.0/go.mod h1:8UBPbiOhrMQ4pLPi3gA1tXnpjrS76UYE/fo5A40vf4g= github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck= +github.com/Azure/go-amqp v0.12.6/go.mod h1:qApuH6OFTSKZFmCOxccvAv5rLizBQf4v8pRmG138DPo= +github.com/Azure/go-amqp v0.12.7/go.mod h1:qApuH6OFTSKZFmCOxccvAv5rLizBQf4v8pRmG138DPo= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0= github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= +github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= +github.com/Azure/go-autorest/autorest v0.11.19/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= +github.com/Azure/go-autorest/autorest v0.11.23/go.mod h1:BAWYUWGPEtKPzjVkp0Q6an0MJcJDsoh5Z1BFAEFs4Xs= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= +github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= +github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= github.com/Azure/go-autorest/autorest/adal v0.9.14/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= +github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= +github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod h1:90gmfKdlmKgfjUpnCEpOJzsUEjrWDSLwHIG73tSXddM= +github.com/Azure/go-autorest/autorest/azure/auth v0.5.10/go.mod h1:zQXYYNX9kXzRMrJNVXWUfNy38oPMF5/2TeZ4Wylc9fE= +github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod h1:ZG5p860J94/0kI9mNJVoIoLgXcirM2gF5i2kWloofxw= +github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod h1:7qkJkT+j6b+hIpzMOwPChJhTqS8VbsqqgULzMNRugoM= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= +github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= +github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= +github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= +github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/DataDog/datadog-go v4.4.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/DataDog/gostackparse v0.5.0/go.mod h1:lTfqcJKqS9KnXQGnyQMCugq3u1FP6UZMfWR0aitKFMM= +github.com/DataDog/sketches-go v1.0.0/go.mod h1:O+XkJHWk9w4hDwY2ZUDU31ZC9sNYlYo8DiFsxjYeo1k= +github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod h1:mjwGPas4yKduTyubHvD1Atl9r1rUq8DfVy+gkVvZ+oo= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= @@ -115,6 +175,10 @@ github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/sarama v1.30.0/go.mod h1:zujlQQx1kzHsh4jfV1USnptCQrHAEZ2Hk8fTKCulPVs= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/Shopify/toxiproxy/v2 v2.1.6-0.20210914104332-15ea381dcdae/go.mod h1:/cvHQkZ1fst0EmZnA5dFtiQdWCNCFYzb+uE2vqVgvx0= github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= @@ -123,6 +187,7 @@ github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7l github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI= +github.com/alecthomas/chroma v0.8.2/go.mod h1:sko8vR34/90zvl5QdcUdvzL3J8NKjAUx9va9jPuFNoM= github.com/alecthomas/chroma v0.9.1/go.mod h1:eMuEnpA18XbG/WhOWtCzJHS7WqEtDAI+HxdwoW0nVSk= github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek= github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s= @@ -133,6 +198,7 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= github.com/andybalholm/crlf v0.0.0-20171020200849-670099aa064f/go.mod h1:k8feO4+kXDxro6ErPXBRTJ/ro2mf0SsFG8s7doP9kJE= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= @@ -141,6 +207,8 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuW github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/arrow/go/arrow v0.0.0-20210818145353-234c94e4ce64/go.mod h1:2qMFB56yOP3KzkB3PbYZ4AlUFg3a88F67TIx5lB/WwY= github.com/apache/arrow/go/arrow v0.0.0-20211013220434-5962184e7a30/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs= +github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU= +github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0= github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= @@ -154,8 +222,16 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= +github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= +github.com/auth0/go-jwt-middleware/v2 v2.0.0-beta/go.mod h1:dWL9pw5FgrzT1Hhmt+D0W8XmDDulGHN3yMMQl1Oq4RM= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= +github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.19.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.31.13/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.42.30/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= +github.com/aws/aws-sdk-go v1.43.5/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go-v2 v1.8.0/go.mod h1:xEFuWz+3TYdlPRuo+CqATbeDWIWyaT5uAPwPaWtgse0= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.6.0/go.mod h1:TNtBVmka80lRPk5+S9ZqVfFszOQAGJJ9KbT3EM3CHNU= @@ -185,36 +261,73 @@ github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAm github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bep/debounce v1.2.0/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0= +github.com/bep/gitmap v1.1.2/go.mod h1:g9VRETxFUXNWzMiuxOwcudo6DfZkW9jOsOW0Ft4kYaY= +github.com/bep/goat v0.5.0/go.mod h1:Md9x7gRxiWKs85yHlVTvHQw9rg86Bm+Y4SuYE8CTH7c= +github.com/bep/godartsass v0.12.0/go.mod h1:nXQlHHk4H1ghUk6n/JkYKG5RD43yJfcfp5aHRqT/pc4= +github.com/bep/golibsass v1.0.0/go.mod h1:DL87K8Un/+pWUS75ggYv41bliGiolxzDKWJAq3eJ1MA= +github.com/bep/gowebp v0.1.0/go.mod h1:ZhFodwdiFp8ehGJpF4LdPl6unxZm9lLFjxD3z2h2AgI= +github.com/bep/tmc v0.5.1/go.mod h1:tGYHN8fS85aJPhDLgXETVKp+PR382OvFi2+q2GkGsq0= +github.com/bep/workers v1.0.0/go.mod h1:7kIESOB86HfR2379pwoMWNy8B50D7r99fRLUyPSNyCs= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= +github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/briandowns/spinner v1.18.1 h1:yhQmQtM1zsqFsouh09Bk/jCjd50pC3EOGsh28gLVvwY= github.com/briandowns/spinner v1.18.1/go.mod h1:mQak9GHqbspjC/5iUx3qMlIho8xBS/ppAL/hX5SmPJU= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= +github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= +github.com/caarlos0/env/v6 v6.9.1/go.mod h1:hvp/ryKXKipEkcuYjs9mI4bBCg+UI0Yhgm5Zu0ddvwc= +github.com/calmh/randomart v1.1.0/go.mod h1:DQUbPVyP+7PAs21w/AnfMKG5NioxS3TbZ2F9MSK/jFM= github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo= github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= +github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894 h1:JLaf/iINcLyjwbtTsCJjc6rtlASgHeIJPrB6QmwURnA= +github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/charmbracelet/bubbles v0.10.3 h1:fKarbRaObLn/DCsZO4Y3vKCwRUzynQD9L+gGev1E/ho= +github.com/charmbracelet/bubbles v0.10.3/go.mod h1:jOA+DUF1rjZm7gZHcNyIVW+YrBPALKfpGVdJu8UiJsA= +github.com/charmbracelet/bubbletea v0.19.3/go.mod h1:VuXF2pToRxDUHcBUcPmCRUHRvFATM4Ckb/ql1rBl3KA= +github.com/charmbracelet/bubbletea v0.20.0 h1:/b8LEPgCbNr7WWZ2LuE/BV1/r4t5PyYJtDb+J3vpwxc= +github.com/charmbracelet/bubbletea v0.20.0/go.mod h1:zpkze1Rioo4rJELjRyGlm9T2YNou1Fm4LIJQSa5QMEM= +github.com/charmbracelet/charm v0.10.3 h1:UxNC2zNEADn318LtFZ7jQIhwsEccCMi8teQHvf7eVh8= +github.com/charmbracelet/charm v0.10.3/go.mod h1:cIbe8nSGNfrLJCAGdHsIp2cZT51IUoQ5KPeax9IUnmU= +github.com/charmbracelet/harmonica v0.1.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao= +github.com/charmbracelet/keygen v0.2.1/go.mod h1:kFQ3Cvop12fXWX1K29vxDxV9x8ujG4wBSXq//GySSSk= +github.com/charmbracelet/lipgloss v0.1.1/go.mod h1:5D8zradw52m7QmxRF6QgwbwJi9je84g8MkWiGN07uKg= +github.com/charmbracelet/lipgloss v0.4.0/go.mod h1:vmdkHvce7UzX6xkyf4cca8WlwdQ5RQr8fzta+xl7BOM= +github.com/charmbracelet/lipgloss v0.5.0 h1:lulQHuVeodSgDez+3rGiuxlPVXSnhth442DATR2/8t8= +github.com/charmbracelet/lipgloss v0.5.0/go.mod h1:EZLha/HbzEt7cYqdFPovlqy5FZPj0xFhg5SaqxScmgs= +github.com/charmbracelet/wish v0.2.1/go.mod h1:ja7i62v6EfVOHH70wlUbLuU0kC7KS2TwgatxkFx4I28= +github.com/chaseadamsio/goorgeous v2.0.0+incompatible/go.mod h1:6QaC0vFoKWYDth94dHFNgRT2YkT5FHdQp/Yx15aAAi0= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= +github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= +github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= +github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= +github.com/chungthuang/quic-go v0.24.1-0.20220110095058-981dc498cb62 h1:PLTB4iA6sOgAItzQY642tYdcGKfG/7i2gu93JQGgUcM= +github.com/chungthuang/quic-go v0.24.1-0.20220110095058-981dc498cb62/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg= github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= @@ -227,7 +340,14 @@ github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJ github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= +github.com/clbanning/mxj/v2 v2.5.5 h1:oT81vUeEiQQ/DcHbzSytRngP6Ky9O+L+0Bw0zSJag9E= +github.com/clbanning/mxj/v2 v2.5.5/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= +github.com/cli/safeexec v1.0.0/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudflare/brotli-go v0.0.0-20191101163834-d34379f7ff93 h1:QrGfkZDnMxcWHaYDdB7CmqS9i26OAnUj/xcus/abYkY= +github.com/cloudflare/brotli-go v0.0.0-20191101163834-d34379f7ff93/go.mod h1:QiTe66jFdP7cUKMCCf/WrvDyYdtdmdZfVcdoLbzaKVY= +github.com/cloudflare/golibs v0.0.0-20170913112048-333127dbecfc h1:Dvk3ySBsOm5EviLx6VCyILnafPcQinXGP5jbTdHUJgE= +github.com/cloudflare/golibs v0.0.0-20170913112048-333127dbecfc/go.mod h1:HlgKKR8V5a1wroIDDIz3/A+T+9Janfq+7n1P5sEFdi0= github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -263,6 +383,7 @@ github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= +github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= @@ -334,9 +455,13 @@ github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRD github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4= github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= +github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0= +github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= +github.com/coredns/coredns v1.8.7 h1:wVMjAnyFnY7Mc18AFO+9qbGD6ODPtdVUIlzoWrHr3hk= +github.com/coredns/coredns v1.8.7/go.mod h1:bFmbgEfeRz5aizL2VsQ5LRlsvJuXWkgG/MWG9zxqjVM= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= @@ -344,15 +469,22 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU= +github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cosiner/argv v0.1.0/go.mod h1:EusR6TucWKX+zFgtdUsKT2Cvg45K5rtpCcWz4hK06d8= +github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -367,20 +499,31 @@ github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk= +github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= +github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= +github.com/dgraph-io/badger/v3 v3.2011.1/go.mod h1:0rLLrQpKVQAL0or/lBLMQznhr6dWWX7h5AKnmnqx268= +github.com/dgraph-io/ristretto v0.0.4-0.20210122082011-bb5d392ed82d/go.mod h1:tv2ec8nA7vRpSYX7/MbP52ihrUMXIHit54CQMq8npXQ= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dhui/dktest v0.3.7/go.mod h1:nYMOkafiA07WchSwKnKFUSbGMb2hMm5DrCGiXYG6gwM= github.com/dhui/dktest v0.3.9 h1:gE51cCl9PJG0Dw3cB7nuEahXx02LAf8IjKmq1DbKqrQ= github.com/dhui/dktest v0.3.9/go.mod h1:lTpM9nXq8oO90hEeMXvoIZkS+n3E1DBIADxHqXjeNiY= +github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= +github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= +github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI= +github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE= +github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E= github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= +github.com/dnstap/golang-dnstap v0.4.0/go.mod h1:FqsSdH58NAmkAvKcpyxht7i4FoBjKu8E4JUPt8ipSUs= github.com/docker/cli v20.10.11+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v20.10.12+incompatible h1:lZlz0uzG+GH+c0plStMUdF/qk3ppmgnswpR5EbqzVGA= github.com/docker/cli v20.10.12+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= @@ -406,12 +549,17 @@ github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -424,31 +572,65 @@ github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPO github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanw/esbuild v0.14.23/go.mod h1:GG+zjdi59yh3ehDn4ZWfPcATxjPDUH53iU4ZJbp7dkY= +github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= +github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= +github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 h1:wWke/RUCl7VRjQhwPlR/v0glZXNYzBHdNUzf/Am2Nmg= +github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9/go.mod h1:uPmAp6Sws4L7+Q/OokbWDAK1ibXYhB3PXFP1kol5hPg= +github.com/facebookgo/grace v0.0.0-20180706040059-75cf19382434 h1:mOp33BLbcbJ8fvTAmZacbBiOASfxN+MLcLxymZCIrGE= +github.com/facebookgo/grace v0.0.0-20180706040059-75cf19382434/go.mod h1:KigFdumBXUPSwzLDbeuzyt0elrL7+CP7TKuhrhT4bcU= +github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= +github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= +github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y= +github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= +github.com/farsightsec/golang-framestream v0.3.0/go.mod h1:eNde4IQyEiA5br02AouhEHCu3p3UzrCdFR4LuQHklMI= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= +github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= +github.com/frankban/quicktest v1.4.1/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= +github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o= +github.com/frankban/quicktest v1.11.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU= +github.com/frankban/quicktest v1.14.2 h1:SPb1KFFmM+ybpEjPUhCCkZOM5xlovT5UbrMvWnXyBns= +github.com/frankban/quicktest v1.14.2/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/fsouza/fake-gcs-server v1.17.0/go.mod h1:D1rTE4YCyHFNa99oyJJ5HyclvN/0uQR+pM/VdlL83bw= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8= github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= +github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= +github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= +github.com/gdamore/tcell v1.3.0 h1:r35w0JBADPZCVQijYebl6YMWWtHRqVEGt7kL2eBADRM= +github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM= +github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= +github.com/getkin/kin-openapi v0.90.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= +github.com/getsentry/raven-go v0.0.0-20180517221441-ed7bcb39ff10 h1:YO10pIIBftO/kkTFdWhctH96grJ7qiy7bMdiZcIvPKs= +github.com/getsentry/raven-go v0.0.0-20180517221441-ed7bcb39ff10/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= +github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/gliderlabs/ssh v0.3.3 h1:mBQ8NiOgDkINJrZtoizkC3nDNYgSaWtxyem6S2XHBtA= github.com/gliderlabs/ssh v0.3.3/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914= @@ -456,6 +638,8 @@ github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8= github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns= +github.com/go-delve/delve v1.5.0/go.mod h1:c6b3a1Gry6x8a4LGCe/CWzrocrfaHvkUxCj3k4bvSUQ= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks= github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= @@ -474,13 +658,17 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2 github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= @@ -500,6 +688,7 @@ github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXS github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= @@ -511,6 +700,7 @@ github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSC github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= +github.com/gobuffalo/flect v0.2.4/go.mod h1:1ZyCLIbg0YD7sDkzvFdPoOydPtD8y9JQnrOROolUcM8= github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= @@ -528,12 +718,17 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= -github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= +github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= +github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= -github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= +github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58 h1:YyrUZvJaU8Q0QsoVo+xLFBgWDTam29PKea6GYmwvSiQ= +github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= +github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= +github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/gobwas/ws v1.0.4 h1:5eXU1CZhpQdq5kXbKb+sECH5Ia5KiO6CYzIzdlVx6Bs= +github.com/gobwas/ws v1.0.4/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= @@ -543,17 +738,29 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013/go.mod h1:3Ltoo9Banwq0gOtcOwxuHG6omk+AwsQPADyw2vQYOJQ= +github.com/gohugoio/hugo v0.93.3 h1:CiiVMcm+2CpANim73kg4hCB1uvCdqYbAMxDlUhU48sM= +github.com/gohugoio/hugo v0.93.3/go.mod h1:5j4ziEh0PkMj+uikYEcQ3VHq2BhXh0MiAWSKhUOvUWs= +github.com/gohugoio/locales v0.14.0/go.mod h1:ip8cCAv/cnmVLzzXtiTpPwgJ4xhKZranqNqtoIu0b/4= +github.com/gohugoio/localescompressed v0.15.0/go.mod h1:jBF6q8D7a0vaEmcWPNcAjUZLJaIVNiwvM3WlmTvooB0= +github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95/go.mod h1:bOlVlCa1/RajcHpXkrUXPSHB/Re1UnlXxD1Qp8SKOd8= +github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 h1:zN2lZNZRflqFyxVaTIU61KNKQ9C0055u9CAfpmqUvo4= +github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3/go.mod h1:nPpo7qLxd6XL3hWJG/O60sR8ZKfMCiIoNap5GvD12KU= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-migrate/migrate/v4 v4.15.1 h1:Sakl3Nm6+wQKq0Q62tpFMi5a503bgGhceo2icrgQ9vM= github.com/golang-migrate/migrate/v4 v4.15.1/go.mod h1:/CrBenUbcDqsW29jGTR/XFqCfVi/Y6mHXlooCcSOJMQ= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= @@ -565,6 +772,7 @@ github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -573,6 +781,7 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -595,11 +804,14 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/flatbuffers v1.12.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -615,11 +827,17 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-dap v0.2.0/go.mod h1:5q8aYQFnHOAZEMP+6vmq25HKYAEwE+LF5yh7JKrrhSQ= +github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-github/v35 v35.2.0/go.mod h1:s0515YVTI+IMrDoy9Y4pHt9ShGpzHvHO8rZ7L7acgvs= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/go-replayers/grpcreplay v0.1.0/go.mod h1:8Ig2Idjpr6gifRd6pNVggX6TC1Zw6Jx74AKp7QNH2QE= +github.com/google/go-replayers/httpreplay v0.1.0/go.mod h1:YKZViNhiGgqdBlUbI2MwGpq4pXxNmhJLPHQ7cv2b5no= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= @@ -629,11 +847,14 @@ github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210423192551-a2663126120b/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210715191844-86eeefc3e471/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= @@ -641,28 +862,43 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= +github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/wire v0.4.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= +github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= +github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= +github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= +github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= +github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= +github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= @@ -670,10 +906,11 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= +github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hairyhenderson/go-codeowners v0.2.3-0.20201026200250-cdc7c0759690/go.mod h1:8Qu9UmnhCRunfRv365Z3w+mT/WfLGKJiK+vugY9qNCU= github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -695,16 +932,15 @@ github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.4.0 h1:aAQzgqIrRKRa7w75CKpbBxYsmUoPjzVm1W59ca1L0J4= github.com/hashicorp/go-version v1.4.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= @@ -717,13 +953,10 @@ github.com/hashicorp/hcl/v2 v2.0.0/go.mod h1:oVVDG71tEinNGYCxinCYadcmKU9bglqW9pV github.com/hashicorp/hcl/v2 v2.11.1 h1:yTyWcXcm9XB0TEkyU/JCRU6rYy4K+mgLtzn2wlrJbcc= github.com/hashicorp/hcl/v2 v2.11.1/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hashicorp/terraform-json v0.13.0 h1:Li9L+lKD1FO5RVFRM1mMMIBDoUHslOniyEi5CM+FWGY= @@ -742,6 +975,9 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9/go.mod h1:BaIJzjD2ZnHmx2acPF6XfGLPzNCMiBbMRqJr+8/8uRI= +github.com/ipostelnik/cli/v2 v2.3.1-0.20210324024421-b6ea8234fe3d h1:PRDnysJ9dF1vUMmEzBu6aHQeUluSQy4eWH3RsSSy/vI= +github.com/ipostelnik/cli/v2 v2.3.1-0.20210324024421-b6ea8234fe3d/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= @@ -786,20 +1022,35 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115/go.mod h1:LadVJg0XuawGk+8L1rYnIED8451UyNxEMdTWCEt5kmU= +github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M= +github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff/go.mod h1:gJWba/XXGl0UoOmBQKRWCJdHrr3nE0T65t6ioaj3mLI= +github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11/go.mod h1:+DBdDyfoO2McrOyDemRBq0q9CMEByef7sYl7JH5Q3BI= +github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb/go.mod h1:ivcmUvxXWjb27NsPEaiYK7AidlZXS7oQ5PowUS9z3I4= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= +github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= +github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= +github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= +github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc= +github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= +github.com/jdkato/prose v1.2.1/go.mod h1:AiRHgVagnEx2JbQRQowVBKjG0bcs/vtkGCH1dYAL1rA= +github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -814,6 +1065,7 @@ github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx github.com/juju/ansiterm v0.0.0-20210929141451-8b71cc96ebdc h1:ZQrgZFsLzkw7o3CoDzsfBhx0bf/1rVBXrLy8dXKRe8o= github.com/juju/ansiterm v0.0.0-20210929141451-8b71cc96ebdc/go.mod h1:PyXUpnI3olx3bsPcHt98FGPX/KCFZ1Fi+hw1XLI6384= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/justinas/nosurf v1.1.1 h1:92Aw44hjSK4MxJeMSyDa7jwuI9GR2J/JCQiaKvXXSlk= @@ -852,12 +1104,15 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4= +github.com/kylecarbs/cloudflared v0.0.0-20220309211552-7f1fc77731ce h1:JrIHtM+6ggTBknLrBPFiAWs9b0X16BkvUUgUM2PkJxs= +github.com/kylecarbs/cloudflared v0.0.0-20220309211552-7f1fc77731ce/go.mod h1:uZ1Z2ydK9Szy+4713zSurrRWW4u0GtIvnuTUUPjr4vA= github.com/kylecarbs/opencensus-go v0.23.1-0.20220307014935-4d0325a68f8b h1:1Y1X6aR78kMEQE1iCjQodB3lA7VO4jB88Wf8ZrzXSsA= github.com/kylecarbs/opencensus-go v0.23.1-0.20220307014935-4d0325a68f8b/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= github.com/kylecarbs/promptui v0.8.1-0.20201231190244-d8f2159af2b2 h1:MUREBTh4kybLY1KyuBfSx+QPfTB8XiUHs6ZxUhOPTnU= @@ -868,28 +1123,38 @@ github.com/kylecarbs/terraform-config-inspect v0.0.0-20211215004401-bbc517866b88 github.com/kylecarbs/terraform-config-inspect v0.0.0-20211215004401-bbc517866b88/go.mod h1:Z0Nnk4+3Cy89smEbrq+sl1bxc9198gIP4I7wcQF6Kqs= github.com/kylecarbs/terraform-exec v0.15.1-0.20220202050609-a1ce7181b180 h1:yafC0pmxjs18fnO5RdKFLSItJIjYwGfSHTfcUvlZb3E= github.com/kylecarbs/terraform-exec v0.15.1-0.20220202050609-a1ce7181b180/go.mod h1:lRENyXw1BL5V0FCCE8lsW3XoVLRLnxM54jrlYSyXpvM= +github.com/kylecarbs/tview v0.0.0-20220309202238-8464256e10a1 h1:w9oY5N7gC5cSI60xRDGbfbTCQz+AEtbMrzcSphQH794= +github.com/kylecarbs/tview v0.0.0-20220309202238-8464256e10a1/go.mod h1:7DqeCBDoqV3Flbw37qU6vlk1YX6yXGzyJAdK5imM2RI= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/kyokomi/emoji/v2 v2.2.8/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s= +github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= +github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/lunixbochs/vtclean v1.0.0 h1:xu2sLAri4lGiovBDQKxl5mrXyESr3gUr5m5SM5+LVb8= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/magefile/mage v1.12.1/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= @@ -897,7 +1162,17 @@ github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsI github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= +github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= +github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= +github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco= +github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= +github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk= +github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= +github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 h1:EnzzN9fPUkUck/1CuY1FlzBaIYMoiBsdwTNmNGkwUUM= +github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= +github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs= +github.com/mattn/go-colorable v0.0.0-20170327083344-ded68f7a9561/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= @@ -908,6 +1183,8 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope github.com/mattn/go-colorable v0.1.10/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= +github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -918,23 +1195,37 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= +github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= +github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= +github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/mattn/go-sqlite3 v1.14.10/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/meowgorithm/babylogger v1.2.0/go.mod h1:Kmw1fbhkP4sLJmhiGIpThiG+guQAQ8dQ3GnLa+8Fjf0= +github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/miekg/dns v1.1.45 h1:g5fRIhm9nx7g8osrAvgb16QJfmyMsyOCb+J7LSv+Qzk= +github.com/miekg/dns v1.1.45/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= +github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a/go.mod h1:v8eSC2SMp9/7FTKUncp7fH9IwPfw+ysMObcEz5FWheQ= github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= @@ -942,8 +1233,7 @@ github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZX github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/hashstructure v1.1.0/go.mod h1:xUDAozZz0Wmdiufv0uyhnHkUTN6/6d8ulp4AwfLKrmA= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -952,9 +1242,11 @@ github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGg github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mmcloughlin/avo v0.0.0-20201105074841-5d2f697d268f/go.mod h1:6aKT4zZIrpGqB3RpFU14ByCSSyKY6LfJz4J/JJChHfI= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/moby v20.10.12+incompatible h1:MJVrdG0tIQqVJQBTdtooPuZQFIgski5pYTXlcW8ToE0= github.com/moby/moby v20.10.12+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= +github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= @@ -971,39 +1263,71 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= +github.com/montanaflynn/stats v0.6.3/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= +github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34= +github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= +github.com/muesli/go-app-paths v0.2.1/go.mod h1:SxS3Umca63pcFcLtbjVb+J0oD7cl4ixQWoBKhGEtEho= +github.com/muesli/reflow v0.2.1-0.20210115123740-9e1d0d53df68/go.mod h1:Xk+z4oIWdQqJzsxyjgl3P22oYZnHdZ8FFTHAQQt5BMQ= +github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= +github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= +github.com/muesli/sasquatch v0.0.0-20200811221207-66979d92330a/go.mod h1:+XG0ne5zXWBTSbbe7Z3/RWxaT8PZY6zaZ1dX6KjprYY= +github.com/muesli/smartcrop v0.3.0/go.mod h1:i2fCI/UorTfgEpPPLWiFBv4pye+YAG78RwcQLUkocpI= +github.com/muesli/termenv v0.8.1/go.mod h1:kzt/D/4a88RoheZmwfqorY3A+tnsSMA9HJC/fQSFKo0= +github.com/muesli/termenv v0.9.0/go.mod h1:R/LzAKf+suGs4IsO95y7+7DpFHO0KABgnZqtlyx2mBw= +github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs= +github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739 h1:QANkGiGr39l1EESqrE0gZw0/AJNYzIvoGLhIoVYtluI= +github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs= +github.com/muesli/toktok v0.1.0/go.mod h1:Xw5/tQTHg6L4aw9jXmBKxjiO3eMn/Fe6IDc8NbBSOMw= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mutecomm/go-sqlcipher/v4 v4.4.0/go.mod h1:PyN04SaWalavxRGH9E8ZftG6Ju7rsPrGmQRjrEaVpiY= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= +github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= +github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba/go.mod h1:ncO5VaFWh0Nrt+4KT4mOZboaczBZcLuHrG+/sUeP8gI= +github.com/neurosnap/sentences v1.0.6/go.mod h1:pg1IapvYpWCJJm/Etxeh0+gtMf1rI1STY9S7eUCPbDc= +github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/niklasfasching/go-org v1.6.0 h1:NCWpmDDNjHNsrei6VmnYXzOiyZUxV8LVU19REGQ8dKA= +github.com/niklasfasching/go-org v1.6.0/go.mod h1:gSHyFcAbr2thIpfljLsP/BB8uwAMyooq6ydIrUDdOCs= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= +github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= +github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -1034,18 +1358,35 @@ github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqi github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= +github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.3.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ= github.com/ory/dockertest/v3 v3.8.1 h1:vU/8d1We4qIad2YM0kOwRVtnyue7ExvacPiw1yDm17g= github.com/ory/dockertest/v3 v3.8.1/go.mod h1:wSRQ3wmkz+uSARYMk7kVJFDBGm8x5gSxIhI7NDc+BAQ= +github.com/oschwald/geoip2-golang v1.5.0/go.mod h1:xdvYt5xQzB8ORWFqPnqMwZpCpgNagttWdoZLlJQzg7s= +github.com/oschwald/maxminddb-golang v1.8.0/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= +github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml/v2 v2.0.0-beta.6 h1:JFNqj2afbbhCqTiyN16D7Tudc/aaDzE2FBDk+VlBQnE= +github.com/pelletier/go-toml/v2 v2.0.0-beta.6/go.mod h1:ke6xncR3W76Ba8xnVxkrZG0js6Rd2BsQEAYrfgJ6eQA= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/peterh/liner v0.0.0-20170317030525-88609521dc4b/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= +github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ= +github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E= github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ= @@ -1096,14 +1437,17 @@ github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= +github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= -github.com/powersj/whatsthis v1.3.0 h1:FhP+pZZr6rxBC2N/ydZOvzcFOx60Ujggy2ACYxa6Xac= -github.com/powersj/whatsthis v1.3.0/go.mod h1:8NwT2j1fdsmLLVBZ0uNPb1cvHwBHm6G3e0t/Kk7AsmI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= +github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 h1:J9b7z+QKAmPf4YLrFg6oQUotqHQeUNWwkvo7jZp1GLU= +github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= @@ -1111,10 +1455,13 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= @@ -1123,6 +1470,9 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -1133,29 +1483,46 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/quasilyte/go-ruleguard/dsl v0.3.17 h1:L5xf3nifnRIdYe9vyMuY2sDnZHIgQol/fDq74FQz7ZY= github.com/quasilyte/go-ruleguard/dsl v0.3.17/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +github.com/rabbitmq/amqp091-go v1.1.0/go.mod h1:ogQDLSOACsLPsIq0NpbtiifNZi2YOz0VTJ0kHRghqbM= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= +github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs= +github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww= +github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= +github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= +github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= +github.com/sanity-io/litter v1.5.2/go.mod h1:5Z71SvaYy5kcGtyglXOC9rrUi3c1E8CamFWjQsazTh0= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= @@ -1166,10 +1533,33 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shogo82148/go-shuffle v0.0.0-20180218125048-27e6095f230d/go.mod h1:2htx6lmL0NGLHlO8ZCf+lQBGBHIbEujyywxJArf+2Yc= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= +github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM= +github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0= +github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= +github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= +github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI= +github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU= +github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag= +github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg= +github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw= +github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y= +github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q= +github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ= +github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I= +github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0= +github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ= +github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk= +github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= +github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -1182,62 +1572,83 @@ github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/snowflakedb/gosnowflake v1.6.3/go.mod h1:6hLajn6yxuJ4xUHZegMekpq9rnQbGJ7TMwXjgTmA6lg= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= +github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.8.1 h1:izYHOT71f9iZ7iq37Uqjael60/vYC6vMtzedudZ0zEk= +github.com/spf13/afero v1.8.1/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.0-20170417170307-b6cb39589372/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +github.com/spf13/fsync v0.9.0/go.mod h1:fNtJEfG3HiltN3y4cPOz6MLjos9+2pIEqLIgszqhp/0= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v0.0.0-20170417173400-9e4c21054fa1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942 h1:t0lM6y/M5IiUZyvbBTcngso8SZEZICH7is9B6g/obVU= +github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tabbed/pqtype v0.1.1 h1:PhEcb9JZ8jr7SUjJDFjRPxny0M8fkXZrxn/a9yQfoZg= github.com/tabbed/pqtype v0.1.1/go.mod h1:HLt2kLJPcUhODQkYn3mJkMHXVsuv3Z2n5NZEeKXL0Uk= +github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= +github.com/tdewolff/minify/v2 v2.10.0/go.mod h1:6XAjcHM46pFcRE0eztigFPm0Q+Cxsw8YhEWT+rDkcZM= +github.com/tdewolff/parse/v2 v2.5.27/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho= +github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ= +github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM= +github.com/twitchyliquid64/golang-asm v0.15.0/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/unrolled/secure v1.10.0 h1:TBNP42z2AB+2pW9PR6vdbqhlQuv1iTeSVzK1qHjOBzA= @@ -1245,7 +1656,10 @@ github.com/unrolled/secure v1.10.0/go.mod h1:BmF5hyM6tXczk3MpQkFf1hpKSRqCyhqcbiQ github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= +github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= @@ -1275,12 +1689,15 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk= github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.8/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= @@ -1304,15 +1721,18 @@ go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3C go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= +go.etcd.io/etcd/client/v3 v3.5.1/go.mod h1:OnjH4M8OnAotwaB2l9bVgZzRFKru7/ZMoS46OtKyd3Q= go.mongodb.org/mongo-driver v1.7.0/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8= go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.starlark.net v0.0.0-20190702223751-32f345186213/go.mod h1:c1/X6cHgvdXj6pUlmWKMkuqRnW4K8x2vwt6JAaaircg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= @@ -1322,12 +1742,21 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= +gocloud.dev v0.20.0/go.mod h1:+Y/RpSXrJthIOM8uFNzWp6MRu9pFPNFEEZrQMxpkfIc= +goji.io v2.0.2+incompatible/go.mod h1:sbqFwrtqZACxLBTQcdgVjFh54yGVCvwq8+w49MVMMIk= +golang.org/x/arch v0.0.0-20190927153633-4e8777c89be4/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4= +golang.org/x/arch v0.0.0-20201008161808-52c3e6f60cff/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4= +golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= @@ -1340,17 +1769,23 @@ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -1377,6 +1812,9 @@ golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+o golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= +golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1402,6 +1840,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= +golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1409,15 +1849,18 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= @@ -1443,6 +1886,7 @@ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -1462,18 +1906,28 @@ golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211013171255-e13a2654a71e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1490,6 +1944,7 @@ golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1501,6 +1956,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180224232135-f6cff0780e54/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1508,12 +1964,15 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1528,6 +1987,8 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1547,6 +2008,7 @@ golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1559,15 +2021,19 @@ golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200317113312-5766fd39f98d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1589,6 +2055,7 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1598,10 +2065,12 @@ golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1611,11 +2080,14 @@ golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210818153620-00dd8d7831e7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1627,6 +2099,8 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210422114643-f5beecf764ed/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1644,9 +2118,12 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1658,6 +2135,7 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -1670,18 +2148,20 @@ golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191127201027-ecd32218bd7f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -1694,16 +2174,23 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200317043434-63da46f3035e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200601175630-2caf76543d99/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200606014950-c42cb6316fb6/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200608174601-1b747fd94509/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201105001634-bc3cf281b174/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -1711,13 +2198,16 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8= +golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1732,7 +2222,10 @@ gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6d gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -1745,6 +2238,7 @@ google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/ google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.26.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= @@ -1765,11 +2259,13 @@ google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUb google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= +google.golang.org/api v0.64.0/go.mod h1:931CdxA8Rm4t6zqTFGSsgwbAEZ2+GMYurbndwSimebM= google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= google.golang.org/api v0.70.0 h1:67zQnAE0T2rB0A3CwLSas0K+SbVzSxP+zTLkQLexeiw= google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= google.golang.org/appengine v1.0.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1780,10 +2276,16 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= +google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= +google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -1800,24 +2302,31 @@ google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200317114155-1f3552e48f24/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200325114520-5b2d0af7952b/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200603110839-e855014d5736/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200608115520-7c474a2e3482/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210207032614-bba0dbe2a9ea/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -1850,6 +2359,7 @@ google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220111164026-67b88f271998/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= @@ -1857,10 +2367,14 @@ google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2 google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf h1:SVYXkUz2yZS9FWb2Gm8ivSlbNQzL2Z/NpPKE3RG2jWk= google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= @@ -1906,6 +2420,7 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/DataDog/dd-trace-go.v1 v1.34.0/go.mod h1:HtrC65fyJ6lWazShCC9rlOeiTSZJ0XtZhkwjZM2WpC4= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1916,18 +2431,24 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/coreos/go-oidc.v2 v2.2.1 h1:MY5SZClJ7vhjKfr64a4nHAOV/c3WH2gB9BMrR64J1Mc= +gopkg.in/coreos/go-oidc.v2 v2.2.1/go.mod h1:fYaTe2FS96wZZwR17YTDHwG+Mw6fmyqJNxN2eNCGPCI= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/neurosnap/sentences.v1 v1.0.6/go.mod h1:YlK+SN+fLQZj+kY3r8DkGDhDr91+S3JmTb5LSxFRQo0= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= +gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= @@ -1943,6 +2464,7 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/postgres v1.0.8/go.mod h1:4eOzrI1MUfm6ObJU/UcmbXyiHSs8jSwH95G5P5dxcAg= @@ -1953,6 +2475,8 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= +grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1963,15 +2487,18 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= +k8s.io/api v0.23.1/go.mod h1:WfXnOnwSqNtG62Y1CdjoMxh7r7u9QXGCkA1u0na2jgo= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= +k8s.io/apimachinery v0.23.1/go.mod h1:SADt2Kl8/sttJ62RRsi9MIV4o8f5S3coArm0Iu3fBno= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= +k8s.io/client-go v0.23.1/go.mod h1:6QSI8fEuqD4zgFK0xbdwfB/PthBsIxCJMa3s17WlcO0= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= @@ -1980,14 +2507,83 @@ k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= +k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/b v1.0.0/go.mod h1:uZWcZfRj1BpYzfN9JTerzlNUnnPsV9O2ZA8JsRcubNg= modernc.org/cc/v3 v3.32.4/go.mod h1:0R6jl1aZlIl2avnYfbfHBS1QB6/f+16mihBObaBC878= +modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.33.11/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.34.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.4/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.5/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.7/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.8/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.10/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.15/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.16/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.17/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.18/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.20/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.22/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= modernc.org/ccgo/v3 v3.9.2/go.mod h1:gnJpy6NIVqkETT+L5zPsQFj7L2kkhfPMzOghRNv/CFo= +modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60= +modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw= +modernc.org/ccgo/v3 v3.11.0/go.mod h1:dGNposbDp9TOZ/1KBxghxtUp/bzErD0/0QW4hhSaBMI= +modernc.org/ccgo/v3 v3.11.1/go.mod h1:lWHxfsn13L3f7hgGsGlU28D9eUOf6y3ZYHKoPaKU0ag= +modernc.org/ccgo/v3 v3.11.3/go.mod h1:0oHunRBMBiXOKdaglfMlRPBALQqsfrCKXgw9okQ3GEw= +modernc.org/ccgo/v3 v3.12.4/go.mod h1:Bk+m6m2tsooJchP/Yk5ji56cClmN6R1cqc9o/YtbgBQ= +modernc.org/ccgo/v3 v3.12.6/go.mod h1:0Ji3ruvpFPpz+yu+1m0wk68pdr/LENABhTrDkMDWH6c= +modernc.org/ccgo/v3 v3.12.8/go.mod h1:Hq9keM4ZfjCDuDXxaHptpv9N24JhgBZmUG5q60iLgUo= +modernc.org/ccgo/v3 v3.12.11/go.mod h1:0jVcmyDwDKDGWbcrzQ+xwJjbhZruHtouiBEvDfoIsdg= +modernc.org/ccgo/v3 v3.12.14/go.mod h1:GhTu1k0YCpJSuWwtRAEHAol5W7g1/RRfS4/9hc9vF5I= +modernc.org/ccgo/v3 v3.12.18/go.mod h1:jvg/xVdWWmZACSgOiAhpWpwHWylbJaSzayCqNOJKIhs= +modernc.org/ccgo/v3 v3.12.20/go.mod h1:aKEdssiu7gVgSy/jjMastnv/q6wWGRbszbheXgWRHc8= +modernc.org/ccgo/v3 v3.12.21/go.mod h1:ydgg2tEprnyMn159ZO/N4pLBqpL7NOkJ88GT5zNU2dE= +modernc.org/ccgo/v3 v3.12.22/go.mod h1:nyDVFMmMWhMsgQw+5JH6B6o4MnZ+UQNw1pp52XYFPRk= +modernc.org/ccgo/v3 v3.12.25/go.mod h1:UaLyWI26TwyIT4+ZFNjkyTbsPsY3plAEB6E7L/vZV3w= +modernc.org/ccgo/v3 v3.12.29/go.mod h1:FXVjG7YLf9FetsS2OOYcwNhcdOLGt8S9bQ48+OP75cE= +modernc.org/ccgo/v3 v3.12.36/go.mod h1:uP3/Fiezp/Ga8onfvMLpREq+KUjUmYMxXPO8tETHtA8= +modernc.org/ccgo/v3 v3.12.38/go.mod h1:93O0G7baRST1vNj4wnZ49b1kLxt0xCW5Hsa2qRaZPqc= +modernc.org/ccgo/v3 v3.12.43/go.mod h1:k+DqGXd3o7W+inNujK15S5ZYuPoWYLpF5PYougCmthU= +modernc.org/ccgo/v3 v3.12.46/go.mod h1:UZe6EvMSqOxaJ4sznY7b23/k13R8XNlyWsO5bAmSgOE= +modernc.org/ccgo/v3 v3.12.47/go.mod h1:m8d6p0zNps187fhBwzY/ii6gxfjob1VxWb919Nk1HUk= +modernc.org/ccgo/v3 v3.12.50/go.mod h1:bu9YIwtg+HXQxBhsRDE+cJjQRuINuT9PUK4orOco/JI= +modernc.org/ccgo/v3 v3.12.51/go.mod h1:gaIIlx4YpmGO2bLye04/yeblmvWEmE4BBBls4aJXFiE= +modernc.org/ccgo/v3 v3.12.53/go.mod h1:8xWGGTFkdFEWBEsUmi+DBjwu/WLy3SSOrqEmKUjMeEg= +modernc.org/ccgo/v3 v3.12.54/go.mod h1:yANKFTm9llTFVX1FqNKHE0aMcQb1fuPJx6p8AcUx+74= +modernc.org/ccgo/v3 v3.12.55/go.mod h1:rsXiIyJi9psOwiBkplOaHye5L4MOOaCjHg1Fxkj7IeU= +modernc.org/ccgo/v3 v3.12.56/go.mod h1:ljeFks3faDseCkr60JMpeDb2GSO3TKAmrzm7q9YOcMU= +modernc.org/ccgo/v3 v3.12.57/go.mod h1:hNSF4DNVgBl8wYHpMvPqQWDQx8luqxDnNGCMM4NFNMc= +modernc.org/ccgo/v3 v3.12.60/go.mod h1:k/Nn0zdO1xHVWjPYVshDeWKqbRWIfif5dtsIOCUVMqM= +modernc.org/ccgo/v3 v3.12.66/go.mod h1:jUuxlCFZTUZLMV08s7B1ekHX5+LIAurKTTaugUr/EhQ= +modernc.org/ccgo/v3 v3.12.67/go.mod h1:Bll3KwKvGROizP2Xj17GEGOTrlvB1XcVaBrC90ORO84= +modernc.org/ccgo/v3 v3.12.73/go.mod h1:hngkB+nUUqzOf3iqsM48Gf1FZhY599qzVg1iX+BT3cQ= +modernc.org/ccgo/v3 v3.12.81/go.mod h1:p2A1duHoBBg1mFtYvnhAnQyI6vL0uw5PGYLSIgF6rYY= +modernc.org/ccgo/v3 v3.12.84/go.mod h1:ApbflUfa5BKadjHynCficldU1ghjen84tuM5jRynB7w= +modernc.org/ccgo/v3 v3.12.86/go.mod h1:dN7S26DLTgVSni1PVA3KxxHTcykyDurf3OgUzNqTSrU= +modernc.org/ccgo/v3 v3.12.90/go.mod h1:obhSc3CdivCRpYZmrvO88TXlW0NvoSVvdh/ccRjJYko= +modernc.org/ccgo/v3 v3.12.92/go.mod h1:5yDdN7ti9KWPi5bRVWPl8UNhpEAtCjuEE7ayQnzzqHA= +modernc.org/ccgo/v3 v3.13.1/go.mod h1:aBYVOUfIlcSnrsRVU8VRS35y2DIfpgkmVkYZ0tpIXi4= +modernc.org/ccgo/v3 v3.15.1/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0= +modernc.org/ccgo/v3 v3.15.9/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0= +modernc.org/ccgo/v3 v3.15.10/go.mod h1:wQKxoFn0ynxMuCLfFD09c8XPUCc8obfchoVR9Cn0fI8= +modernc.org/ccgo/v3 v3.15.12/go.mod h1:VFePOWoCd8uDGRJpq/zfJ29D0EVzMSyID8LCMWYbX6I= +modernc.org/ccgo/v3 v3.15.14/go.mod h1:144Sz2iBCKogb9OKwsu7hQEub3EVgOlyI8wMUPGKUXQ= +modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= +modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= modernc.org/db v1.0.0/go.mod h1:kYD/cO29L/29RM0hXYl4i3+Q5VojL31kTUVpVJDw0s8= modernc.org/file v1.0.0/go.mod h1:uqEokAEn1u6e+J45e54dsEA/pw4o7zLrA2GwyntZzjw= modernc.org/fileutil v1.0.0/go.mod h1:JHsWpkrk/CnVV1H/eGlFf85BEpfkrp56ro8nojIq9Q8= @@ -1996,20 +2592,70 @@ modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= modernc.org/internal v1.0.0/go.mod h1:VUD/+JAkhCpvkUitlEOnhpVxCgsBI90oTzSCRcqQVSM= modernc.org/libc v1.7.13-0.20210308123627-12f642a52bb8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= modernc.org/libc v1.9.5/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= +modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= +modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q= +modernc.org/libc v1.11.0/go.mod h1:2lOfPmj7cz+g1MrPNmX65QCzVxgNq2C5o0jdLY2gAYg= +modernc.org/libc v1.11.2/go.mod h1:ioIyrl3ETkugDO3SGZ+6EOKvlP3zSOycUETe4XM4n8M= +modernc.org/libc v1.11.5/go.mod h1:k3HDCP95A6U111Q5TmG3nAyUcp3kR5YFZTeDS9v8vSU= +modernc.org/libc v1.11.6/go.mod h1:ddqmzR6p5i4jIGK1d/EiSw97LBcE3dK24QEwCFvgNgE= +modernc.org/libc v1.11.11/go.mod h1:lXEp9QOOk4qAYOtL3BmMve99S5Owz7Qyowzvg6LiZso= +modernc.org/libc v1.11.13/go.mod h1:ZYawJWlXIzXy2Pzghaf7YfM8OKacP3eZQI81PDLFdY8= +modernc.org/libc v1.11.16/go.mod h1:+DJquzYi+DMRUtWI1YNxrlQO6TcA5+dRRiq8HWBWRC8= +modernc.org/libc v1.11.19/go.mod h1:e0dgEame6mkydy19KKaVPBeEnyJB4LGNb0bBH1EtQ3I= +modernc.org/libc v1.11.24/go.mod h1:FOSzE0UwookyT1TtCJrRkvsOrX2k38HoInhw+cSCUGk= +modernc.org/libc v1.11.26/go.mod h1:SFjnYi9OSd2W7f4ct622o/PAYqk7KHv6GS8NZULIjKY= +modernc.org/libc v1.11.27/go.mod h1:zmWm6kcFXt/jpzeCgfvUNswM0qke8qVwxqZrnddlDiE= +modernc.org/libc v1.11.28/go.mod h1:Ii4V0fTFcbq3qrv3CNn+OGHAvzqMBvC7dBNyC4vHZlg= +modernc.org/libc v1.11.31/go.mod h1:FpBncUkEAtopRNJj8aRo29qUiyx5AvAlAxzlx9GNaVM= +modernc.org/libc v1.11.34/go.mod h1:+Tzc4hnb1iaX/SKAutJmfzES6awxfU1BPvrrJO0pYLg= +modernc.org/libc v1.11.37/go.mod h1:dCQebOwoO1046yTrfUE5nX1f3YpGZQKNcITUYWlrAWo= +modernc.org/libc v1.11.39/go.mod h1:mV8lJMo2S5A31uD0k1cMu7vrJbSA3J3waQJxpV4iqx8= +modernc.org/libc v1.11.42/go.mod h1:yzrLDU+sSjLE+D4bIhS7q1L5UwXDOw99PLSX0BlZvSQ= +modernc.org/libc v1.11.44/go.mod h1:KFq33jsma7F5WXiYelU8quMJasCCTnHK0mkri4yPHgA= +modernc.org/libc v1.11.45/go.mod h1:Y192orvfVQQYFzCNsn+Xt0Hxt4DiO4USpLNXBlXg/tM= +modernc.org/libc v1.11.47/go.mod h1:tPkE4PzCTW27E6AIKIR5IwHAQKCAtudEIeAV1/SiyBg= +modernc.org/libc v1.11.49/go.mod h1:9JrJuK5WTtoTWIFQ7QjX2Mb/bagYdZdscI3xrvHbXjE= +modernc.org/libc v1.11.51/go.mod h1:R9I8u9TS+meaWLdbfQhq2kFknTW0O3aw3kEMqDDxMaM= +modernc.org/libc v1.11.53/go.mod h1:5ip5vWYPAoMulkQ5XlSJTy12Sz5U6blOQiYasilVPsU= +modernc.org/libc v1.11.54/go.mod h1:S/FVnskbzVUrjfBqlGFIPA5m7UwB3n9fojHhCNfSsnw= +modernc.org/libc v1.11.55/go.mod h1:j2A5YBRm6HjNkoSs/fzZrSxCuwWqcMYTDPLNx0URn3M= +modernc.org/libc v1.11.56/go.mod h1:pakHkg5JdMLt2OgRadpPOTnyRXm/uzu+Yyg/LSLdi18= +modernc.org/libc v1.11.58/go.mod h1:ns94Rxv0OWyoQrDqMFfWwka2BcaF6/61CqJRK9LP7S8= +modernc.org/libc v1.11.71/go.mod h1:DUOmMYe+IvKi9n6Mycyx3DbjfzSKrdr/0Vgt3j7P5gw= +modernc.org/libc v1.11.75/go.mod h1:dGRVugT6edz361wmD9gk6ax1AbDSe0x5vji0dGJiPT0= +modernc.org/libc v1.11.82/go.mod h1:NF+Ek1BOl2jeC7lw3a7Jj5PWyHPwWD4aq3wVKxqV1fI= +modernc.org/libc v1.11.86/go.mod h1:ePuYgoQLmvxdNT06RpGnaDKJmDNEkV7ZPKI2jnsvZoE= +modernc.org/libc v1.11.87/go.mod h1:Qvd5iXTeLhI5PS0XSyqMY99282y+3euapQFxM7jYnpY= +modernc.org/libc v1.11.88/go.mod h1:h3oIVe8dxmTcchcFuCcJ4nAWaoiwzKCdv82MM0oiIdQ= +modernc.org/libc v1.11.98/go.mod h1:ynK5sbjsU77AP+nn61+k+wxUGRx9rOFcIqWYYMaDZ4c= +modernc.org/libc v1.11.101/go.mod h1:wLLYgEiY2D17NbBOEp+mIJJJBGSiy7fLL4ZrGGZ+8jI= +modernc.org/libc v1.12.0/go.mod h1:2MH3DaF/gCU8i/UBiVE1VFRos4o523M7zipmwH8SIgQ= +modernc.org/libc v1.14.1/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk= +modernc.org/libc v1.14.2/go.mod h1:MX1GBLnRLNdvmK9azU9LCxZ5lMyhrbEMK8rG3X/Fe34= +modernc.org/libc v1.14.3/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ= +modernc.org/libc v1.14.6/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak= modernc.org/lldb v1.0.0/go.mod h1:jcRvJGWfCGodDZz8BPwiKMJxGJngQ/5DrRapkQnLob8= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc= +modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM= modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= modernc.org/ql v1.0.0/go.mod h1:xGVyrLIatPcO2C1JvI/Co8c0sr6y91HKFNy4pt9JXEY= modernc.org/sortutil v1.1.0/go.mod h1:ZyL98OQHJgH9IEfN71VsamvJgrtRX9Dj2gX+vH86L1k= modernc.org/sqlite v1.10.6/go.mod h1:Z9FEjUtZP4qFEg6/SiADg9XCER7aYy9a/j7Pg9P7CPs= +modernc.org/sqlite v1.14.8/go.mod h1:TFmXjym+/jR31fxc2B5eHnKMuJJGY7i1L/T5A0jzVww= modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= +modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= modernc.org/tcl v1.5.2/go.mod h1:pmJYOLgpiys3oI4AeAafkcUfE+TKKilminxNyU/+Zlo= +modernc.org/tcl v1.11.0/go.mod h1:zsTUpbQ+NxQEjOjCUlImDLPv1sG8Ww0qp66ZvyOxCgw= modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/z v1.0.1-0.20210308123920-1f282aa71362/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA= modernc.org/z v1.0.1/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA= +modernc.org/z v1.3.0/go.mod h1:+mvgLH814oDjtATDdT3rs84JnUIpkvAF5B8AVkNlE2g= +modernc.org/z v1.3.1/go.mod h1:0RBFPpdFNiKpjTza1WYaB4+6ySjS6dLBoo09OQZ4E3w= modernc.org/zappy v1.0.0/go.mod h1:hHe+oGahLVII/aTTyWK/b53VDHMAGCBYYeZ9sn83HC4= nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= @@ -2019,9 +2665,15 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= +sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= storj.io/drpc v0.0.29 h1:Ihd4ls/JQFr0lctefie3iu+3QM4duccCKr9uMzf4sKY= storj.io/drpc v0.0.29/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= +zombiezen.com/go/capnproto2 v2.18.0+incompatible h1:mwfXZniffG5mXokQGHUJWGnqIBggoPfT/CEwon9Yess= +zombiezen.com/go/capnproto2 v2.18.0+incompatible/go.mod h1:XO5Pr2SbXgqZwn0m0Ru54QBqpOf4K5AYBO+8LAOBQEQ= diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go index 1c14979fe5111..cee42dfe216a4 100644 --- a/provisioner/terraform/provision.go +++ b/provisioner/terraform/provision.go @@ -19,6 +19,7 @@ import ( "cdr.dev/slog" + "github.com/coder/coder/provisionersdk" "github.com/coder/coder/provisionersdk/proto" ) @@ -81,6 +82,9 @@ func (t *terraform) runTerraformPlan(ctx context.Context, terraform *tfexec.Terr parts := strings.SplitN(envEntry, "=", 2) env[parts[0]] = parts[1] } + for key, value := range provisionersdk.AgentScriptEnv() { + env[key] = value + } env["CODER_URL"] = request.Metadata.CoderUrl env["CODER_WORKSPACE_TRANSITION"] = strings.ToLower(request.Metadata.WorkspaceTransition.String()) planfilePath := filepath.Join(request.Directory, "terraform.tfplan") @@ -288,6 +292,9 @@ func (t *terraform) runTerraformApply(ctx context.Context, terraform *tfexec.Ter "CODER_URL="+request.Metadata.CoderUrl, "CODER_WORKSPACE_TRANSITION="+strings.ToLower(request.Metadata.WorkspaceTransition.String()), ) + for key, value := range provisionersdk.AgentScriptEnv() { + env = append(env, key+"="+value) + } vars := []string{} for _, param := range request.ParameterValues { switch param.DestinationScheme { @@ -439,14 +446,27 @@ func (t *terraform) runTerraformApply(ctx context.Context, terraform *tfexec.Ter break } } - // Associate resources where the agent depends on it. - for agentKey, dependsOn := range agentDepends { - for _, depend := range dependsOn { - if depend != strings.Join([]string{resource.Type, resource.Name}, ".") { - continue + if agent == nil { + // Associate resources where the agent depends on it. + for agentKey, dependsOn := range agentDepends { + for _, depend := range dependsOn { + if depend != strings.Join([]string{resource.Type, resource.Name}, ".") { + continue + } + agent = agents[agentKey] + break + } + } + } + + if agent != nil { + if agent.GetGoogleInstanceIdentity() != nil { + // Make sure the instance has an instance ID! + _, exists := resource.AttributeValues["instance_id"] + if !exists { + // This was a mistake! + agent = nil } - agent = agents[agentKey] - break } } diff --git a/provisionersdk/agent.go b/provisionersdk/agent.go index 6faa2db8947db..31459149f17cf 100644 --- a/provisionersdk/agent.go +++ b/provisionersdk/agent.go @@ -10,10 +10,9 @@ var ( "windows": { "amd64": ` $ProgressPreference = "SilentlyContinue" -$ErrorActionPreference = "Stop" -Invoke-WebRequest -Uri ${ACCESS_URL}/bin/coder-windows-amd64 -OutFile $env:TEMP\coder.exe +Invoke-WebRequest -Uri ${ACCESS_URL}bin/coder-windows-amd64.exe -OutFile $env:TEMP\coder.exe $env:CODER_URL = "${ACCESS_URL}" -Start-Process -FilePath $env:TEMP\coder.exe workspaces agent +Start-Process -FilePath $env:TEMP\coder.exe -ArgumentList "workspaces","agent" -PassThru `, }, "linux": { @@ -21,10 +20,10 @@ Start-Process -FilePath $env:TEMP\coder.exe workspaces agent #!/usr/bin/env sh set -eu pipefail BINARY_LOCATION=$(mktemp -d)/coder -curl -fsSL ${ACCESS_URL}/bin/coder-linux-amd64 -o $BINARY_LOCATION +curl -fsSL ${ACCESS_URL}bin/coder-linux-amd64 -o $BINARY_LOCATION chmod +x $BINARY_LOCATION export CODER_URL="${ACCESS_URL}" -exec $BINARY_LOCATION agent +exec $BINARY_LOCATION workspaces agent `, }, "darwin": { @@ -32,10 +31,10 @@ exec $BINARY_LOCATION agent #!/usr/bin/env sh set -eu pipefail BINARY_LOCATION=$(mktemp -d)/coder -curl -fsSL ${ACCESS_URL}/bin/coder-darwin-amd64 -o $BINARY_LOCATION +curl -fsSL ${ACCESS_URL}bin/coder-darwin-amd64 -o $BINARY_LOCATION chmod +x $BINARY_LOCATION export CODER_URL="${ACCESS_URL}" -exec $BINARY_LOCATION agent +exec $BINARY_LOCATION workspaces agent `, }, } diff --git a/provisionersdk/archive.go b/provisionersdk/archive.go new file mode 100644 index 0000000000000..53265584e1ccb --- /dev/null +++ b/provisionersdk/archive.go @@ -0,0 +1,56 @@ +package provisionersdk + +import ( + "archive/tar" + "bytes" + "io" + "os" + "path/filepath" + "strings" +) + +// Tar archives a directory. +func Tar(directory string) ([]byte, error) { + var buffer bytes.Buffer + tarWriter := tar.NewWriter(&buffer) + err := filepath.Walk(directory, func(file string, fileInfo os.FileInfo, err error) error { + if err != nil { + return err + } + header, err := tar.FileInfoHeader(fileInfo, file) + if err != nil { + return err + } + rel, err := filepath.Rel(directory, file) + if err != nil { + return err + } + if strings.HasPrefix(rel, ".") { + // Don't archive hidden files! + return err + } + header.Name = rel + if err := tarWriter.WriteHeader(header); err != nil { + return err + } + if fileInfo.IsDir() { + return nil + } + data, err := os.Open(file) + if err != nil { + return err + } + if _, err := io.Copy(tarWriter, data); err != nil { + return err + } + return data.Close() + }) + if err != nil { + return nil, err + } + err = tarWriter.Flush() + if err != nil { + return nil, err + } + return buffer.Bytes(), nil +} diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go index 60cd88ce606a2..83f660c5451c8 100644 --- a/pty/ptytest/ptytest.go +++ b/pty/ptytest/ptytest.go @@ -93,7 +93,7 @@ func (p *PTY) ExpectMatch(str string) string { } func (p *PTY) WriteLine(str string) { - newline := "\n" + newline := "\r" if runtime.GOOS == "windows" { newline = "\r\n" } diff --git a/template/gcp-linux/gcp-linux.json b/template/gcp-linux/gcp-linux.json new file mode 100644 index 0000000000000..99a058f18bc58 --- /dev/null +++ b/template/gcp-linux/gcp-linux.json @@ -0,0 +1,86 @@ +{ + "ID": "gcp-linux", + "Name": "Develop on Google Cloud", + "Description": "Get started with remote development on Google Cloud.", + "schema": [ + { + "id": "00000000-0000-0000-0000-000000000000", + "created_at": "0001-01-01T00:00:00Z", + "job_id": "00000000-0000-0000-0000-000000000000", + "name": "gcp_credentials", + "description": "", + "default_source_scheme": "none", + "default_source_value": "", + "allow_override_source": false, + "default_destination_scheme": "provisioner_variable", + "allow_override_destination": false, + "default_refresh": "", + "redisplay_value": false, + "validation_error": "", + "validation_condition": "", + "validation_type_system": "none", + "validation_value_type": "" + }, + { + "id": "00000000-0000-0000-0000-000000000000", + "created_at": "0001-01-01T00:00:00Z", + "job_id": "00000000-0000-0000-0000-000000000000", + "name": "gcp_project", + "description": "The Google Cloud project to manage resources in.", + "default_source_scheme": "none", + "default_source_value": "", + "allow_override_source": false, + "default_destination_scheme": "provisioner_variable", + "allow_override_destination": false, + "default_refresh": "", + "redisplay_value": true, + "validation_error": "", + "validation_condition": "", + "validation_type_system": "none", + "validation_value_type": "" + }, + { + "id": "00000000-0000-0000-0000-000000000000", + "created_at": "0001-01-01T00:00:00Z", + "job_id": "00000000-0000-0000-0000-000000000000", + "name": "gcp_region", + "description": "", + "default_source_scheme": "data", + "default_source_value": "\"us-central1\"", + "allow_override_source": false, + "default_destination_scheme": "provisioner_variable", + "allow_override_destination": false, + "default_refresh": "", + "redisplay_value": true, + "validation_error": "", + "validation_condition": "", + "validation_type_system": "none", + "validation_value_type": "" + } + ], + "resources": [ + { + "id": "00000000-0000-0000-0000-000000000000", + "created_at": "0001-01-01T00:00:00Z", + "job_id": "00000000-0000-0000-0000-000000000000", + "workspace_transition": "start", + "type": "google_compute_instance", + "name": "dev", + "agent": { + "id": "00000000-0000-0000-0000-000000000000", + "created_at": "0001-01-01T00:00:00Z", + "updated_at": "0001-01-01T00:00:00Z", + "resource_id": "00000000-0000-0000-0000-000000000000", + "environment_variables": null + } + }, + { + "id": "00000000-0000-0000-0000-000000000000", + "created_at": "0001-01-01T00:00:00Z", + "job_id": "00000000-0000-0000-0000-000000000000", + "workspace_transition": "start", + "type": "random_string", + "name": "random" + } + ] +} \ No newline at end of file diff --git a/template/gcp-linux/gcp-linux.md b/template/gcp-linux/gcp-linux.md new file mode 100644 index 0000000000000..2a1c3051fd940 --- /dev/null +++ b/template/gcp-linux/gcp-linux.md @@ -0,0 +1,5 @@ +--- +name: Develop on Google Cloud +description: Get started with remote development on Google Cloud. +tags: [cloud, google] +--- diff --git a/template/gcp-linux/gcp-linux.tf b/template/gcp-linux/gcp-linux.tf new file mode 100644 index 0000000000000..c5f55e1c3fe14 --- /dev/null +++ b/template/gcp-linux/gcp-linux.tf @@ -0,0 +1,73 @@ +terraform { + required_providers { + coder = { + source = "coder/coder" + } + } +} + +variable "gcp_credentials" { + sensitive = true +} + +variable "gcp_project" { + description = "The Google Cloud project to manage resources in." +} + +variable "gcp_region" { + default = "us-central1" +} + +provider "google" { + project = var.gcp_project + region = var.gcp_region + credentials = var.gcp_credentials +} + +data "coder_workspace" "me" { +} + +data "coder_agent_script" "dev" { + arch = "amd64" + os = "linux" +} + +data "google_compute_default_service_account" "default" { +} + +resource "random_string" "random" { + count = data.coder_workspace.me.transition == "start" ? 1 : 0 + length = 8 + special = false +} + +resource "google_compute_instance" "dev" { + zone = "us-central1-a" + count = data.coder_workspace.me.transition == "start" ? 1 : 0 + name = "coder-${lower(random_string.random[0].result)}" + machine_type = "e2-medium" + network_interface { + network = "default" + access_config { + // Ephemeral public IP + } + } + boot_disk { + initialize_params { + image = "debian-cloud/debian-9" + } + } + service_account { + email = data.google_compute_default_service_account.default.email + scopes = ["cloud-platform"] + } + metadata_startup_script = data.coder_agent_script.dev.value +} + +resource "coder_agent" "dev" { + count = length(google_compute_instance.dev) + auth { + type = "google-instance-identity" + instance_id = google_compute_instance.dev[0].instance_id + } +} diff --git a/template/gcp-windows/gcp-windows.json b/template/gcp-windows/gcp-windows.json new file mode 100644 index 0000000000000..ba4e03e6ee283 --- /dev/null +++ b/template/gcp-windows/gcp-windows.json @@ -0,0 +1,86 @@ +{ + "ID": "gcp-windows", + "Name": "Develop on Google Cloud", + "Description": "Get started with remote development on Google Cloud.", + "schema": [ + { + "id": "00000000-0000-0000-0000-000000000000", + "created_at": "0001-01-01T00:00:00Z", + "job_id": "00000000-0000-0000-0000-000000000000", + "name": "gcp_credentials", + "description": "", + "default_source_scheme": "none", + "default_source_value": "", + "allow_override_source": false, + "default_destination_scheme": "provisioner_variable", + "allow_override_destination": false, + "default_refresh": "", + "redisplay_value": false, + "validation_error": "", + "validation_condition": "", + "validation_type_system": "none", + "validation_value_type": "" + }, + { + "id": "00000000-0000-0000-0000-000000000000", + "created_at": "0001-01-01T00:00:00Z", + "job_id": "00000000-0000-0000-0000-000000000000", + "name": "gcp_project", + "description": "The Google Cloud project to manage resources in.", + "default_source_scheme": "none", + "default_source_value": "", + "allow_override_source": false, + "default_destination_scheme": "provisioner_variable", + "allow_override_destination": false, + "default_refresh": "", + "redisplay_value": true, + "validation_error": "", + "validation_condition": "", + "validation_type_system": "none", + "validation_value_type": "" + }, + { + "id": "00000000-0000-0000-0000-000000000000", + "created_at": "0001-01-01T00:00:00Z", + "job_id": "00000000-0000-0000-0000-000000000000", + "name": "gcp_region", + "description": "", + "default_source_scheme": "data", + "default_source_value": "\"us-central1\"", + "allow_override_source": false, + "default_destination_scheme": "provisioner_variable", + "allow_override_destination": false, + "default_refresh": "", + "redisplay_value": true, + "validation_error": "", + "validation_condition": "", + "validation_type_system": "none", + "validation_value_type": "" + } + ], + "resources": [ + { + "id": "00000000-0000-0000-0000-000000000000", + "created_at": "0001-01-01T00:00:00Z", + "job_id": "00000000-0000-0000-0000-000000000000", + "workspace_transition": "start", + "type": "google_compute_instance", + "name": "dev", + "agent": { + "id": "00000000-0000-0000-0000-000000000000", + "created_at": "0001-01-01T00:00:00Z", + "updated_at": "0001-01-01T00:00:00Z", + "resource_id": "00000000-0000-0000-0000-000000000000", + "environment_variables": null + } + }, + { + "id": "00000000-0000-0000-0000-000000000000", + "created_at": "0001-01-01T00:00:00Z", + "job_id": "00000000-0000-0000-0000-000000000000", + "workspace_transition": "start", + "type": "random_string", + "name": "random" + } + ] +} \ No newline at end of file diff --git a/template/gcp-windows/gcp-windows.md b/template/gcp-windows/gcp-windows.md new file mode 100644 index 0000000000000..2a1c3051fd940 --- /dev/null +++ b/template/gcp-windows/gcp-windows.md @@ -0,0 +1,5 @@ +--- +name: Develop on Google Cloud +description: Get started with remote development on Google Cloud. +tags: [cloud, google] +--- diff --git a/template/gcp-windows/gcp-windows.tf b/template/gcp-windows/gcp-windows.tf new file mode 100644 index 0000000000000..5bb993083b09a --- /dev/null +++ b/template/gcp-windows/gcp-windows.tf @@ -0,0 +1,76 @@ +terraform { + required_providers { + coder = { + source = "coder/coder" + } + } +} + +variable "gcp_credentials" { + sensitive = true +} + +variable "gcp_project" { + description = "The Google Cloud project to manage resources in." +} + +variable "gcp_region" { + default = "us-central1" +} + +provider "google" { + project = var.gcp_project + region = var.gcp_region + credentials = var.gcp_credentials +} + +data "coder_workspace" "me" { +} + +data "coder_agent_script" "dev" { + arch = "amd64" + os = "windows" +} + +data "google_compute_default_service_account" "default" { +} + +resource "random_string" "random" { + count = data.coder_workspace.me.transition == "start" ? 1 : 0 + length = 8 + special = false +} + +resource "google_compute_instance" "dev" { + zone = "us-central1-a" + count = data.coder_workspace.me.transition == "start" ? 1 : 0 + name = "coder-${lower(random_string.random[0].result)}" + machine_type = "e2-medium" + network_interface { + network = "default" + access_config { + // Ephemeral public IP + } + } + boot_disk { + initialize_params { + image = "projects/windows-cloud/global/images/windows-server-2022-dc-core-v20220215" + } + } + service_account { + email = data.google_compute_default_service_account.default.email + scopes = ["cloud-platform"] + } + metadata = { + windows-startup-script-ps1 = data.coder_agent_script.dev.value + serial-port-enable = "TRUE" + } +} + +resource "coder_agent" "dev" { + count = length(google_compute_instance.dev) + auth { + type = "google-instance-identity" + instance_id = google_compute_instance.dev[0].instance_id + } +} diff --git a/template/template.go b/template/template.go new file mode 100644 index 0000000000000..b5bbb9cfde5ca --- /dev/null +++ b/template/template.go @@ -0,0 +1,31 @@ +package template + +import ( + "embed" + "fmt" +) + +//go:embed */*.json +//go:embed */*.tf +var files embed.FS + +func List() { + dirs, err := files.ReadDir(".") + if err != nil { + panic(err) + } + fmt.Printf("Dirs: %+v\n", dirs) + for _, dir := range dirs { + subpaths, err := files.ReadDir(dir.Name()) + if err != nil { + panic(err) + } + for _, subpath := range subpaths { + fmt.Printf("Got dir: %s\n", subpath.Name()) + } + } +} + +func Setup() { + +} diff --git a/template/template_test.go b/template/template_test.go new file mode 100644 index 0000000000000..8d190d0689ccd --- /dev/null +++ b/template/template_test.go @@ -0,0 +1,12 @@ +package template_test + +import ( + "testing" + + "github.com/coder/coder/template" +) + +func TestTemplate(t *testing.T) { + t.Parallel() + template.List() +} From 688ab170302d4378243fb6b61b29a08848d857cf Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Thu, 10 Mar 2022 19:44:57 +0000 Subject: [PATCH 02/37] Move API structs to codersdk --- cli/cliui/prompt_test.go | 5 +- cli/login.go | 5 +- cli/projectcreate.go | 15 ++- cli/projects.go | 6 +- cli/root.go | 5 +- cli/workspacecreate.go | 6 +- cmd/templater/main.go | 26 +++--- coderd/coderd.go | 4 + coderd/coderdtest/coderdtest.go | 34 +++---- coderd/coderdtest/coderdtest_test.go | 4 +- coderd/files.go | 10 +- coderd/organizations.go | 46 ++------- coderd/organizations_test.go | 13 ++- coderd/parameters.go | 49 ++-------- coderd/parameters_test.go | 21 ++--- coderd/projects.go | 26 ++---- coderd/projectversions.go | 23 +---- coderd/provisionerdaemons.go | 2 - coderd/provisionerjobs.go | 52 +++-------- coderd/provisionerjobs_test.go | 8 +- coderd/templates.go | 34 +++++-- coderd/templates_test.go | 27 ++++++ coderd/tunnel/tunnel.go | 2 +- coderd/tunnel/tunnel_test.go | 3 +- coderd/users.go | 79 +++------------- coderd/users_test.go | 41 ++++---- coderd/workspacebuilds.go | 29 ++---- coderd/workspacebuilds_test.go | 9 +- coderd/workspaceresourceauth.go | 15 +-- coderd/workspaceresourceauth_test.go | 3 +- coderd/workspaceresources.go | 53 ++--------- coderd/workspaceresources_test.go | 5 +- coderd/workspaces.go | 25 ++--- coderd/workspaces_test.go | 17 ++-- codersdk/files.go | 15 +-- codersdk/organizations.go | 78 +++++++++++----- codersdk/parameters.go | 47 ++++++++-- codersdk/projects.go | 38 +++++--- codersdk/projectversions.go | 44 ++++++--- codersdk/provisionerdaemons.go | 44 +++++++-- codersdk/templates.go | 47 ++++++++++ codersdk/users.go | 135 +++++++++++++++++++-------- codersdk/workspacebuilds.go | 35 +++++-- codersdk/workspaceresourceauth.go | 24 +++-- codersdk/workspaceresources.go | 51 +++++++++- codersdk/workspaces.go | 49 ++++++---- provisionersdk/agent_test.go | 4 +- provisionersdk/archive_test.go | 19 ++++ template/template.go | 67 +++++++++++-- template/template_test.go | 7 +- 50 files changed, 788 insertions(+), 618 deletions(-) create mode 100644 coderd/templates_test.go create mode 100644 codersdk/templates.go create mode 100644 provisionersdk/archive_test.go diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go index 7dc67ca71eae2..96ebd4fb7645e 100644 --- a/cli/cliui/prompt_test.go +++ b/cli/cliui/prompt_test.go @@ -4,11 +4,12 @@ import ( "fmt" "testing" - "github.com/coder/coder/cli/cliui" - "github.com/coder/coder/pty/ptytest" "github.com/spf13/cobra" "github.com/stretchr/testify/require" "go.uber.org/goleak" + + "github.com/coder/coder/cli/cliui" + "github.com/coder/coder/pty/ptytest" ) func TestMain(m *testing.M) { diff --git a/cli/login.go b/cli/login.go index 84626af2533ee..05a8eef9df5bc 100644 --- a/cli/login.go +++ b/cli/login.go @@ -19,7 +19,6 @@ import ( "golang.org/x/xerrors" "github.com/coder/coder/cli/cliui" - "github.com/coder/coder/coderd" "github.com/coder/coder/codersdk" ) @@ -122,7 +121,7 @@ func login() *cobra.Command { return xerrors.Errorf("specify password prompt: %w", err) } - _, err = client.CreateFirstUser(cmd.Context(), coderd.CreateFirstUserRequest{ + _, err = client.CreateFirstUser(cmd.Context(), codersdk.CreateFirstUserRequest{ Email: email, Username: username, Organization: username, @@ -131,7 +130,7 @@ func login() *cobra.Command { if err != nil { return xerrors.Errorf("create initial user: %w", err) } - resp, err := client.LoginWithPassword(cmd.Context(), coderd.LoginWithPasswordRequest{ + resp, err := client.LoginWithPassword(cmd.Context(), codersdk.LoginWithPasswordRequest{ Email: email, Password: password, }) diff --git a/cli/projectcreate.go b/cli/projectcreate.go index 45ad1590d7948..58e3ef0c37833 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -14,7 +14,6 @@ import ( "github.com/spf13/cobra" "golang.org/x/xerrors" - "github.com/coder/coder/coderd" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/provisionerd" @@ -82,7 +81,7 @@ func projectCreate() *cobra.Command { return err } - project, err := client.CreateProject(cmd.Context(), organization.ID, coderd.CreateProjectRequest{ + project, err := client.CreateProject(cmd.Context(), organization.ID, codersdk.CreateProjectRequest{ Name: name, VersionID: job.ID, }) @@ -117,7 +116,7 @@ func projectCreate() *cobra.Command { return cmd } -func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, organization coderd.Organization, provisioner database.ProvisionerType, directory string, parameters ...coderd.CreateParameterRequest) (*coderd.ProjectVersion, error) { +func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, organization codersdk.Organization, provisioner database.ProvisionerType, directory string, parameters ...codersdk.CreateParameterRequest) (*codersdk.ProjectVersion, error) { spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) spin.Writer = cmd.OutOrStdout() spin.Suffix = " Uploading current directory..." @@ -138,7 +137,7 @@ func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, o } before := time.Now() - version, err := client.CreateProjectVersion(cmd.Context(), organization.ID, coderd.CreateProjectVersionRequest{ + version, err := client.CreateProjectVersion(cmd.Context(), organization.ID, codersdk.CreateProjectVersionRequest{ StorageMethod: database.ProvisionerStorageMethodFile, StorageSource: resp.Hash, Provisioner: provisioner, @@ -152,7 +151,7 @@ func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, o if err != nil { return nil, err } - logBuffer := make([]coderd.ProvisionerJobLog, 0, 64) + logBuffer := make([]codersdk.ProvisionerJobLog, 0, 64) for { log, ok := <-logs if !ok { @@ -176,7 +175,7 @@ func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, o spin.Stop() if provisionerd.IsMissingParameterError(version.Job.Error) { - valuesBySchemaID := map[string]coderd.ProjectVersionParameter{} + valuesBySchemaID := map[string]codersdk.ProjectVersionParameter{} for _, parameterValue := range parameterValues { valuesBySchemaID[parameterValue.SchemaID.String()] = parameterValue } @@ -191,7 +190,7 @@ func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, o if err != nil { return nil, err } - parameters = append(parameters, coderd.CreateParameterRequest{ + parameters = append(parameters, codersdk.CreateParameterRequest{ Name: parameterSchema.Name, SourceValue: value, SourceScheme: database.ParameterSourceSchemeData, @@ -201,7 +200,7 @@ func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, o return validateProjectVersionSource(cmd, client, organization, provisioner, directory, parameters...) } - if version.Job.Status != coderd.ProvisionerJobSucceeded { + if version.Job.Status != codersdk.ProvisionerJobSucceeded { for _, log := range logBuffer { _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s %s\n", color.HiGreenString("[tf]"), log.Output) } diff --git a/cli/projects.go b/cli/projects.go index 74c4424a537e6..ba7836eb27db3 100644 --- a/cli/projects.go +++ b/cli/projects.go @@ -9,7 +9,7 @@ import ( "github.com/xlab/treeprint" "golang.org/x/xerrors" - "github.com/coder/coder/coderd" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" ) @@ -40,8 +40,8 @@ func projects() *cobra.Command { return cmd } -func displayProjectImportInfo(cmd *cobra.Command, parameterSchemas []coderd.ProjectVersionParameterSchema, parameterValues []coderd.ProjectVersionParameter, resources []coderd.WorkspaceResource) error { - schemaByID := map[string]coderd.ProjectVersionParameterSchema{} +func displayProjectImportInfo(cmd *cobra.Command, parameterSchemas []codersdk.ProjectVersionParameterSchema, parameterValues []codersdk.ProjectVersionParameter, resources []codersdk.WorkspaceResource) error { + schemaByID := map[string]codersdk.ProjectVersionParameterSchema{} for _, schema := range parameterSchemas { schemaByID[schema.ID.String()] = schema } diff --git a/cli/root.go b/cli/root.go index 878b3fc614713..5be14daade57a 100644 --- a/cli/root.go +++ b/cli/root.go @@ -14,7 +14,6 @@ import ( "github.com/spf13/cobra" "github.com/coder/coder/cli/config" - "github.com/coder/coder/coderd" "github.com/coder/coder/codersdk" ) @@ -108,10 +107,10 @@ func createClient(cmd *cobra.Command) (*codersdk.Client, error) { } // currentOrganization returns the currently active organization for the authenticated user. -func currentOrganization(cmd *cobra.Command, client *codersdk.Client) (coderd.Organization, error) { +func currentOrganization(cmd *cobra.Command, client *codersdk.Client) (codersdk.Organization, error) { orgs, err := client.OrganizationsByUser(cmd.Context(), "me") if err != nil { - return coderd.Organization{}, nil + return codersdk.Organization{}, nil } // For now, we won't use the config to set this. // Eventually, we will support changing using "coder switch " diff --git a/cli/workspacecreate.go b/cli/workspacecreate.go index 156324240fad8..459eb81eeb106 100644 --- a/cli/workspacecreate.go +++ b/cli/workspacecreate.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/xerrors" - "github.com/coder/coder/coderd" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" ) @@ -93,14 +93,14 @@ func workspaceCreate() *cobra.Command { return err } - workspace, err := client.CreateWorkspace(cmd.Context(), "", coderd.CreateWorkspaceRequest{ + workspace, err := client.CreateWorkspace(cmd.Context(), "", codersdk.CreateWorkspaceRequest{ ProjectID: project.ID, Name: name, }) if err != nil { return err } - version, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + version, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: projectVersion.ID, Transition: database.WorkspaceTransitionStart, }) diff --git a/cmd/templater/main.go b/cmd/templater/main.go index cf9e10873708b..a9959b7b90a19 100644 --- a/cmd/templater/main.go +++ b/cmd/templater/main.go @@ -39,10 +39,10 @@ func main() { cmd := &cobra.Command{ Use: "templater", RunE: func(cmd *cobra.Command, args []string) error { - parameters := make([]coderd.CreateParameterRequest, 0) + parameters := make([]codersdk.CreateParameterRequest, 0) for _, parameter := range rawParameters { parts := strings.SplitN(parameter, "=", 2) - parameters = append(parameters, coderd.CreateParameterRequest{ + parameters = append(parameters, codersdk.CreateParameterRequest{ Name: parts[0], SourceValue: parts[1], SourceScheme: database.ParameterSourceSchemeData, @@ -59,7 +59,7 @@ func main() { } } -func parse(cmd *cobra.Command, args []string, parameters []coderd.CreateParameterRequest) error { +func parse(cmd *cobra.Command, args []string, parameters []codersdk.CreateParameterRequest) error { srv := httptest.NewUnstartedServer(nil) srv.Config.BaseContext = func(_ net.Listener) context.Context { return cmd.Context() @@ -101,7 +101,7 @@ func parse(cmd *cobra.Command, args []string, parameters []coderd.CreateParamete } defer daemonClose.Close() - created, err := client.CreateFirstUser(cmd.Context(), coderd.CreateFirstUserRequest{ + created, err := client.CreateFirstUser(cmd.Context(), codersdk.CreateFirstUserRequest{ Email: "templater@coder.com", Username: "templater", Organization: "templater", @@ -110,7 +110,7 @@ func parse(cmd *cobra.Command, args []string, parameters []coderd.CreateParamete if err != nil { return err } - auth, err := client.LoginWithPassword(cmd.Context(), coderd.LoginWithPasswordRequest{ + auth, err := client.LoginWithPassword(cmd.Context(), codersdk.LoginWithPasswordRequest{ Email: "templater@coder.com", Password: "insecure", }) @@ -133,7 +133,7 @@ func parse(cmd *cobra.Command, args []string, parameters []coderd.CreateParamete } before := time.Now() - version, err := client.CreateProjectVersion(cmd.Context(), created.OrganizationID, coderd.CreateProjectVersionRequest{ + version, err := client.CreateProjectVersion(cmd.Context(), created.OrganizationID, codersdk.CreateProjectVersionRequest{ ProjectID: nil, StorageMethod: database.ProvisionerStorageMethodFile, StorageSource: resp.Hash, @@ -158,7 +158,7 @@ func parse(cmd *cobra.Command, args []string, parameters []coderd.CreateParamete if err != nil { return err } - if version.Job.Status != coderd.ProvisionerJobSucceeded { + if version.Job.Status != codersdk.ProvisionerJobSucceeded { return xerrors.Errorf("Job wasn't successful, it was %q. Check the logs!", version.Job.Status) } @@ -215,7 +215,7 @@ func parse(cmd *cobra.Command, args []string, parameters []coderd.CreateParamete return schemas[i].Name < schemas[j].Name }) - template := coderd.Template{ + template := codersdk.Template{ ID: filepath.Base(dir), Name: name.(string), Description: description.(string), @@ -229,7 +229,7 @@ func parse(cmd *cobra.Command, args []string, parameters []coderd.CreateParamete } os.WriteFile(filepath.Base(dir)+".json", data, 0600) - project, err := client.CreateProject(cmd.Context(), created.OrganizationID, coderd.CreateProjectRequest{ + project, err := client.CreateProject(cmd.Context(), created.OrganizationID, codersdk.CreateProjectRequest{ Name: "test", VersionID: version.ID, }) @@ -237,7 +237,7 @@ func parse(cmd *cobra.Command, args []string, parameters []coderd.CreateParamete return err } - workspace, err := client.CreateWorkspace(cmd.Context(), created.UserID, coderd.CreateWorkspaceRequest{ + workspace, err := client.CreateWorkspace(cmd.Context(), created.UserID, codersdk.CreateWorkspaceRequest{ ProjectID: project.ID, Name: "example", }) @@ -245,7 +245,7 @@ func parse(cmd *cobra.Command, args []string, parameters []coderd.CreateParamete return err } - build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: version.ID, Transition: database.WorkspaceTransitionStart, }) @@ -278,7 +278,7 @@ func parse(cmd *cobra.Command, args []string, parameters []coderd.CreateParamete } } - build, err = client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err = client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: version.ID, Transition: database.WorkspaceTransitionDelete, }) @@ -303,7 +303,7 @@ func parse(cmd *cobra.Command, args []string, parameters []coderd.CreateParamete return nil } -func awaitAgent(ctx context.Context, client *codersdk.Client, resource coderd.WorkspaceResource) error { +func awaitAgent(ctx context.Context, client *codersdk.Client, resource codersdk.WorkspaceResource) error { ticker := time.NewTicker(time.Second) defer ticker.Stop() for { diff --git a/coderd/coderd.go b/coderd/coderd.go index 6a21929411eb2..f794e01a77787 100644 --- a/coderd/coderd.go +++ b/coderd/coderd.go @@ -99,6 +99,10 @@ func New(options *Options) (http.Handler, func()) { r.Get("/listen", api.provisionerDaemonsListen) }) }) + r.Route("/templates", func(r chi.Router) { + r.Get("/", api.listTemplates) + r.Get("/{id}", api.templateArchive) + }) r.Route("/users", func(r chi.Router) { r.Get("/first", api.firstUser) r.Post("/first", api.postFirstUser) diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index 63c7c875c9cff..a9053f347c3ec 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -134,8 +134,8 @@ func NewProvisionerDaemon(t *testing.T, client *codersdk.Client) io.Closer { // CreateFirstUser creates a user with preset credentials and authenticates // with the passed in codersdk client. -func CreateFirstUser(t *testing.T, client *codersdk.Client) coderd.CreateFirstUserResponse { - req := coderd.CreateFirstUserRequest{ +func CreateFirstUser(t *testing.T, client *codersdk.Client) codersdk.CreateFirstUserResponse { + req := codersdk.CreateFirstUserRequest{ Email: "testuser@coder.com", Username: "testuser", Password: "testpass", @@ -144,7 +144,7 @@ func CreateFirstUser(t *testing.T, client *codersdk.Client) coderd.CreateFirstUs resp, err := client.CreateFirstUser(context.Background(), req) require.NoError(t, err) - login, err := client.LoginWithPassword(context.Background(), coderd.LoginWithPasswordRequest{ + login, err := client.LoginWithPassword(context.Background(), codersdk.LoginWithPasswordRequest{ Email: req.Email, Password: req.Password, }) @@ -155,7 +155,7 @@ func CreateFirstUser(t *testing.T, client *codersdk.Client) coderd.CreateFirstUs // CreateAnotherUser creates and authenticates a new user. func CreateAnotherUser(t *testing.T, client *codersdk.Client, organization string) *codersdk.Client { - req := coderd.CreateUserRequest{ + req := codersdk.CreateUserRequest{ Email: namesgenerator.GetRandomName(1) + "@coder.com", Username: randomUsername(), Password: "testpass", @@ -164,7 +164,7 @@ func CreateAnotherUser(t *testing.T, client *codersdk.Client, organization strin _, err := client.CreateUser(context.Background(), req) require.NoError(t, err) - login, err := client.LoginWithPassword(context.Background(), coderd.LoginWithPasswordRequest{ + login, err := client.LoginWithPassword(context.Background(), codersdk.LoginWithPasswordRequest{ Email: req.Email, Password: req.Password, }) @@ -178,12 +178,12 @@ func CreateAnotherUser(t *testing.T, client *codersdk.Client, organization strin // CreateProjectVersion creates a project import provisioner job // with the responses provided. It uses the "echo" provisioner for compatibility // with testing. -func CreateProjectVersion(t *testing.T, client *codersdk.Client, organization string, res *echo.Responses) coderd.ProjectVersion { +func CreateProjectVersion(t *testing.T, client *codersdk.Client, organization string, res *echo.Responses) codersdk.ProjectVersion { data, err := echo.Tar(res) require.NoError(t, err) file, err := client.Upload(context.Background(), codersdk.ContentTypeTar, data) require.NoError(t, err) - projectVersion, err := client.CreateProjectVersion(context.Background(), organization, coderd.CreateProjectVersionRequest{ + projectVersion, err := client.CreateProjectVersion(context.Background(), organization, codersdk.CreateProjectVersionRequest{ StorageSource: file.Hash, StorageMethod: database.ProvisionerStorageMethodFile, Provisioner: database.ProvisionerTypeEcho, @@ -194,8 +194,8 @@ func CreateProjectVersion(t *testing.T, client *codersdk.Client, organization st // CreateProject creates a project with the "echo" provisioner for // compatibility with testing. The name assigned is randomly generated. -func CreateProject(t *testing.T, client *codersdk.Client, organization string, version uuid.UUID) coderd.Project { - project, err := client.CreateProject(context.Background(), organization, coderd.CreateProjectRequest{ +func CreateProject(t *testing.T, client *codersdk.Client, organization string, version uuid.UUID) codersdk.Project { + project, err := client.CreateProject(context.Background(), organization, codersdk.CreateProjectRequest{ Name: randomUsername(), VersionID: version, }) @@ -204,8 +204,8 @@ func CreateProject(t *testing.T, client *codersdk.Client, organization string, v } // AwaitProjectImportJob awaits for an import job to reach completed status. -func AwaitProjectVersionJob(t *testing.T, client *codersdk.Client, version uuid.UUID) coderd.ProjectVersion { - var projectVersion coderd.ProjectVersion +func AwaitProjectVersionJob(t *testing.T, client *codersdk.Client, version uuid.UUID) codersdk.ProjectVersion { + var projectVersion codersdk.ProjectVersion require.Eventually(t, func() bool { var err error projectVersion, err = client.ProjectVersion(context.Background(), version) @@ -216,8 +216,8 @@ func AwaitProjectVersionJob(t *testing.T, client *codersdk.Client, version uuid. } // AwaitWorkspaceBuildJob waits for a workspace provision job to reach completed status. -func AwaitWorkspaceBuildJob(t *testing.T, client *codersdk.Client, build uuid.UUID) coderd.WorkspaceBuild { - var workspaceBuild coderd.WorkspaceBuild +func AwaitWorkspaceBuildJob(t *testing.T, client *codersdk.Client, build uuid.UUID) codersdk.WorkspaceBuild { + var workspaceBuild codersdk.WorkspaceBuild require.Eventually(t, func() bool { var err error workspaceBuild, err = client.WorkspaceBuild(context.Background(), build) @@ -228,8 +228,8 @@ func AwaitWorkspaceBuildJob(t *testing.T, client *codersdk.Client, build uuid.UU } // AwaitWorkspaceAgents waits for all resources with agents to be connected. -func AwaitWorkspaceAgents(t *testing.T, client *codersdk.Client, build uuid.UUID) []coderd.WorkspaceResource { - var resources []coderd.WorkspaceResource +func AwaitWorkspaceAgents(t *testing.T, client *codersdk.Client, build uuid.UUID) []codersdk.WorkspaceResource { + var resources []codersdk.WorkspaceResource require.Eventually(t, func() bool { var err error resources, err = client.WorkspaceResourcesByBuild(context.Background(), build) @@ -249,8 +249,8 @@ func AwaitWorkspaceAgents(t *testing.T, client *codersdk.Client, build uuid.UUID // CreateWorkspace creates a workspace for the user and project provided. // A random name is generated for it. -func CreateWorkspace(t *testing.T, client *codersdk.Client, user string, projectID uuid.UUID) coderd.Workspace { - workspace, err := client.CreateWorkspace(context.Background(), user, coderd.CreateWorkspaceRequest{ +func CreateWorkspace(t *testing.T, client *codersdk.Client, user string, projectID uuid.UUID) codersdk.Workspace { + workspace, err := client.CreateWorkspace(context.Background(), user, codersdk.CreateWorkspaceRequest{ ProjectID: projectID, Name: randomUsername(), }) diff --git a/coderd/coderdtest/coderdtest_test.go b/coderd/coderdtest/coderdtest_test.go index 6f4cb6127e25b..40cecf63bca82 100644 --- a/coderd/coderdtest/coderdtest_test.go +++ b/coderd/coderdtest/coderdtest_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/coder/coder/coderd" "github.com/coder/coder/coderd/coderdtest" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" ) @@ -26,7 +26,7 @@ func TestNew(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) diff --git a/coderd/files.go b/coderd/files.go index 2d753b44132d0..ca176322ae6fb 100644 --- a/coderd/files.go +++ b/coderd/files.go @@ -12,16 +12,12 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" "github.com/coder/coder/httpmw" ) -// UploadResponse contains the hash to reference the uploaded file. -type UploadResponse struct { - Hash string `json:"hash"` -} - func (api *api) postFile(rw http.ResponseWriter, r *http.Request) { apiKey := httpmw.APIKey(r) contentType := r.Header.Get("Content-Type") @@ -49,7 +45,7 @@ func (api *api) postFile(rw http.ResponseWriter, r *http.Request) { if err == nil { // The file already exists! render.Status(r, http.StatusOK) - render.JSON(rw, r, UploadResponse{ + render.JSON(rw, r, codersdk.UploadResponse{ Hash: file.Hash, }) return @@ -68,7 +64,7 @@ func (api *api) postFile(rw http.ResponseWriter, r *http.Request) { return } render.Status(r, http.StatusCreated) - render.JSON(rw, r, UploadResponse{ + render.JSON(rw, r, codersdk.UploadResponse{ Hash: file.Hash, }) } diff --git a/coderd/organizations.go b/coderd/organizations.go index c8f3e4fc975b9..b4d8a252b891e 100644 --- a/coderd/organizations.go +++ b/coderd/organizations.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "net/http" - "time" "github.com/go-chi/chi/v5" "github.com/go-chi/render" @@ -13,45 +12,12 @@ import ( "github.com/moby/moby/pkg/namesgenerator" "golang.org/x/xerrors" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" "github.com/coder/coder/httpmw" ) -// Organization is the JSON representation of a Coder organization. -type Organization struct { - ID string `json:"id" validate:"required"` - Name string `json:"name" validate:"required"` - CreatedAt time.Time `json:"created_at" validate:"required"` - UpdatedAt time.Time `json:"updated_at" validate:"required"` -} - -// CreateProjectVersionRequest enables callers to create a new Project Version. -type CreateProjectVersionRequest struct { - // ProjectID optionally associates a version with a project. - ProjectID *uuid.UUID `json:"project_id"` - - StorageMethod database.ProvisionerStorageMethod `json:"storage_method" validate:"oneof=file,required"` - StorageSource string `json:"storage_source" validate:"required"` - Provisioner database.ProvisionerType `json:"provisioner" validate:"oneof=terraform echo,required"` - // ParameterValues allows for additional parameters to be provided - // during the dry-run provision stage. - ParameterValues []CreateParameterRequest `json:"parameter_values"` -} - -// CreateProjectRequest provides options when creating a project. -type CreateProjectRequest struct { - Name string `json:"name" validate:"username,required"` - - // VersionID is an in-progress or completed job to use as - // an initial version of the project. - // - // This is required on creation to enable a user-flow of validating a - // project works. There is no reason the data-model cannot support - // empty projects, but it doesn't make sense for users. - VersionID uuid.UUID `json:"project_version_id" validate:"required"` -} - func (*api) organization(rw http.ResponseWriter, r *http.Request) { organization := httpmw.OrganizationParam(r) render.Status(r, http.StatusOK) @@ -80,7 +46,7 @@ func (api *api) provisionerDaemonsByOrganization(rw http.ResponseWriter, r *http func (api *api) postProjectVersionsByOrganization(rw http.ResponseWriter, r *http.Request) { apiKey := httpmw.APIKey(r) organization := httpmw.OrganizationParam(r) - var req CreateProjectVersionRequest + var req codersdk.CreateProjectVersionRequest if !httpapi.Read(rw, r, &req) { return } @@ -187,7 +153,7 @@ func (api *api) postProjectVersionsByOrganization(rw http.ResponseWriter, r *htt // Create a new project in an organization. func (api *api) postProjectsByOrganization(rw http.ResponseWriter, r *http.Request) { - var createProject CreateProjectRequest + var createProject codersdk.CreateProjectRequest if !httpapi.Read(rw, r, &createProject) { return } @@ -232,7 +198,7 @@ func (api *api) postProjectsByOrganization(rw http.ResponseWriter, r *http.Reque return } - var project Project + var project codersdk.Project err = api.Database.InTx(func(db database.Store) error { dbProject, err := db.InsertProject(r.Context(), database.InsertProjectParams{ ID: uuid.New(), @@ -338,8 +304,8 @@ func (api *api) projectByOrganizationAndName(rw http.ResponseWriter, r *http.Req } // convertOrganization consumes the database representation and outputs an API friendly representation. -func convertOrganization(organization database.Organization) Organization { - return Organization{ +func convertOrganization(organization database.Organization) codersdk.Organization { + return codersdk.Organization{ ID: organization.ID, Name: organization.Name, CreatedAt: organization.CreatedAt, diff --git a/coderd/organizations_test.go b/coderd/organizations_test.go index b37ac9419d14c..822cacce4a95d 100644 --- a/coderd/organizations_test.go +++ b/coderd/organizations_test.go @@ -8,7 +8,6 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/coder/coder/coderd" "github.com/coder/coder/coderd/coderdtest" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" @@ -40,7 +39,7 @@ func TestPostProjectVersionsByOrganization(t *testing.T) { client := coderdtest.New(t, nil) user := coderdtest.CreateFirstUser(t, client) projectID := uuid.New() - _, err := client.CreateProjectVersion(context.Background(), user.OrganizationID, coderd.CreateProjectVersionRequest{ + _, err := client.CreateProjectVersion(context.Background(), user.OrganizationID, codersdk.CreateProjectVersionRequest{ ProjectID: &projectID, StorageMethod: database.ProvisionerStorageMethodFile, StorageSource: "hash", @@ -55,7 +54,7 @@ func TestPostProjectVersionsByOrganization(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) user := coderdtest.CreateFirstUser(t, client) - _, err := client.CreateProjectVersion(context.Background(), user.OrganizationID, coderd.CreateProjectVersionRequest{ + _, err := client.CreateProjectVersion(context.Background(), user.OrganizationID, codersdk.CreateProjectVersionRequest{ StorageMethod: database.ProvisionerStorageMethodFile, StorageSource: "hash", Provisioner: database.ProvisionerTypeEcho, @@ -77,11 +76,11 @@ func TestPostProjectVersionsByOrganization(t *testing.T) { require.NoError(t, err) file, err := client.Upload(context.Background(), codersdk.ContentTypeTar, data) require.NoError(t, err) - _, err = client.CreateProjectVersion(context.Background(), user.OrganizationID, coderd.CreateProjectVersionRequest{ + _, err = client.CreateProjectVersion(context.Background(), user.OrganizationID, codersdk.CreateProjectVersionRequest{ StorageMethod: database.ProvisionerStorageMethodFile, StorageSource: file.Hash, Provisioner: database.ProvisionerTypeEcho, - ParameterValues: []coderd.CreateParameterRequest{{ + ParameterValues: []codersdk.CreateParameterRequest{{ Name: "example", SourceValue: "value", SourceScheme: database.ParameterSourceSchemeData, @@ -108,7 +107,7 @@ func TestPostProjectsByOrganization(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) - _, err := client.CreateProject(context.Background(), user.OrganizationID, coderd.CreateProjectRequest{ + _, err := client.CreateProject(context.Background(), user.OrganizationID, codersdk.CreateProjectRequest{ Name: project.Name, VersionID: version.ID, }) @@ -121,7 +120,7 @@ func TestPostProjectsByOrganization(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) user := coderdtest.CreateFirstUser(t, client) - _, err := client.CreateProject(context.Background(), user.OrganizationID, coderd.CreateProjectRequest{ + _, err := client.CreateProject(context.Background(), user.OrganizationID, codersdk.CreateProjectRequest{ Name: "test", VersionID: uuid.New(), }) diff --git a/coderd/parameters.go b/coderd/parameters.go index 5b0d8e7efde9b..3330d5db14617 100644 --- a/coderd/parameters.go +++ b/coderd/parameters.go @@ -5,47 +5,18 @@ import ( "errors" "fmt" "net/http" - "time" "github.com/go-chi/chi/v5" "github.com/go-chi/render" "github.com/google/uuid" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" ) -type ParameterScope string - -const ( - ParameterOrganization ParameterScope = "organization" - ParameterProject ParameterScope = "project" - ParameterUser ParameterScope = "user" - ParameterWorkspace ParameterScope = "workspace" -) - -// Parameter represents a set value for the scope. -type Parameter struct { - ID uuid.UUID `db:"id" json:"id"` - CreatedAt time.Time `db:"created_at" json:"created_at"` - UpdatedAt time.Time `db:"updated_at" json:"updated_at"` - Scope ParameterScope `db:"scope" json:"scope"` - ScopeID string `db:"scope_id" json:"scope_id"` - Name string `db:"name" json:"name"` - SourceScheme database.ParameterSourceScheme `db:"source_scheme" json:"source_scheme"` - DestinationScheme database.ParameterDestinationScheme `db:"destination_scheme" json:"destination_scheme"` -} - -// CreateParameterRequest is used to create a new parameter value for a scope. -type CreateParameterRequest struct { - Name string `json:"name" validate:"required"` - SourceValue string `json:"source_value" validate:"required"` - SourceScheme database.ParameterSourceScheme `json:"source_scheme" validate:"oneof=data,required"` - DestinationScheme database.ParameterDestinationScheme `json:"destination_scheme" validate:"oneof=environment_variable provisioner_variable,required"` -} - func (api *api) postParameter(rw http.ResponseWriter, r *http.Request) { - var createRequest CreateParameterRequest + var createRequest codersdk.CreateParameterRequest if !httpapi.Read(rw, r, &createRequest) { return } @@ -110,7 +81,7 @@ func (api *api) parameters(rw http.ResponseWriter, r *http.Request) { }) return } - apiParameterValues := make([]Parameter, 0, len(parameterValues)) + apiParameterValues := make([]codersdk.Parameter, 0, len(parameterValues)) for _, parameterValue := range parameterValues { apiParameterValues = append(apiParameterValues, convertParameterValue(parameterValue)) } @@ -154,12 +125,12 @@ func (api *api) deleteParameter(rw http.ResponseWriter, r *http.Request) { }) } -func convertParameterValue(parameterValue database.ParameterValue) Parameter { - return Parameter{ +func convertParameterValue(parameterValue database.ParameterValue) codersdk.Parameter { + return codersdk.Parameter{ ID: parameterValue.ID, CreatedAt: parameterValue.CreatedAt, UpdatedAt: parameterValue.UpdatedAt, - Scope: ParameterScope(parameterValue.Scope), + Scope: codersdk.ParameterScope(parameterValue.Scope), ScopeID: parameterValue.ScopeID, Name: parameterValue.Name, SourceScheme: parameterValue.SourceScheme, @@ -170,13 +141,13 @@ func convertParameterValue(parameterValue database.ParameterValue) Parameter { func readScopeAndID(rw http.ResponseWriter, r *http.Request) (database.ParameterScope, string, bool) { var scope database.ParameterScope switch chi.URLParam(r, "scope") { - case string(ParameterOrganization): + case string(codersdk.ParameterOrganization): scope = database.ParameterScopeOrganization - case string(ParameterProject): + case string(codersdk.ParameterProject): scope = database.ParameterScopeProject - case string(ParameterUser): + case string(codersdk.ParameterUser): scope = database.ParameterScopeUser - case string(ParameterWorkspace): + case string(codersdk.ParameterWorkspace): scope = database.ParameterScopeWorkspace default: httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{ diff --git a/coderd/parameters_test.go b/coderd/parameters_test.go index 06fb5757739bc..674adec078358 100644 --- a/coderd/parameters_test.go +++ b/coderd/parameters_test.go @@ -7,7 +7,6 @@ import ( "github.com/stretchr/testify/require" - "github.com/coder/coder/coderd" "github.com/coder/coder/coderd/coderdtest" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" @@ -19,7 +18,7 @@ func TestPostParameter(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) user := coderdtest.CreateFirstUser(t, client) - _, err := client.CreateParameter(context.Background(), coderd.ParameterScope("something"), user.OrganizationID, coderd.CreateParameterRequest{ + _, err := client.CreateParameter(context.Background(), codersdk.ParameterScope("something"), user.OrganizationID, codersdk.CreateParameterRequest{ Name: "example", SourceValue: "tomato", SourceScheme: database.ParameterSourceSchemeData, @@ -34,7 +33,7 @@ func TestPostParameter(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) user := coderdtest.CreateFirstUser(t, client) - _, err := client.CreateParameter(context.Background(), coderd.ParameterOrganization, user.OrganizationID, coderd.CreateParameterRequest{ + _, err := client.CreateParameter(context.Background(), codersdk.ParameterOrganization, user.OrganizationID, codersdk.CreateParameterRequest{ Name: "example", SourceValue: "tomato", SourceScheme: database.ParameterSourceSchemeData, @@ -47,7 +46,7 @@ func TestPostParameter(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) user := coderdtest.CreateFirstUser(t, client) - _, err := client.CreateParameter(context.Background(), coderd.ParameterOrganization, user.OrganizationID, coderd.CreateParameterRequest{ + _, err := client.CreateParameter(context.Background(), codersdk.ParameterOrganization, user.OrganizationID, codersdk.CreateParameterRequest{ Name: "example", SourceValue: "tomato", SourceScheme: database.ParameterSourceSchemeData, @@ -55,7 +54,7 @@ func TestPostParameter(t *testing.T) { }) require.NoError(t, err) - _, err = client.CreateParameter(context.Background(), coderd.ParameterOrganization, user.OrganizationID, coderd.CreateParameterRequest{ + _, err = client.CreateParameter(context.Background(), codersdk.ParameterOrganization, user.OrganizationID, codersdk.CreateParameterRequest{ Name: "example", SourceValue: "tomato", SourceScheme: database.ParameterSourceSchemeData, @@ -73,21 +72,21 @@ func TestParameters(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) user := coderdtest.CreateFirstUser(t, client) - _, err := client.Parameters(context.Background(), coderd.ParameterOrganization, user.OrganizationID) + _, err := client.Parameters(context.Background(), codersdk.ParameterOrganization, user.OrganizationID) require.NoError(t, err) }) t.Run("List", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) user := coderdtest.CreateFirstUser(t, client) - _, err := client.CreateParameter(context.Background(), coderd.ParameterOrganization, user.OrganizationID, coderd.CreateParameterRequest{ + _, err := client.CreateParameter(context.Background(), codersdk.ParameterOrganization, user.OrganizationID, codersdk.CreateParameterRequest{ Name: "example", SourceValue: "tomato", SourceScheme: database.ParameterSourceSchemeData, DestinationScheme: database.ParameterDestinationSchemeProvisionerVariable, }) require.NoError(t, err) - params, err := client.Parameters(context.Background(), coderd.ParameterOrganization, user.OrganizationID) + params, err := client.Parameters(context.Background(), codersdk.ParameterOrganization, user.OrganizationID) require.NoError(t, err) require.Len(t, params, 1) }) @@ -99,7 +98,7 @@ func TestDeleteParameter(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) user := coderdtest.CreateFirstUser(t, client) - err := client.DeleteParameter(context.Background(), coderd.ParameterOrganization, user.OrganizationID, "something") + err := client.DeleteParameter(context.Background(), codersdk.ParameterOrganization, user.OrganizationID, "something") var apiErr *codersdk.Error require.ErrorAs(t, err, &apiErr) require.Equal(t, http.StatusNotFound, apiErr.StatusCode()) @@ -108,14 +107,14 @@ func TestDeleteParameter(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) user := coderdtest.CreateFirstUser(t, client) - param, err := client.CreateParameter(context.Background(), coderd.ParameterOrganization, user.OrganizationID, coderd.CreateParameterRequest{ + param, err := client.CreateParameter(context.Background(), codersdk.ParameterOrganization, user.OrganizationID, codersdk.CreateParameterRequest{ Name: "example", SourceValue: "tomato", SourceScheme: database.ParameterSourceSchemeData, DestinationScheme: database.ParameterDestinationSchemeProvisionerVariable, }) require.NoError(t, err) - err = client.DeleteParameter(context.Background(), coderd.ParameterOrganization, user.OrganizationID, param.Name) + err = client.DeleteParameter(context.Background(), codersdk.ParameterOrganization, user.OrganizationID, param.Name) require.NoError(t, err) }) } diff --git a/coderd/projects.go b/coderd/projects.go index 9369ed1fec203..a4eb959974d5f 100644 --- a/coderd/projects.go +++ b/coderd/projects.go @@ -5,31 +5,17 @@ import ( "errors" "fmt" "net/http" - "time" "github.com/go-chi/chi/v5" "github.com/go-chi/render" "github.com/google/uuid" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" "github.com/coder/coder/httpmw" ) -// Project is the JSON representation of a Coder project. -// This type matches the database object for now, but is -// abstracted for ease of change later on. -type Project struct { - ID uuid.UUID `json:"id"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` - OrganizationID string `json:"organization_id"` - Name string `json:"name"` - Provisioner database.ProvisionerType `json:"provisioner"` - ActiveVersionID uuid.UUID `json:"active_version_id"` - WorkspaceOwnerCount uint32 `json:"workspace_owner_count"` -} - // Returns a single project. func (api *api) project(rw http.ResponseWriter, r *http.Request) { project := httpmw.ProjectParam(r) @@ -81,7 +67,7 @@ func (api *api) projectVersionsByProject(rw http.ResponseWriter, r *http.Request jobByID[job.ID.String()] = job } - apiVersion := make([]ProjectVersion, 0) + apiVersion := make([]codersdk.ProjectVersion, 0) for _, version := range versions { job, exists := jobByID[version.JobID.String()] if !exists { @@ -130,8 +116,8 @@ func (api *api) projectVersionByName(rw http.ResponseWriter, r *http.Request) { render.JSON(rw, r, convertProjectVersion(projectVersion, convertProvisionerJob(job))) } -func convertProjects(projects []database.Project, workspaceCounts []database.GetWorkspaceOwnerCountsByProjectIDsRow) []Project { - apiProjects := make([]Project, 0, len(projects)) +func convertProjects(projects []database.Project, workspaceCounts []database.GetWorkspaceOwnerCountsByProjectIDsRow) []codersdk.Project { + apiProjects := make([]codersdk.Project, 0, len(projects)) for _, project := range projects { found := false for _, workspaceCount := range workspaceCounts { @@ -149,8 +135,8 @@ func convertProjects(projects []database.Project, workspaceCounts []database.Get return apiProjects } -func convertProject(project database.Project, workspaceOwnerCount uint32) Project { - return Project{ +func convertProject(project database.Project, workspaceOwnerCount uint32) codersdk.Project { + return codersdk.Project{ ID: project.ID, CreatedAt: project.CreatedAt, UpdatedAt: project.UpdatedAt, diff --git a/coderd/projectversions.go b/coderd/projectversions.go index a32c8db7e6d16..3b62022dc0400 100644 --- a/coderd/projectversions.go +++ b/coderd/projectversions.go @@ -5,33 +5,16 @@ import ( "errors" "fmt" "net/http" - "time" "github.com/go-chi/render" - "github.com/google/uuid" "github.com/coder/coder/coderd/parameter" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" "github.com/coder/coder/httpmw" ) -// ProjectVersion represents a single version of a project. -type ProjectVersion struct { - ID uuid.UUID `json:"id"` - ProjectID *uuid.UUID `json:"project_id,omitempty"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` - Name string `json:"name"` - Job ProvisionerJob `json:"job"` -} - -// ProjectVersionParameterSchema represents a parameter parsed from project version source. -type ProjectVersionParameterSchema database.ParameterSchema - -// ProjectVersionParameter represents a computed parameter value. -type ProjectVersionParameter parameter.ComputedValue - func (api *api) projectVersion(rw http.ResponseWriter, r *http.Request) { projectVersion := httpmw.ProjectVersionParam(r) job, err := api.Database.GetProvisionerJobByID(r.Context(), projectVersion.JobID) @@ -138,8 +121,8 @@ func (api *api) projectVersionLogs(rw http.ResponseWriter, r *http.Request) { api.provisionerJobLogs(rw, r, job) } -func convertProjectVersion(version database.ProjectVersion, job ProvisionerJob) ProjectVersion { - return ProjectVersion{ +func convertProjectVersion(version database.ProjectVersion, job codersdk.ProvisionerJob) codersdk.ProjectVersion { + return codersdk.ProjectVersion{ ID: version.ID, ProjectID: &version.ProjectID.UUID, CreatedAt: version.CreatedAt, diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go index dfd9b13ed52d6..df60dda52c7bd 100644 --- a/coderd/provisionerdaemons.go +++ b/coderd/provisionerdaemons.go @@ -30,8 +30,6 @@ import ( sdkproto "github.com/coder/coder/provisionersdk/proto" ) -type ProvisionerDaemon database.ProvisionerDaemon - // Serves the provisioner daemon protobuf API over a WebSocket. func (api *api) provisionerDaemonsListen(rw http.ResponseWriter, r *http.Request) { api.websocketWaitGroup.Add(1) diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go index 62f7b6f64ed0e..44bd31ff53e4f 100644 --- a/coderd/provisionerjobs.go +++ b/coderd/provisionerjobs.go @@ -15,39 +15,11 @@ import ( "cdr.dev/slog" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" ) -// ProvisionerJobStaus represents the at-time state of a job. -type ProvisionerJobStatus string - -const ( - ProvisionerJobPending ProvisionerJobStatus = "pending" - ProvisionerJobRunning ProvisionerJobStatus = "running" - ProvisionerJobSucceeded ProvisionerJobStatus = "succeeded" - ProvisionerJobCancelled ProvisionerJobStatus = "canceled" - ProvisionerJobFailed ProvisionerJobStatus = "failed" -) - -type ProvisionerJob struct { - ID uuid.UUID `json:"id"` - CreatedAt time.Time `json:"created_at"` - StartedAt *time.Time `json:"started_at,omitempty"` - CompletedAt *time.Time `json:"completed_at,omitempty"` - Error string `json:"error,omitempty"` - Status ProvisionerJobStatus `json:"status"` - WorkerID *uuid.UUID `json:"worker_id,omitempty"` -} - -type ProvisionerJobLog struct { - ID uuid.UUID `json:"id"` - CreatedAt time.Time `json:"created_at"` - Source database.LogSource `json:"log_source"` - Level database.LogLevel `json:"log_level"` - Output string `json:"output"` -} - // Returns provisioner logs based on query parameters. // The intended usage for a client to stream all logs (with JS API): // const timestamp = new Date().getTime(); @@ -220,7 +192,7 @@ func (api *api) provisionerJobResources(rw http.ResponseWriter, r *http.Request, }) return } - apiResources := make([]WorkspaceResource, 0) + apiResources := make([]codersdk.WorkspaceResource, 0) for _, resource := range resources { if !resource.AgentID.Valid { apiResources = append(apiResources, convertWorkspaceResource(resource, nil)) @@ -246,8 +218,8 @@ func (api *api) provisionerJobResources(rw http.ResponseWriter, r *http.Request, render.JSON(rw, r, apiResources) } -func convertProvisionerJobLog(provisionerJobLog database.ProvisionerJobLog) ProvisionerJobLog { - return ProvisionerJobLog{ +func convertProvisionerJobLog(provisionerJobLog database.ProvisionerJobLog) codersdk.ProvisionerJobLog { + return codersdk.ProvisionerJobLog{ ID: provisionerJobLog.ID, CreatedAt: provisionerJobLog.CreatedAt, Source: provisionerJobLog.Source, @@ -256,8 +228,8 @@ func convertProvisionerJobLog(provisionerJobLog database.ProvisionerJobLog) Prov } } -func convertProvisionerJob(provisionerJob database.ProvisionerJob) ProvisionerJob { - job := ProvisionerJob{ +func convertProvisionerJob(provisionerJob database.ProvisionerJob) codersdk.ProvisionerJob { + job := codersdk.ProvisionerJob{ ID: provisionerJob.ID, CreatedAt: provisionerJob.CreatedAt, Error: provisionerJob.Error.String, @@ -275,20 +247,20 @@ func convertProvisionerJob(provisionerJob database.ProvisionerJob) ProvisionerJo switch { case provisionerJob.CancelledAt.Valid: - job.Status = ProvisionerJobCancelled + job.Status = codersdk.ProvisionerJobCancelled case !provisionerJob.StartedAt.Valid: - job.Status = ProvisionerJobPending + job.Status = codersdk.ProvisionerJobPending case provisionerJob.CompletedAt.Valid: if job.Error == "" { - job.Status = ProvisionerJobSucceeded + job.Status = codersdk.ProvisionerJobSucceeded } else { - job.Status = ProvisionerJobFailed + job.Status = codersdk.ProvisionerJobFailed } case database.Now().Sub(provisionerJob.UpdatedAt) > 30*time.Second: - job.Status = ProvisionerJobFailed + job.Status = codersdk.ProvisionerJobFailed job.Error = "Worker failed to update job in time." default: - job.Status = ProvisionerJobRunning + job.Status = codersdk.ProvisionerJobRunning } return job diff --git a/coderd/provisionerjobs_test.go b/coderd/provisionerjobs_test.go index 828062bcf7014..9cff1b1f4af77 100644 --- a/coderd/provisionerjobs_test.go +++ b/coderd/provisionerjobs_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/coder/coder/coderd" "github.com/coder/coder/coderd/coderdtest" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/provisioner/echo" "github.com/coder/coder/provisionersdk/proto" @@ -40,7 +40,7 @@ func TestProvisionerJobLogs(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) before := time.Now().UTC() - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) @@ -83,7 +83,7 @@ func TestProvisionerJobLogs(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) before := database.Now() - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) @@ -121,7 +121,7 @@ func TestProvisionerJobLogs(t *testing.T) { project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) diff --git a/coderd/templates.go b/coderd/templates.go index b58e5c20978a5..466b51b07c446 100644 --- a/coderd/templates.go +++ b/coderd/templates.go @@ -1,10 +1,32 @@ package coderd -type Template struct { - ID string - Name string - Description string +import ( + "fmt" + "net/http" - ProjectVersionParameterSchema []ProjectVersionParameterSchema `json:"schema"` - Resources []WorkspaceResource `json:"resources"` + "github.com/go-chi/chi/v5" + "github.com/go-chi/render" + + "github.com/coder/coder/httpapi" + "github.com/coder/coder/template" +) + +func (api *api) listTemplates(rw http.ResponseWriter, r *http.Request) { + render.Status(r, http.StatusOK) + render.JSON(rw, r, template.List()) +} + +func (api *api) templateArchive(rw http.ResponseWriter, r *http.Request) { + id := chi.URLParam(r, "id") + archive, exists := template.Archive(id) + if !exists { + httpapi.Write(rw, http.StatusNotFound, httpapi.Response{ + Message: fmt.Sprintf("template does not exists with id %q", id), + }) + return + } + + rw.Header().Set("Content-Type", "application/x-tar") + rw.WriteHeader(http.StatusOK) + _, _ = rw.Write(archive) } diff --git a/coderd/templates_test.go b/coderd/templates_test.go new file mode 100644 index 0000000000000..b0da17807021c --- /dev/null +++ b/coderd/templates_test.go @@ -0,0 +1,27 @@ +package coderd_test + +import ( + "context" + "testing" + + "github.com/coder/coder/coderd/coderdtest" + "github.com/stretchr/testify/require" +) + +func TestListTemplates(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + templates, err := client.Templates(context.Background()) + require.NoError(t, err) + require.Greater(t, len(templates), 0) +} + +func TestTemplateArchive(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + templates, err := client.Templates(context.Background()) + require.NoError(t, err) + data, _, err := client.TemplateArchive(context.Background(), templates[0].ID) + require.NoError(t, err) + require.Greater(t, len(data), 0) +} diff --git a/coderd/tunnel/tunnel.go b/coderd/tunnel/tunnel.go index 715311ee18a29..0dc445b4ce300 100644 --- a/coderd/tunnel/tunnel.go +++ b/coderd/tunnel/tunnel.go @@ -21,7 +21,7 @@ import ( // New creates a new tunnel pointing at the URL provided. // Once created, it returns the external hostname that will resolve to it. // -// The tunnel will exit when the context provided is cancelled. +// The tunnel will exit when the context provided is canceled. // // Upstream connection occurs async through Cloudflare, so the error channel // will only be executed if the tunnel has failed after numerous attempts. diff --git a/coderd/tunnel/tunnel_test.go b/coderd/tunnel/tunnel_test.go index b1d5716e6f080..45240b02e5c64 100644 --- a/coderd/tunnel/tunnel_test.go +++ b/coderd/tunnel/tunnel_test.go @@ -8,9 +8,10 @@ import ( "testing" "time" - "github.com/coder/coder/coderd/tunnel" "github.com/stretchr/testify/require" "golang.org/x/xerrors" + + "github.com/coder/coder/coderd/tunnel" ) // The tunnel leaks a few goroutines that aren't impactful to production scenarios. diff --git a/coderd/users.go b/coderd/users.go index 3398b2447f684..ad9306dad16a2 100644 --- a/coderd/users.go +++ b/coderd/users.go @@ -14,66 +14,13 @@ import ( "golang.org/x/xerrors" "github.com/coder/coder/coderd/userpassword" + "github.com/coder/coder/codersdk" "github.com/coder/coder/cryptorand" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" "github.com/coder/coder/httpmw" ) -// User represents a user in Coder. -type User struct { - ID string `json:"id" validate:"required"` - Email string `json:"email" validate:"required"` - CreatedAt time.Time `json:"created_at" validate:"required"` - Username string `json:"username" validate:"required"` -} - -type CreateFirstUserRequest struct { - Email string `json:"email" validate:"required,email"` - Username string `json:"username" validate:"required,username"` - Password string `json:"password" validate:"required"` - Organization string `json:"organization" validate:"required,username"` -} - -// CreateFirstUserResponse contains IDs for newly created user info. -type CreateFirstUserResponse struct { - UserID string `json:"user_id"` - OrganizationID string `json:"organization_id"` -} - -type CreateUserRequest struct { - Email string `json:"email" validate:"required,email"` - Username string `json:"username" validate:"required,username"` - Password string `json:"password" validate:"required"` - OrganizationID string `json:"organization_id" validate:"required"` -} - -// LoginWithPasswordRequest enables callers to authenticate with email and password. -type LoginWithPasswordRequest struct { - Email string `json:"email" validate:"required,email"` - Password string `json:"password" validate:"required"` -} - -// LoginWithPasswordResponse contains a session token for the newly authenticated user. -type LoginWithPasswordResponse struct { - SessionToken string `json:"session_token" validate:"required"` -} - -// GenerateAPIKeyResponse contains an API key for a user. -type GenerateAPIKeyResponse struct { - Key string `json:"key"` -} - -type CreateOrganizationRequest struct { - Name string `json:"name" validate:"required,username"` -} - -// CreateWorkspaceRequest provides options for creating a new workspace. -type CreateWorkspaceRequest struct { - ProjectID uuid.UUID `json:"project_id" validate:"required"` - Name string `json:"name" validate:"username,required"` -} - // Returns whether the initial user has been created or not. func (api *api) firstUser(rw http.ResponseWriter, r *http.Request) { userCount, err := api.Database.GetUserCount(r.Context()) @@ -96,7 +43,7 @@ func (api *api) firstUser(rw http.ResponseWriter, r *http.Request) { // Creates the initial user for a Coder deployment. func (api *api) postFirstUser(rw http.ResponseWriter, r *http.Request) { - var createUser CreateFirstUserRequest + var createUser codersdk.CreateFirstUserRequest if !httpapi.Read(rw, r, &createUser) { return } @@ -168,7 +115,7 @@ func (api *api) postFirstUser(rw http.ResponseWriter, r *http.Request) { } render.Status(r, http.StatusCreated) - render.JSON(rw, r, CreateFirstUserResponse{ + render.JSON(rw, r, codersdk.CreateFirstUserResponse{ UserID: user.ID, OrganizationID: organization.ID, }) @@ -178,7 +125,7 @@ func (api *api) postFirstUser(rw http.ResponseWriter, r *http.Request) { func (api *api) postUsers(rw http.ResponseWriter, r *http.Request) { apiKey := httpmw.APIKey(r) - var createUser CreateUserRequest + var createUser codersdk.CreateUserRequest if !httpapi.Read(rw, r, &createUser) { return } @@ -299,7 +246,7 @@ func (api *api) organizationsByUser(rw http.ResponseWriter, r *http.Request) { return } - publicOrganizations := make([]Organization, 0, len(organizations)) + publicOrganizations := make([]codersdk.Organization, 0, len(organizations)) for _, organization := range organizations { publicOrganizations = append(publicOrganizations, convertOrganization(organization)) } @@ -347,7 +294,7 @@ func (api *api) organizationByUserAndName(rw http.ResponseWriter, r *http.Reques func (api *api) postOrganizationsByUser(rw http.ResponseWriter, r *http.Request) { user := httpmw.UserParam(r) - var req CreateOrganizationRequest + var req codersdk.CreateOrganizationRequest if !httpapi.Read(rw, r, &req) { return } @@ -401,7 +348,7 @@ func (api *api) postOrganizationsByUser(rw http.ResponseWriter, r *http.Request) // Authenticates the user with an email and password. func (api *api) postLogin(rw http.ResponseWriter, r *http.Request) { - var loginWithPassword LoginWithPasswordRequest + var loginWithPassword codersdk.LoginWithPasswordRequest if !httpapi.Read(rw, r, &loginWithPassword) { return } @@ -471,7 +418,7 @@ func (api *api) postLogin(rw http.ResponseWriter, r *http.Request) { }) render.Status(r, http.StatusCreated) - render.JSON(rw, r, LoginWithPasswordResponse{ + render.JSON(rw, r, codersdk.LoginWithPasswordResponse{ SessionToken: sessionToken, }) } @@ -517,7 +464,7 @@ func (api *api) postAPIKey(rw http.ResponseWriter, r *http.Request) { generatedAPIKey := fmt.Sprintf("%s-%s", keyID, keySecret) render.Status(r, http.StatusCreated) - render.JSON(rw, r, GenerateAPIKeyResponse{Key: generatedAPIKey}) + render.JSON(rw, r, codersdk.GenerateAPIKeyResponse{Key: generatedAPIKey}) } // Clear the user's session cookie @@ -536,7 +483,7 @@ func (*api) postLogout(rw http.ResponseWriter, r *http.Request) { // Create a new workspace for the currently authenticated user. func (api *api) postWorkspacesByUser(rw http.ResponseWriter, r *http.Request) { - var createWorkspace CreateWorkspaceRequest + var createWorkspace codersdk.CreateWorkspaceRequest if !httpapi.Read(rw, r, &createWorkspace) { return } @@ -637,7 +584,7 @@ func (api *api) workspacesByUser(rw http.ResponseWriter, r *http.Request) { }) return } - apiWorkspaces := make([]Workspace, 0, len(workspaces)) + apiWorkspaces := make([]codersdk.Workspace, 0, len(workspaces)) for _, workspace := range workspaces { apiWorkspaces = append(apiWorkspaces, convertWorkspace(workspace)) } @@ -684,8 +631,8 @@ func generateAPIKeyIDSecret() (id string, secret string, err error) { return id, secret, nil } -func convertUser(user database.User) User { - return User{ +func convertUser(user database.User) codersdk.User { + return codersdk.User{ ID: user.ID, Email: user.Email, CreatedAt: user.CreatedAt, diff --git a/coderd/users_test.go b/coderd/users_test.go index f28302bbff428..8f51bf5bafabf 100644 --- a/coderd/users_test.go +++ b/coderd/users_test.go @@ -8,7 +8,6 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/coder/coder/coderd" "github.com/coder/coder/coderd/coderdtest" "github.com/coder/coder/codersdk" "github.com/coder/coder/httpmw" @@ -19,7 +18,7 @@ func TestFirstUser(t *testing.T) { t.Run("BadRequest", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) - _, err := client.CreateFirstUser(context.Background(), coderd.CreateFirstUserRequest{}) + _, err := client.CreateFirstUser(context.Background(), codersdk.CreateFirstUserRequest{}) require.Error(t, err) }) @@ -27,7 +26,7 @@ func TestFirstUser(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) _ = coderdtest.CreateFirstUser(t, client) - _, err := client.CreateFirstUser(context.Background(), coderd.CreateFirstUserRequest{ + _, err := client.CreateFirstUser(context.Background(), codersdk.CreateFirstUserRequest{ Email: "some@email.com", Username: "exampleuser", Password: "password", @@ -50,7 +49,7 @@ func TestPostLogin(t *testing.T) { t.Run("InvalidUser", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) - _, err := client.LoginWithPassword(context.Background(), coderd.LoginWithPasswordRequest{ + _, err := client.LoginWithPassword(context.Background(), codersdk.LoginWithPasswordRequest{ Email: "my@email.org", Password: "password", }) @@ -62,7 +61,7 @@ func TestPostLogin(t *testing.T) { t.Run("BadPassword", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) - req := coderd.CreateFirstUserRequest{ + req := codersdk.CreateFirstUserRequest{ Email: "testuser@coder.com", Username: "testuser", Password: "testpass", @@ -70,7 +69,7 @@ func TestPostLogin(t *testing.T) { } _, err := client.CreateFirstUser(context.Background(), req) require.NoError(t, err) - _, err = client.LoginWithPassword(context.Background(), coderd.LoginWithPasswordRequest{ + _, err = client.LoginWithPassword(context.Background(), codersdk.LoginWithPasswordRequest{ Email: req.Email, Password: "badpass", }) @@ -82,7 +81,7 @@ func TestPostLogin(t *testing.T) { t.Run("Success", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) - req := coderd.CreateFirstUserRequest{ + req := codersdk.CreateFirstUserRequest{ Email: "testuser@coder.com", Username: "testuser", Password: "testpass", @@ -90,7 +89,7 @@ func TestPostLogin(t *testing.T) { } _, err := client.CreateFirstUser(context.Background(), req) require.NoError(t, err) - _, err = client.LoginWithPassword(context.Background(), coderd.LoginWithPasswordRequest{ + _, err = client.LoginWithPassword(context.Background(), codersdk.LoginWithPasswordRequest{ Email: req.Email, Password: req.Password, }) @@ -130,7 +129,7 @@ func TestPostUsers(t *testing.T) { t.Run("NoAuth", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) - _, err := client.CreateUser(context.Background(), coderd.CreateUserRequest{}) + _, err := client.CreateUser(context.Background(), codersdk.CreateUserRequest{}) require.Error(t, err) }) @@ -140,7 +139,7 @@ func TestPostUsers(t *testing.T) { coderdtest.CreateFirstUser(t, client) me, err := client.User(context.Background(), "") require.NoError(t, err) - _, err = client.CreateUser(context.Background(), coderd.CreateUserRequest{ + _, err = client.CreateUser(context.Background(), codersdk.CreateUserRequest{ Email: me.Email, Username: me.Username, Password: "password", @@ -155,7 +154,7 @@ func TestPostUsers(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) coderdtest.CreateFirstUser(t, client) - _, err := client.CreateUser(context.Background(), coderd.CreateUserRequest{ + _, err := client.CreateUser(context.Background(), codersdk.CreateUserRequest{ OrganizationID: "not-exists", Email: "another@user.org", Username: "someone-else", @@ -171,12 +170,12 @@ func TestPostUsers(t *testing.T) { client := coderdtest.New(t, nil) first := coderdtest.CreateFirstUser(t, client) other := coderdtest.CreateAnotherUser(t, client, first.OrganizationID) - org, err := other.CreateOrganization(context.Background(), "", coderd.CreateOrganizationRequest{ + org, err := other.CreateOrganization(context.Background(), "", codersdk.CreateOrganizationRequest{ Name: "another", }) require.NoError(t, err) - _, err = client.CreateUser(context.Background(), coderd.CreateUserRequest{ + _, err = client.CreateUser(context.Background(), codersdk.CreateUserRequest{ Email: "some@domain.com", Username: "anotheruser", Password: "testing", @@ -191,7 +190,7 @@ func TestPostUsers(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) user := coderdtest.CreateFirstUser(t, client) - _, err := client.CreateUser(context.Background(), coderd.CreateUserRequest{ + _, err := client.CreateUser(context.Background(), codersdk.CreateUserRequest{ OrganizationID: user.OrganizationID, Email: "another@user.org", Username: "someone-else", @@ -236,7 +235,7 @@ func TestOrganizationByUserAndName(t *testing.T) { client := coderdtest.New(t, nil) first := coderdtest.CreateFirstUser(t, client) other := coderdtest.CreateAnotherUser(t, client, first.OrganizationID) - org, err := other.CreateOrganization(context.Background(), "", coderd.CreateOrganizationRequest{ + org, err := other.CreateOrganization(context.Background(), "", codersdk.CreateOrganizationRequest{ Name: "another", }) require.NoError(t, err) @@ -265,7 +264,7 @@ func TestPostOrganizationsByUser(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) org, err := client.Organization(context.Background(), user.OrganizationID) require.NoError(t, err) - _, err = client.CreateOrganization(context.Background(), "", coderd.CreateOrganizationRequest{ + _, err = client.CreateOrganization(context.Background(), "", codersdk.CreateOrganizationRequest{ Name: org.Name, }) var apiErr *codersdk.Error @@ -277,7 +276,7 @@ func TestPostOrganizationsByUser(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) _ = coderdtest.CreateFirstUser(t, client) - _, err := client.CreateOrganization(context.Background(), "", coderd.CreateOrganizationRequest{ + _, err := client.CreateOrganization(context.Background(), "", codersdk.CreateOrganizationRequest{ Name: "new", }) require.NoError(t, err) @@ -315,7 +314,7 @@ func TestPostWorkspacesByUser(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) _ = coderdtest.CreateFirstUser(t, client) - _, err := client.CreateWorkspace(context.Background(), "", coderd.CreateWorkspaceRequest{ + _, err := client.CreateWorkspace(context.Background(), "", codersdk.CreateWorkspaceRequest{ ProjectID: uuid.New(), Name: "workspace", }) @@ -331,14 +330,14 @@ func TestPostWorkspacesByUser(t *testing.T) { first := coderdtest.CreateFirstUser(t, client) other := coderdtest.CreateAnotherUser(t, client, first.OrganizationID) - org, err := other.CreateOrganization(context.Background(), "", coderd.CreateOrganizationRequest{ + org, err := other.CreateOrganization(context.Background(), "", codersdk.CreateOrganizationRequest{ Name: "another", }) require.NoError(t, err) version := coderdtest.CreateProjectVersion(t, other, org.ID, nil) project := coderdtest.CreateProject(t, other, org.ID, version.ID) - _, err = client.CreateWorkspace(context.Background(), "", coderd.CreateWorkspaceRequest{ + _, err = client.CreateWorkspace(context.Background(), "", codersdk.CreateWorkspaceRequest{ ProjectID: project.ID, Name: "workspace", }) @@ -355,7 +354,7 @@ func TestPostWorkspacesByUser(t *testing.T) { job := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) project := coderdtest.CreateProject(t, client, user.OrganizationID, job.ID) workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) - _, err := client.CreateWorkspace(context.Background(), "", coderd.CreateWorkspaceRequest{ + _, err := client.CreateWorkspace(context.Background(), "", codersdk.CreateWorkspaceRequest{ ProjectID: project.ID, Name: workspace.Name, }) diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go index 6db8dbf21ea43..455170d3f3e89 100644 --- a/coderd/workspacebuilds.go +++ b/coderd/workspacebuilds.go @@ -3,32 +3,15 @@ package coderd import ( "fmt" "net/http" - "time" "github.com/go-chi/render" - "github.com/google/uuid" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" "github.com/coder/coder/httpmw" ) -// WorkspaceBuild is an at-point representation of a workspace state. -// Iterate on before/after to determine a chronological history. -type WorkspaceBuild struct { - ID uuid.UUID `json:"id"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` - WorkspaceID uuid.UUID `json:"workspace_id"` - ProjectVersionID uuid.UUID `json:"project_version_id"` - BeforeID uuid.UUID `json:"before_id"` - AfterID uuid.UUID `json:"after_id"` - Name string `json:"name"` - Transition database.WorkspaceTransition `json:"transition"` - Initiator string `json:"initiator"` - Job ProvisionerJob `json:"job"` -} - func (api *api) workspaceBuild(rw http.ResponseWriter, r *http.Request) { workspaceBuild := httpmw.WorkspaceBuildParam(r) job, err := api.Database.GetProvisionerJobByID(r.Context(), workspaceBuild.JobID) @@ -66,9 +49,9 @@ func (api *api) workspaceBuildLogs(rw http.ResponseWriter, r *http.Request) { api.provisionerJobLogs(rw, r, job) } -func convertWorkspaceBuild(workspaceBuild database.WorkspaceBuild, job ProvisionerJob) WorkspaceBuild { +func convertWorkspaceBuild(workspaceBuild database.WorkspaceBuild, job codersdk.ProvisionerJob) codersdk.WorkspaceBuild { //nolint:unconvert - return WorkspaceBuild(WorkspaceBuild{ + return codersdk.WorkspaceBuild{ ID: workspaceBuild.ID, CreatedAt: workspaceBuild.CreatedAt, UpdatedAt: workspaceBuild.UpdatedAt, @@ -80,11 +63,11 @@ func convertWorkspaceBuild(workspaceBuild database.WorkspaceBuild, job Provision Transition: workspaceBuild.Transition, Initiator: workspaceBuild.Initiator, Job: job, - }) + } } -func convertWorkspaceResource(resource database.WorkspaceResource, agent *WorkspaceAgent) WorkspaceResource { - return WorkspaceResource{ +func convertWorkspaceResource(resource database.WorkspaceResource, agent *codersdk.WorkspaceAgent) codersdk.WorkspaceResource { + return codersdk.WorkspaceResource{ ID: resource.ID, CreatedAt: resource.CreatedAt, JobID: resource.JobID, diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go index 3dc62333670fb..bf135ec6e212a 100644 --- a/coderd/workspacebuilds_test.go +++ b/coderd/workspacebuilds_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/require" - "github.com/coder/coder/coderd" "github.com/coder/coder/coderd/coderdtest" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" @@ -25,7 +24,7 @@ func TestWorkspaceBuild(t *testing.T) { project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) @@ -46,7 +45,7 @@ func TestWorkspaceBuildResources(t *testing.T) { closeDaemon.Close() project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) @@ -84,7 +83,7 @@ func TestWorkspaceBuildResources(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) @@ -136,7 +135,7 @@ func TestWorkspaceBuildLogs(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) diff --git a/coderd/workspaceresourceauth.go b/coderd/workspaceresourceauth.go index 1f906cbbb14a4..5165079f140b6 100644 --- a/coderd/workspaceresourceauth.go +++ b/coderd/workspaceresourceauth.go @@ -9,27 +9,18 @@ import ( "github.com/go-chi/render" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" "github.com/mitchellh/mapstructure" ) -type GoogleInstanceIdentityToken struct { - JSONWebToken string `json:"json_web_token" validate:"required"` -} - -// WorkspaceAgentAuthenticateResponse is returned when an instance ID -// has been exchanged for a session token. -type WorkspaceAgentAuthenticateResponse struct { - SessionToken string `json:"session_token"` -} - // Google Compute Engine supports instance identity verification: // https://cloud.google.com/compute/docs/instances/verifying-instance-identity // Using this, we can exchange a signed instance payload for an agent token. func (api *api) postWorkspaceAuthGoogleInstanceIdentity(rw http.ResponseWriter, r *http.Request) { - var req GoogleInstanceIdentityToken + var req codersdk.GoogleInstanceIdentityToken if !httpapi.Read(rw, r, &req) { return } @@ -121,7 +112,7 @@ func (api *api) postWorkspaceAuthGoogleInstanceIdentity(rw http.ResponseWriter, return } render.Status(r, http.StatusOK) - render.JSON(rw, r, WorkspaceAgentAuthenticateResponse{ + render.JSON(rw, r, codersdk.WorkspaceAgentAuthenticateResponse{ SessionToken: agent.AuthToken.String(), }) } diff --git a/coderd/workspaceresourceauth_test.go b/coderd/workspaceresourceauth_test.go index 17e23493a02c3..1240e8ac236d6 100644 --- a/coderd/workspaceresourceauth_test.go +++ b/coderd/workspaceresourceauth_test.go @@ -19,7 +19,6 @@ import ( "google.golang.org/api/idtoken" "google.golang.org/api/option" - "github.com/coder/coder/coderd" "github.com/coder/coder/coderd/coderdtest" "github.com/coder/coder/codersdk" "github.com/coder/coder/cryptorand" @@ -106,7 +105,7 @@ func TestPostWorkspaceAuthGoogleInstanceIdentity(t *testing.T) { project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) diff --git a/coderd/workspaceresources.go b/coderd/workspaceresources.go index 7dfdbc3701802..59b572ce70537 100644 --- a/coderd/workspaceresources.go +++ b/coderd/workspaceresources.go @@ -8,13 +8,14 @@ import ( "net/http" "time" - "cdr.dev/slog" "github.com/go-chi/render" - "github.com/google/uuid" "github.com/hashicorp/yamux" "golang.org/x/xerrors" "nhooyr.io/websocket" + "cdr.dev/slog" + + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" "github.com/coder/coder/httpmw" @@ -23,46 +24,6 @@ import ( "github.com/coder/coder/provisionersdk" ) -type WorkspaceResource struct { - ID uuid.UUID `json:"id"` - CreatedAt time.Time `json:"created_at"` - JobID uuid.UUID `json:"job_id"` - Transition database.WorkspaceTransition `json:"workspace_transition"` - Type string `json:"type"` - Name string `json:"name"` - Agent *WorkspaceAgent `json:"agent,omitempty"` -} - -type WorkspaceAgent struct { - ID uuid.UUID `json:"id"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` - ResourceID uuid.UUID `json:"resource_id"` - InstanceID string `json:"instance_id,omitempty"` - EnvironmentVariables map[string]string `json:"environment_variables"` - StartupScript string `json:"startup_script,omitempty"` -} - -type WorkspaceAgentResourceMetadata struct { - MemoryTotal uint64 `json:"memory_total"` - DiskTotal uint64 `json:"disk_total"` - CPUCores uint64 `json:"cpu_cores"` - CPUModel string `json:"cpu_model"` - CPUMhz float64 `json:"cpu_mhz"` -} - -type WorkspaceAgentInstanceMetadata struct { - JailOrchestrator string `json:"jail_orchestrator"` - OperatingSystem string `json:"operating_system"` - Platform string `json:"platform"` - PlatformFamily string `json:"platform_family"` - KernelVersion string `json:"kernel_version"` - KernelArchitecture string `json:"kernel_architecture"` - Cloud string `json:"cloud"` - Jail string `json:"jail"` - VNC bool `json:"vnc"` -} - func (api *api) workspaceResource(rw http.ResponseWriter, r *http.Request) { workspaceBuild := httpmw.WorkspaceBuildParam(r) workspaceResource := httpmw.WorkspaceResourceParam(r) @@ -79,7 +40,7 @@ func (api *api) workspaceResource(rw http.ResponseWriter, r *http.Request) { }) return } - var apiAgent *WorkspaceAgent + var apiAgent *codersdk.WorkspaceAgent if workspaceResource.AgentID.Valid { agent, err := api.Database.GetWorkspaceAgentByResourceID(r.Context(), workspaceResource.ID) if err != nil { @@ -227,15 +188,15 @@ func (api *api) workspaceAgentListen(rw http.ResponseWriter, r *http.Request) { } } -func convertWorkspaceAgent(agent database.WorkspaceAgent) (WorkspaceAgent, error) { +func convertWorkspaceAgent(agent database.WorkspaceAgent) (codersdk.WorkspaceAgent, error) { var envs map[string]string if agent.EnvironmentVariables.Valid { err := json.Unmarshal(agent.EnvironmentVariables.RawMessage, &envs) if err != nil { - return WorkspaceAgent{}, xerrors.Errorf("unmarshal: %w", err) + return codersdk.WorkspaceAgent{}, xerrors.Errorf("unmarshal: %w", err) } } - return WorkspaceAgent{ + return codersdk.WorkspaceAgent{ ID: agent.ID, CreatedAt: agent.CreatedAt, UpdatedAt: agent.UpdatedAt.Time, diff --git a/coderd/workspaceresources_test.go b/coderd/workspaceresources_test.go index 2b7476a2ef8ae..ac9982906a0fa 100644 --- a/coderd/workspaceresources_test.go +++ b/coderd/workspaceresources_test.go @@ -11,7 +11,6 @@ import ( "cdr.dev/slog/sloggers/slogtest" "github.com/coder/coder/agent" - "github.com/coder/coder/coderd" "github.com/coder/coder/coderd/coderdtest" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" @@ -48,7 +47,7 @@ func TestWorkspaceResource(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) @@ -90,7 +89,7 @@ func TestWorkspaceAgentListen(t *testing.T) { project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) diff --git a/coderd/workspaces.go b/coderd/workspaces.go index cb16105135c6f..92a86f168b065 100644 --- a/coderd/workspaces.go +++ b/coderd/workspaces.go @@ -13,21 +13,12 @@ import ( "github.com/moby/moby/pkg/namesgenerator" "golang.org/x/xerrors" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/httpapi" "github.com/coder/coder/httpmw" ) -// Workspace is a per-user deployment of a project. It tracks -// project versions, and can be updated. -type Workspace database.Workspace - -// CreateWorkspaceBuildRequest provides options to update the latest workspace build. -type CreateWorkspaceBuildRequest struct { - ProjectVersionID uuid.UUID `json:"project_version_id" validate:"required"` - Transition database.WorkspaceTransition `json:"transition" validate:"oneof=create start stop delete,required"` -} - func (*api) workspace(rw http.ResponseWriter, r *http.Request) { workspace := httpmw.WorkspaceParam(r) render.Status(r, http.StatusOK) @@ -57,7 +48,7 @@ func (api *api) workspaceBuilds(rw http.ResponseWriter, r *http.Request) { jobByID[job.ID.String()] = job } - apiBuilds := make([]WorkspaceBuild, 0) + apiBuilds := make([]codersdk.WorkspaceBuild, 0) for _, build := range builds { job, exists := jobByID[build.JobID.String()] if !exists { @@ -76,7 +67,7 @@ func (api *api) workspaceBuilds(rw http.ResponseWriter, r *http.Request) { func (api *api) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) { apiKey := httpmw.APIKey(r) workspace := httpmw.WorkspaceParam(r) - var createBuild CreateWorkspaceBuildRequest + var createBuild codersdk.CreateWorkspaceBuildRequest if !httpapi.Read(rw, r, &createBuild) { return } @@ -106,17 +97,17 @@ func (api *api) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) { } projectVersionJobStatus := convertProvisionerJob(projectVersionJob).Status switch projectVersionJobStatus { - case ProvisionerJobPending, ProvisionerJobRunning: + case codersdk.ProvisionerJobPending, codersdk.ProvisionerJobRunning: httpapi.Write(rw, http.StatusNotAcceptable, httpapi.Response{ Message: fmt.Sprintf("The provided project version is %s. Wait for it to complete importing!", projectVersionJobStatus), }) return - case ProvisionerJobFailed: + case codersdk.ProvisionerJobFailed: httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{ Message: fmt.Sprintf("The provided project version %q has failed to import. You cannot create workspaces using it!", projectVersion.Name), }) return - case ProvisionerJobCancelled: + case codersdk.ProvisionerJobCancelled: httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{ Message: "The provided project version was canceled during import. You cannot create workspaces using it!", }) @@ -285,6 +276,6 @@ func (api *api) workspaceBuildByName(rw http.ResponseWriter, r *http.Request) { render.JSON(rw, r, convertWorkspaceBuild(workspaceBuild, convertProvisionerJob(job))) } -func convertWorkspace(workspace database.Workspace) Workspace { - return Workspace(workspace) +func convertWorkspace(workspace database.Workspace) codersdk.Workspace { + return codersdk.Workspace(workspace) } diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go index 0e43c53562f03..15008205deaa9 100644 --- a/coderd/workspaces_test.go +++ b/coderd/workspaces_test.go @@ -8,7 +8,6 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/coder/coder/coderd" "github.com/coder/coder/coderd/coderdtest" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" @@ -36,7 +35,7 @@ func TestPostWorkspaceBuild(t *testing.T) { job := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) project := coderdtest.CreateProject(t, client, user.OrganizationID, job.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - _, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + _, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: uuid.New(), Transition: database.WorkspaceTransitionStart, }) @@ -57,7 +56,7 @@ func TestPostWorkspaceBuild(t *testing.T) { project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - _, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + _, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) @@ -78,12 +77,12 @@ func TestPostWorkspaceBuild(t *testing.T) { // Close here so workspace build doesn't process! closeDaemon.Close() workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - _, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + _, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) require.NoError(t, err) - _, err = client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + _, err = client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) @@ -102,13 +101,13 @@ func TestPostWorkspaceBuild(t *testing.T) { project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - firstBuild, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + firstBuild, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) require.NoError(t, err) coderdtest.AwaitWorkspaceBuildJob(t, client, firstBuild.ID) - secondBuild, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + secondBuild, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) @@ -147,7 +146,7 @@ func TestWorkspaceBuildLatest(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - _, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + _, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) @@ -183,7 +182,7 @@ func TestWorkspaceBuildByName(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) diff --git a/codersdk/files.go b/codersdk/files.go index 565859f87a007..15c30f30f87f7 100644 --- a/codersdk/files.go +++ b/codersdk/files.go @@ -6,28 +6,31 @@ import ( "fmt" "io" "net/http" - - "github.com/coder/coder/coderd" ) const ( ContentTypeTar = "application/x-tar" ) +// UploadResponse contains the hash to reference the uploaded file. +type UploadResponse struct { + Hash string `json:"hash"` +} + // Upload uploads an arbitrary file with the content type provided. // This is used to upload a source-code archive. -func (c *Client) Upload(ctx context.Context, contentType string, content []byte) (coderd.UploadResponse, error) { +func (c *Client) Upload(ctx context.Context, contentType string, content []byte) (UploadResponse, error) { res, err := c.request(ctx, http.MethodPost, "/api/v2/files", content, func(r *http.Request) { r.Header.Set("Content-Type", contentType) }) if err != nil { - return coderd.UploadResponse{}, err + return UploadResponse{}, err } defer res.Body.Close() if res.StatusCode != http.StatusCreated && res.StatusCode != http.StatusOK { - return coderd.UploadResponse{}, readBodyAsError(res) + return UploadResponse{}, readBodyAsError(res) } - var resp coderd.UploadResponse + var resp UploadResponse return resp, json.NewDecoder(res.Body).Decode(&resp) } diff --git a/codersdk/organizations.go b/codersdk/organizations.go index 9a496bbb0dc1c..1e1f9e5df4fdc 100644 --- a/codersdk/organizations.go +++ b/codersdk/organizations.go @@ -5,25 +5,61 @@ import ( "encoding/json" "fmt" "net/http" + "time" - "github.com/coder/coder/coderd" + "github.com/coder/coder/database" + "github.com/google/uuid" ) -func (c *Client) Organization(ctx context.Context, id string) (coderd.Organization, error) { +// Organization is the JSON representation of a Coder organization. +type Organization struct { + ID string `json:"id" validate:"required"` + Name string `json:"name" validate:"required"` + CreatedAt time.Time `json:"created_at" validate:"required"` + UpdatedAt time.Time `json:"updated_at" validate:"required"` +} + +// CreateProjectVersionRequest enables callers to create a new Project Version. +type CreateProjectVersionRequest struct { + // ProjectID optionally associates a version with a project. + ProjectID *uuid.UUID `json:"project_id"` + + StorageMethod database.ProvisionerStorageMethod `json:"storage_method" validate:"oneof=file,required"` + StorageSource string `json:"storage_source" validate:"required"` + Provisioner database.ProvisionerType `json:"provisioner" validate:"oneof=terraform echo,required"` + // ParameterValues allows for additional parameters to be provided + // during the dry-run provision stage. + ParameterValues []CreateParameterRequest `json:"parameter_values"` +} + +// CreateProjectRequest provides options when creating a project. +type CreateProjectRequest struct { + Name string `json:"name" validate:"username,required"` + + // VersionID is an in-progress or completed job to use as + // an initial version of the project. + // + // This is required on creation to enable a user-flow of validating a + // project works. There is no reason the data-model cannot support + // empty projects, but it doesn't make sense for users. + VersionID uuid.UUID `json:"project_version_id" validate:"required"` +} + +func (c *Client) Organization(ctx context.Context, id string) (Organization, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/organizations/%s", id), nil) if err != nil { - return coderd.Organization{}, err + return Organization{}, err } defer res.Body.Close() if res.StatusCode != http.StatusOK { - return coderd.Organization{}, readBodyAsError(res) + return Organization{}, readBodyAsError(res) } - var organization coderd.Organization + var organization Organization return organization, json.NewDecoder(res.Body).Decode(&organization) } // ProvisionerDaemonsByOrganization returns provisioner daemons available for an organization. -func (c *Client) ProvisionerDaemonsByOrganization(ctx context.Context, organization string) ([]coderd.ProvisionerDaemon, error) { +func (c *Client) ProvisionerDaemonsByOrganization(ctx context.Context, organization string) ([]ProvisionerDaemon, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/organizations/%s/provisionerdaemons", organization), nil) if err != nil { return nil, err @@ -32,41 +68,41 @@ func (c *Client) ProvisionerDaemonsByOrganization(ctx context.Context, organizat if res.StatusCode != http.StatusOK { return nil, readBodyAsError(res) } - var daemons []coderd.ProvisionerDaemon + var daemons []ProvisionerDaemon return daemons, json.NewDecoder(res.Body).Decode(&daemons) } // CreateProjectVersion processes source-code and optionally associates the version with a project. // Executing without a project is useful for validating source-code. -func (c *Client) CreateProjectVersion(ctx context.Context, organization string, req coderd.CreateProjectVersionRequest) (coderd.ProjectVersion, error) { +func (c *Client) CreateProjectVersion(ctx context.Context, organization string, req CreateProjectVersionRequest) (ProjectVersion, error) { res, err := c.request(ctx, http.MethodPost, fmt.Sprintf("/api/v2/organizations/%s/projectversions", organization), req) if err != nil { - return coderd.ProjectVersion{}, err + return ProjectVersion{}, err } defer res.Body.Close() if res.StatusCode != http.StatusCreated { - return coderd.ProjectVersion{}, readBodyAsError(res) + return ProjectVersion{}, readBodyAsError(res) } - var projectVersion coderd.ProjectVersion + var projectVersion ProjectVersion return projectVersion, json.NewDecoder(res.Body).Decode(&projectVersion) } // CreateProject creates a new project inside an organization. -func (c *Client) CreateProject(ctx context.Context, organization string, request coderd.CreateProjectRequest) (coderd.Project, error) { +func (c *Client) CreateProject(ctx context.Context, organization string, request CreateProjectRequest) (Project, error) { res, err := c.request(ctx, http.MethodPost, fmt.Sprintf("/api/v2/organizations/%s/projects", organization), request) if err != nil { - return coderd.Project{}, err + return Project{}, err } defer res.Body.Close() if res.StatusCode != http.StatusCreated { - return coderd.Project{}, readBodyAsError(res) + return Project{}, readBodyAsError(res) } - var project coderd.Project + var project Project return project, json.NewDecoder(res.Body).Decode(&project) } // ProjectsByOrganization lists all projects inside of an organization. -func (c *Client) ProjectsByOrganization(ctx context.Context, organization string) ([]coderd.Project, error) { +func (c *Client) ProjectsByOrganization(ctx context.Context, organization string) ([]Project, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/organizations/%s/projects", organization), nil) if err != nil { return nil, err @@ -75,20 +111,20 @@ func (c *Client) ProjectsByOrganization(ctx context.Context, organization string if res.StatusCode != http.StatusOK { return nil, readBodyAsError(res) } - var projects []coderd.Project + var projects []Project return projects, json.NewDecoder(res.Body).Decode(&projects) } // ProjectByName finds a project inside the organization provided with a case-insensitive name. -func (c *Client) ProjectByName(ctx context.Context, organization, name string) (coderd.Project, error) { +func (c *Client) ProjectByName(ctx context.Context, organization, name string) (Project, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/organizations/%s/projects/%s", organization, name), nil) if err != nil { - return coderd.Project{}, err + return Project{}, err } defer res.Body.Close() if res.StatusCode != http.StatusOK { - return coderd.Project{}, readBodyAsError(res) + return Project{}, readBodyAsError(res) } - var project coderd.Project + var project Project return project, json.NewDecoder(res.Body).Decode(&project) } diff --git a/codersdk/parameters.go b/codersdk/parameters.go index 5d861b20606a3..99cf7f530b445 100644 --- a/codersdk/parameters.go +++ b/codersdk/parameters.go @@ -5,24 +5,55 @@ import ( "encoding/json" "fmt" "net/http" + "time" - "github.com/coder/coder/coderd" + "github.com/coder/coder/database" + "github.com/google/uuid" ) -func (c *Client) CreateParameter(ctx context.Context, scope coderd.ParameterScope, id string, req coderd.CreateParameterRequest) (coderd.Parameter, error) { +type ParameterScope string + +const ( + ParameterOrganization ParameterScope = "organization" + ParameterProject ParameterScope = "project" + ParameterUser ParameterScope = "user" + ParameterWorkspace ParameterScope = "workspace" +) + +// Parameter represents a set value for the scope. +type Parameter struct { + ID uuid.UUID `db:"id" json:"id"` + CreatedAt time.Time `db:"created_at" json:"created_at"` + UpdatedAt time.Time `db:"updated_at" json:"updated_at"` + Scope ParameterScope `db:"scope" json:"scope"` + ScopeID string `db:"scope_id" json:"scope_id"` + Name string `db:"name" json:"name"` + SourceScheme database.ParameterSourceScheme `db:"source_scheme" json:"source_scheme"` + DestinationScheme database.ParameterDestinationScheme `db:"destination_scheme" json:"destination_scheme"` +} + +// CreateParameterRequest is used to create a new parameter value for a scope. +type CreateParameterRequest struct { + Name string `json:"name" validate:"required"` + SourceValue string `json:"source_value" validate:"required"` + SourceScheme database.ParameterSourceScheme `json:"source_scheme" validate:"oneof=data,required"` + DestinationScheme database.ParameterDestinationScheme `json:"destination_scheme" validate:"oneof=environment_variable provisioner_variable,required"` +} + +func (c *Client) CreateParameter(ctx context.Context, scope ParameterScope, id string, req CreateParameterRequest) (Parameter, error) { res, err := c.request(ctx, http.MethodPost, fmt.Sprintf("/api/v2/parameters/%s/%s", scope, id), req) if err != nil { - return coderd.Parameter{}, err + return Parameter{}, err } defer res.Body.Close() if res.StatusCode != http.StatusCreated { - return coderd.Parameter{}, readBodyAsError(res) + return Parameter{}, readBodyAsError(res) } - var param coderd.Parameter + var param Parameter return param, json.NewDecoder(res.Body).Decode(¶m) } -func (c *Client) DeleteParameter(ctx context.Context, scope coderd.ParameterScope, id, name string) error { +func (c *Client) DeleteParameter(ctx context.Context, scope ParameterScope, id, name string) error { res, err := c.request(ctx, http.MethodDelete, fmt.Sprintf("/api/v2/parameters/%s/%s/%s", scope, id, name), nil) if err != nil { return err @@ -34,7 +65,7 @@ func (c *Client) DeleteParameter(ctx context.Context, scope coderd.ParameterScop return nil } -func (c *Client) Parameters(ctx context.Context, scope coderd.ParameterScope, id string) ([]coderd.Parameter, error) { +func (c *Client) Parameters(ctx context.Context, scope ParameterScope, id string) ([]Parameter, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/parameters/%s/%s", scope, id), nil) if err != nil { return nil, err @@ -43,6 +74,6 @@ func (c *Client) Parameters(ctx context.Context, scope coderd.ParameterScope, id if res.StatusCode != http.StatusOK { return nil, readBodyAsError(res) } - var parameters []coderd.Parameter + var parameters []Parameter return parameters, json.NewDecoder(res.Body).Decode(¶meters) } diff --git a/codersdk/projects.go b/codersdk/projects.go index 7d2116865e9f4..606b387bcf668 100644 --- a/codersdk/projects.go +++ b/codersdk/projects.go @@ -5,28 +5,42 @@ import ( "encoding/json" "fmt" "net/http" + "time" + "github.com/coder/coder/database" "github.com/google/uuid" - - "github.com/coder/coder/coderd" ) +// Project is the JSON representation of a Coder project. +// This type matches the database object for now, but is +// abstracted for ease of change later on. +type Project struct { + ID uuid.UUID `json:"id"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` + OrganizationID string `json:"organization_id"` + Name string `json:"name"` + Provisioner database.ProvisionerType `json:"provisioner"` + ActiveVersionID uuid.UUID `json:"active_version_id"` + WorkspaceOwnerCount uint32 `json:"workspace_owner_count"` +} + // Project returns a single project. -func (c *Client) Project(ctx context.Context, project uuid.UUID) (coderd.Project, error) { +func (c *Client) Project(ctx context.Context, project uuid.UUID) (Project, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/projects/%s", project), nil) if err != nil { - return coderd.Project{}, nil + return Project{}, nil } defer res.Body.Close() if res.StatusCode != http.StatusOK { - return coderd.Project{}, readBodyAsError(res) + return Project{}, readBodyAsError(res) } - var resp coderd.Project + var resp Project return resp, json.NewDecoder(res.Body).Decode(&resp) } // ProjectVersionsByProject lists versions associated with a project. -func (c *Client) ProjectVersionsByProject(ctx context.Context, project uuid.UUID) ([]coderd.ProjectVersion, error) { +func (c *Client) ProjectVersionsByProject(ctx context.Context, project uuid.UUID) ([]ProjectVersion, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/projects/%s/versions", project), nil) if err != nil { return nil, err @@ -35,21 +49,21 @@ func (c *Client) ProjectVersionsByProject(ctx context.Context, project uuid.UUID if res.StatusCode != http.StatusOK { return nil, readBodyAsError(res) } - var projectVersion []coderd.ProjectVersion + var projectVersion []ProjectVersion return projectVersion, json.NewDecoder(res.Body).Decode(&projectVersion) } // ProjectVersionByName returns a project version by it's friendly name. // This is used for path-based routing. Like: /projects/example/versions/helloworld -func (c *Client) ProjectVersionByName(ctx context.Context, project uuid.UUID, name string) (coderd.ProjectVersion, error) { +func (c *Client) ProjectVersionByName(ctx context.Context, project uuid.UUID, name string) (ProjectVersion, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/projects/%s/versions/%s", project, name), nil) if err != nil { - return coderd.ProjectVersion{}, err + return ProjectVersion{}, err } defer res.Body.Close() if res.StatusCode != http.StatusOK { - return coderd.ProjectVersion{}, readBodyAsError(res) + return ProjectVersion{}, readBodyAsError(res) } - var projectVersion coderd.ProjectVersion + var projectVersion ProjectVersion return projectVersion, json.NewDecoder(res.Body).Decode(&projectVersion) } diff --git a/codersdk/projectversions.go b/codersdk/projectversions.go index 40530ff68eb08..c1d96a9c31b6a 100644 --- a/codersdk/projectversions.go +++ b/codersdk/projectversions.go @@ -7,27 +7,43 @@ import ( "net/http" "time" + "github.com/coder/coder/coderd/parameter" + "github.com/coder/coder/database" "github.com/google/uuid" - - "github.com/coder/coder/coderd" ) +// ProjectVersion represents a single version of a project. +type ProjectVersion struct { + ID uuid.UUID `json:"id"` + ProjectID *uuid.UUID `json:"project_id,omitempty"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` + Name string `json:"name"` + Job ProvisionerJob `json:"job"` +} + +// ProjectVersionParameterSchema represents a parameter parsed from project version source. +type ProjectVersionParameterSchema database.ParameterSchema + +// ProjectVersionParameter represents a computed parameter value. +type ProjectVersionParameter parameter.ComputedValue + // ProjectVersion returns a project version by ID. -func (c *Client) ProjectVersion(ctx context.Context, id uuid.UUID) (coderd.ProjectVersion, error) { +func (c *Client) ProjectVersion(ctx context.Context, id uuid.UUID) (ProjectVersion, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/projectversions/%s", id), nil) if err != nil { - return coderd.ProjectVersion{}, err + return ProjectVersion{}, err } defer res.Body.Close() if res.StatusCode != http.StatusOK { - return coderd.ProjectVersion{}, readBodyAsError(res) + return ProjectVersion{}, readBodyAsError(res) } - var version coderd.ProjectVersion + var version ProjectVersion return version, json.NewDecoder(res.Body).Decode(&version) } // ProjectVersionSchema returns schemas for a project version by ID. -func (c *Client) ProjectVersionSchema(ctx context.Context, version uuid.UUID) ([]coderd.ProjectVersionParameterSchema, error) { +func (c *Client) ProjectVersionSchema(ctx context.Context, version uuid.UUID) ([]ProjectVersionParameterSchema, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/projectversions/%s/schema", version), nil) if err != nil { return nil, err @@ -36,12 +52,12 @@ func (c *Client) ProjectVersionSchema(ctx context.Context, version uuid.UUID) ([ if res.StatusCode != http.StatusOK { return nil, readBodyAsError(res) } - var params []coderd.ProjectVersionParameterSchema + var params []ProjectVersionParameterSchema return params, json.NewDecoder(res.Body).Decode(¶ms) } // ProjectVersionParameters returns computed parameters for a project version. -func (c *Client) ProjectVersionParameters(ctx context.Context, version uuid.UUID) ([]coderd.ProjectVersionParameter, error) { +func (c *Client) ProjectVersionParameters(ctx context.Context, version uuid.UUID) ([]ProjectVersionParameter, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/projectversions/%s/parameters", version), nil) if err != nil { return nil, err @@ -50,12 +66,12 @@ func (c *Client) ProjectVersionParameters(ctx context.Context, version uuid.UUID if res.StatusCode != http.StatusOK { return nil, readBodyAsError(res) } - var params []coderd.ProjectVersionParameter + var params []ProjectVersionParameter return params, json.NewDecoder(res.Body).Decode(¶ms) } // ProjectVersionResources returns resources a project version declares. -func (c *Client) ProjectVersionResources(ctx context.Context, version uuid.UUID) ([]coderd.WorkspaceResource, error) { +func (c *Client) ProjectVersionResources(ctx context.Context, version uuid.UUID) ([]WorkspaceResource, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/projectversions/%s/resources", version), nil) if err != nil { return nil, err @@ -64,16 +80,16 @@ func (c *Client) ProjectVersionResources(ctx context.Context, version uuid.UUID) if res.StatusCode != http.StatusOK { return nil, readBodyAsError(res) } - var resources []coderd.WorkspaceResource + var resources []WorkspaceResource return resources, json.NewDecoder(res.Body).Decode(&resources) } // ProjectVersionLogsBefore returns logs that occurred before a specific time. -func (c *Client) ProjectVersionLogsBefore(ctx context.Context, version uuid.UUID, before time.Time) ([]coderd.ProvisionerJobLog, error) { +func (c *Client) ProjectVersionLogsBefore(ctx context.Context, version uuid.UUID, before time.Time) ([]ProvisionerJobLog, error) { return c.provisionerJobLogsBefore(ctx, fmt.Sprintf("/api/v2/projectversions/%s/logs", version), before) } // ProjectVersionLogsAfter streams logs for a project version that occurred after a specific time. -func (c *Client) ProjectVersionLogsAfter(ctx context.Context, version uuid.UUID, after time.Time) (<-chan coderd.ProvisionerJobLog, error) { +func (c *Client) ProjectVersionLogsAfter(ctx context.Context, version uuid.UUID, after time.Time) (<-chan ProvisionerJobLog, error) { return c.provisionerJobLogsAfter(ctx, fmt.Sprintf("/api/v2/projectversions/%s/logs", version), after) } diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go index 446399d3eece3..e3bc27ede0308 100644 --- a/codersdk/provisionerdaemons.go +++ b/codersdk/provisionerdaemons.go @@ -10,15 +10,47 @@ import ( "strconv" "time" + "github.com/google/uuid" "github.com/hashicorp/yamux" "golang.org/x/xerrors" "nhooyr.io/websocket" - "github.com/coder/coder/coderd" + "github.com/coder/coder/database" "github.com/coder/coder/provisionerd/proto" "github.com/coder/coder/provisionersdk" ) +type ProvisionerDaemon database.ProvisionerDaemon + +// ProvisionerJobStaus represents the at-time state of a job. +type ProvisionerJobStatus string + +const ( + ProvisionerJobPending ProvisionerJobStatus = "pending" + ProvisionerJobRunning ProvisionerJobStatus = "running" + ProvisionerJobSucceeded ProvisionerJobStatus = "succeeded" + ProvisionerJobCancelled ProvisionerJobStatus = "canceled" + ProvisionerJobFailed ProvisionerJobStatus = "failed" +) + +type ProvisionerJob struct { + ID uuid.UUID `json:"id"` + CreatedAt time.Time `json:"created_at"` + StartedAt *time.Time `json:"started_at,omitempty"` + CompletedAt *time.Time `json:"completed_at,omitempty"` + Error string `json:"error,omitempty"` + Status ProvisionerJobStatus `json:"status"` + WorkerID *uuid.UUID `json:"worker_id,omitempty"` +} + +type ProvisionerJobLog struct { + ID uuid.UUID `json:"id"` + CreatedAt time.Time `json:"created_at"` + Source database.LogSource `json:"log_source"` + Level database.LogLevel `json:"log_level"` + Output string `json:"output"` +} + // ListenProvisionerDaemon returns the gRPC service for a provisioner daemon implementation. func (c *Client) ListenProvisionerDaemon(ctx context.Context) (proto.DRPCProvisionerDaemonClient, error) { serverURL, err := c.URL.Parse("/api/v2/provisionerdaemons/me/listen") @@ -48,7 +80,7 @@ func (c *Client) ListenProvisionerDaemon(ctx context.Context) (proto.DRPCProvisi // provisionerJobLogsBefore provides log output that occurred before a time. // This is abstracted from a specific job type to provide consistency between // APIs. Logs is the only shared route between jobs. -func (c *Client) provisionerJobLogsBefore(ctx context.Context, path string, before time.Time) ([]coderd.ProvisionerJobLog, error) { +func (c *Client) provisionerJobLogsBefore(ctx context.Context, path string, before time.Time) ([]ProvisionerJobLog, error) { values := url.Values{} if !before.IsZero() { values["before"] = []string{strconv.FormatInt(before.UTC().UnixMilli(), 10)} @@ -62,12 +94,12 @@ func (c *Client) provisionerJobLogsBefore(ctx context.Context, path string, befo return nil, readBodyAsError(res) } - var logs []coderd.ProvisionerJobLog + var logs []ProvisionerJobLog return logs, json.NewDecoder(res.Body).Decode(&logs) } // provisionerJobLogsAfter streams logs that occurred after a specific time. -func (c *Client) provisionerJobLogsAfter(ctx context.Context, path string, after time.Time) (<-chan coderd.ProvisionerJobLog, error) { +func (c *Client) provisionerJobLogsAfter(ctx context.Context, path string, after time.Time) (<-chan ProvisionerJobLog, error) { afterQuery := "" if !after.IsZero() { afterQuery = fmt.Sprintf("&after=%d", after.UTC().UnixMilli()) @@ -81,11 +113,11 @@ func (c *Client) provisionerJobLogsAfter(ctx context.Context, path string, after return nil, readBodyAsError(res) } - logs := make(chan coderd.ProvisionerJobLog) + logs := make(chan ProvisionerJobLog) decoder := json.NewDecoder(res.Body) go func() { defer close(logs) - var log coderd.ProvisionerJobLog + var log ProvisionerJobLog for { err = decoder.Decode(&log) if err != nil { diff --git a/codersdk/templates.go b/codersdk/templates.go new file mode 100644 index 0000000000000..1b32f82dcbcf8 --- /dev/null +++ b/codersdk/templates.go @@ -0,0 +1,47 @@ +package codersdk + +import ( + "context" + "encoding/json" + "fmt" + "io" + "net/http" +) + +type Template struct { + ID string `json:"id"` + Name string `json:"name"` + Description string `json:"description"` + + ProjectVersionParameterSchema []ProjectVersionParameterSchema `json:"schema"` + Resources []WorkspaceResource `json:"resources"` +} + +func (c *Client) Templates(ctx context.Context) ([]Template, error) { + res, err := c.request(ctx, http.MethodGet, "/api/v2/templates", nil) + if err != nil { + return nil, err + } + defer res.Body.Close() + if res.StatusCode != http.StatusOK { + return nil, readBodyAsError(res) + } + var templates []Template + return templates, json.NewDecoder(res.Body).Decode(&templates) +} + +func (c *Client) TemplateArchive(ctx context.Context, id string) ([]byte, string, error) { + res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/templates/%s", id), nil) + if err != nil { + return nil, "", err + } + defer res.Body.Close() + if res.StatusCode != http.StatusOK { + return nil, "", readBodyAsError(res) + } + data, err := io.ReadAll(res.Body) + if err != nil { + return nil, "", err + } + return data, res.Header.Get("Content-Type"), nil +} diff --git a/codersdk/users.go b/codersdk/users.go index 1973471dfbcdc..94bafe47b1aea 100644 --- a/codersdk/users.go +++ b/codersdk/users.go @@ -5,10 +5,65 @@ import ( "encoding/json" "fmt" "net/http" + "time" - "github.com/coder/coder/coderd" + "github.com/google/uuid" ) +// User represents a user in Coder. +type User struct { + ID string `json:"id" validate:"required"` + Email string `json:"email" validate:"required"` + CreatedAt time.Time `json:"created_at" validate:"required"` + Username string `json:"username" validate:"required"` +} + +type CreateFirstUserRequest struct { + Email string `json:"email" validate:"required,email"` + Username string `json:"username" validate:"required,username"` + Password string `json:"password" validate:"required"` + Organization string `json:"organization" validate:"required,username"` +} + +// CreateFirstUserResponse contains IDs for newly created user info. +type CreateFirstUserResponse struct { + UserID string `json:"user_id"` + OrganizationID string `json:"organization_id"` +} + +type CreateUserRequest struct { + Email string `json:"email" validate:"required,email"` + Username string `json:"username" validate:"required,username"` + Password string `json:"password" validate:"required"` + OrganizationID string `json:"organization_id" validate:"required"` +} + +// LoginWithPasswordRequest enables callers to authenticate with email and password. +type LoginWithPasswordRequest struct { + Email string `json:"email" validate:"required,email"` + Password string `json:"password" validate:"required"` +} + +// LoginWithPasswordResponse contains a session token for the newly authenticated user. +type LoginWithPasswordResponse struct { + SessionToken string `json:"session_token" validate:"required"` +} + +// GenerateAPIKeyResponse contains an API key for a user. +type GenerateAPIKeyResponse struct { + Key string `json:"key"` +} + +type CreateOrganizationRequest struct { + Name string `json:"name" validate:"required,username"` +} + +// CreateWorkspaceRequest provides options for creating a new workspace. +type CreateWorkspaceRequest struct { + ProjectID uuid.UUID `json:"project_id" validate:"required"` + Name string `json:"name" validate:"username,required"` +} + // HasFirstUser returns whether the first user has been created. func (c *Client) HasFirstUser(ctx context.Context) (bool, error) { res, err := c.request(ctx, http.MethodGet, "/api/v2/users/first", nil) @@ -27,35 +82,35 @@ func (c *Client) HasFirstUser(ctx context.Context) (bool, error) { // CreateFirstUser attempts to create the first user on a Coder deployment. // This initial user has superadmin privileges. If >0 users exist, this request will fail. -func (c *Client) CreateFirstUser(ctx context.Context, req coderd.CreateFirstUserRequest) (coderd.CreateFirstUserResponse, error) { +func (c *Client) CreateFirstUser(ctx context.Context, req CreateFirstUserRequest) (CreateFirstUserResponse, error) { res, err := c.request(ctx, http.MethodPost, "/api/v2/users/first", req) if err != nil { - return coderd.CreateFirstUserResponse{}, err + return CreateFirstUserResponse{}, err } defer res.Body.Close() if res.StatusCode != http.StatusCreated { - return coderd.CreateFirstUserResponse{}, readBodyAsError(res) + return CreateFirstUserResponse{}, readBodyAsError(res) } - var resp coderd.CreateFirstUserResponse + var resp CreateFirstUserResponse return resp, json.NewDecoder(res.Body).Decode(&resp) } // CreateUser creates a new user. -func (c *Client) CreateUser(ctx context.Context, req coderd.CreateUserRequest) (coderd.User, error) { +func (c *Client) CreateUser(ctx context.Context, req CreateUserRequest) (User, error) { res, err := c.request(ctx, http.MethodPost, "/api/v2/users", req) if err != nil { - return coderd.User{}, err + return User{}, err } defer res.Body.Close() if res.StatusCode != http.StatusCreated { - return coderd.User{}, readBodyAsError(res) + return User{}, readBodyAsError(res) } - var user coderd.User + var user User return user, json.NewDecoder(res.Body).Decode(&user) } // CreateAPIKey generates an API key for the user ID provided. -func (c *Client) CreateAPIKey(ctx context.Context, id string) (*coderd.GenerateAPIKeyResponse, error) { +func (c *Client) CreateAPIKey(ctx context.Context, id string) (*GenerateAPIKeyResponse, error) { if id == "" { id = "me" } @@ -67,25 +122,25 @@ func (c *Client) CreateAPIKey(ctx context.Context, id string) (*coderd.GenerateA if res.StatusCode > http.StatusCreated { return nil, readBodyAsError(res) } - apiKey := &coderd.GenerateAPIKeyResponse{} + apiKey := &GenerateAPIKeyResponse{} return apiKey, json.NewDecoder(res.Body).Decode(apiKey) } // LoginWithPassword creates a session token authenticating with an email and password. // Call `SetSessionToken()` to apply the newly acquired token to the client. -func (c *Client) LoginWithPassword(ctx context.Context, req coderd.LoginWithPasswordRequest) (coderd.LoginWithPasswordResponse, error) { +func (c *Client) LoginWithPassword(ctx context.Context, req LoginWithPasswordRequest) (LoginWithPasswordResponse, error) { res, err := c.request(ctx, http.MethodPost, "/api/v2/users/login", req) if err != nil { - return coderd.LoginWithPasswordResponse{}, err + return LoginWithPasswordResponse{}, err } defer res.Body.Close() if res.StatusCode != http.StatusCreated { - return coderd.LoginWithPasswordResponse{}, readBodyAsError(res) + return LoginWithPasswordResponse{}, readBodyAsError(res) } - var resp coderd.LoginWithPasswordResponse + var resp LoginWithPasswordResponse err = json.NewDecoder(res.Body).Decode(&resp) if err != nil { - return coderd.LoginWithPasswordResponse{}, err + return LoginWithPasswordResponse{}, err } return resp, nil } @@ -105,24 +160,24 @@ func (c *Client) Logout(ctx context.Context) error { // User returns a user for the ID provided. // If the ID string is empty, the current user will be returned. -func (c *Client) User(ctx context.Context, id string) (coderd.User, error) { +func (c *Client) User(ctx context.Context, id string) (User, error) { if id == "" { id = "me" } res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/users/%s", id), nil) if err != nil { - return coderd.User{}, err + return User{}, err } defer res.Body.Close() if res.StatusCode > http.StatusOK { - return coderd.User{}, readBodyAsError(res) + return User{}, readBodyAsError(res) } - var user coderd.User + var user User return user, json.NewDecoder(res.Body).Decode(&user) } // OrganizationsByUser returns all organizations the user is a member of. -func (c *Client) OrganizationsByUser(ctx context.Context, id string) ([]coderd.Organization, error) { +func (c *Client) OrganizationsByUser(ctx context.Context, id string) ([]Organization, error) { if id == "" { id = "me" } @@ -134,62 +189,62 @@ func (c *Client) OrganizationsByUser(ctx context.Context, id string) ([]coderd.O if res.StatusCode > http.StatusOK { return nil, readBodyAsError(res) } - var orgs []coderd.Organization + var orgs []Organization return orgs, json.NewDecoder(res.Body).Decode(&orgs) } -func (c *Client) OrganizationByName(ctx context.Context, user, name string) (coderd.Organization, error) { +func (c *Client) OrganizationByName(ctx context.Context, user, name string) (Organization, error) { if user == "" { user = "me" } res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/users/%s/organizations/%s", user, name), nil) if err != nil { - return coderd.Organization{}, err + return Organization{}, err } defer res.Body.Close() if res.StatusCode != http.StatusOK { - return coderd.Organization{}, readBodyAsError(res) + return Organization{}, readBodyAsError(res) } - var org coderd.Organization + var org Organization return org, json.NewDecoder(res.Body).Decode(&org) } // CreateOrganization creates an organization and adds the provided user as an admin. -func (c *Client) CreateOrganization(ctx context.Context, user string, req coderd.CreateOrganizationRequest) (coderd.Organization, error) { +func (c *Client) CreateOrganization(ctx context.Context, user string, req CreateOrganizationRequest) (Organization, error) { if user == "" { user = "me" } res, err := c.request(ctx, http.MethodPost, fmt.Sprintf("/api/v2/users/%s/organizations", user), req) if err != nil { - return coderd.Organization{}, err + return Organization{}, err } defer res.Body.Close() if res.StatusCode != http.StatusCreated { - return coderd.Organization{}, readBodyAsError(res) + return Organization{}, readBodyAsError(res) } - var org coderd.Organization + var org Organization return org, json.NewDecoder(res.Body).Decode(&org) } // CreateWorkspace creates a new workspace for the project specified. -func (c *Client) CreateWorkspace(ctx context.Context, user string, request coderd.CreateWorkspaceRequest) (coderd.Workspace, error) { +func (c *Client) CreateWorkspace(ctx context.Context, user string, request CreateWorkspaceRequest) (Workspace, error) { if user == "" { user = "me" } res, err := c.request(ctx, http.MethodPost, fmt.Sprintf("/api/v2/users/%s/workspaces", user), request) if err != nil { - return coderd.Workspace{}, err + return Workspace{}, err } defer res.Body.Close() if res.StatusCode != http.StatusCreated { - return coderd.Workspace{}, readBodyAsError(res) + return Workspace{}, readBodyAsError(res) } - var workspace coderd.Workspace + var workspace Workspace return workspace, json.NewDecoder(res.Body).Decode(&workspace) } // WorkspacesByUser returns all workspaces the specified user has access to. -func (c *Client) WorkspacesByUser(ctx context.Context, user string) ([]coderd.Workspace, error) { +func (c *Client) WorkspacesByUser(ctx context.Context, user string) ([]Workspace, error) { if user == "" { user = "me" } @@ -201,22 +256,22 @@ func (c *Client) WorkspacesByUser(ctx context.Context, user string) ([]coderd.Wo if res.StatusCode != http.StatusOK { return nil, readBodyAsError(res) } - var workspaces []coderd.Workspace + var workspaces []Workspace return workspaces, json.NewDecoder(res.Body).Decode(&workspaces) } -func (c *Client) WorkspaceByName(ctx context.Context, user, name string) (coderd.Workspace, error) { +func (c *Client) WorkspaceByName(ctx context.Context, user, name string) (Workspace, error) { if user == "" { user = "me" } res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/users/%s/workspaces/%s", user, name), nil) if err != nil { - return coderd.Workspace{}, err + return Workspace{}, err } defer res.Body.Close() if res.StatusCode != http.StatusOK { - return coderd.Workspace{}, readBodyAsError(res) + return Workspace{}, readBodyAsError(res) } - var workspace coderd.Workspace + var workspace Workspace return workspace, json.NewDecoder(res.Body).Decode(&workspace) } diff --git a/codersdk/workspacebuilds.go b/codersdk/workspacebuilds.go index f62eea4a0e5df..7c153f339fa50 100644 --- a/codersdk/workspacebuilds.go +++ b/codersdk/workspacebuilds.go @@ -7,28 +7,43 @@ import ( "net/http" "time" + "github.com/coder/coder/database" "github.com/google/uuid" - - "github.com/coder/coder/coderd" ) +// WorkspaceBuild is an at-point representation of a workspace state. +// Iterate on before/after to determine a chronological history. +type WorkspaceBuild struct { + ID uuid.UUID `json:"id"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` + WorkspaceID uuid.UUID `json:"workspace_id"` + ProjectVersionID uuid.UUID `json:"project_version_id"` + BeforeID uuid.UUID `json:"before_id"` + AfterID uuid.UUID `json:"after_id"` + Name string `json:"name"` + Transition database.WorkspaceTransition `json:"transition"` + Initiator string `json:"initiator"` + Job ProvisionerJob `json:"job"` +} + // WorkspaceBuild returns a single workspace build for a workspace. // If history is "", the latest version is returned. -func (c *Client) WorkspaceBuild(ctx context.Context, id uuid.UUID) (coderd.WorkspaceBuild, error) { +func (c *Client) WorkspaceBuild(ctx context.Context, id uuid.UUID) (WorkspaceBuild, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/workspacebuilds/%s", id), nil) if err != nil { - return coderd.WorkspaceBuild{}, err + return WorkspaceBuild{}, err } defer res.Body.Close() if res.StatusCode != http.StatusOK { - return coderd.WorkspaceBuild{}, readBodyAsError(res) + return WorkspaceBuild{}, readBodyAsError(res) } - var workspaceBuild coderd.WorkspaceBuild + var workspaceBuild WorkspaceBuild return workspaceBuild, json.NewDecoder(res.Body).Decode(&workspaceBuild) } // WorkspaceResourcesByBuild returns resources for a workspace build. -func (c *Client) WorkspaceResourcesByBuild(ctx context.Context, build uuid.UUID) ([]coderd.WorkspaceResource, error) { +func (c *Client) WorkspaceResourcesByBuild(ctx context.Context, build uuid.UUID) ([]WorkspaceResource, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/workspacebuilds/%s/resources", build), nil) if err != nil { return nil, err @@ -37,16 +52,16 @@ func (c *Client) WorkspaceResourcesByBuild(ctx context.Context, build uuid.UUID) if res.StatusCode != http.StatusOK { return nil, readBodyAsError(res) } - var resources []coderd.WorkspaceResource + var resources []WorkspaceResource return resources, json.NewDecoder(res.Body).Decode(&resources) } // WorkspaceBuildLogsBefore returns logs that occurred before a specific time. -func (c *Client) WorkspaceBuildLogsBefore(ctx context.Context, version uuid.UUID, before time.Time) ([]coderd.ProvisionerJobLog, error) { +func (c *Client) WorkspaceBuildLogsBefore(ctx context.Context, version uuid.UUID, before time.Time) ([]ProvisionerJobLog, error) { return c.provisionerJobLogsBefore(ctx, fmt.Sprintf("/api/v2/workspacebuilds/%s/logs", version), before) } // WorkspaceBuildLogsAfter streams logs for a workspace build that occurred after a specific time. -func (c *Client) WorkspaceBuildLogsAfter(ctx context.Context, version uuid.UUID, after time.Time) (<-chan coderd.ProvisionerJobLog, error) { +func (c *Client) WorkspaceBuildLogsAfter(ctx context.Context, version uuid.UUID, after time.Time) (<-chan ProvisionerJobLog, error) { return c.provisionerJobLogsAfter(ctx, fmt.Sprintf("/api/v2/workspacebuilds/%s/logs", version), after) } diff --git a/codersdk/workspaceresourceauth.go b/codersdk/workspaceresourceauth.go index c2522444eeced..26f075e70650c 100644 --- a/codersdk/workspaceresourceauth.go +++ b/codersdk/workspaceresourceauth.go @@ -8,15 +8,23 @@ import ( "cloud.google.com/go/compute/metadata" "golang.org/x/xerrors" - - "github.com/coder/coder/coderd" ) +type GoogleInstanceIdentityToken struct { + JSONWebToken string `json:"json_web_token" validate:"required"` +} + +// WorkspaceAgentAuthenticateResponse is returned when an instance ID +// has been exchanged for a session token. +type WorkspaceAgentAuthenticateResponse struct { + SessionToken string `json:"session_token"` +} + // AuthWorkspaceGoogleInstanceIdentity uses the Google Compute Engine Metadata API to // fetch a signed JWT, and exchange it for a session token for a workspace agent. // // The requesting instance must be registered as a resource in the latest history for a workspace. -func (c *Client) AuthWorkspaceGoogleInstanceIdentity(ctx context.Context, serviceAccount string, gcpClient *metadata.Client) (coderd.WorkspaceAgentAuthenticateResponse, error) { +func (c *Client) AuthWorkspaceGoogleInstanceIdentity(ctx context.Context, serviceAccount string, gcpClient *metadata.Client) (WorkspaceAgentAuthenticateResponse, error) { if serviceAccount == "" { // This is the default name specified by Google. serviceAccount = "default" @@ -27,18 +35,18 @@ func (c *Client) AuthWorkspaceGoogleInstanceIdentity(ctx context.Context, servic // "format=full" is required, otherwise the responding payload will be missing "instance_id". jwt, err := gcpClient.Get(fmt.Sprintf("instance/service-accounts/%s/identity?audience=coder&format=full", serviceAccount)) if err != nil { - return coderd.WorkspaceAgentAuthenticateResponse{}, xerrors.Errorf("get metadata identity: %w", err) + return WorkspaceAgentAuthenticateResponse{}, xerrors.Errorf("get metadata identity: %w", err) } - res, err := c.request(ctx, http.MethodPost, "/api/v2/workspaceresources/auth/google-instance-identity", coderd.GoogleInstanceIdentityToken{ + res, err := c.request(ctx, http.MethodPost, "/api/v2/workspaceresources/auth/google-instance-identity", GoogleInstanceIdentityToken{ JSONWebToken: jwt, }) if err != nil { - return coderd.WorkspaceAgentAuthenticateResponse{}, err + return WorkspaceAgentAuthenticateResponse{}, err } defer res.Body.Close() if res.StatusCode != http.StatusOK { - return coderd.WorkspaceAgentAuthenticateResponse{}, readBodyAsError(res) + return WorkspaceAgentAuthenticateResponse{}, readBodyAsError(res) } - var resp coderd.WorkspaceAgentAuthenticateResponse + var resp WorkspaceAgentAuthenticateResponse return resp, json.NewDecoder(res.Body).Decode(&resp) } diff --git a/codersdk/workspaceresources.go b/codersdk/workspaceresources.go index 39dcb0920aee7..0cdb0dcc799fa 100644 --- a/codersdk/workspaceresources.go +++ b/codersdk/workspaceresources.go @@ -7,13 +7,14 @@ import ( "io" "net/http" "net/http/cookiejar" + "time" "github.com/google/uuid" "github.com/hashicorp/yamux" "golang.org/x/xerrors" "nhooyr.io/websocket" - "github.com/coder/coder/coderd" + "github.com/coder/coder/database" "github.com/coder/coder/httpmw" "github.com/coder/coder/peer" "github.com/coder/coder/peerbroker" @@ -21,16 +22,56 @@ import ( "github.com/coder/coder/provisionersdk" ) -func (c *Client) WorkspaceResource(ctx context.Context, id uuid.UUID) (coderd.WorkspaceResource, error) { +type WorkspaceResource struct { + ID uuid.UUID `json:"id"` + CreatedAt time.Time `json:"created_at"` + JobID uuid.UUID `json:"job_id"` + Transition database.WorkspaceTransition `json:"workspace_transition"` + Type string `json:"type"` + Name string `json:"name"` + Agent *WorkspaceAgent `json:"agent,omitempty"` +} + +type WorkspaceAgent struct { + ID uuid.UUID `json:"id"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` + ResourceID uuid.UUID `json:"resource_id"` + InstanceID string `json:"instance_id,omitempty"` + EnvironmentVariables map[string]string `json:"environment_variables"` + StartupScript string `json:"startup_script,omitempty"` +} + +type WorkspaceAgentResourceMetadata struct { + MemoryTotal uint64 `json:"memory_total"` + DiskTotal uint64 `json:"disk_total"` + CPUCores uint64 `json:"cpu_cores"` + CPUModel string `json:"cpu_model"` + CPUMhz float64 `json:"cpu_mhz"` +} + +type WorkspaceAgentInstanceMetadata struct { + JailOrchestrator string `json:"jail_orchestrator"` + OperatingSystem string `json:"operating_system"` + Platform string `json:"platform"` + PlatformFamily string `json:"platform_family"` + KernelVersion string `json:"kernel_version"` + KernelArchitecture string `json:"kernel_architecture"` + Cloud string `json:"cloud"` + Jail string `json:"jail"` + VNC bool `json:"vnc"` +} + +func (c *Client) WorkspaceResource(ctx context.Context, id uuid.UUID) (WorkspaceResource, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/workspaceresources/%s", id), nil) if err != nil { - return coderd.WorkspaceResource{}, err + return WorkspaceResource{}, err } defer res.Body.Close() if res.StatusCode != http.StatusOK { - return coderd.WorkspaceResource{}, readBodyAsError(res) + return WorkspaceResource{}, readBodyAsError(res) } - var resource coderd.WorkspaceResource + var resource WorkspaceResource return resource, json.NewDecoder(res.Body).Decode(&resource) } diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go index 9aacf60d39db2..234aeb6174470 100644 --- a/codersdk/workspaces.go +++ b/codersdk/workspaces.go @@ -6,26 +6,35 @@ import ( "fmt" "net/http" + "github.com/coder/coder/database" "github.com/google/uuid" - - "github.com/coder/coder/coderd" ) +// Workspace is a per-user deployment of a project. It tracks +// project versions, and can be updated. +type Workspace database.Workspace + +// CreateWorkspaceBuildRequest provides options to update the latest workspace build. +type CreateWorkspaceBuildRequest struct { + ProjectVersionID uuid.UUID `json:"project_version_id" validate:"required"` + Transition database.WorkspaceTransition `json:"transition" validate:"oneof=create start stop delete,required"` +} + // Workspace returns a single workspace. -func (c *Client) Workspace(ctx context.Context, id uuid.UUID) (coderd.Workspace, error) { +func (c *Client) Workspace(ctx context.Context, id uuid.UUID) (Workspace, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/workspaces/%s", id), nil) if err != nil { - return coderd.Workspace{}, err + return Workspace{}, err } defer res.Body.Close() if res.StatusCode != http.StatusOK { - return coderd.Workspace{}, readBodyAsError(res) + return Workspace{}, readBodyAsError(res) } - var workspace coderd.Workspace + var workspace Workspace return workspace, json.NewDecoder(res.Body).Decode(&workspace) } -func (c *Client) WorkspaceBuilds(ctx context.Context, workspace uuid.UUID) ([]coderd.WorkspaceBuild, error) { +func (c *Client) WorkspaceBuilds(ctx context.Context, workspace uuid.UUID) ([]WorkspaceBuild, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/workspaces/%s/builds", workspace), nil) if err != nil { return nil, err @@ -34,46 +43,46 @@ func (c *Client) WorkspaceBuilds(ctx context.Context, workspace uuid.UUID) ([]co if res.StatusCode != http.StatusOK { return nil, readBodyAsError(res) } - var workspaceBuild []coderd.WorkspaceBuild + var workspaceBuild []WorkspaceBuild return workspaceBuild, json.NewDecoder(res.Body).Decode(&workspaceBuild) } // CreateWorkspaceBuild queues a new build to occur for a workspace. -func (c *Client) CreateWorkspaceBuild(ctx context.Context, workspace uuid.UUID, request coderd.CreateWorkspaceBuildRequest) (coderd.WorkspaceBuild, error) { +func (c *Client) CreateWorkspaceBuild(ctx context.Context, workspace uuid.UUID, request CreateWorkspaceBuildRequest) (WorkspaceBuild, error) { res, err := c.request(ctx, http.MethodPost, fmt.Sprintf("/api/v2/workspaces/%s/builds", workspace), request) if err != nil { - return coderd.WorkspaceBuild{}, err + return WorkspaceBuild{}, err } defer res.Body.Close() if res.StatusCode != http.StatusCreated { - return coderd.WorkspaceBuild{}, readBodyAsError(res) + return WorkspaceBuild{}, readBodyAsError(res) } - var workspaceBuild coderd.WorkspaceBuild + var workspaceBuild WorkspaceBuild return workspaceBuild, json.NewDecoder(res.Body).Decode(&workspaceBuild) } -func (c *Client) WorkspaceBuildByName(ctx context.Context, workspace uuid.UUID, name string) (coderd.WorkspaceBuild, error) { +func (c *Client) WorkspaceBuildByName(ctx context.Context, workspace uuid.UUID, name string) (WorkspaceBuild, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/workspaces/%s/builds/%s", workspace, name), nil) if err != nil { - return coderd.WorkspaceBuild{}, err + return WorkspaceBuild{}, err } defer res.Body.Close() if res.StatusCode != http.StatusOK { - return coderd.WorkspaceBuild{}, readBodyAsError(res) + return WorkspaceBuild{}, readBodyAsError(res) } - var workspaceBuild coderd.WorkspaceBuild + var workspaceBuild WorkspaceBuild return workspaceBuild, json.NewDecoder(res.Body).Decode(&workspaceBuild) } -func (c *Client) WorkspaceBuildLatest(ctx context.Context, workspace uuid.UUID) (coderd.WorkspaceBuild, error) { +func (c *Client) WorkspaceBuildLatest(ctx context.Context, workspace uuid.UUID) (WorkspaceBuild, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/workspaces/%s/builds/latest", workspace), nil) if err != nil { - return coderd.WorkspaceBuild{}, err + return WorkspaceBuild{}, err } defer res.Body.Close() if res.StatusCode != http.StatusOK { - return coderd.WorkspaceBuild{}, readBodyAsError(res) + return WorkspaceBuild{}, readBodyAsError(res) } - var workspaceBuild coderd.WorkspaceBuild + var workspaceBuild WorkspaceBuild return workspaceBuild, json.NewDecoder(res.Body).Decode(&workspaceBuild) } diff --git a/provisionersdk/agent_test.go b/provisionersdk/agent_test.go index 767ba966bae55..2a7e56b90a252 100644 --- a/provisionersdk/agent_test.go +++ b/provisionersdk/agent_test.go @@ -44,12 +44,12 @@ func TestAgentScript(t *testing.T) { t.Skip("Agent not supported...") return } - script = strings.ReplaceAll(script, "${ACCESS_URL}", srvURL.String()) + script = strings.ReplaceAll(script, "${ACCESS_URL}", srvURL.String()+"/") output, err := exec.Command("sh", "-c", script).CombinedOutput() t.Log(string(output)) require.NoError(t, err) // Because we use the "echo" binary, we should expect the arguments provided // as the response to executing our script. - require.Equal(t, "agent", strings.TrimSpace(string(output))) + require.Equal(t, "workspaces agent", strings.TrimSpace(string(output))) }) } diff --git a/provisionersdk/archive_test.go b/provisionersdk/archive_test.go new file mode 100644 index 0000000000000..d93080d844287 --- /dev/null +++ b/provisionersdk/archive_test.go @@ -0,0 +1,19 @@ +package provisionersdk_test + +import ( + "io/ioutil" + "testing" + + "github.com/coder/coder/provisionersdk" + "github.com/stretchr/testify/require" +) + +func TestTar(t *testing.T) { + t.Parallel() + dir := t.TempDir() + file, err := ioutil.TempFile(dir, "") + require.NoError(t, err) + _ = file.Close() + _, err = provisionersdk.Tar(dir) + require.NoError(t, err) +} diff --git a/template/template.go b/template/template.go index b5bbb9cfde5ca..5653eec7ea287 100644 --- a/template/template.go +++ b/template/template.go @@ -1,31 +1,80 @@ +// + package template import ( + "archive/tar" + "bytes" "embed" + "encoding/json" "fmt" + "path/filepath" + + "github.com/coder/coder/codersdk" ) -//go:embed */*.json -//go:embed */*.tf -var files embed.FS +var ( + //go:embed */*.json + //go:embed */*.tf + files embed.FS -func List() { + list []codersdk.Template = make([]codersdk.Template, 0) + archives map[string][]byte = map[string][]byte{} +) + +// Parses templates from the embedded archive and inserts them into the map. +func init() { dirs, err := files.ReadDir(".") if err != nil { panic(err) } - fmt.Printf("Dirs: %+v\n", dirs) for _, dir := range dirs { - subpaths, err := files.ReadDir(dir.Name()) + // Each one of these is a template! + templateData, err := files.ReadFile(filepath.Join(dir.Name(), dir.Name()+".json")) + if err != nil { + panic(fmt.Sprintf("template %q does not contain compiled json", dir.Name())) + } + templateSrc, err := files.ReadFile(filepath.Join(dir.Name(), dir.Name()+".tf")) + if err != nil { + panic(fmt.Sprintf("template %q does not contain terraform source", dir.Name())) + } + + var template codersdk.Template + err = json.Unmarshal(templateData, &template) + if err != nil { + panic(fmt.Sprintf("unmarshal template %q: %s", dir.Name(), err)) + } + + var buffer bytes.Buffer + tarWriter := tar.NewWriter(&buffer) + err = tarWriter.WriteHeader(&tar.Header{ + Typeflag: tar.TypeReg, + Name: dir.Name() + ".tf", + Size: int64(len(templateSrc)), + }) if err != nil { panic(err) } - for _, subpath := range subpaths { - fmt.Printf("Got dir: %s\n", subpath.Name()) + _, err = tarWriter.Write(templateSrc) + if err != nil { + panic(err) } + err = tarWriter.Flush() + if err != nil { + panic(err) + } + archives[dir.Name()] = buffer.Bytes() + list = append(list, template) } } -func Setup() { +// List returns all embedded templates. +func List() []codersdk.Template { + return list +} +// Archive returns a tar by template ID. +func Archive(id string) ([]byte, bool) { + data, exists := archives[id] + return data, exists } diff --git a/template/template_test.go b/template/template_test.go index 8d190d0689ccd..724f422cc23b4 100644 --- a/template/template_test.go +++ b/template/template_test.go @@ -4,9 +4,14 @@ import ( "testing" "github.com/coder/coder/template" + "github.com/stretchr/testify/require" ) func TestTemplate(t *testing.T) { t.Parallel() - template.List() + list := template.List() + require.Greater(t, len(list), 0) + + _, exists := template.Archive(list[0].ID) + require.True(t, exists) } From 8cee1fbdba33beed7ad53571e4201a1cc658470f Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Fri, 11 Mar 2022 02:29:37 +0000 Subject: [PATCH 03/37] Back to green tests! --- cli/cliui/cliui.go | 2 + cli/cliui/prompt.go | 153 +++++++++++------------- cli/cliui/prompt_test.go | 28 +++-- cli/login.go | 25 ++-- cli/login_test.go | 1 - cli/projectcreate.go | 23 ++-- cli/workspacecreate.go | 9 +- cmd/cliui/main.go | 14 ++- provisioner/terraform/provision_test.go | 7 -- pty/ptytest/ptytest.go | 2 +- 10 files changed, 132 insertions(+), 132 deletions(-) diff --git a/cli/cliui/cliui.go b/cli/cliui/cliui.go index 4a59f81b4a7ad..7828a23307edd 100644 --- a/cli/cliui/cliui.go +++ b/cli/cliui/cliui.go @@ -25,11 +25,13 @@ func ValidateNotEmpty(s string) error { // Styles compose visual elements of the UI! var Styles = struct { + Bold, Field, Prompt, FocusedPrompt, Logo lipgloss.Style }{ + Bold: lipgloss.NewStyle().Bold(true), Field: defaultStyles.Code.Foreground(lipgloss.AdaptiveColor{Light: "#000000", Dark: "#FFFFFF"}), Prompt: defaultStyles.Prompt.Foreground(lipgloss.AdaptiveColor{Light: "#9B9B9B", Dark: "#5C5C5C"}), FocusedPrompt: defaultStyles.FocusedPrompt.Foreground(lipgloss.Color("#651fff")), diff --git a/cli/cliui/prompt.go b/cli/cliui/prompt.go index 44ed1926834ec..71b8813d35b15 100644 --- a/cli/cliui/prompt.go +++ b/cli/cliui/prompt.go @@ -1,107 +1,96 @@ package cliui import ( - "strings" + "errors" + "fmt" + "io" - "github.com/charmbracelet/bubbles/textinput" - tea "github.com/charmbracelet/bubbletea" + "github.com/manifoldco/promptui" "github.com/spf13/cobra" ) type PromptOptions struct { - Prompt string - Default string - CharLimit int - Validate Validate - EchoMode textinput.EchoMode - EchoCharacter rune - IsConfirm bool + Text string + Default string + Mask rune + Validate Validate + IsConfirm bool } +// Prompt displays an input for user data. +// See this live: "go run ./cmd/cliui prompt" func Prompt(cmd *cobra.Command, opts PromptOptions) (string, error) { - input := &input{ - opts: opts, - model: textinput.New(), + prompt := &promptui.Prompt{ + Label: opts.Text, + Default: opts.Default, + Mask: opts.Mask, + Validate: promptui.ValidateFunc(opts.Validate), + IsConfirm: opts.IsConfirm, } - input.model.Prompt = opts.Prompt + " " - input.model.Placeholder = opts.Default - input.model.CharLimit = opts.CharLimit - input.model.EchoCharacter = opts.EchoCharacter - input.model.EchoMode = opts.EchoMode - input.model.Focus() - program := tea.NewProgram(input, tea.WithInput(cmd.InOrStdin()), tea.WithOutput(cmd.OutOrStdout())) - err := program.Start() - if err != nil { - return "", err + prompt.Stdin = io.NopCloser(cmd.InOrStdin()) + prompt.Stdout = readWriteCloser{ + Writer: cmd.OutOrStdout(), } - if input.canceled { - return "", Canceled - } - if opts.IsConfirm && !strings.EqualFold(input.model.Value(), "yes") { - return "", Canceled + + // The prompt library displays defaults in a jarring way for the user + // by attempting to autocomplete it. This sets no default enabling us + // to customize the display. + defaultValue := prompt.Default + if !prompt.IsConfirm { + prompt.Default = "" } - return input.model.Value(), nil -} -type input struct { - opts PromptOptions - model textinput.Model - err string - canceled bool -} + // Rewrite the confirm template to remove bold, and fit to the Coder style. + confirmEnd := fmt.Sprintf("[y/%s] ", Styles.Bold.Render("N")) + if prompt.Default == "y" { + confirmEnd = fmt.Sprintf("[%s/n] ", Styles.Bold.Render("Y")) + } + confirm := Styles.FocusedPrompt.String() + `{{ . }} ` + confirmEnd -func (i *input) Init() tea.Cmd { - return textinput.Blink -} + // Customize to remove bold. + valid := Styles.FocusedPrompt.String() + "{{ . }} " + if defaultValue != "" { + valid += fmt.Sprintf("(%s) ", defaultValue) + } -func (i *input) Update(msg tea.Msg) (tea.Model, tea.Cmd) { - var cmd tea.Cmd - switch msg := msg.(type) { - case tea.KeyMsg: - switch msg.Type { - case tea.KeyEnter: - // Apply the default placeholder value. - if i.model.Value() == "" && i.model.Placeholder != "" { - i.model.SetValue(i.model.Placeholder) - } + success := valid + invalid := valid + if prompt.IsConfirm { + success = confirm + invalid = confirm + } - // Validate the value. - if i.opts.Validate != nil { - err := i.opts.Validate(i.model.Value()) - if err != nil { - i.err = err.Error() - return i, nil - } + prompt.Templates = &promptui.PromptTemplates{ + Confirm: confirm, + Success: success, + Invalid: invalid, + Valid: valid, + ValidationError: defaultStyles.Error.Render("{{ . }}"), + } + oldValidate := prompt.Validate + if oldValidate != nil { + // Override the validate function to pass our default! + prompt.Validate = func(s string) error { + if s == "" { + s = defaultValue } - i.err = "" - i.model.SetCursorMode(textinput.CursorHide) - - return i, tea.Quit - case tea.KeyCtrlC, tea.KeyEsc: - i.canceled = true - i.model.SetCursorMode(textinput.CursorHide) - return i, tea.Quit + return oldValidate(s) } - - // We handle errors just like any other message - case error: - i.err = msg.Error() - return i, nil } - - i.model, cmd = i.model.Update(msg) - return i, cmd -} - -func (i *input) View() string { - prompt := Styles.FocusedPrompt - if i.model.CursorMode() == textinput.CursorHide { - prompt = Styles.Prompt + value, err := prompt.Run() + if value == "" && !prompt.IsConfirm { + value = defaultValue } - validate := "" - if i.err != "" { - validate = "\n" + defaultStyles.Error.Render("▲ "+i.err) + if errors.Is(err, promptui.ErrInterrupt) || errors.Is(err, promptui.ErrAbort) { + return "", Canceled } - return prompt.String() + i.model.View() + "\n" + validate + return value, err +} + +// readWriteCloser fakes reads, writes, and closing! +type readWriteCloser struct { + io.Reader + io.Writer + io.Closer } diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go index 96ebd4fb7645e..bc445f330aa2b 100644 --- a/cli/cliui/prompt_test.go +++ b/cli/cliui/prompt_test.go @@ -1,21 +1,15 @@ package cliui_test import ( - "fmt" "testing" "github.com/spf13/cobra" "github.com/stretchr/testify/require" - "go.uber.org/goleak" "github.com/coder/coder/cli/cliui" "github.com/coder/coder/pty/ptytest" ) -func TestMain(m *testing.M) { - goleak.VerifyTestMain(m) -} - func TestPrompt(t *testing.T) { t.Parallel() t.Run("Success", func(t *testing.T) { @@ -23,16 +17,30 @@ func TestPrompt(t *testing.T) { ch := make(chan string, 0) go func() { resp, err := prompt(ptty, cliui.PromptOptions{ - Prompt: "Example", + Text: "Example", }) require.NoError(t, err) - fmt.Printf("We got it!\n") ch <- resp }() ptty.ExpectMatch("Example") ptty.WriteLine("hello") - resp := <-ch - require.Equal(t, "hello", resp) + require.Equal(t, "hello", <-ch) + }) + + t.Run("Confirm", func(t *testing.T) { + ptty := ptytest.New(t) + ch := make(chan string, 0) + go func() { + resp, err := prompt(ptty, cliui.PromptOptions{ + Text: "Example", + IsConfirm: true, + }) + require.NoError(t, err) + ch <- resp + }() + ptty.ExpectMatch("Example") + ptty.WriteLine("y") + require.Equal(t, "y", <-ch) }) } diff --git a/cli/login.go b/cli/login.go index 05a8eef9df5bc..0d98f755a7476 100644 --- a/cli/login.go +++ b/cli/login.go @@ -10,10 +10,8 @@ import ( "runtime" "strings" - "github.com/charmbracelet/bubbles/textinput" "github.com/fatih/color" "github.com/go-playground/validator/v10" - "github.com/manifoldco/promptui" "github.com/pkg/browser" "github.com/spf13/cobra" "golang.org/x/xerrors" @@ -72,8 +70,8 @@ func login() *cobra.Command { _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s Your Coder deployment hasn't been set up!\n", caret) _, err := cliui.Prompt(cmd, cliui.PromptOptions{ - Prompt: "Would you like to create the first user?", - Default: "yes", + Text: "Would you like to create the first user?", + Default: "y", IsConfirm: true, }) if errors.Is(err, cliui.Canceled) { @@ -87,7 +85,7 @@ func login() *cobra.Command { return xerrors.Errorf("get current user: %w", err) } username, err := cliui.Prompt(cmd, cliui.PromptOptions{ - Prompt: "What " + cliui.Styles.Field.Render("username") + " would you like?", + Text: "What " + cliui.Styles.Field.Render("username") + " would you like?", Default: currentUser.Username, }) if errors.Is(err, cliui.Canceled) { @@ -98,11 +96,11 @@ func login() *cobra.Command { } email, err := cliui.Prompt(cmd, cliui.PromptOptions{ - Prompt: "What's your " + cliui.Styles.Field.Render("email") + "?", + Text: "What's your " + cliui.Styles.Field.Render("email") + "?", Validate: func(s string) error { err := validator.New().Var(s, "email") if err != nil { - return xerrors.New("That's not a valid email address!") + return xerrors.Errorf("That's not a valid email address!", s) } return err }, @@ -112,10 +110,9 @@ func login() *cobra.Command { } password, err := cliui.Prompt(cmd, cliui.PromptOptions{ - Prompt: "Enter a " + cliui.Styles.Field.Render("password") + ":", - EchoMode: textinput.EchoPassword, - EchoCharacter: '*', - Validate: cliui.ValidateNotEmpty, + Text: "Enter a " + cliui.Styles.Field.Render("password") + ":", + Mask: '*', + Validate: cliui.ValidateNotEmpty, }) if err != nil { return xerrors.Errorf("specify password prompt: %w", err) @@ -161,9 +158,9 @@ func login() *cobra.Command { _, _ = fmt.Fprintf(cmd.OutOrStdout(), "Your browser has been opened to visit:\n\n\t%s\n\n", authURL.String()) } - sessionToken, err := prompt(cmd, &promptui.Prompt{ - Label: "Paste your token here:", - Mask: '*', + sessionToken, err := cliui.Prompt(cmd, cliui.PromptOptions{ + Text: "Paste your token here:", + Mask: '*', Validate: func(token string) error { client.SessionToken = token _, err := client.User(cmd.Context(), "me") diff --git a/cli/login_test.go b/cli/login_test.go index e6ed0ce4401ef..751cb544c3fae 100644 --- a/cli/login_test.go +++ b/cli/login_test.go @@ -38,7 +38,6 @@ func TestLogin(t *testing.T) { matches := []string{ "first user?", "y", "username", "testuser", - "organization", "testorg", "email", "user@coder.com", "password", "password", } diff --git a/cli/projectcreate.go b/cli/projectcreate.go index 58e3ef0c37833..e89920402cc8d 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -14,6 +14,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/xerrors" + "github.com/coder/coder/cli/cliui" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/provisionerd" @@ -37,10 +38,10 @@ func projectCreate() *cobra.Command { if err != nil { return err } - _, err = prompt(cmd, &promptui.Prompt{ + _, err = cliui.Prompt(cmd, cliui.PromptOptions{ Default: "y", IsConfirm: true, - Label: fmt.Sprintf("Set up %s in your organization?", color.New(color.FgHiCyan).Sprintf("%q", directory)), + Text: fmt.Sprintf("Set up %s in your organization?", color.New(color.FgHiCyan).Sprintf("%q", directory)), }) if err != nil { if errors.Is(err, promptui.ErrAbort) { @@ -49,9 +50,9 @@ func projectCreate() *cobra.Command { return err } - name, err := prompt(cmd, &promptui.Prompt{ + name, err := cliui.Prompt(cmd, cliui.PromptOptions{ Default: filepath.Base(directory), - Label: "What's your project's name?", + Text: "What's your project's name?", Validate: func(s string) error { project, _ := client.ProjectByName(cmd.Context(), organization.ID, s) if project.ID.String() != uuid.Nil.String() { @@ -69,8 +70,8 @@ func projectCreate() *cobra.Command { return err } - _, err = prompt(cmd, &promptui.Prompt{ - Label: "Create project?", + _, err = cliui.Prompt(cmd, cliui.PromptOptions{ + Text: "Create project?", IsConfirm: true, Default: "y", }) @@ -90,13 +91,13 @@ func projectCreate() *cobra.Command { } _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s The %s project has been created!\n", caret, color.HiCyanString(project.Name)) - _, err = prompt(cmd, &promptui.Prompt{ - Label: "Create a new workspace?", + _, err = cliui.Prompt(cmd, cliui.PromptOptions{ + Text: "Create a new workspace?", IsConfirm: true, Default: "y", }) if err != nil { - if errors.Is(err, promptui.ErrAbort) { + if errors.Is(err, cliui.Canceled) { return nil } return err @@ -184,8 +185,8 @@ func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, o if ok { continue } - value, err := prompt(cmd, &promptui.Prompt{ - Label: fmt.Sprintf("Enter value for %s:", color.HiCyanString(parameterSchema.Name)), + value, err := cliui.Prompt(cmd, cliui.PromptOptions{ + Text: fmt.Sprintf("Enter value for %s:", color.HiCyanString(parameterSchema.Name)), }) if err != nil { return nil, err diff --git a/cli/workspacecreate.go b/cli/workspacecreate.go index 459eb81eeb106..27df53329f951 100644 --- a/cli/workspacecreate.go +++ b/cli/workspacecreate.go @@ -11,6 +11,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/xerrors" + "github.com/coder/coder/cli/cliui" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" ) @@ -33,8 +34,8 @@ func workspaceCreate() *cobra.Command { if len(args) >= 2 { name = args[1] } else { - name, err = prompt(cmd, &promptui.Prompt{ - Label: "What's your workspace's name?", + name, err = cliui.Prompt(cmd, cliui.PromptOptions{ + Text: "What's your workspace's name?", Validate: func(s string) error { if s == "" { return xerrors.Errorf("You must provide a name!") @@ -81,8 +82,8 @@ func workspaceCreate() *cobra.Command { return err } - _, err = prompt(cmd, &promptui.Prompt{ - Label: fmt.Sprintf("Create workspace %s?", color.HiCyanString(name)), + _, err = cliui.Prompt(cmd, cliui.PromptOptions{ + Text: fmt.Sprintf("Create workspace %s?", color.HiCyanString(name)), Default: "y", IsConfirm: true, }) diff --git a/cmd/cliui/main.go b/cmd/cliui/main.go index 43a814be77f4e..576a6ca0290ea 100644 --- a/cmd/cliui/main.go +++ b/cmd/cliui/main.go @@ -20,7 +20,7 @@ func main() { Use: "prompt", RunE: func(cmd *cobra.Command, args []string) error { _, err := cliui.Prompt(cmd, cliui.PromptOptions{ - Prompt: "What is our " + cliui.Styles.Field.Render("company name") + "?", + Text: "What is our " + cliui.Styles.Field.Render("company name") + "?", Default: "acme-corp", Validate: func(s string) error { if !strings.EqualFold(s, "coder") { @@ -35,7 +35,17 @@ func main() { if err != nil { return err } - fmt.Printf("You got it!\n") + _, err = cliui.Prompt(cmd, cliui.PromptOptions{ + Text: "Do you want to accept?", + Default: "y", + IsConfirm: true, + }) + if errors.Is(err, cliui.Canceled) { + return nil + } + if err != nil { + return err + } return nil }, }) diff --git a/provisioner/terraform/provision_test.go b/provisioner/terraform/provision_test.go index 6916d67da6352..605ac0fa38b94 100644 --- a/provisioner/terraform/provision_test.go +++ b/provisioner/terraform/provision_test.go @@ -201,13 +201,6 @@ provider "coder" { Resources: []*proto.Resource{{ Name: "A", Type: "null_resource", - Agent: &proto.Agent{ - Auth: &proto.Agent_GoogleInstanceIdentity{ - GoogleInstanceIdentity: &proto.GoogleInstanceIdentityAuth{ - InstanceId: "an-instance", - }, - }, - }, }}, }, }, diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go index 83f660c5451c8..60cd88ce606a2 100644 --- a/pty/ptytest/ptytest.go +++ b/pty/ptytest/ptytest.go @@ -93,7 +93,7 @@ func (p *PTY) ExpectMatch(str string) string { } func (p *PTY) WriteLine(str string) { - newline := "\r" + newline := "\n" if runtime.GOOS == "windows" { newline = "\r\n" } From 11e1d99625fa3b395b7cc261ea5248aea92e88e4 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Fri, 11 Mar 2022 03:02:24 +0000 Subject: [PATCH 04/37] =?UTF-8?q?It=20all=20works,=20but=20now=20with=20te?= =?UTF-8?q?a!=20=F0=9F=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cli/cliui/prompt.go | 153 +++++++++++++++++++----------------- cli/cliui/prompt_test.go | 6 +- cli/login.go | 15 ++-- cli/login_test.go | 8 +- cli/projectcreate.go | 6 +- cli/projectcreate_test.go | 12 +-- cli/root.go | 2 +- cli/workspacecreate.go | 2 +- cli/workspacecreate_test.go | 4 +- cmd/cliui/main.go | 2 +- pty/pty.go | 9 ++- pty/pty_other.go | 9 +-- pty/pty_windows.go | 8 +- pty/ptytest/ptytest.go | 14 +++- 14 files changed, 137 insertions(+), 113 deletions(-) diff --git a/cli/cliui/prompt.go b/cli/cliui/prompt.go index 71b8813d35b15..484ea770b2543 100644 --- a/cli/cliui/prompt.go +++ b/cli/cliui/prompt.go @@ -1,96 +1,107 @@ package cliui import ( - "errors" - "fmt" - "io" + "strings" - "github.com/manifoldco/promptui" + "github.com/charmbracelet/bubbles/textinput" + tea "github.com/charmbracelet/bubbletea" "github.com/spf13/cobra" ) type PromptOptions struct { - Text string - Default string - Mask rune - Validate Validate - IsConfirm bool + Text string + Default string + CharLimit int + Validate Validate + EchoMode textinput.EchoMode + EchoCharacter rune + IsConfirm bool } -// Prompt displays an input for user data. -// See this live: "go run ./cmd/cliui prompt" func Prompt(cmd *cobra.Command, opts PromptOptions) (string, error) { - prompt := &promptui.Prompt{ - Label: opts.Text, - Default: opts.Default, - Mask: opts.Mask, - Validate: promptui.ValidateFunc(opts.Validate), - IsConfirm: opts.IsConfirm, + input := &input{ + opts: opts, + model: textinput.New(), } + input.model.Prompt = opts.Text + " " + input.model.Placeholder = opts.Default + input.model.CharLimit = opts.CharLimit + input.model.EchoCharacter = opts.EchoCharacter + input.model.EchoMode = opts.EchoMode + input.model.Focus() - prompt.Stdin = io.NopCloser(cmd.InOrStdin()) - prompt.Stdout = readWriteCloser{ - Writer: cmd.OutOrStdout(), + program := tea.NewProgram(input, tea.WithInput(cmd.InOrStdin()), tea.WithOutput(cmd.OutOrStdout())) + err := program.Start() + if err != nil { + return "", err } - - // The prompt library displays defaults in a jarring way for the user - // by attempting to autocomplete it. This sets no default enabling us - // to customize the display. - defaultValue := prompt.Default - if !prompt.IsConfirm { - prompt.Default = "" + if input.canceled { + return "", Canceled } - - // Rewrite the confirm template to remove bold, and fit to the Coder style. - confirmEnd := fmt.Sprintf("[y/%s] ", Styles.Bold.Render("N")) - if prompt.Default == "y" { - confirmEnd = fmt.Sprintf("[%s/n] ", Styles.Bold.Render("Y")) + if opts.IsConfirm && !strings.EqualFold(input.model.Value(), "yes") { + return "", Canceled } - confirm := Styles.FocusedPrompt.String() + `{{ . }} ` + confirmEnd + return input.model.Value(), nil +} - // Customize to remove bold. - valid := Styles.FocusedPrompt.String() + "{{ . }} " - if defaultValue != "" { - valid += fmt.Sprintf("(%s) ", defaultValue) - } +type input struct { + opts PromptOptions + model textinput.Model + err string + canceled bool +} - success := valid - invalid := valid - if prompt.IsConfirm { - success = confirm - invalid = confirm - } +func (*input) Init() tea.Cmd { + return textinput.Blink +} - prompt.Templates = &promptui.PromptTemplates{ - Confirm: confirm, - Success: success, - Invalid: invalid, - Valid: valid, - ValidationError: defaultStyles.Error.Render("{{ . }}"), - } - oldValidate := prompt.Validate - if oldValidate != nil { - // Override the validate function to pass our default! - prompt.Validate = func(s string) error { - if s == "" { - s = defaultValue +func (i *input) Update(msg tea.Msg) (tea.Model, tea.Cmd) { + var cmd tea.Cmd + switch msg := msg.(type) { + case tea.KeyMsg: + switch msg.Type { + case tea.KeyEnter: + // Apply the default placeholder value. + if i.model.Value() == "" && i.model.Placeholder != "" { + i.model.SetValue(i.model.Placeholder) } - return oldValidate(s) + + // Validate the value. + if i.opts.Validate != nil { + err := i.opts.Validate(i.model.Value()) + if err != nil { + i.err = err.Error() + return i, nil + } + } + i.err = "" + i.model.SetCursorMode(textinput.CursorHide) + + return i, tea.Quit + case tea.KeyCtrlC, tea.KeyEsc: + i.canceled = true + i.model.SetCursorMode(textinput.CursorHide) + return i, tea.Quit } + + // We handle errors just like any other message + case error: + i.err = msg.Error() + return i, nil } - value, err := prompt.Run() - if value == "" && !prompt.IsConfirm { - value = defaultValue - } - if errors.Is(err, promptui.ErrInterrupt) || errors.Is(err, promptui.ErrAbort) { - return "", Canceled - } - return value, err + + i.model, cmd = i.model.Update(msg) + return i, cmd } -// readWriteCloser fakes reads, writes, and closing! -type readWriteCloser struct { - io.Reader - io.Writer - io.Closer +func (i *input) View() string { + prompt := Styles.FocusedPrompt + if i.model.CursorMode() == textinput.CursorHide { + prompt = Styles.Prompt + } + validate := "" + if i.err != "" { + validate = "\n" + defaultStyles.Error.Render("▲ "+i.err) + } + return prompt.String() + i.model.View() + "\n" + validate } diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go index bc445f330aa2b..340931de49dba 100644 --- a/cli/cliui/prompt_test.go +++ b/cli/cliui/prompt_test.go @@ -39,14 +39,14 @@ func TestPrompt(t *testing.T) { ch <- resp }() ptty.ExpectMatch("Example") - ptty.WriteLine("y") - require.Equal(t, "y", <-ch) + ptty.WriteLine("yes") + require.Equal(t, "yes", <-ch) }) } func prompt(ptty *ptytest.PTY, opts cliui.PromptOptions) (string, error) { cmd := &cobra.Command{} cmd.SetOutput(ptty.Output()) - cmd.SetIn(ptty.Input()) + cmd.SetIn(ptty.Input().Reader) return cliui.Prompt(cmd, opts) } diff --git a/cli/login.go b/cli/login.go index 0d98f755a7476..29f3a511b2b5a 100644 --- a/cli/login.go +++ b/cli/login.go @@ -10,6 +10,7 @@ import ( "runtime" "strings" + "github.com/charmbracelet/bubbles/textinput" "github.com/fatih/color" "github.com/go-playground/validator/v10" "github.com/pkg/browser" @@ -71,7 +72,7 @@ func login() *cobra.Command { _, err := cliui.Prompt(cmd, cliui.PromptOptions{ Text: "Would you like to create the first user?", - Default: "y", + Default: "yes", IsConfirm: true, }) if errors.Is(err, cliui.Canceled) { @@ -110,9 +111,10 @@ func login() *cobra.Command { } password, err := cliui.Prompt(cmd, cliui.PromptOptions{ - Text: "Enter a " + cliui.Styles.Field.Render("password") + ":", - Mask: '*', - Validate: cliui.ValidateNotEmpty, + Text: "Enter a " + cliui.Styles.Field.Render("password") + ":", + EchoMode: textinput.EchoPassword, + EchoCharacter: '*', + Validate: cliui.ValidateNotEmpty, }) if err != nil { return xerrors.Errorf("specify password prompt: %w", err) @@ -159,8 +161,9 @@ func login() *cobra.Command { } sessionToken, err := cliui.Prompt(cmd, cliui.PromptOptions{ - Text: "Paste your token here:", - Mask: '*', + Text: "Paste your token here:", + EchoMode: textinput.EchoPassword, + EchoCharacter: '*', Validate: func(token string) error { client.SessionToken = token _, err := client.User(cmd.Context(), "me") diff --git a/cli/login_test.go b/cli/login_test.go index 751cb544c3fae..b875f2c387c86 100644 --- a/cli/login_test.go +++ b/cli/login_test.go @@ -28,7 +28,7 @@ func TestLogin(t *testing.T) { // https://github.com/mattn/go-isatty/issues/59 root, _ := clitest.New(t, "login", client.URL.String(), "--force-tty") pty := ptytest.New(t) - root.SetIn(pty.Input()) + root.SetIn(pty.Input().Reader) root.SetOut(pty.Output()) go func() { err := root.Execute() @@ -36,7 +36,7 @@ func TestLogin(t *testing.T) { }() matches := []string{ - "first user?", "y", + "first user?", "yes", "username", "testuser", "email", "user@coder.com", "password", "password", @@ -57,7 +57,7 @@ func TestLogin(t *testing.T) { root, _ := clitest.New(t, "login", client.URL.String(), "--force-tty", "--no-open") pty := ptytest.New(t) - root.SetIn(pty.Input()) + root.SetIn(pty.Input().Reader) root.SetOut(pty.Output()) go func() { err := root.Execute() @@ -76,7 +76,7 @@ func TestLogin(t *testing.T) { root, _ := clitest.New(t, "login", client.URL.String(), "--force-tty", "--no-open") pty := ptytest.New(t) - root.SetIn(pty.Input()) + root.SetIn(pty.Input().Reader) root.SetOut(pty.Output()) go func() { err := root.Execute() diff --git a/cli/projectcreate.go b/cli/projectcreate.go index e89920402cc8d..7d9ea0cc1e51d 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -39,7 +39,7 @@ func projectCreate() *cobra.Command { return err } _, err = cliui.Prompt(cmd, cliui.PromptOptions{ - Default: "y", + Default: "yes", IsConfirm: true, Text: fmt.Sprintf("Set up %s in your organization?", color.New(color.FgHiCyan).Sprintf("%q", directory)), }) @@ -73,7 +73,7 @@ func projectCreate() *cobra.Command { _, err = cliui.Prompt(cmd, cliui.PromptOptions{ Text: "Create project?", IsConfirm: true, - Default: "y", + Default: "yes", }) if err != nil { if errors.Is(err, promptui.ErrAbort) { @@ -94,7 +94,7 @@ func projectCreate() *cobra.Command { _, err = cliui.Prompt(cmd, cliui.PromptOptions{ Text: "Create a new workspace?", IsConfirm: true, - Default: "y", + Default: "yes", }) if err != nil { if errors.Is(err, cliui.Canceled) { diff --git a/cli/projectcreate_test.go b/cli/projectcreate_test.go index ad9c010b107bf..c15d1416b2524 100644 --- a/cli/projectcreate_test.go +++ b/cli/projectcreate_test.go @@ -27,7 +27,7 @@ func TestProjectCreate(t *testing.T) { clitest.SetupConfig(t, client, root) _ = coderdtest.NewProvisionerDaemon(t, client) pty := ptytest.New(t) - cmd.SetIn(pty.Input()) + cmd.SetIn(pty.Input().Reader) cmd.SetOut(pty.Output()) closeChan := make(chan struct{}) go func() { @@ -37,9 +37,9 @@ func TestProjectCreate(t *testing.T) { }() matches := []string{ - "organization?", "y", + "organization?", "yes", "name?", "test-project", - "project?", "y", + "project?", "yes", "created!", "n", } for i := 0; i < len(matches); i += 2 { @@ -74,7 +74,7 @@ func TestProjectCreate(t *testing.T) { clitest.SetupConfig(t, client, root) coderdtest.NewProvisionerDaemon(t, client) pty := ptytest.New(t) - cmd.SetIn(pty.Input()) + cmd.SetIn(pty.Input().Reader) cmd.SetOut(pty.Output()) closeChan := make(chan struct{}) go func() { @@ -84,10 +84,10 @@ func TestProjectCreate(t *testing.T) { }() matches := []string{ - "organization?", "y", + "organization?", "yes", "name?", "test-project", "somevar", "value", - "project?", "y", + "project?", "yes", "created!", "n", } for i := 0; i < len(matches); i += 2 { diff --git a/cli/root.go b/cli/root.go index 5be14daade57a..3899758a2ac12 100644 --- a/cli/root.go +++ b/cli/root.go @@ -162,7 +162,7 @@ func prompt(cmd *cobra.Command, prompt *promptui.Prompt) (string, error) { // Rewrite the confirm template to remove bold, and fit to the Coder style. confirmEnd := fmt.Sprintf("[y/%s] ", color.New(color.Bold).Sprint("N")) - if prompt.Default == "y" { + if prompt.Default == "yes" { confirmEnd = fmt.Sprintf("[%s/n] ", color.New(color.Bold).Sprint("Y")) } confirm := color.HiBlackString("?") + ` {{ . }} ` + confirmEnd diff --git a/cli/workspacecreate.go b/cli/workspacecreate.go index 27df53329f951..5c8766d0fb6ec 100644 --- a/cli/workspacecreate.go +++ b/cli/workspacecreate.go @@ -84,7 +84,7 @@ func workspaceCreate() *cobra.Command { _, err = cliui.Prompt(cmd, cliui.PromptOptions{ Text: fmt.Sprintf("Create workspace %s?", color.HiCyanString(name)), - Default: "y", + Default: "yes", IsConfirm: true, }) if err != nil { diff --git a/cli/workspacecreate_test.go b/cli/workspacecreate_test.go index 6709da6aa057e..b700045a5ce67 100644 --- a/cli/workspacecreate_test.go +++ b/cli/workspacecreate_test.go @@ -38,7 +38,7 @@ func TestWorkspaceCreate(t *testing.T) { clitest.SetupConfig(t, client, root) pty := ptytest.New(t) - cmd.SetIn(pty.Input()) + cmd.SetIn(pty.Input().Reader) cmd.SetOut(pty.Output()) closeChan := make(chan struct{}) go func() { @@ -49,7 +49,7 @@ func TestWorkspaceCreate(t *testing.T) { matches := []string{ "name?", "workspace-name", - "Create workspace", "y", + "Create workspace", "yes", } for i := 0; i < len(matches); i += 2 { match := matches[i] diff --git a/cmd/cliui/main.go b/cmd/cliui/main.go index 576a6ca0290ea..287036c4e7390 100644 --- a/cmd/cliui/main.go +++ b/cmd/cliui/main.go @@ -37,7 +37,7 @@ func main() { } _, err = cliui.Prompt(cmd, cliui.PromptOptions{ Text: "Do you want to accept?", - Default: "y", + Default: "yes", IsConfirm: true, }) if errors.Is(err, cliui.Canceled) { diff --git a/pty/pty.go b/pty/pty.go index 0086bfba56c15..d2555fda4695c 100644 --- a/pty/pty.go +++ b/pty/pty.go @@ -14,7 +14,7 @@ type PTY interface { // uses the output stream for writing. // // The same stream could be read to validate output. - Output() io.ReadWriter + Output() ReadWriter // Input handles TTY input. // @@ -22,7 +22,7 @@ type PTY interface { // uses the PTY input for reading. // // The same stream would be used to provide user input: pty.Input().Write(...) - Input() io.ReadWriter + Input() ReadWriter // Resize sets the size of the PTY. Resize(cols uint16, rows uint16) error @@ -33,7 +33,10 @@ func New() (PTY, error) { return newPty() } -type readWriter struct { +// ReadWriter implements io.ReadWriter, but is intentionally avoids +// using the interface to allow for direct access to the reader or +// writer. This is to enable a caller to grab file descriptors. +type ReadWriter struct { io.Reader io.Writer } diff --git a/pty/pty_other.go b/pty/pty_other.go index c3933878456cb..2cd49b5974087 100644 --- a/pty/pty_other.go +++ b/pty/pty_other.go @@ -4,7 +4,6 @@ package pty import ( - "io" "os" "sync" @@ -28,15 +27,15 @@ type otherPty struct { pty, tty *os.File } -func (p *otherPty) Input() io.ReadWriter { - return readWriter{ +func (p *otherPty) Input() ReadWriter { + return ReadWriter{ Reader: p.tty, Writer: p.pty, } } -func (p *otherPty) Output() io.ReadWriter { - return readWriter{ +func (p *otherPty) Output() ReadWriter { + return ReadWriter{ Reader: p.pty, Writer: p.tty, } diff --git a/pty/pty_windows.go b/pty/pty_windows.go index fa6f1932a48c3..b57273bd72cd5 100644 --- a/pty/pty_windows.go +++ b/pty/pty_windows.go @@ -67,15 +67,15 @@ type ptyWindows struct { closed bool } -func (p *ptyWindows) Output() io.ReadWriter { - return readWriter{ +func (p *ptyWindows) Output() ReadWriter { + return ReadWriter{ Reader: p.outputRead, Writer: p.outputWrite, } } -func (p *ptyWindows) Input() io.ReadWriter { - return readWriter{ +func (p *ptyWindows) Input() ReadWriter { + return ReadWriter{ Reader: p.inputRead, Writer: p.inputWrite, } diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go index 60cd88ce606a2..f0256d1f0e285 100644 --- a/pty/ptytest/ptytest.go +++ b/pty/ptytest/ptytest.go @@ -3,7 +3,6 @@ package ptytest import ( "bufio" "bytes" - "fmt" "io" "os" "os/exec" @@ -11,6 +10,7 @@ import ( "runtime" "strings" "testing" + "time" "unicode/utf8" "github.com/stretchr/testify/require" @@ -61,6 +61,7 @@ func create(t *testing.T, ptty pty.PTY) *PTY { outputWriter: writer, runeReader: bufio.NewReaderSize(ptty.Output(), utf8.UTFMax), + runeWriter: bufio.NewWriterSize(ptty.Input(), utf8.UTFMax), } } @@ -70,6 +71,7 @@ type PTY struct { outputWriter io.Writer runeReader *bufio.Reader + runeWriter *bufio.Writer } func (p *PTY) ExpectMatch(str string) string { @@ -93,10 +95,16 @@ func (p *PTY) ExpectMatch(str string) string { } func (p *PTY) WriteLine(str string) { - newline := "\n" + _, err := p.Input().Write([]byte(str)) + require.NoError(p.t, err) + + // This is jank. Bubbletea requires line returns to be on + // a separate read, but this is an inherent race. + time.Sleep(5 * time.Millisecond) + newline := "\r" if runtime.GOOS == "windows" { newline = "\r\n" } - _, err := fmt.Fprintf(p.PTY.Input(), "%s%s", str, newline) + _, err = p.Input().Write([]byte(newline)) require.NoError(p.t, err) } From b23a58c8fe12398abc74963c4661ac4b9211feb6 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Fri, 11 Mar 2022 20:05:19 +0000 Subject: [PATCH 05/37] It works! --- .goreleaser.yml | 3 +- agent/agent.go | 3 +- cli/cliui/cliui.go | 14 +- cli/cliui/list.go | 111 ++++++++++++++ cli/cliui/prompt.go | 10 +- cli/cliui/prompt_test.go | 4 +- cli/daemon.go | 65 ++++++-- cli/login.go | 13 +- cli/projectcreate.go | 206 ++++++++++++++++++++++---- cli/root.go | 74 +-------- cli/ssh.go | 90 +++++++++++ cli/workspaceagent.go | 5 +- cmd/cliui/main.go | 19 ++- cmd/templater/main.go | 9 +- coderd/templates_test.go | 3 +- coderd/tunnel/tunnel.go | 2 + codersdk/organizations.go | 3 +- codersdk/parameters.go | 3 +- codersdk/projects.go | 3 +- codersdk/projectversions.go | 3 +- codersdk/workspacebuilds.go | 3 +- codersdk/workspaceresources.go | 7 +- codersdk/workspaces.go | 3 +- go.mod | 73 ++++----- go.sum | 158 +++++++++++++------- provisioner/terraform/serve.go | 17 ++- provisionersdk/archive_test.go | 3 +- pty/pty_windows.go | 1 - template/gcp-linux/gcp-linux.json | 4 +- template/gcp-linux/gcp-linux.md | 4 +- template/gcp-windows/gcp-windows.json | 4 +- template/gcp-windows/gcp-windows.md | 4 +- template/template.go | 13 +- template/template_slim.go | 16 ++ template/template_test.go | 6 +- 35 files changed, 714 insertions(+), 245 deletions(-) create mode 100644 cli/cliui/list.go create mode 100644 template/template_slim.go diff --git a/.goreleaser.yml b/.goreleaser.yml index bcb2f7ead8a98..b10f2e8675b4f 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,5 +1,6 @@ archives: - - builds: + - id: coder + builds: - coder files: - README.md diff --git a/agent/agent.go b/agent/agent.go index a121b2150947f..0ac2d267e9f0d 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -8,6 +8,7 @@ import ( "fmt" "io" "net" + "os" "os/exec" "os/user" "sync" @@ -197,7 +198,7 @@ func (*server) handleSSHSession(session ssh.Session) error { }() cmd := exec.CommandContext(session.Context(), command, args...) - cmd.Env = session.Environ() + cmd.Env = append(os.Environ(), session.Environ()...) sshPty, windowSize, isPty := session.Pty() if isPty { diff --git a/cli/cliui/cliui.go b/cli/cliui/cliui.go index 7828a23307edd..ac920564c8c3f 100644 --- a/cli/cliui/cliui.go +++ b/cli/cliui/cliui.go @@ -26,14 +26,24 @@ func ValidateNotEmpty(s string) error { // Styles compose visual elements of the UI! var Styles = struct { Bold, + Code, Field, + Keyword, + Paragraph, Prompt, FocusedPrompt, - Logo lipgloss.Style + Logo, + Wrap lipgloss.Style }{ Bold: lipgloss.NewStyle().Bold(true), - Field: defaultStyles.Code.Foreground(lipgloss.AdaptiveColor{Light: "#000000", Dark: "#FFFFFF"}), + Code: defaultStyles.Code, + Field: defaultStyles.Code.Copy().Foreground(lipgloss.AdaptiveColor{Light: "#000000", Dark: "#FFFFFF"}), + Keyword: defaultStyles.Keyword, + Paragraph: defaultStyles.Paragraph, Prompt: defaultStyles.Prompt.Foreground(lipgloss.AdaptiveColor{Light: "#9B9B9B", Dark: "#5C5C5C"}), FocusedPrompt: defaultStyles.FocusedPrompt.Foreground(lipgloss.Color("#651fff")), Logo: defaultStyles.Logo.SetString("Coder"), + Wrap: defaultStyles.Wrap, } + +// coder login diff --git a/cli/cliui/list.go b/cli/cliui/list.go new file mode 100644 index 0000000000000..c07c7af7d5fc7 --- /dev/null +++ b/cli/cliui/list.go @@ -0,0 +1,111 @@ +package cliui + +import ( + "github.com/charmbracelet/bubbles/key" + "github.com/charmbracelet/bubbles/list" + tea "github.com/charmbracelet/bubbletea" + "github.com/spf13/cobra" +) + +type ListItem struct { + ID string + Title string + Description string +} + +type ListOptions struct { + Title string + Items []ListItem +} + +func List(cmd *cobra.Command, opts ListOptions) (string, error) { + items := make([]list.Item, 0) + for _, item := range opts.Items { + items = append(items, teaItem{ + id: item.ID, + title: item.Title, + description: item.Description, + }) + } + model := list.New(items, list.NewDefaultDelegate(), 0, 0) + model.Title = "Select Template" + model.AdditionalShortHelpKeys = func() []key.Binding { + return []key.Binding{ + key.NewBinding(key.WithKeys("enter"), key.WithHelp("enter", "select")), + } + } + listModel := &listModel{ + opts: opts, + model: model, + } + program := tea.NewProgram(listModel, tea.WithInput(cmd.InOrStdin()), tea.WithOutput(cmd.OutOrStdout())) + err := program.Start() + if err != nil { + return "", err + } + if listModel.selected != nil { + for _, item := range opts.Items { + if item.ID == listModel.selected.id { + return item.ID, nil + } + } + } + + return "", Canceled +} + +// teaItem fulfills the "DefaultItem" interface which allows the title +// and description to display! +type teaItem struct { + id string + title string + description string +} + +func (l teaItem) FilterValue() string { return l.title + "\n" + l.description } +func (l teaItem) Title() string { return l.title } +func (l teaItem) Description() string { return l.description } + +type listModel struct { + opts ListOptions + model list.Model + err string + selected *teaItem +} + +func (m *listModel) Init() tea.Cmd { + return tea.EnterAltScreen +} + +func (m *listModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { + var cmds []tea.Cmd + + switch msg := msg.(type) { + case tea.WindowSizeMsg: + // topGap, rightGap, bottomGap, leftGap := appStyle.GetPadding() + m.model.SetSize(msg.Width, msg.Height) + + case tea.KeyMsg: + // Don't match any of the keys below if we're actively filtering. + if m.model.FilterState() == list.Filtering { + break + } + switch msg.Type { + case tea.KeyEnter: + item := m.model.SelectedItem().(teaItem) + m.selected = &item + return m, tea.Quit + } + } + + // This will also call our delegate's update function. + newListModel, cmd := m.model.Update(msg) + m.model = newListModel + cmds = append(cmds, cmd) + + return m, tea.Batch(cmds...) +} + +func (l *listModel) View() string { + return l.model.View() +} diff --git a/cli/cliui/prompt.go b/cli/cliui/prompt.go index 484ea770b2543..ee4685e3f3b17 100644 --- a/cli/cliui/prompt.go +++ b/cli/cliui/prompt.go @@ -19,7 +19,7 @@ type PromptOptions struct { } func Prompt(cmd *cobra.Command, opts PromptOptions) (string, error) { - input := &input{ + input := &inputModel{ opts: opts, model: textinput.New(), } @@ -44,18 +44,18 @@ func Prompt(cmd *cobra.Command, opts PromptOptions) (string, error) { return input.model.Value(), nil } -type input struct { +type inputModel struct { opts PromptOptions model textinput.Model err string canceled bool } -func (*input) Init() tea.Cmd { +func (*inputModel) Init() tea.Cmd { return textinput.Blink } -func (i *input) Update(msg tea.Msg) (tea.Model, tea.Cmd) { +func (i *inputModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { var cmd tea.Cmd switch msg := msg.(type) { case tea.KeyMsg: @@ -94,7 +94,7 @@ func (i *input) Update(msg tea.Msg) (tea.Model, tea.Cmd) { return i, cmd } -func (i *input) View() string { +func (i *inputModel) View() string { prompt := Styles.FocusedPrompt if i.model.CursorMode() == textinput.CursorHide { prompt = Styles.Prompt diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go index 340931de49dba..3cb48423ccc4d 100644 --- a/cli/cliui/prompt_test.go +++ b/cli/cliui/prompt_test.go @@ -13,8 +13,9 @@ import ( func TestPrompt(t *testing.T) { t.Parallel() t.Run("Success", func(t *testing.T) { + t.Parallel() ptty := ptytest.New(t) - ch := make(chan string, 0) + ch := make(chan string) go func() { resp, err := prompt(ptty, cliui.PromptOptions{ Text: "Example", @@ -28,6 +29,7 @@ func TestPrompt(t *testing.T) { }) t.Run("Confirm", func(t *testing.T) { + t.Parallel() ptty := ptytest.New(t) ch := make(chan string, 0) go func() { diff --git a/cli/daemon.go b/cli/daemon.go index 178c91820936d..417a4a2987357 100644 --- a/cli/daemon.go +++ b/cli/daemon.go @@ -2,6 +2,7 @@ package cli import ( "context" + "fmt" "io" "io/ioutil" "net" @@ -12,10 +13,14 @@ import ( "github.com/spf13/cobra" "golang.org/x/xerrors" + "google.golang.org/api/idtoken" + "google.golang.org/api/option" "cdr.dev/slog" "cdr.dev/slog/sloggers/sloghuman" + "github.com/coder/coder/cli/cliui" "github.com/coder/coder/coderd" + "github.com/coder/coder/coderd/tunnel" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/database/databasefake" @@ -28,29 +33,62 @@ import ( func daemon() *cobra.Command { var ( address string + dev bool ) root := &cobra.Command{ Use: "daemon", RunE: func(cmd *cobra.Command, args []string) error { logger := slog.Make(sloghuman.Sink(os.Stderr)) - accessURL := &url.URL{ - Scheme: "http", - Host: address, - } - handler, closeCoderd := coderd.New(&coderd.Options{ - AccessURL: accessURL, - Logger: logger, - Database: databasefake.New(), - Pubsub: database.NewPubsubInMemory(), - }) - listener, err := net.Listen("tcp", address) if err != nil { return xerrors.Errorf("listen %q: %w", address, err) } defer listener.Close() - client := codersdk.New(accessURL) + localURL := &url.URL{ + Scheme: "http", + Host: address, + } + accessURL := localURL + var tunnelErr <-chan error + if dev { + var accessURLRaw string + accessURLRaw, tunnelErr, err = tunnel.New(cmd.Context(), localURL.String()) + if err != nil { + return xerrors.Errorf("create tunnel: %w", err) + } + accessURL, err = url.Parse(accessURLRaw) + if err != nil { + return xerrors.Errorf("parse: %w", err) + } + + fmt.Fprintf(cmd.OutOrStdout(), ` ▄█▀ ▀█▄ + ▄▄ ▀▀▀ █▌ ██▀▀█▄ ▐█ + ▄▄██▀▀█▄▄▄ ██ ██ █▀▀█ ▐█▀▀██ ▄█▀▀█ █▀▀ +█▌ ▄▌ ▐█ █▌ ▀█▄▄▄█▌ █ █ ▐█ ██ ██▀▀ █ + ██████▀▄█ ▀▀▀▀ ▀▀▀▀ ▀▀▀▀▀ ▀▀▀▀ ▀ + +`+cliui.Styles.Paragraph.Render(cliui.Styles.Wrap.Render(cliui.Styles.Prompt.String()+`Started in `+ + cliui.Styles.Field.Render("dev")+` mode. All data is in-memory! Learn how to setup and manage a production Coder deployment here: `+cliui.Styles.Prompt.Render("https://coder.com/docs/TODO")))+ + ` +`+ + cliui.Styles.Paragraph.Render(cliui.Styles.Wrap.Render(cliui.Styles.FocusedPrompt.String()+`Run `+cliui.Styles.Code.Render("coder login "+localURL.String())+" in a new terminal to get started.\n"))+` +`) + } + + validator, err := idtoken.NewValidator(cmd.Context(), option.WithoutAuthentication()) + if err != nil { + return err + } + logger.Info(cmd.Context(), "opened tunnel", slog.F("url", accessURL.String())) + handler, closeCoderd := coderd.New(&coderd.Options{ + AccessURL: accessURL, + Logger: logger, + Database: databasefake.New(), + Pubsub: database.NewPubsubInMemory(), + GoogleTokenValidator: validator, + }) + client := codersdk.New(localURL) daemonClose, err := newProvisionerDaemon(cmd.Context(), client, logger) if err != nil { return xerrors.Errorf("create provisioner daemon: %w", err) @@ -67,6 +105,8 @@ func daemon() *cobra.Command { select { case <-cmd.Context().Done(): return cmd.Context().Err() + case err := <-tunnelErr: + return err case err := <-errCh: return err } @@ -77,6 +117,7 @@ func daemon() *cobra.Command { defaultAddress = "127.0.0.1:3000" } root.Flags().StringVarP(&address, "address", "a", defaultAddress, "The address to serve the API and dashboard.") + root.Flags().BoolVarP(&dev, "dev", "d", false, "Serve Coder in dev mode for tinkering.") return root } diff --git a/cli/login.go b/cli/login.go index 29f3a511b2b5a..4f1f8d401f2f7 100644 --- a/cli/login.go +++ b/cli/login.go @@ -11,7 +11,6 @@ import ( "strings" "github.com/charmbracelet/bubbles/textinput" - "github.com/fatih/color" "github.com/go-playground/validator/v10" "github.com/pkg/browser" "github.com/spf13/cobra" @@ -68,7 +67,7 @@ func login() *cobra.Command { if !isTTY(cmd) { return xerrors.New("the initial user cannot be created in non-interactive mode. use the API") } - _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s Your Coder deployment hasn't been set up!\n", caret) + _, _ = fmt.Fprintf(cmd.OutOrStdout(), caret+"Your Coder deployment hasn't been set up!\n") _, err := cliui.Prompt(cmd, cliui.PromptOptions{ Text: "Would you like to create the first user?", @@ -101,7 +100,7 @@ func login() *cobra.Command { Validate: func(s string) error { err := validator.New().Var(s, "email") if err != nil { - return xerrors.Errorf("That's not a valid email address!", s) + return xerrors.New("That's not a valid email address!") } return err }, @@ -148,7 +147,11 @@ func login() *cobra.Command { return xerrors.Errorf("write server url: %w", err) } - _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s Welcome to Coder, %s! You're authenticated.\n", caret, color.HiCyanString(username)) + _, _ = fmt.Fprintf(cmd.OutOrStdout(), + cliui.Styles.Paragraph.Render(fmt.Sprintf("Welcome to Coder, %s! You're authenticated.", cliui.Styles.Keyword.Render(username)))+"\n") + + _, _ = fmt.Fprintf(cmd.OutOrStdout(), + cliui.Styles.Paragraph.Render("Get started by creating a project: "+cliui.Styles.Code.Render("coder projects create"))+"\n") return nil } @@ -194,7 +197,7 @@ func login() *cobra.Command { return xerrors.Errorf("write server url: %w", err) } - _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s Welcome to Coder, %s! You're authenticated.\n", caret, color.HiCyanString(resp.Username)) + _, _ = fmt.Fprintf(cmd.OutOrStdout(), caret+"Welcome to Coder, %s! You're authenticated.\n", cliui.Styles.Keyword.Render(resp.Username)) return nil }, } diff --git a/cli/projectcreate.go b/cli/projectcreate.go index 7d9ea0cc1e51d..1dbf772988ed2 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -4,21 +4,24 @@ import ( "errors" "fmt" "os" - "path/filepath" "time" "github.com/briandowns/spinner" "github.com/fatih/color" - "github.com/google/uuid" "github.com/manifoldco/promptui" + "github.com/pion/webrtc/v3" "github.com/spf13/cobra" + "golang.org/x/crypto/ssh" + "golang.org/x/term" "golang.org/x/xerrors" + "github.com/coder/coder/agent" "github.com/coder/coder/cli/cliui" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" + "github.com/coder/coder/peer" + "github.com/coder/coder/peerbroker" "github.com/coder/coder/provisionerd" - "github.com/coder/coder/provisionersdk" ) func projectCreate() *cobra.Command { @@ -38,34 +41,44 @@ func projectCreate() *cobra.Command { if err != nil { return err } - _, err = cliui.Prompt(cmd, cliui.PromptOptions{ - Default: "yes", - IsConfirm: true, - Text: fmt.Sprintf("Set up %s in your organization?", color.New(color.FgHiCyan).Sprintf("%q", directory)), + + templates, err := client.Templates(cmd.Context()) + if err != nil { + return err + } + + items := make([]cliui.ListItem, 0) + for _, template := range templates { + items = append(items, cliui.ListItem{ + ID: template.ID, + Title: template.Name, + Description: template.Description, + }) + } + selectedItem, err := cliui.List(cmd, cliui.ListOptions{ + Title: "Select a Template", + Items: items, }) if err != nil { - if errors.Is(err, promptui.ErrAbort) { + if errors.Is(err, cliui.Canceled) { return nil } return err } + var selectedTemplate codersdk.Template + for _, template := range templates { + if template.ID == selectedItem { + selectedTemplate = template + break + } + } - name, err := cliui.Prompt(cmd, cliui.PromptOptions{ - Default: filepath.Base(directory), - Text: "What's your project's name?", - Validate: func(s string) error { - project, _ := client.ProjectByName(cmd.Context(), organization.ID, s) - if project.ID.String() != uuid.Nil.String() { - return xerrors.New("A project already exists with that name!") - } - return nil - }, - }) + archive, _, err := client.TemplateArchive(cmd.Context(), selectedTemplate.ID) if err != nil { return err } - job, err := validateProjectVersionSource(cmd, client, organization, database.ProvisionerType(provisioner), directory) + job, err := validateProjectVersionSource(cmd, client, organization, database.ProvisionerType(provisioner), archive) if err != nil { return err } @@ -83,7 +96,7 @@ func projectCreate() *cobra.Command { } project, err := client.CreateProject(cmd.Context(), organization.ID, codersdk.CreateProjectRequest{ - Name: name, + Name: selectedTemplate.ID, VersionID: job.ID, }) if err != nil { @@ -103,6 +116,147 @@ func projectCreate() *cobra.Command { return err } + workspace, err := client.CreateWorkspace(cmd.Context(), "", codersdk.CreateWorkspaceRequest{ + ProjectID: project.ID, + Name: selectedTemplate.ID, + }) + if err != nil { + return err + } + build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ + ProjectVersionID: job.ID, + Transition: database.WorkspaceTransitionStart, + }) + if err != nil { + return err + } + + spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) + spin.Writer = cmd.OutOrStdout() + spin.Suffix = " Building workspace..." + err = spin.Color("fgHiGreen") + if err != nil { + return err + } + spin.Start() + defer spin.Stop() + logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, time.Time{}) + if err != nil { + return err + } + logBuffer := make([]codersdk.ProvisionerJobLog, 0, 64) + for { + log, ok := <-logs + if !ok { + break + } + logBuffer = append(logBuffer, log) + } + build, err = client.WorkspaceBuild(cmd.Context(), build.ID) + if err != nil { + return err + } + if build.Job.Status != codersdk.ProvisionerJobSucceeded { + for _, log := range logBuffer { + _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s %s\n", color.HiGreenString("[tf]"), log.Output) + } + return xerrors.New(build.Job.Error) + } + resources, err := client.WorkspaceResourcesByBuild(cmd.Context(), build.ID) + if err != nil { + return err + } + var workspaceAgent *codersdk.WorkspaceAgent + for _, resource := range resources { + if resource.Agent != nil { + workspaceAgent = resource.Agent + break + } + } + if workspaceAgent == nil { + return xerrors.New("something went wrong.. no agent found") + } + spin.Suffix = " Waiting for agent to connect..." + ticker := time.NewTicker(time.Second) + for { + select { + case <-cmd.Context().Done(): + return nil + case <-ticker.C: + } + resource, err := client.WorkspaceResource(cmd.Context(), workspaceAgent.ResourceID) + if err != nil { + return err + } + if resource.Agent.UpdatedAt.IsZero() { + continue + } + break + } + spin.Stop() + _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s The %s workspace has been created!\n", caret, color.HiCyanString(project.Name)) + _, err = cliui.Prompt(cmd, cliui.PromptOptions{ + Text: "Would you like to SSH?", + IsConfirm: true, + Default: "yes", + }) + if err != nil { + if errors.Is(err, cliui.Canceled) { + return nil + } + return err + } + + dialed, err := client.DialWorkspaceAgent(cmd.Context(), workspaceAgent.ResourceID) + if err != nil { + return err + } + stream, err := dialed.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{}) + if err != nil { + return err + } + sshClient, err := agent.DialSSHClient(conn) + if err != nil { + return err + } + session, err := sshClient.NewSession() + if err != nil { + return err + } + state, err := term.MakeRaw(int(os.Stdin.Fd())) + if err != nil { + return err + } + defer func() { + _ = term.Restore(int(os.Stdin.Fd()), state) + }() + width, height, err := term.GetSize(int(os.Stdin.Fd())) + if err != nil { + return err + } + err = session.RequestPty("xterm-256color", height, width, ssh.TerminalModes{ + ssh.OCRNL: 1, + }) + if err != nil { + return err + } + session.Stdin = os.Stdin + session.Stdout = os.Stdout + session.Stderr = os.Stderr + err = session.Shell() + if err != nil { + return err + } + err = session.Wait() + if err != nil { + return err + } return nil }, } @@ -117,7 +271,7 @@ func projectCreate() *cobra.Command { return cmd } -func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, organization codersdk.Organization, provisioner database.ProvisionerType, directory string, parameters ...codersdk.CreateParameterRequest) (*codersdk.ProjectVersion, error) { +func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, organization codersdk.Organization, provisioner database.ProvisionerType, archive []byte, parameters ...codersdk.CreateParameterRequest) (*codersdk.ProjectVersion, error) { spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) spin.Writer = cmd.OutOrStdout() spin.Suffix = " Uploading current directory..." @@ -128,11 +282,7 @@ func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, o spin.Start() defer spin.Stop() - tarData, err := provisionersdk.Tar(directory) - if err != nil { - return nil, err - } - resp, err := client.Upload(cmd.Context(), codersdk.ContentTypeTar, tarData) + resp, err := client.Upload(cmd.Context(), codersdk.ContentTypeTar, archive) if err != nil { return nil, err } @@ -198,7 +348,7 @@ func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, o DestinationScheme: parameterSchema.DefaultDestinationScheme, }) } - return validateProjectVersionSource(cmd, client, organization, provisioner, directory, parameters...) + return validateProjectVersionSource(cmd, client, organization, provisioner, archive, parameters...) } if version.Job.Status != codersdk.ProvisionerJobSucceeded { diff --git a/cli/root.go b/cli/root.go index 3899758a2ac12..69ca4a50ae302 100644 --- a/cli/root.go +++ b/cli/root.go @@ -1,24 +1,22 @@ package cli import ( - "fmt" - "io" "net/url" "os" "strings" "github.com/fatih/color" "github.com/kirsle/configdir" - "github.com/manifoldco/promptui" "github.com/mattn/go-isatty" "github.com/spf13/cobra" + "github.com/coder/coder/cli/cliui" "github.com/coder/coder/cli/config" "github.com/coder/coder/codersdk" ) var ( - caret = color.HiBlackString(">") + caret = cliui.Styles.Prompt.String() ) const ( @@ -68,8 +66,9 @@ func Root() *cobra.Command { cmd.AddCommand(projects()) cmd.AddCommand(workspaces()) cmd.AddCommand(users()) + cmd.AddCommand(workspaceSSH()) - cmd.PersistentFlags().String(varGlobalConfig, configdir.LocalConfig("coder"), "Path to the global `coder` config directory") + cmd.PersistentFlags().String(varGlobalConfig, configdir.LocalConfig("coderv2"), "Path to the global `coder` config directory") cmd.PersistentFlags().Bool(varForceTty, false, "Force the `coder` command to run as if connected to a TTY") err := cmd.PersistentFlags().MarkHidden(varForceTty) if err != nil { @@ -145,68 +144,3 @@ func isTTY(cmd *cobra.Command) bool { } return isatty.IsTerminal(file.Fd()) } - -func prompt(cmd *cobra.Command, prompt *promptui.Prompt) (string, error) { - prompt.Stdin = io.NopCloser(cmd.InOrStdin()) - prompt.Stdout = readWriteCloser{ - Writer: cmd.OutOrStdout(), - } - - // The prompt library displays defaults in a jarring way for the user - // by attempting to autocomplete it. This sets no default enabling us - // to customize the display. - defaultValue := prompt.Default - if !prompt.IsConfirm { - prompt.Default = "" - } - - // Rewrite the confirm template to remove bold, and fit to the Coder style. - confirmEnd := fmt.Sprintf("[y/%s] ", color.New(color.Bold).Sprint("N")) - if prompt.Default == "yes" { - confirmEnd = fmt.Sprintf("[%s/n] ", color.New(color.Bold).Sprint("Y")) - } - confirm := color.HiBlackString("?") + ` {{ . }} ` + confirmEnd - - // Customize to remove bold. - valid := color.HiBlackString("?") + " {{ . }} " - if defaultValue != "" { - valid += fmt.Sprintf("(%s) ", defaultValue) - } - - success := valid - invalid := valid - if prompt.IsConfirm { - success = confirm - invalid = confirm - } - - prompt.Templates = &promptui.PromptTemplates{ - Confirm: confirm, - Success: success, - Invalid: invalid, - Valid: valid, - } - oldValidate := prompt.Validate - if oldValidate != nil { - // Override the validate function to pass our default! - prompt.Validate = func(s string) error { - if s == "" { - s = defaultValue - } - return oldValidate(s) - } - } - value, err := prompt.Run() - if value == "" && !prompt.IsConfirm { - value = defaultValue - } - - return value, err -} - -// readWriteCloser fakes reads, writes, and closing! -type readWriteCloser struct { - io.Reader - io.Writer - io.Closer -} diff --git a/cli/ssh.go b/cli/ssh.go index 7f1e458cd3abe..001e90b8c0a31 100644 --- a/cli/ssh.go +++ b/cli/ssh.go @@ -1 +1,91 @@ package cli + +import ( + "fmt" + "os" + + "github.com/pion/webrtc/v3" + "github.com/spf13/cobra" + "golang.org/x/crypto/ssh" + "golang.org/x/crypto/ssh/terminal" + + "github.com/coder/coder/agent" + "github.com/coder/coder/peer" + "github.com/coder/coder/peerbroker" +) + +func workspaceSSH() *cobra.Command { + return &cobra.Command{ + Use: "ssh", + RunE: func(cmd *cobra.Command, args []string) error { + client, err := createClient(cmd) + if err != nil { + return err + } + + workspace, err := client.WorkspaceByName(cmd.Context(), "", args[0]) + if err != nil { + return err + } + build, err := client.WorkspaceBuildLatest(cmd.Context(), workspace.ID) + if err != nil { + return err + } + resources, err := client.WorkspaceResourcesByBuild(cmd.Context(), build.ID) + if err != nil { + return err + } + for _, resource := range resources { + fmt.Printf("Got resource: %+v\n", resource) + if resource.Agent == nil { + continue + } + + dialed, err := client.DialWorkspaceAgent(cmd.Context(), resource.ID) + if err != nil { + return err + } + stream, err := dialed.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{}) + if err != nil { + return err + } + client, err := agent.DialSSHClient(conn) + if err != nil { + return err + } + + session, err := client.NewSession() + if err != nil { + return err + } + // Set raw + terminal.MakeRaw(int(os.Stdin.Fd())) + err = session.RequestPty("xterm-256color", 128, 128, ssh.TerminalModes{ + ssh.OCRNL: 1, + }) + if err != nil { + return err + } + session.Stdin = os.Stdin + session.Stdout = os.Stdout + session.Stderr = os.Stderr + err = session.Shell() + if err != nil { + return err + } + err = session.Wait() + if err != nil { + return err + } + } + + return nil + }, + } +} diff --git a/cli/workspaceagent.go b/cli/workspaceagent.go index a5004f672dfd4..64ee0c90225cb 100644 --- a/cli/workspaceagent.go +++ b/cli/workspaceagent.go @@ -4,11 +4,12 @@ import ( "net/url" "os" - "cdr.dev/slog" - "cdr.dev/slog/sloggers/sloghuman" "github.com/spf13/cobra" "golang.org/x/xerrors" + "cdr.dev/slog" + "cdr.dev/slog/sloggers/sloghuman" + "github.com/coder/coder/agent" "github.com/coder/coder/codersdk" "github.com/coder/coder/peer" diff --git a/cmd/cliui/main.go b/cmd/cliui/main.go index 287036c4e7390..3fc31668eaf3b 100644 --- a/cmd/cliui/main.go +++ b/cmd/cliui/main.go @@ -6,8 +6,9 @@ import ( "os" "strings" - "github.com/coder/coder/cli/cliui" "github.com/spf13/cobra" + + "github.com/coder/coder/cli/cliui" ) func main() { @@ -16,6 +17,22 @@ func main() { Short: "Used for visually testing UI components for the CLI.", } + root.AddCommand(&cobra.Command{ + Use: "list", + RunE: func(cmd *cobra.Command, args []string) error { + cliui.List(cmd, cliui.ListOptions{ + Items: []cliui.ListItem{{ + Title: "Example", + Description: "Something...", + }, { + Title: "Wow, here's another!", + Description: "Another exciting description!", + }}, + }) + return nil + }, + }) + root.AddCommand(&cobra.Command{ Use: "prompt", RunE: func(cmd *cobra.Command, args []string) error { diff --git a/cmd/templater/main.go b/cmd/templater/main.go index a9959b7b90a19..661910573df98 100644 --- a/cmd/templater/main.go +++ b/cmd/templater/main.go @@ -15,6 +15,11 @@ import ( "strings" "time" + "github.com/google/uuid" + "github.com/spf13/cobra" + "golang.org/x/xerrors" + "google.golang.org/api/idtoken" + "cdr.dev/slog" "cdr.dev/slog/sloggers/sloghuman" "github.com/coder/coder/coderd" @@ -26,10 +31,6 @@ import ( "github.com/coder/coder/provisionerd" "github.com/coder/coder/provisionersdk" "github.com/coder/coder/provisionersdk/proto" - "github.com/google/uuid" - "github.com/spf13/cobra" - "golang.org/x/xerrors" - "google.golang.org/api/idtoken" "github.com/gohugoio/hugo/parser/pageparser" ) diff --git a/coderd/templates_test.go b/coderd/templates_test.go index b0da17807021c..36936e241cdbc 100644 --- a/coderd/templates_test.go +++ b/coderd/templates_test.go @@ -4,8 +4,9 @@ import ( "context" "testing" - "github.com/coder/coder/coderd/coderdtest" "github.com/stretchr/testify/require" + + "github.com/coder/coder/coderd/coderdtest" ) func TestListTemplates(t *testing.T) { diff --git a/coderd/tunnel/tunnel.go b/coderd/tunnel/tunnel.go index 0dc445b4ce300..3408de9738ad3 100644 --- a/coderd/tunnel/tunnel.go +++ b/coderd/tunnel/tunnel.go @@ -26,6 +26,8 @@ import ( // Upstream connection occurs async through Cloudflare, so the error channel // will only be executed if the tunnel has failed after numerous attempts. func New(ctx context.Context, url string) (string, <-chan error, error) { + _ = os.Setenv("QUIC_GO_DISABLE_RECEIVE_BUFFER_WARNING", "true") + httpTimeout := time.Second * 30 client := http.Client{ Transport: &http.Transport{ diff --git a/codersdk/organizations.go b/codersdk/organizations.go index 1e1f9e5df4fdc..ac3e0baed1de0 100644 --- a/codersdk/organizations.go +++ b/codersdk/organizations.go @@ -7,8 +7,9 @@ import ( "net/http" "time" - "github.com/coder/coder/database" "github.com/google/uuid" + + "github.com/coder/coder/database" ) // Organization is the JSON representation of a Coder organization. diff --git a/codersdk/parameters.go b/codersdk/parameters.go index 99cf7f530b445..185e2917aec57 100644 --- a/codersdk/parameters.go +++ b/codersdk/parameters.go @@ -7,8 +7,9 @@ import ( "net/http" "time" - "github.com/coder/coder/database" "github.com/google/uuid" + + "github.com/coder/coder/database" ) type ParameterScope string diff --git a/codersdk/projects.go b/codersdk/projects.go index 606b387bcf668..223ff22b97f4c 100644 --- a/codersdk/projects.go +++ b/codersdk/projects.go @@ -7,8 +7,9 @@ import ( "net/http" "time" - "github.com/coder/coder/database" "github.com/google/uuid" + + "github.com/coder/coder/database" ) // Project is the JSON representation of a Coder project. diff --git a/codersdk/projectversions.go b/codersdk/projectversions.go index c1d96a9c31b6a..72e7c47f69a8d 100644 --- a/codersdk/projectversions.go +++ b/codersdk/projectversions.go @@ -7,9 +7,10 @@ import ( "net/http" "time" + "github.com/google/uuid" + "github.com/coder/coder/coderd/parameter" "github.com/coder/coder/database" - "github.com/google/uuid" ) // ProjectVersion represents a single version of a project. diff --git a/codersdk/workspacebuilds.go b/codersdk/workspacebuilds.go index 7c153f339fa50..b432244692764 100644 --- a/codersdk/workspacebuilds.go +++ b/codersdk/workspacebuilds.go @@ -7,8 +7,9 @@ import ( "net/http" "time" - "github.com/coder/coder/database" "github.com/google/uuid" + + "github.com/coder/coder/database" ) // WorkspaceBuild is an at-point representation of a workspace state. diff --git a/codersdk/workspaceresources.go b/codersdk/workspaceresources.go index 0cdb0dcc799fa..f4b13b40adc1f 100644 --- a/codersdk/workspaceresources.go +++ b/codersdk/workspaceresources.go @@ -11,6 +11,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/yamux" + "github.com/pion/webrtc/v3" "golang.org/x/xerrors" "nhooyr.io/websocket" @@ -147,5 +148,9 @@ func (c *Client) ListenWorkspaceAgent(ctx context.Context, opts *peer.ConnOption if err != nil { return nil, xerrors.Errorf("multiplex client: %w", err) } - return peerbroker.Listen(session, nil, opts) + return peerbroker.Listen(session, func(ctx context.Context) ([]webrtc.ICEServer, error) { + return []webrtc.ICEServer{{ + URLs: []string{"stun:stun.l.google.com:19302"}, + }}, nil + }, opts) } diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go index 234aeb6174470..2c7013674c3d9 100644 --- a/codersdk/workspaces.go +++ b/codersdk/workspaces.go @@ -6,8 +6,9 @@ import ( "fmt" "net/http" - "github.com/coder/coder/database" "github.com/google/uuid" + + "github.com/coder/coder/database" ) // Workspace is a per-user deployment of a project. It tracks diff --git a/go.mod b/go.mod index cbca3e44e9332..2485d19d978f5 100644 --- a/go.mod +++ b/go.mod @@ -19,12 +19,10 @@ replace go.opencensus.io => github.com/kylecarbs/opencensus-go v0.23.1-0.2022030 // These are to allow embedding the cloudflared quick-tunnel CLI. // Required until https://github.com/cloudflare/cloudflared/pull/597 is merged. -replace github.com/cloudflare/cloudflared => github.com/kylecarbs/cloudflared v0.0.0-20220309211552-7f1fc77731ce +replace github.com/cloudflare/cloudflared => github.com/kylecarbs/cloudflared v0.0.0-20220311054120-ea109c6bf7be replace github.com/urfave/cli/v2 => github.com/ipostelnik/cli/v2 v2.3.1-0.20210324024421-b6ea8234fe3d -replace github.com/lucas-clemente/quic-go => github.com/chungthuang/quic-go v0.24.1-0.20220110095058-981dc498cb62 - replace github.com/rivo/tview => github.com/kylecarbs/tview v0.0.0-20220309202238-8464256e10a1 require ( @@ -42,12 +40,13 @@ require ( github.com/gliderlabs/ssh v0.3.3 github.com/go-chi/chi/v5 v5.0.7 github.com/go-chi/render v1.0.1 - github.com/go-playground/validator/v10 v10.10.0 - github.com/gohugoio/hugo v0.93.3 + github.com/go-playground/validator/v10 v10.10.1 + github.com/gohugoio/hugo v0.94.0 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang-migrate/migrate/v4 v4.15.1 github.com/google/uuid v1.3.0 github.com/hashicorp/go-version v1.4.0 + github.com/hashicorp/hc-install v0.3.1 github.com/hashicorp/terraform-config-inspect v0.0.0-20211115214459-90acf1ca460f github.com/hashicorp/terraform-exec v0.15.0 github.com/hashicorp/terraform-json v0.13.0 @@ -58,7 +57,7 @@ require ( github.com/manifoldco/promptui v0.9.0 github.com/mattn/go-isatty v0.0.14 github.com/mitchellh/mapstructure v1.4.3 - github.com/moby/moby v20.10.12+incompatible + github.com/moby/moby v20.10.13+incompatible github.com/ory/dockertest/v3 v3.8.1 github.com/pion/datachannel v1.5.2 github.com/pion/logging v0.2.2 @@ -67,8 +66,8 @@ require ( github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 github.com/pkg/errors v0.9.1 github.com/quasilyte/go-ruleguard/dsl v0.3.17 - github.com/rs/zerolog v1.20.0 - github.com/spf13/cobra v1.3.0 + github.com/rs/zerolog v1.26.1 + github.com/spf13/cobra v1.4.0 github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942 github.com/tabbed/pqtype v0.1.1 github.com/unrolled/secure v1.10.0 @@ -76,11 +75,11 @@ require ( github.com/xlab/treeprint v1.1.0 go.uber.org/atomic v1.9.0 go.uber.org/goleak v1.1.12 - golang.org/x/crypto v0.0.0-20220214200702-86341886e292 - golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 - golang.org/x/sys v0.0.0-20220209214540-3681064d5158 + golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70 + golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a + golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 - google.golang.org/api v0.70.0 + google.golang.org/api v0.71.0 google.golang.org/protobuf v1.27.1 nhooyr.io/websocket v1.8.7 storj.io/drpc v0.0.29 @@ -88,7 +87,7 @@ require ( require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect - github.com/BurntSushi/toml v0.3.1 // indirect + github.com/BurntSushi/toml v1.0.0 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect github.com/agext/levenshtein v1.2.3 // indirect @@ -99,25 +98,25 @@ require ( github.com/atotto/clipboard v0.1.4 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.1.2 // indirect - github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894 // indirect + github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/cheekybits/genny v1.0.0 // indirect github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect github.com/clbanning/mxj/v2 v2.5.5 // indirect github.com/cloudflare/brotli-go v0.0.0-20191101163834-d34379f7ff93 // indirect - github.com/cloudflare/golibs v0.0.0-20170913112048-333127dbecfc // indirect + github.com/cloudflare/golibs v0.0.0-20210909181612-21743d7dd02a // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/continuity v0.2.2 // indirect github.com/coredns/caddy v1.1.1 // indirect - github.com/coredns/coredns v1.8.7 // indirect + github.com/coredns/coredns v1.9.0 // indirect github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dhui/dktest v0.3.9 // indirect github.com/dlclark/regexp2 v1.4.0 // indirect - github.com/docker/cli v20.10.12+incompatible // indirect + github.com/docker/cli v20.10.13+incompatible // indirect github.com/docker/distribution v2.8.0+incompatible // indirect - github.com/docker/docker v20.10.12+incompatible // indirect + github.com/docker/docker v20.10.13+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.4.0 // indirect github.com/facebookgo/grace v0.0.0-20180706040059-75cf19382434 // indirect @@ -125,15 +124,15 @@ require ( github.com/francoispqt/gojay v1.2.13 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect github.com/gdamore/encoding v1.0.0 // indirect - github.com/gdamore/tcell v1.3.0 // indirect - github.com/getsentry/raven-go v0.0.0-20180517221441-ed7bcb39ff10 // indirect + github.com/gdamore/tcell v1.4.0 // indirect + github.com/getsentry/raven-go v0.2.0 // indirect github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect github.com/gobwas/glob v0.2.3 // indirect - github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58 // indirect + github.com/gobwas/httphead v0.1.0 // indirect github.com/gobwas/pool v0.2.1 // indirect - github.com/gobwas/ws v1.0.4 // indirect + github.com/gobwas/ws v1.1.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -144,6 +143,7 @@ require ( github.com/gorilla/websocket v1.5.0 // indirect github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/hcl/v2 v2.11.1 // indirect @@ -151,9 +151,9 @@ require ( github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/juju/ansiterm v0.0.0-20210929141451-8b71cc96ebdc // indirect - github.com/klauspost/compress v1.14.3 // indirect + github.com/klauspost/compress v1.15.0 // indirect github.com/leodido/go-urn v1.2.1 // indirect - github.com/lucas-clemente/quic-go v0.24.0 // indirect + github.com/lucas-clemente/quic-go v0.25.1-0.20220307142123-ad1cb27c1b64 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/lunixbochs/vtclean v1.0.0 // indirect github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect @@ -162,16 +162,16 @@ require ( github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect - github.com/miekg/dns v1.1.45 // indirect + github.com/miekg/dns v1.1.46 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect + github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 // indirect github.com/muesli/reflow v0.3.0 // indirect github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739 // indirect - github.com/niklasfasching/go-org v1.6.0 // indirect + github.com/niklasfasching/go-org v1.6.2 // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/onsi/ginkgo v1.16.5 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect @@ -180,8 +180,8 @@ require ( github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pelletier/go-toml/v2 v2.0.0-beta.6 // indirect github.com/pion/dtls/v2 v2.1.3 // indirect - github.com/pion/ice/v2 v2.2.1 // indirect - github.com/pion/interceptor v0.1.7 // indirect + github.com/pion/ice/v2 v2.2.2 // indirect + github.com/pion/interceptor v0.1.9 // indirect github.com/pion/mdns v0.0.5 // indirect github.com/pion/randutil v0.1.0 // indirect github.com/pion/rtcp v1.2.9 // indirect @@ -193,14 +193,15 @@ require ( github.com/pion/turn/v2 v2.0.8 // indirect github.com/pion/udp v0.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect - github.com/prometheus/client_golang v1.11.0 // indirect + github.com/pquerna/cachecontrol v0.1.0 // indirect + github.com/prometheus/client_golang v1.12.1 // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.32.1 // indirect - github.com/prometheus/procfs v0.6.0 // indirect + github.com/prometheus/procfs v0.7.3 // indirect github.com/rivo/tview v0.0.0-20200712113419-c65badfc3d92 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/sahilm/fuzzy v0.1.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/afero v1.8.1 // indirect github.com/spf13/cast v1.4.1 // indirect @@ -213,19 +214,19 @@ require ( github.com/zeebo/errs v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect golang.org/x/mod v0.5.1 // indirect - golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect + golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/tools v0.1.9 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf // indirect - google.golang.org/grpc v1.44.0 // indirect + google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 // indirect + google.golang.org/grpc v1.45.0 // indirect gopkg.in/coreos/go-oidc.v2 v2.2.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect - zombiezen.com/go/capnproto2 v2.18.0+incompatible // indirect + zombiezen.com/go/capnproto2 v2.18.2+incompatible // indirect ) diff --git a/go.sum b/go.sum index d04f771880e21..2ed797c832a6b 100644 --- a/go.sum +++ b/go.sum @@ -86,6 +86,7 @@ github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v61.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v61.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-service-bus-go v0.10.1/go.mod h1:E/FOceuKAFUfpbIJDKWz/May6guE+eGibfGT6q+n1to= github.com/Azure/azure-storage-blob-go v0.9.0/go.mod h1:8UBPbiOhrMQ4pLPi3gA1tXnpjrS76UYE/fo5A40vf4g= github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck= @@ -102,6 +103,7 @@ github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKn github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= github.com/Azure/go-autorest/autorest v0.11.19/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= github.com/Azure/go-autorest/autorest v0.11.23/go.mod h1:BAWYUWGPEtKPzjVkp0Q6an0MJcJDsoh5Z1BFAEFs4Xs= +github.com/Azure/go-autorest/autorest v0.11.24/go.mod h1:G6kyRlFnTuSbEYkQGawPfsCswgme4iYf6rfSKUDzbCc= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= @@ -113,8 +115,10 @@ github.com/Azure/go-autorest/autorest/adal v0.9.14/go.mod h1:W/MM4U6nLxnIskrw4Uw github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod h1:90gmfKdlmKgfjUpnCEpOJzsUEjrWDSLwHIG73tSXddM= github.com/Azure/go-autorest/autorest/azure/auth v0.5.10/go.mod h1:zQXYYNX9kXzRMrJNVXWUfNy38oPMF5/2TeZ4Wylc9fE= +github.com/Azure/go-autorest/autorest/azure/auth v0.5.11/go.mod h1:84w/uV8E37feW2NCJ08uT9VBfjfUHpgLVnG2InYD6cg= github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod h1:ZG5p860J94/0kI9mNJVoIoLgXcirM2gF5i2kWloofxw= github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod h1:7qkJkT+j6b+hIpzMOwPChJhTqS8VbsqqgULzMNRugoM= +github.com/Azure/go-autorest/autorest/azure/cli v0.4.5/go.mod h1:ADQAXrkgm7acgWVUNamOgh8YNrv4p27l3Wc55oVfpzg= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= @@ -132,13 +136,17 @@ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= +github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.0.0-20211129110424-6491aa3bf583/go.mod h1:EP9f4GqaDJyP1F5jTNMtzdIpw3JpNs3rMSJOnYywCiw= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v4.4.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/DataDog/datadog-go v4.8.2+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/DataDog/datadog-go/v5 v5.0.2/go.mod h1:ZI9JFB4ewXbw1sBnF4sxsR2k1H3xjV+PUAOUsHvKpcU= github.com/DataDog/gostackparse v0.5.0/go.mod h1:lTfqcJKqS9KnXQGnyQMCugq3u1FP6UZMfWR0aitKFMM= github.com/DataDog/sketches-go v1.0.0/go.mod h1:O+XkJHWk9w4hDwY2ZUDU31ZC9sNYlYo8DiFsxjYeo1k= github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= @@ -187,7 +195,6 @@ github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7l github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI= -github.com/alecthomas/chroma v0.8.2/go.mod h1:sko8vR34/90zvl5QdcUdvzL3J8NKjAUx9va9jPuFNoM= github.com/alecthomas/chroma v0.9.1/go.mod h1:eMuEnpA18XbG/WhOWtCzJHS7WqEtDAI+HxdwoW0nVSk= github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek= github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s= @@ -231,6 +238,7 @@ github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.19.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.31.13/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.42.30/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= +github.com/aws/aws-sdk-go v1.42.47/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= github.com/aws/aws-sdk-go v1.43.5/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go-v2 v1.8.0/go.mod h1:xEFuWz+3TYdlPRuo+CqATbeDWIWyaT5uAPwPaWtgse0= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= @@ -298,8 +306,9 @@ github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInq github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894 h1:JLaf/iINcLyjwbtTsCJjc6rtlASgHeIJPrB6QmwURnA= github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d h1:S2NE3iHSwP0XV47EEXL8mWmRdEfGscSJ+7EgePNgt0s= +github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -319,15 +328,12 @@ github.com/charmbracelet/lipgloss v0.4.0/go.mod h1:vmdkHvce7UzX6xkyf4cca8WlwdQ5R github.com/charmbracelet/lipgloss v0.5.0 h1:lulQHuVeodSgDez+3rGiuxlPVXSnhth442DATR2/8t8= github.com/charmbracelet/lipgloss v0.5.0/go.mod h1:EZLha/HbzEt7cYqdFPovlqy5FZPj0xFhg5SaqxScmgs= github.com/charmbracelet/wish v0.2.1/go.mod h1:ja7i62v6EfVOHH70wlUbLuU0kC7KS2TwgatxkFx4I28= -github.com/chaseadamsio/goorgeous v2.0.0+incompatible/go.mod h1:6QaC0vFoKWYDth94dHFNgRT2YkT5FHdQp/Yx15aAAi0= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= -github.com/chungthuang/quic-go v0.24.1-0.20220110095058-981dc498cb62 h1:PLTB4iA6sOgAItzQY642tYdcGKfG/7i2gu93JQGgUcM= -github.com/chungthuang/quic-go v0.24.1-0.20220110095058-981dc498cb62/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg= github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= @@ -346,8 +352,9 @@ github.com/cli/safeexec v1.0.0/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/brotli-go v0.0.0-20191101163834-d34379f7ff93 h1:QrGfkZDnMxcWHaYDdB7CmqS9i26OAnUj/xcus/abYkY= github.com/cloudflare/brotli-go v0.0.0-20191101163834-d34379f7ff93/go.mod h1:QiTe66jFdP7cUKMCCf/WrvDyYdtdmdZfVcdoLbzaKVY= -github.com/cloudflare/golibs v0.0.0-20170913112048-333127dbecfc h1:Dvk3ySBsOm5EviLx6VCyILnafPcQinXGP5jbTdHUJgE= github.com/cloudflare/golibs v0.0.0-20170913112048-333127dbecfc/go.mod h1:HlgKKR8V5a1wroIDDIz3/A+T+9Janfq+7n1P5sEFdi0= +github.com/cloudflare/golibs v0.0.0-20210909181612-21743d7dd02a h1:v+0H/eaA84deS6fymIq7Z0ASwfL21Z5FRdZsW+DhMGc= +github.com/cloudflare/golibs v0.0.0-20210909181612-21743d7dd02a/go.mod h1:HlgKKR8V5a1wroIDDIz3/A+T+9Janfq+7n1P5sEFdi0= github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -457,8 +464,9 @@ github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgU github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0= github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= -github.com/coredns/coredns v1.8.7 h1:wVMjAnyFnY7Mc18AFO+9qbGD6ODPtdVUIlzoWrHr3hk= github.com/coredns/coredns v1.8.7/go.mod h1:bFmbgEfeRz5aizL2VsQ5LRlsvJuXWkgG/MWG9zxqjVM= +github.com/coredns/coredns v1.9.0 h1:M1EF1uups4CYcQGb1z8A97mfoq4BYCw3+xCYcJkOSDc= +github.com/coredns/coredns v1.9.0/go.mod h1:czzy6Ofs15Mzn1PXpWoplBCZxoWdGoQUInL9uPSiYME= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= @@ -508,6 +516,7 @@ github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8l github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= github.com/dgraph-io/badger/v3 v3.2011.1/go.mod h1:0rLLrQpKVQAL0or/lBLMQznhr6dWWX7h5AKnmnqx268= github.com/dgraph-io/ristretto v0.0.4-0.20210122082011-bb5d392ed82d/go.mod h1:tv2ec8nA7vRpSYX7/MbP52ihrUMXIHit54CQMq8npXQ= +github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= @@ -519,14 +528,13 @@ github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQ github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI= github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE= -github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E= github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnstap/golang-dnstap v0.4.0/go.mod h1:FqsSdH58NAmkAvKcpyxht7i4FoBjKu8E4JUPt8ipSUs= github.com/docker/cli v20.10.11+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v20.10.12+incompatible h1:lZlz0uzG+GH+c0plStMUdF/qk3ppmgnswpR5EbqzVGA= -github.com/docker/cli v20.10.12+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v20.10.13+incompatible h1:o/STAn7e+b/pQ6keReGRoewVmAgXUkZAMQ8st4vHdKg= +github.com/docker/cli v20.10.13+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= @@ -534,8 +542,9 @@ github.com/docker/distribution v2.8.0+incompatible h1:l9EaZDICImO1ngI+uTifW+ZYvv github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.12+incompatible h1:CEeNmFM0QZIsJCZKMkZx0ZcahTiewkrgiwfYD+dfl1U= github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.13+incompatible h1:5s7uxnKZG+b8hYWlPYUi6x1Sjpq2MSt96d15eLZeHyw= +github.com/docker/docker v20.10.13+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= @@ -573,7 +582,7 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanw/esbuild v0.14.23/go.mod h1:GG+zjdi59yh3ehDn4ZWfPcATxjPDUH53iU4ZJbp7dkY= +github.com/evanw/esbuild v0.14.25/go.mod h1:GG+zjdi59yh3ehDn4ZWfPcATxjPDUH53iU4ZJbp7dkY= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 h1:wWke/RUCl7VRjQhwPlR/v0glZXNYzBHdNUzf/Am2Nmg= @@ -618,12 +627,14 @@ github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmx github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= -github.com/gdamore/tcell v1.3.0 h1:r35w0JBADPZCVQijYebl6YMWWtHRqVEGt7kL2eBADRM= github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM= +github.com/gdamore/tcell v1.4.0 h1:vUnHwJRvcPQa3tzi+0QI4U9JINXYJlOz9yiaiPQ2wMU= +github.com/gdamore/tcell v1.4.0/go.mod h1:vxEiSDZdW3L+Uhjii9c3375IlDmR05bzxY404ZVSMo0= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= -github.com/getkin/kin-openapi v0.90.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= -github.com/getsentry/raven-go v0.0.0-20180517221441-ed7bcb39ff10 h1:YO10pIIBftO/kkTFdWhctH96grJ7qiy7bMdiZcIvPKs= +github.com/getkin/kin-openapi v0.91.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/getsentry/raven-go v0.0.0-20180517221441-ed7bcb39ff10/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= +github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= +github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= @@ -683,8 +694,8 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+ github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= -github.com/go-playground/validator/v10 v10.10.0 h1:I7mrTYv78z8k8VXa/qJlOlEXn/nBh+BF8dHX5nt/dr0= -github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= +github.com/go-playground/validator/v10 v10.10.1 h1:uA0+amWMiglNZKZ9FJRKUAe9U3RX91eVn1JYXMWt7ig= +github.com/go-playground/validator/v10 v10.10.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= @@ -721,14 +732,16 @@ github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY9 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= -github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58 h1:YyrUZvJaU8Q0QsoVo+xLFBgWDTam29PKea6GYmwvSiQ= github.com/gobwas/httphead v0.0.0-20200921212729-da3d93bc3c58/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= +github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/gobwas/ws v1.0.4 h1:5eXU1CZhpQdq5kXbKb+sECH5Ia5KiO6CYzIzdlVx6Bs= github.com/gobwas/ws v1.0.4/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA= +github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= @@ -750,8 +763,8 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013/go.mod h1:3Ltoo9Banwq0gOtcOwxuHG6omk+AwsQPADyw2vQYOJQ= -github.com/gohugoio/hugo v0.93.3 h1:CiiVMcm+2CpANim73kg4hCB1uvCdqYbAMxDlUhU48sM= -github.com/gohugoio/hugo v0.93.3/go.mod h1:5j4ziEh0PkMj+uikYEcQ3VHq2BhXh0MiAWSKhUOvUWs= +github.com/gohugoio/hugo v0.94.0 h1:YlDzhh2XLmNCddCFgNfWdzN3YrULSxl/6mdPcgM/kxA= +github.com/gohugoio/hugo v0.94.0/go.mod h1:YbyVv5NZq8gFW94jdhmWszUtEduZPqmH3aE0r+r3wUQ= github.com/gohugoio/locales v0.14.0/go.mod h1:ip8cCAv/cnmVLzzXtiTpPwgJ4xhKZranqNqtoIu0b/4= github.com/gohugoio/localescompressed v0.15.0/go.mod h1:jBF6q8D7a0vaEmcWPNcAjUZLJaIVNiwvM3WlmTvooB0= github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95/go.mod h1:bOlVlCa1/RajcHpXkrUXPSHB/Re1UnlXxD1Qp8SKOd8= @@ -1050,6 +1063,7 @@ github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhB github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -1091,8 +1105,8 @@ github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdY github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.14.3 h1:DQv1WP+iS4srNjibdnHtqu8JNWCDMluj5NzPnFJsnvk= -github.com/klauspost/compress v1.14.3/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.15.0 h1:xqfchp4whNFxn5A4XFyyYtitiWI8Hy5EW59jEwcyL6U= +github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -1111,8 +1125,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4= -github.com/kylecarbs/cloudflared v0.0.0-20220309211552-7f1fc77731ce h1:JrIHtM+6ggTBknLrBPFiAWs9b0X16BkvUUgUM2PkJxs= -github.com/kylecarbs/cloudflared v0.0.0-20220309211552-7f1fc77731ce/go.mod h1:uZ1Z2ydK9Szy+4713zSurrRWW4u0GtIvnuTUUPjr4vA= +github.com/kylecarbs/cloudflared v0.0.0-20220311054120-ea109c6bf7be h1:kl9byH/iaZJ99iJbSAFXjJ8jBpg6TLk6L2/73uSV8wU= +github.com/kylecarbs/cloudflared v0.0.0-20220311054120-ea109c6bf7be/go.mod h1:4chGYq3uDzeHSpht2LFNZc/8ulHhMW9MvHPvzT5aZx8= github.com/kylecarbs/opencensus-go v0.23.1-0.20220307014935-4d0325a68f8b h1:1Y1X6aR78kMEQE1iCjQodB3lA7VO4jB88Wf8ZrzXSsA= github.com/kylecarbs/opencensus-go v0.23.1-0.20220307014935-4d0325a68f8b/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= github.com/kylecarbs/promptui v0.8.1-0.20201231190244-d8f2159af2b2 h1:MUREBTh4kybLY1KyuBfSx+QPfTB8XiUHs6ZxUhOPTnU= @@ -1128,7 +1142,7 @@ github.com/kylecarbs/tview v0.0.0-20220309202238-8464256e10a1/go.mod h1:7DqeCBDo github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/kyokomi/emoji/v2 v2.2.8/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE= +github.com/kyokomi/emoji/v2 v2.2.9/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= @@ -1142,6 +1156,8 @@ github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lucas-clemente/quic-go v0.25.1-0.20220307142123-ad1cb27c1b64 h1:Jm4MidwZYa0G6/2lgwt5xVd+ifcR6MnB/Og/6LqgaYI= +github.com/lucas-clemente/quic-go v0.25.1-0.20220307142123-ad1cb27c1b64/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg= github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= @@ -1158,6 +1174,7 @@ github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= @@ -1200,6 +1217,7 @@ github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= @@ -1219,8 +1237,9 @@ github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3N github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/miekg/dns v1.1.45 h1:g5fRIhm9nx7g8osrAvgb16QJfmyMsyOCb+J7LSv+Qzk= github.com/miekg/dns v1.1.45/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= +github.com/miekg/dns v1.1.46 h1:uzwpxRtSVxtcIZmz/4Uz6/Rn7G11DvsaslXoy5LxQio= +github.com/miekg/dns v1.1.46/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a/go.mod h1:v8eSC2SMp9/7FTKUncp7fH9IwPfw+ysMObcEz5FWheQ= github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= @@ -1244,8 +1263,8 @@ github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQ github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mmcloughlin/avo v0.0.0-20201105074841-5d2f697d268f/go.mod h1:6aKT4zZIrpGqB3RpFU14ByCSSyKY6LfJz4J/JJChHfI= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= -github.com/moby/moby v20.10.12+incompatible h1:MJVrdG0tIQqVJQBTdtooPuZQFIgski5pYTXlcW8ToE0= -github.com/moby/moby v20.10.12+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= +github.com/moby/moby v20.10.13+incompatible h1:EzlPdbJmYtz9QwFkLNvnEF8LoVFddaBzBsJjBH9eMHc= +github.com/moby/moby v20.10.13+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= @@ -1267,8 +1286,9 @@ github.com/montanaflynn/stats v0.6.3/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFW github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= -github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34= github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= +github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 h1:kMlmsLSbjkikxQJ1IPwaM+7LJ9ltFu/fi8CRzvSnQmA= +github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= github.com/muesli/go-app-paths v0.2.1/go.mod h1:SxS3Umca63pcFcLtbjVb+J0oD7cl4ixQWoBKhGEtEho= github.com/muesli/reflow v0.2.1-0.20210115123740-9e1d0d53df68/go.mod h1:Xk+z4oIWdQqJzsxyjgl3P22oYZnHdZ8FFTHAQQt5BMQ= github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= @@ -1295,8 +1315,8 @@ github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba/go.mod h1: github.com/neurosnap/sentences v1.0.6/go.mod h1:pg1IapvYpWCJJm/Etxeh0+gtMf1rI1STY9S7eUCPbDc= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/niklasfasching/go-org v1.6.0 h1:NCWpmDDNjHNsrei6VmnYXzOiyZUxV8LVU19REGQ8dKA= -github.com/niklasfasching/go-org v1.6.0/go.mod h1:gSHyFcAbr2thIpfljLsP/BB8uwAMyooq6ydIrUDdOCs= +github.com/niklasfasching/go-org v1.6.2 h1:kQBIZlfL4oRNApJCrBgaeNBfzxWzP6XlC7/b744Polk= +github.com/niklasfasching/go-org v1.6.2/go.mod h1:wn76Xgu4/KRe43WZhsgZjxYMaloSrl3BSweGV74SwHs= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -1365,9 +1385,11 @@ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYr github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.3.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ= +github.com/openzipkin/zipkin-go v0.4.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ= github.com/ory/dockertest/v3 v3.8.1 h1:vU/8d1We4qIad2YM0kOwRVtnyue7ExvacPiw1yDm17g= github.com/ory/dockertest/v3 v3.8.1/go.mod h1:wSRQ3wmkz+uSARYMk7kVJFDBGm8x5gSxIhI7NDc+BAQ= github.com/oschwald/geoip2-golang v1.5.0/go.mod h1:xdvYt5xQzB8ORWFqPnqMwZpCpgNagttWdoZLlJQzg7s= +github.com/oschwald/geoip2-golang v1.6.1/go.mod h1:xdvYt5xQzB8ORWFqPnqMwZpCpgNagttWdoZLlJQzg7s= github.com/oschwald/maxminddb-golang v1.8.0/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= @@ -1393,10 +1415,12 @@ github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5y github.com/pion/dtls/v2 v2.1.2/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus= github.com/pion/dtls/v2 v2.1.3 h1:3UF7udADqous+M2R5Uo2q/YaP4EzUoWKdfX2oscCUio= github.com/pion/dtls/v2 v2.1.3/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus= -github.com/pion/ice/v2 v2.2.1 h1:R3MeuJZpU1ty3diPqpD5OxaxcZ15eprAc+EtUiSoFxg= github.com/pion/ice/v2 v2.2.1/go.mod h1:Op8jlPtjeiycsXh93Cs4jK82C9j/kh7vef6ztIOvtIQ= -github.com/pion/interceptor v0.1.7 h1:HThW0tIIKT9RRoDWGURe8rlZVOx0fJHxBHpA0ej0+bo= +github.com/pion/ice/v2 v2.2.2 h1:UfmAslxZ0u0itVjA4x7aw7WeQIv22FdF8VjW9cM+74g= +github.com/pion/ice/v2 v2.2.2/go.mod h1:vLI7dFqxw8zMSb9J+ca74XU7JjLhddgfQB9+BbTydCo= github.com/pion/interceptor v0.1.7/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= +github.com/pion/interceptor v0.1.9 h1:WcKmTV1PHWZyEU+lIit4U+QC2tkG4IbiMIYbBhIQ5i0= +github.com/pion/interceptor v0.1.9/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= @@ -1446,8 +1470,9 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 h1:J9b7z+QKAmPf4YLrFg6oQUotqHQeUNWwkvo7jZp1GLU= github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= +github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc= +github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= @@ -1455,8 +1480,9 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1483,8 +1509,9 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/quasilyte/go-ruleguard/dsl v0.3.17 h1:L5xf3nifnRIdYe9vyMuY2sDnZHIgQol/fDq74FQz7ZY= github.com/quasilyte/go-ruleguard/dsl v0.3.17/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= @@ -1506,10 +1533,12 @@ github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6po github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= -github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs= github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= +github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= +github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww= github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= @@ -1521,6 +1550,7 @@ github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= +github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI= github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= github.com/sanity-io/litter v1.5.2/go.mod h1:5Z71SvaYy5kcGtyglXOC9rrUi3c1E8CamFWjQsazTh0= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= @@ -1592,8 +1622,9 @@ github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKv github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= +github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/fsync v0.9.0/go.mod h1:fNtJEfG3HiltN3y4cPOz6MLjos9+2pIEqLIgszqhp/0= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= @@ -1696,6 +1727,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.8/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= @@ -1719,9 +1751,12 @@ go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/api/v3 v3.5.2/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/pkg/v3 v3.5.2/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.etcd.io/etcd/client/v3 v3.5.1/go.mod h1:OnjH4M8OnAotwaB2l9bVgZzRFKru7/ZMoS46OtKyd3Q= +go.etcd.io/etcd/client/v3 v3.5.2/go.mod h1:kOOaWFFgHygyT0WlSmL8TJiXmMysO/nNUlEsSsN6W4o= go.mongodb.org/mongo-driver v1.7.0/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8= go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= @@ -1780,15 +1815,16 @@ golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70 h1:syTAU9FwmvzEoIYMqcPHOcVm4H3U5u90WsvuYgwpETU= +golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1909,6 +1945,7 @@ golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211013171255-e13a2654a71e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -1919,8 +1956,9 @@ golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1942,8 +1980,10 @@ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a h1:qfl7ob3DIEs3Ml9oLuPwY2N04gymzAW04WsUQHIClgM= +golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -2050,6 +2090,7 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2077,6 +2118,7 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210818153620-00dd8d7831e7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2095,9 +2137,12 @@ golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng= +golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210422114643-f5beecf764ed/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -2119,6 +2164,7 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2206,6 +2252,7 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2261,8 +2308,9 @@ google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFd google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/api v0.64.0/go.mod h1:931CdxA8Rm4t6zqTFGSsgwbAEZ2+GMYurbndwSimebM= google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= -google.golang.org/api v0.70.0 h1:67zQnAE0T2rB0A3CwLSas0K+SbVzSxP+zTLkQLexeiw= google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= +google.golang.org/api v0.71.0 h1:SgWof18M8V2NylsX7bL4fM28j+nFdRopHZbdipaaw20= +google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= google.golang.org/appengine v1.0.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2364,8 +2412,10 @@ google.golang.org/genproto v0.0.0-20220111164026-67b88f271998/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf h1:SVYXkUz2yZS9FWb2Gm8ivSlbNQzL2Z/NpPKE3RG2jWk= google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 h1:FglFEfyj61zP3c6LgjmVHxYxZWXYul9oiS1EZqD5gLc= +google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= @@ -2403,8 +2453,9 @@ google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.44.0 h1:weqSxi/TMs1SqFRMHCtBgXRs8k3X39QIDEZ0pRcttUg= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -2421,6 +2472,7 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/DataDog/dd-trace-go.v1 v1.34.0/go.mod h1:HtrC65fyJ6lWazShCC9rlOeiTSZJ0XtZhkwjZM2WpC4= +gopkg.in/DataDog/dd-trace-go.v1 v1.36.0/go.mod h1:Cv0Bzs/zTzzrUDSw8Q+q/vC+uwPD+R530npGo0lfiCE= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -2488,10 +2540,12 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.23.1/go.mod h1:WfXnOnwSqNtG62Y1CdjoMxh7r7u9QXGCkA1u0na2jgo= +k8s.io/api v0.23.3/go.mod h1:w258XdGyvCmnBj/vGzQMj6kzdufJZVUwEM1U2fRJwSQ= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.23.1/go.mod h1:SADt2Kl8/sttJ62RRsi9MIV4o8f5S3coArm0Iu3fBno= +k8s.io/apimachinery v0.23.3/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= @@ -2499,6 +2553,7 @@ k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/client-go v0.23.1/go.mod h1:6QSI8fEuqD4zgFK0xbdwfB/PthBsIxCJMa3s17WlcO0= +k8s.io/client-go v0.23.3/go.mod h1:47oMd+YvAOqZM7pcQ6neJtBiFH7alOyfunYN48VsmwE= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= @@ -2519,6 +2574,7 @@ k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/b v1.0.0/go.mod h1:uZWcZfRj1BpYzfN9JTerzlNUnnPsV9O2ZA8JsRcubNg= modernc.org/cc/v3 v3.32.4/go.mod h1:0R6jl1aZlIl2avnYfbfHBS1QB6/f+16mihBObaBC878= @@ -2669,11 +2725,13 @@ sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNza sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= storj.io/drpc v0.0.29 h1:Ihd4ls/JQFr0lctefie3iu+3QM4duccCKr9uMzf4sKY= storj.io/drpc v0.0.29/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= -zombiezen.com/go/capnproto2 v2.18.0+incompatible h1:mwfXZniffG5mXokQGHUJWGnqIBggoPfT/CEwon9Yess= zombiezen.com/go/capnproto2 v2.18.0+incompatible/go.mod h1:XO5Pr2SbXgqZwn0m0Ru54QBqpOf4K5AYBO+8LAOBQEQ= +zombiezen.com/go/capnproto2 v2.18.2+incompatible h1:v3BD1zbruvffn7zjJUU5Pn8nZAB11bhZSQC4W+YnnKo= +zombiezen.com/go/capnproto2 v2.18.2+incompatible/go.mod h1:XO5Pr2SbXgqZwn0m0Ru54QBqpOf4K5AYBO+8LAOBQEQ= diff --git a/provisioner/terraform/serve.go b/provisioner/terraform/serve.go index 453e1957c96ff..f51b77f37150e 100644 --- a/provisioner/terraform/serve.go +++ b/provisioner/terraform/serve.go @@ -11,6 +11,9 @@ import ( "github.com/coder/coder/provisionersdk" "github.com/coder/coder/provisionersdk/proto" + + "github.com/hashicorp/hc-install/product" + "github.com/hashicorp/hc-install/releases" ) var ( @@ -40,9 +43,19 @@ func Serve(ctx context.Context, options *ServeOptions) error { if options.BinaryPath == "" { binaryPath, err := exec.LookPath("terraform") if err != nil { - return xerrors.Errorf("terraform binary not found: %w", err) + installer := &releases.ExactVersion{ + Product: product.Terraform, + Version: version.Must(version.NewVersion("1.1.7")), + } + + execPath, err := installer.Install(ctx) + if err != nil { + return xerrors.Errorf("install terraform: %w", err) + } + options.BinaryPath = execPath + } else { + options.BinaryPath = binaryPath } - options.BinaryPath = binaryPath } shutdownCtx, shutdownCancel := context.WithCancel(ctx) return provisionersdk.Serve(ctx, &terraform{ diff --git a/provisionersdk/archive_test.go b/provisionersdk/archive_test.go index d93080d844287..2a99d306b8be9 100644 --- a/provisionersdk/archive_test.go +++ b/provisionersdk/archive_test.go @@ -4,8 +4,9 @@ import ( "io/ioutil" "testing" - "github.com/coder/coder/provisionersdk" "github.com/stretchr/testify/require" + + "github.com/coder/coder/provisionersdk" ) func TestTar(t *testing.T) { diff --git a/pty/pty_windows.go b/pty/pty_windows.go index b57273bd72cd5..b39f4a7856fc4 100644 --- a/pty/pty_windows.go +++ b/pty/pty_windows.go @@ -4,7 +4,6 @@ package pty import ( - "io" "os" "sync" "unsafe" diff --git a/template/gcp-linux/gcp-linux.json b/template/gcp-linux/gcp-linux.json index 99a058f18bc58..31ed21231569f 100644 --- a/template/gcp-linux/gcp-linux.json +++ b/template/gcp-linux/gcp-linux.json @@ -1,7 +1,7 @@ { "ID": "gcp-linux", - "Name": "Develop on Google Cloud", - "Description": "Get started with remote development on Google Cloud.", + "Name": "Develop in Linux on Google Cloud", + "Description": "Get started with Linux development on Google Cloud.", "schema": [ { "id": "00000000-0000-0000-0000-000000000000", diff --git a/template/gcp-linux/gcp-linux.md b/template/gcp-linux/gcp-linux.md index 2a1c3051fd940..7f28a1b63c975 100644 --- a/template/gcp-linux/gcp-linux.md +++ b/template/gcp-linux/gcp-linux.md @@ -1,5 +1,5 @@ --- -name: Develop on Google Cloud -description: Get started with remote development on Google Cloud. +name: Develop in Linux on Google Cloud +description: Get started with Linux development on Google Cloud. tags: [cloud, google] --- diff --git a/template/gcp-windows/gcp-windows.json b/template/gcp-windows/gcp-windows.json index ba4e03e6ee283..3dbb6b47bbebf 100644 --- a/template/gcp-windows/gcp-windows.json +++ b/template/gcp-windows/gcp-windows.json @@ -1,7 +1,7 @@ { "ID": "gcp-windows", - "Name": "Develop on Google Cloud", - "Description": "Get started with remote development on Google Cloud.", + "Name": "Develop in Windows on Google Cloud", + "Description": "Get started with Windows development on Google Cloud.", "schema": [ { "id": "00000000-0000-0000-0000-000000000000", diff --git a/template/gcp-windows/gcp-windows.md b/template/gcp-windows/gcp-windows.md index 2a1c3051fd940..3b0be9a82ac30 100644 --- a/template/gcp-windows/gcp-windows.md +++ b/template/gcp-windows/gcp-windows.md @@ -1,5 +1,5 @@ --- -name: Develop on Google Cloud -description: Get started with remote development on Google Cloud. +name: Develop in Windows on Google Cloud +description: Get started with Windows development on Google Cloud. tags: [cloud, google] --- diff --git a/template/template.go b/template/template.go index 5653eec7ea287..18bd495790088 100644 --- a/template/template.go +++ b/template/template.go @@ -1,4 +1,5 @@ -// +//go:build !slim +// +build !slim package template @@ -8,7 +9,7 @@ import ( "embed" "encoding/json" "fmt" - "path/filepath" + "path" "github.com/coder/coder/codersdk" ) @@ -30,13 +31,13 @@ func init() { } for _, dir := range dirs { // Each one of these is a template! - templateData, err := files.ReadFile(filepath.Join(dir.Name(), dir.Name()+".json")) + templateData, err := files.ReadFile(path.Join(dir.Name(), dir.Name()+".json")) if err != nil { - panic(fmt.Sprintf("template %q does not contain compiled json", dir.Name())) + panic(fmt.Sprintf("template %q does not contain compiled json: %s", dir.Name(), err)) } - templateSrc, err := files.ReadFile(filepath.Join(dir.Name(), dir.Name()+".tf")) + templateSrc, err := files.ReadFile(path.Join(dir.Name(), dir.Name()+".tf")) if err != nil { - panic(fmt.Sprintf("template %q does not contain terraform source", dir.Name())) + panic(fmt.Sprintf("template %q does not contain terraform source: %s", dir.Name(), err)) } var template codersdk.Template diff --git a/template/template_slim.go b/template/template_slim.go new file mode 100644 index 0000000000000..49b160b7266fa --- /dev/null +++ b/template/template_slim.go @@ -0,0 +1,16 @@ +//go:build slim +// +build slim + +package template + +import "github.com/coder/coder/codersdk" + +// List returns all embedded templates. +func List() []codersdk.Template { + return []codersdk.Template{} +} + +// Archive returns a tar by template ID. +func Archive(_ string) ([]byte, bool) { + return nil, false +} diff --git a/template/template_test.go b/template/template_test.go index 724f422cc23b4..ba4bf3e271c66 100644 --- a/template/template_test.go +++ b/template/template_test.go @@ -1,10 +1,14 @@ +//go:build !slim +// +build !slim + package template_test import ( "testing" - "github.com/coder/coder/template" "github.com/stretchr/testify/require" + + "github.com/coder/coder/template" ) func TestTemplate(t *testing.T) { From c01b8f7d65bbb37cf92e7f5043db31607891e6d5 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Sun, 13 Mar 2022 16:46:58 +0000 Subject: [PATCH 06/37] Add cancellation to provisionerd --- cli/cliui/prompt_test.go | 6 +- cli/projectcreate.go | 6 +- cli/ssh.go | 4 +- cmd/templater/main.go | 3 + provisioner/echo/serve.go | 7 +- provisioner/echo/serve_test.go | 10 +- provisioner/terraform/provision.go | 74 ++++- provisioner/terraform/provision_test.go | 80 +++-- provisioner/terraform/serve.go | 17 +- provisionerd/proto/provisionerd.pb.go | 74 +++-- provisionerd/proto/provisionerd.proto | 3 +- provisionerd/provisionerd.go | 138 ++++++-- provisionerd/provisionerd_test.go | 109 +++++-- provisionersdk/proto/provisioner.pb.go | 345 ++++++++++++++------ provisionersdk/proto/provisioner.proto | 12 +- provisionersdk/proto/provisioner_drpc.pb.go | 79 ++--- 16 files changed, 667 insertions(+), 300 deletions(-) diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go index 3cb48423ccc4d..e4b32d3427d21 100644 --- a/cli/cliui/prompt_test.go +++ b/cli/cliui/prompt_test.go @@ -15,17 +15,17 @@ func TestPrompt(t *testing.T) { t.Run("Success", func(t *testing.T) { t.Parallel() ptty := ptytest.New(t) - ch := make(chan string) + msgChan := make(chan string) go func() { resp, err := prompt(ptty, cliui.PromptOptions{ Text: "Example", }) require.NoError(t, err) - ch <- resp + msgChan <- resp }() ptty.ExpectMatch("Example") ptty.WriteLine("hello") - require.Equal(t, "hello", <-ch) + require.Equal(t, "hello", <-msgChan) }) t.Run("Confirm", func(t *testing.T) { diff --git a/cli/projectcreate.go b/cli/projectcreate.go index 1dbf772988ed2..52811c52de31e 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -78,7 +78,7 @@ func projectCreate() *cobra.Command { return err } - job, err := validateProjectVersionSource(cmd, client, organization, database.ProvisionerType(provisioner), archive) + job, err := createValidProjectVersion(cmd, client, organization, database.ProvisionerType(provisioner), archive) if err != nil { return err } @@ -271,7 +271,7 @@ func projectCreate() *cobra.Command { return cmd } -func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, organization codersdk.Organization, provisioner database.ProvisionerType, archive []byte, parameters ...codersdk.CreateParameterRequest) (*codersdk.ProjectVersion, error) { +func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, organization codersdk.Organization, provisioner database.ProvisionerType, archive []byte, parameters ...codersdk.CreateParameterRequest) (*codersdk.ProjectVersion, error) { spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) spin.Writer = cmd.OutOrStdout() spin.Suffix = " Uploading current directory..." @@ -348,7 +348,7 @@ func validateProjectVersionSource(cmd *cobra.Command, client *codersdk.Client, o DestinationScheme: parameterSchema.DefaultDestinationScheme, }) } - return validateProjectVersionSource(cmd, client, organization, provisioner, archive, parameters...) + return createValidProjectVersion(cmd, client, organization, provisioner, archive, parameters...) } if version.Job.Status != codersdk.ProvisionerJobSucceeded { diff --git a/cli/ssh.go b/cli/ssh.go index 001e90b8c0a31..52d1875bf57ee 100644 --- a/cli/ssh.go +++ b/cli/ssh.go @@ -7,7 +7,7 @@ import ( "github.com/pion/webrtc/v3" "github.com/spf13/cobra" "golang.org/x/crypto/ssh" - "golang.org/x/crypto/ssh/terminal" + "golang.org/x/term" "github.com/coder/coder/agent" "github.com/coder/coder/peer" @@ -65,7 +65,7 @@ func workspaceSSH() *cobra.Command { return err } // Set raw - terminal.MakeRaw(int(os.Stdin.Fd())) + term.MakeRaw(int(os.Stdin.Fd())) err = session.RequestPty("xterm-256color", 128, 128, ssh.TerminalModes{ ssh.OCRNL: 1, }) diff --git a/cmd/templater/main.go b/cmd/templater/main.go index 661910573df98..925825a3d7386 100644 --- a/cmd/templater/main.go +++ b/cmd/templater/main.go @@ -71,6 +71,9 @@ func parse(cmd *cobra.Command, args []string, parameters []codersdk.CreateParame return err } accessURL, errCh, err := tunnel.New(cmd.Context(), srv.URL) + if err != nil { + return err + } go func() { err := <-errCh if err != nil { diff --git a/provisioner/echo/serve.go b/provisioner/echo/serve.go index 9d003ac8311cb..56428d6a3c0a0 100644 --- a/provisioner/echo/serve.go +++ b/provisioner/echo/serve.go @@ -73,7 +73,12 @@ func (*echo) Parse(request *proto.Parse_Request, stream proto.DRPCProvisioner_Pa } // Provision reads requests from the provided directory to stream responses. -func (*echo) Provision(request *proto.Provision_Request, stream proto.DRPCProvisioner_ProvisionStream) error { +func (*echo) Provision(stream proto.DRPCProvisioner_ProvisionStream) error { + msg, err := stream.Recv() + if err != nil { + return err + } + request := msg.GetStart() for index := 0; ; index++ { extension := ".protobuf" if request.DryRun { diff --git a/provisioner/echo/serve_test.go b/provisioner/echo/serve_test.go index adf8cced81a90..f5f9ee13ee370 100644 --- a/provisioner/echo/serve_test.go +++ b/provisioner/echo/serve_test.go @@ -92,8 +92,14 @@ func TestEcho(t *testing.T) { Provision: responses, }) require.NoError(t, err) - client, err := api.Provision(ctx, &proto.Provision_Request{ - Directory: unpackTar(t, data), + client, err := api.Provision(ctx) + require.NoError(t, err) + err = client.Send(&proto.Provision_Request{ + Type: &proto.Provision_Request_Start{ + Start: &proto.Provision_Start{ + Directory: unpackTar(t, data), + }, + }, }) require.NoError(t, err) log, err := client.Recv() diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go index cee42dfe216a4..b9f09f578bfa1 100644 --- a/provisioner/terraform/provision.go +++ b/provisioner/terraform/provision.go @@ -24,21 +24,49 @@ import ( ) // Provision executes `terraform apply`. -func (t *terraform) Provision(request *proto.Provision_Request, stream proto.DRPCProvisioner_ProvisionStream) error { - ctx := stream.Context() - statefilePath := filepath.Join(request.Directory, "terraform.tfstate") - if len(request.State) > 0 { - err := os.WriteFile(statefilePath, request.State, 0600) +func (t *terraform) Provision(stream proto.DRPCProvisioner_ProvisionStream) error { + shutdown, shutdownFunc := context.WithCancel(stream.Context()) + defer shutdownFunc() + + request, err := stream.Recv() + if err != nil { + return err + } + if request.GetCancel() != nil { + return nil + } + // We expect the first message is start! + if request.GetStart() == nil { + return nil + } + go func() { + for { + request, err := stream.Recv() + if err != nil { + return + } + if request.GetCancel() == nil { + // This is only to process cancels! + continue + } + shutdownFunc() + return + } + }() + start := request.GetStart() + statefilePath := filepath.Join(start.Directory, "terraform.tfstate") + if len(start.State) > 0 { + err := os.WriteFile(statefilePath, start.State, 0600) if err != nil { return xerrors.Errorf("write statefile %q: %w", statefilePath, err) } } - terraform, err := tfexec.NewTerraform(request.Directory, t.binaryPath) + terraform, err := tfexec.NewTerraform(start.Directory, t.binaryPath) if err != nil { return xerrors.Errorf("create new terraform executor: %w", err) } - version, _, err := terraform.Version(ctx, false) + version, _, err := terraform.Version(shutdown, false) if err != nil { return xerrors.Errorf("get terraform version: %w", err) } @@ -63,20 +91,20 @@ func (t *terraform) Provision(request *proto.Provision_Request, stream proto.DRP } }() terraform.SetStdout(writer) - t.logger.Debug(ctx, "running initialization") - err = terraform.Init(ctx) + t.logger.Debug(shutdown, "running initialization") + err = terraform.Init(shutdown) if err != nil { return xerrors.Errorf("initialize terraform: %w", err) } - t.logger.Debug(ctx, "ran initialization") + t.logger.Debug(shutdown, "ran initialization") - if request.DryRun { - return t.runTerraformPlan(ctx, terraform, request, stream) + if start.DryRun { + return t.runTerraformPlan(stream.Context(), shutdown, terraform, start, stream) } - return t.runTerraformApply(ctx, terraform, request, stream, statefilePath) + return t.runTerraformApply(stream.Context(), shutdown, terraform, start, stream, statefilePath) } -func (t *terraform) runTerraformPlan(ctx context.Context, terraform *tfexec.Terraform, request *proto.Provision_Request, stream proto.DRPCProvisioner_ProvisionStream) error { +func (t *terraform) runTerraformPlan(ctx, shutdown context.Context, terraform *tfexec.Terraform, request *proto.Provision_Start, stream proto.DRPCProvisioner_ProvisionStream) error { env := map[string]string{} for _, envEntry := range os.Environ() { parts := strings.SplitN(envEntry, "=", 2) @@ -286,7 +314,7 @@ func (t *terraform) runTerraformPlan(ctx context.Context, terraform *tfexec.Terr }) } -func (t *terraform) runTerraformApply(ctx context.Context, terraform *tfexec.Terraform, request *proto.Provision_Request, stream proto.DRPCProvisioner_ProvisionStream, statefilePath string) error { +func (t *terraform) runTerraformApply(ctx, shutdown context.Context, terraform *tfexec.Terraform, request *proto.Provision_Start, stream proto.DRPCProvisioner_ProvisionStream, statefilePath string) error { env := os.Environ() env = append(env, "CODER_URL="+request.Metadata.CoderUrl, @@ -354,7 +382,7 @@ func (t *terraform) runTerraformApply(ctx context.Context, terraform *tfexec.Ter }() t.logger.Debug(ctx, "running apply", slog.F("vars", len(vars)), slog.F("env", len(env))) - err := runApplyCommand(ctx, t.shutdownCtx, request.Metadata.WorkspaceTransition, terraform.ExecPath(), terraform.WorkingDir(), writer, env, vars) + err := runApplyCommand(ctx, shutdown, request.Metadata.WorkspaceTransition, terraform.ExecPath(), terraform.WorkingDir(), writer, env, vars) if err != nil { errorMessage := err.Error() // Terraform can fail and apply and still need to store it's state. @@ -549,3 +577,17 @@ func convertTerraformLogLevel(logLevel string) (proto.LogLevel, error) { return proto.LogLevel(0), xerrors.Errorf("invalid log level %q", logLevel) } } + +func combineContexts(ctx1, ctx2 context.Context) context.Context { + ctx, cancelFunc := context.WithCancel(ctx1) + go func() { + defer cancelFunc() + select { + case <-ctx.Done(): + return + case <-ctx2.Done(): + return + } + }() + return ctx +} diff --git a/provisioner/terraform/provision_test.go b/provisioner/terraform/provision_test.go index 605ac0fa38b94..fbbf57bf3ab55 100644 --- a/provisioner/terraform/provision_test.go +++ b/provisioner/terraform/provision_test.go @@ -69,11 +69,15 @@ provider "coder" { }`, }, Request: &proto.Provision_Request{ - ParameterValues: []*proto.ParameterValue{{ - DestinationScheme: proto.ParameterDestination_PROVISIONER_VARIABLE, - Name: "A", - Value: "example", - }}, + Type: &proto.Provision_Request_Start{ + Start: &proto.Provision_Start{ + ParameterValues: []*proto.ParameterValue{{ + DestinationScheme: proto.ParameterDestination_PROVISIONER_VARIABLE, + Name: "A", + Value: "example", + }}, + }, + }, }, Response: &proto.Provision_Response{ Type: &proto.Provision_Response_Complete{ @@ -114,7 +118,11 @@ provider "coder" { "main.tf": `resource "null_resource" "A" {}`, }, Request: &proto.Provision_Request{ - DryRun: true, + Type: &proto.Provision_Request_Start{ + Start: &proto.Provision_Start{ + DryRun: true, + }, + }, }, Response: &proto.Provision_Response{ Type: &proto.Provision_Response_Complete{ @@ -156,8 +164,12 @@ provider "coder" { }`, }, Request: &proto.Provision_Request{ - Metadata: &proto.Provision_Metadata{ - CoderUrl: "https://example.com", + Type: &proto.Provision_Request_Start{ + Start: &proto.Provision_Start{ + Metadata: &proto.Provision_Metadata{ + CoderUrl: "https://example.com", + }, + }, }, }, Response: &proto.Provision_Response{ @@ -191,8 +203,12 @@ provider "coder" { resource "null_resource" "A" {}`, }, Request: &proto.Provision_Request{ - Metadata: &proto.Provision_Metadata{ - CoderUrl: "https://example.com", + Type: &proto.Provision_Request_Start{ + Start: &proto.Provision_Start{ + Metadata: &proto.Provision_Metadata{ + CoderUrl: "https://example.com", + }, + }, }, }, Response: &proto.Provision_Response{ @@ -217,9 +233,13 @@ provider "coder" { }`, }, Request: &proto.Provision_Request{ - DryRun: true, - Metadata: &proto.Provision_Metadata{ - CoderUrl: "https://example.com", + Type: &proto.Provision_Request_Start{ + Start: &proto.Provision_Start{ + DryRun: true, + Metadata: &proto.Provision_Metadata{ + CoderUrl: "https://example.com", + }, + }, }, }, Response: &proto.Provision_Response{ @@ -251,9 +271,13 @@ provider "coder" { }`, }, Request: &proto.Provision_Request{ - DryRun: true, - Metadata: &proto.Provision_Metadata{ - CoderUrl: "https://example.com", + Type: &proto.Provision_Request_Start{ + Start: &proto.Provision_Start{ + DryRun: true, + Metadata: &proto.Provision_Metadata{ + CoderUrl: "https://example.com", + }, + }, }, }, Response: &proto.Provision_Response{ @@ -285,18 +309,24 @@ provider "coder" { } request := &proto.Provision_Request{ - Directory: directory, + Type: &proto.Provision_Request_Start{ + Start: &proto.Provision_Start{ + Directory: directory, + }, + }, } if testCase.Request != nil { - request.ParameterValues = testCase.Request.ParameterValues - request.State = testCase.Request.State - request.DryRun = testCase.Request.DryRun - request.Metadata = testCase.Request.Metadata + request.GetStart().ParameterValues = testCase.Request.GetStart().ParameterValues + request.GetStart().State = testCase.Request.GetStart().State + request.GetStart().DryRun = testCase.Request.GetStart().DryRun + request.GetStart().Metadata = testCase.Request.GetStart().Metadata } - if request.Metadata == nil { - request.Metadata = &proto.Provision_Metadata{} + if request.GetStart().Metadata == nil { + request.GetStart().Metadata = &proto.Provision_Metadata{} } - response, err := api.Provision(ctx, request) + response, err := api.Provision(ctx) + require.NoError(t, err) + err = response.Send(request) require.NoError(t, err) for { msg, err := response.Recv() @@ -315,7 +345,7 @@ provider "coder" { } require.NoError(t, err) - if !request.DryRun { + if !request.GetStart().DryRun { require.Greater(t, len(msg.GetComplete().State), 0) } diff --git a/provisioner/terraform/serve.go b/provisioner/terraform/serve.go index f51b77f37150e..bda2944ea0701 100644 --- a/provisioner/terraform/serve.go +++ b/provisioner/terraform/serve.go @@ -10,7 +10,6 @@ import ( "cdr.dev/slog" "github.com/coder/coder/provisionersdk" - "github.com/coder/coder/provisionersdk/proto" "github.com/hashicorp/hc-install/product" "github.com/hashicorp/hc-install/releases" @@ -57,25 +56,13 @@ func Serve(ctx context.Context, options *ServeOptions) error { options.BinaryPath = binaryPath } } - shutdownCtx, shutdownCancel := context.WithCancel(ctx) return provisionersdk.Serve(ctx, &terraform{ - binaryPath: options.BinaryPath, - logger: options.Logger, - shutdownCtx: shutdownCtx, - shutdownCancel: shutdownCancel, + binaryPath: options.BinaryPath, + logger: options.Logger, }, options.ServeOptions) } type terraform struct { binaryPath string logger slog.Logger - - shutdownCtx context.Context - shutdownCancel context.CancelFunc -} - -// Shutdown signals to begin graceful shutdown of any running operations. -func (t *terraform) Shutdown(_ context.Context, _ *proto.Empty) (*proto.Empty, error) { - t.shutdownCancel() - return &proto.Empty{}, nil } diff --git a/provisionerd/proto/provisionerd.pb.go b/provisionerd/proto/provisionerd.pb.go index 4a6f31fe1fa58..315134e40cc9a 100644 --- a/provisionerd/proto/provisionerd.pb.go +++ b/provisionerd/proto/provisionerd.pb.go @@ -554,9 +554,10 @@ type UpdateJobResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + Cancelled bool `protobuf:"varint,1,opt,name=cancelled,proto3" json:"cancelled,omitempty"` // If parameter schemas are sent, the job will respond // with resolved parameter values. - ParameterValues []*proto.ParameterValue `protobuf:"bytes,1,rep,name=parameter_values,json=parameterValues,proto3" json:"parameter_values,omitempty"` + ParameterValues []*proto.ParameterValue `protobuf:"bytes,2,rep,name=parameter_values,json=parameterValues,proto3" json:"parameter_values,omitempty"` } func (x *UpdateJobResponse) Reset() { @@ -591,6 +592,13 @@ func (*UpdateJobResponse) Descriptor() ([]byte, []int) { return file_provisionerd_proto_provisionerd_proto_rawDescGZIP(), []int{6} } +func (x *UpdateJobResponse) GetCancelled() bool { + if x != nil { + return x.Cancelled + } + return false +} + func (x *UpdateJobResponse) GetParameterValues() []*proto.ParameterValue { if x != nil { return x.ParameterValues @@ -1038,37 +1046,39 @@ var file_provisionerd_proto_provisionerd_proto_rawDesc = []byte{ 0x0b, 0x32, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x10, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, - 0x73, 0x22, 0x5b, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x46, 0x0a, 0x10, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, - 0x74, 0x65, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, - 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x70, - 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x2a, 0x34, - 0x0a, 0x09, 0x4c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x12, 0x50, - 0x52, 0x4f, 0x56, 0x49, 0x53, 0x49, 0x4f, 0x4e, 0x45, 0x52, 0x5f, 0x44, 0x41, 0x45, 0x4d, 0x4f, - 0x4e, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x50, 0x52, 0x4f, 0x56, 0x49, 0x53, 0x49, 0x4f, 0x4e, - 0x45, 0x52, 0x10, 0x01, 0x32, 0x98, 0x02, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, - 0x6f, 0x6e, 0x65, 0x72, 0x44, 0x61, 0x65, 0x6d, 0x6f, 0x6e, 0x12, 0x3c, 0x0a, 0x0a, 0x41, 0x63, - 0x71, 0x75, 0x69, 0x72, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, - 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, - 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x41, 0x63, 0x71, - 0x75, 0x69, 0x72, 0x65, 0x64, 0x4a, 0x6f, 0x62, 0x12, 0x4c, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, - 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, - 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x46, 0x61, 0x69, 0x6c, 0x4a, 0x6f, - 0x62, 0x12, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, - 0x2e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x4a, 0x6f, 0x62, 0x1a, 0x13, 0x2e, 0x70, 0x72, 0x6f, - 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, - 0x3e, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x1a, - 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x43, 0x6f, - 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x4a, 0x6f, 0x62, 0x1a, 0x13, 0x2e, 0x70, 0x72, 0x6f, - 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, - 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, - 0x64, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, - 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x22, 0x79, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, + 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x63, 0x61, 0x6e, 0x63, 0x65, + 0x6c, 0x6c, 0x65, 0x64, 0x12, 0x46, 0x0a, 0x10, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, + 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, + 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, + 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x2a, 0x34, 0x0a, 0x09, + 0x4c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x52, 0x4f, + 0x56, 0x49, 0x53, 0x49, 0x4f, 0x4e, 0x45, 0x52, 0x5f, 0x44, 0x41, 0x45, 0x4d, 0x4f, 0x4e, 0x10, + 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x50, 0x52, 0x4f, 0x56, 0x49, 0x53, 0x49, 0x4f, 0x4e, 0x45, 0x52, + 0x10, 0x01, 0x32, 0x98, 0x02, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, + 0x65, 0x72, 0x44, 0x61, 0x65, 0x6d, 0x6f, 0x6e, 0x12, 0x3c, 0x0a, 0x0a, 0x41, 0x63, 0x71, 0x75, + 0x69, 0x72, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, + 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, 0x70, 0x72, + 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x41, 0x63, 0x71, 0x75, 0x69, + 0x72, 0x65, 0x64, 0x4a, 0x6f, 0x62, 0x12, 0x4c, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x4a, 0x6f, 0x62, 0x12, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, + 0x72, 0x64, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, + 0x72, 0x64, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x46, 0x61, 0x69, 0x6c, 0x4a, 0x6f, 0x62, 0x12, + 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x46, + 0x61, 0x69, 0x6c, 0x65, 0x64, 0x4a, 0x6f, 0x62, 0x1a, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, + 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x3e, 0x0a, + 0x0b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x1a, 0x2e, 0x70, + 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x64, 0x4a, 0x6f, 0x62, 0x1a, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, + 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x2b, 0x5a, + 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x64, 0x65, + 0x72, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, + 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/provisionerd/proto/provisionerd.proto b/provisionerd/proto/provisionerd.proto index 150878c7d5b13..f03de41e7a14b 100644 --- a/provisionerd/proto/provisionerd.proto +++ b/provisionerd/proto/provisionerd.proto @@ -85,9 +85,10 @@ message UpdateJobRequest { } message UpdateJobResponse { + bool cancelled = 1; // If parameter schemas are sent, the job will respond // with resolved parameter values. - repeated provisioner.ParameterValue parameter_values = 1; + repeated provisioner.ParameterValue parameter_values = 2; } service ProvisionerDaemon { diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go index fcc409f799803..e75210755ee49 100644 --- a/provisionerd/provisionerd.go +++ b/provisionerd/provisionerd.go @@ -221,6 +221,8 @@ func (p *Server) acquireJob(ctx context.Context) { } func (p *Server) runJob(ctx context.Context, job *proto.AcquiredJob) { + shutdown, shutdownCancel := context.WithCancel(ctx) + defer shutdownCancel() go func() { ticker := time.NewTicker(p.opts.UpdateInterval) defer ticker.Stop() @@ -229,14 +231,23 @@ func (p *Server) runJob(ctx context.Context, job *proto.AcquiredJob) { return case <-ctx.Done(): return + case <-p.shutdown: + p.opts.Logger.Info(ctx, "attempting graceful cancellation") + shutdownCancel() + return case <-ticker.C: - _, err := p.client.UpdateJob(ctx, &proto.UpdateJobRequest{ + resp, err := p.client.UpdateJob(ctx, &proto.UpdateJobRequest{ JobId: job.JobId, }) if err != nil { p.failActiveJobf("send periodic update: %s", err) return } + if !resp.Cancelled { + return + } + p.opts.Logger.Info(ctx, "attempting graceful cancellation") + shutdownCancel() } }() defer func() { @@ -333,7 +344,7 @@ func (p *Server) runJob(ctx context.Context, job *proto.AcquiredJob) { case *proto.AcquiredJob_ProjectImport_: p.opts.Logger.Debug(context.Background(), "acquired job is project import") - p.runProjectImport(ctx, provisioner, job) + p.runProjectImport(ctx, shutdown, provisioner, job) case *proto.AcquiredJob_WorkspaceBuild_: p.opts.Logger.Debug(context.Background(), "acquired job is workspace provision", slog.F("workspace_name", jobType.WorkspaceBuild.WorkspaceName), @@ -341,7 +352,7 @@ func (p *Server) runJob(ctx context.Context, job *proto.AcquiredJob) { slog.F("parameters", jobType.WorkspaceBuild.ParameterValues), ) - p.runWorkspaceBuild(ctx, provisioner, job) + p.runWorkspaceBuild(ctx, shutdown, provisioner, job) default: p.failActiveJobf("unknown job type %q; ensure your provisioner daemon is up-to-date", reflect.TypeOf(job.Type).String()) return @@ -354,7 +365,21 @@ func (p *Server) runJob(ctx context.Context, job *proto.AcquiredJob) { } } -func (p *Server) runProjectImport(ctx context.Context, provisioner sdkproto.DRPCProvisionerClient, job *proto.AcquiredJob) { +func (p *Server) runProjectImport(ctx, shutdown context.Context, provisioner sdkproto.DRPCProvisionerClient, job *proto.AcquiredJob) { + _, err := p.client.UpdateJob(ctx, &proto.UpdateJobRequest{ + JobId: job.GetJobId(), + Logs: []*proto.Log{{ + Source: proto.LogSource_PROVISIONER_DAEMON, + Level: sdkproto.LogLevel_INFO, + CreatedAt: time.Now().UTC().UnixMilli(), + Output: "Parsing variables...", + }}, + }) + if err != nil { + p.failActiveJobf("write log: %s", err) + return + } + parameterSchemas, err := p.runProjectImportParse(ctx, provisioner, job) if err != nil { p.failActiveJobf("run parse: %s", err) @@ -382,7 +407,20 @@ func (p *Server) runProjectImport(ctx context.Context, provisioner sdkproto.DRPC } } - startResources, err := p.runProjectImportProvision(ctx, provisioner, job, updateResponse.ParameterValues, &sdkproto.Provision_Metadata{ + _, err = p.client.UpdateJob(ctx, &proto.UpdateJobRequest{ + JobId: job.GetJobId(), + Logs: []*proto.Log{{ + Source: proto.LogSource_PROVISIONER_DAEMON, + Level: sdkproto.LogLevel_INFO, + CreatedAt: time.Now().UTC().UnixMilli(), + Output: "Running start...", + }}, + }) + if err != nil { + p.failActiveJobf("write log: %s", err) + return + } + startResources, err := p.runProjectImportProvision(ctx, shutdown, provisioner, job, updateResponse.ParameterValues, &sdkproto.Provision_Metadata{ CoderUrl: job.GetProjectImport().Metadata.CoderUrl, WorkspaceTransition: sdkproto.WorkspaceTransition_START, }) @@ -390,7 +428,20 @@ func (p *Server) runProjectImport(ctx context.Context, provisioner sdkproto.DRPC p.failActiveJobf("project import provision for start: %s", err) return } - stopResources, err := p.runProjectImportProvision(ctx, provisioner, job, updateResponse.ParameterValues, &sdkproto.Provision_Metadata{ + _, err = p.client.UpdateJob(ctx, &proto.UpdateJobRequest{ + JobId: job.GetJobId(), + Logs: []*proto.Log{{ + Source: proto.LogSource_PROVISIONER_DAEMON, + Level: sdkproto.LogLevel_INFO, + CreatedAt: time.Now().UTC().UnixMilli(), + Output: "Running stop...", + }}, + }) + if err != nil { + p.failActiveJobf("write log: %s", err) + return + } + stopResources, err := p.runProjectImportProvision(ctx, shutdown, provisioner, job, updateResponse.ParameterValues, &sdkproto.Provision_Metadata{ CoderUrl: job.GetProjectImport().Metadata.CoderUrl, WorkspaceTransition: sdkproto.WorkspaceTransition_STOP, }) @@ -462,17 +513,37 @@ func (p *Server) runProjectImportParse(ctx context.Context, provisioner sdkproto // Performs a dry-run provision when importing a project. // This is used to detect resources that would be provisioned // for a workspace in various states. -func (p *Server) runProjectImportProvision(ctx context.Context, provisioner sdkproto.DRPCProvisionerClient, job *proto.AcquiredJob, values []*sdkproto.ParameterValue, metadata *sdkproto.Provision_Metadata) ([]*sdkproto.Resource, error) { - stream, err := provisioner.Provision(ctx, &sdkproto.Provision_Request{ - Directory: p.opts.WorkDirectory, - ParameterValues: values, - DryRun: true, - Metadata: metadata, - }) +func (p *Server) runProjectImportProvision(ctx, shutdown context.Context, provisioner sdkproto.DRPCProvisionerClient, job *proto.AcquiredJob, values []*sdkproto.ParameterValue, metadata *sdkproto.Provision_Metadata) ([]*sdkproto.Resource, error) { + stream, err := provisioner.Provision(ctx) if err != nil { return nil, xerrors.Errorf("provision: %w", err) } defer stream.Close() + go func() { + select { + case <-ctx.Done(): + return + case <-shutdown.Done(): + _ = stream.Send(&sdkproto.Provision_Request{ + Type: &sdkproto.Provision_Request_Cancel{ + Cancel: &sdkproto.Provision_Cancel{}, + }, + }) + } + }() + err = stream.Send(&sdkproto.Provision_Request{ + Type: &sdkproto.Provision_Request_Start{ + Start: &sdkproto.Provision_Start{ + Directory: p.opts.WorkDirectory, + ParameterValues: values, + DryRun: true, + Metadata: metadata, + }, + }, + }) + if err != nil { + return nil, xerrors.Errorf("start provision: %w", err) + } for { msg, err := stream.Recv() @@ -513,18 +584,39 @@ func (p *Server) runProjectImportProvision(ctx context.Context, provisioner sdkp } } -func (p *Server) runWorkspaceBuild(ctx context.Context, provisioner sdkproto.DRPCProvisionerClient, job *proto.AcquiredJob) { - stream, err := provisioner.Provision(ctx, &sdkproto.Provision_Request{ - Directory: p.opts.WorkDirectory, - ParameterValues: job.GetWorkspaceBuild().ParameterValues, - Metadata: job.GetWorkspaceBuild().Metadata, - State: job.GetWorkspaceBuild().State, - }) +func (p *Server) runWorkspaceBuild(ctx, shutdown context.Context, provisioner sdkproto.DRPCProvisionerClient, job *proto.AcquiredJob) { + stream, err := provisioner.Provision(ctx) if err != nil { p.failActiveJobf("provision: %s", err) return } defer stream.Close() + go func() { + select { + case <-ctx.Done(): + return + case <-shutdown.Done(): + _ = stream.Send(&sdkproto.Provision_Request{ + Type: &sdkproto.Provision_Request_Cancel{ + Cancel: &sdkproto.Provision_Cancel{}, + }, + }) + } + }() + err = stream.Send(&sdkproto.Provision_Request{ + Type: &sdkproto.Provision_Request_Start{ + Start: &sdkproto.Provision_Start{ + Directory: p.opts.WorkDirectory, + ParameterValues: job.GetWorkspaceBuild().ParameterValues, + Metadata: job.GetWorkspaceBuild().Metadata, + State: job.GetWorkspaceBuild().State, + }, + }, + }) + if err != nil { + p.failActiveJobf("start provision: %s", err) + return + } for { msg, err := stream.Recv() @@ -666,12 +758,6 @@ func (p *Server) Shutdown(ctx context.Context) error { } p.opts.Logger.Info(ctx, "attempting graceful shutdown") close(p.shutdown) - for id, provisioner := range p.opts.Provisioners { - _, err := provisioner.Shutdown(ctx, &sdkproto.Empty{}) - if err != nil { - return xerrors.Errorf("shutdown %q: %w", id, err) - } - } select { case <-ctx.Done(): p.opts.Logger.Warn(ctx, "graceful shutdown failed", slog.Error(ctx.Err())) diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go index f1af2f8607f84..e5b204f0fb04e 100644 --- a/provisionerd/provisionerd_test.go +++ b/provisionerd/provisionerd_test.go @@ -261,11 +261,13 @@ func TestProvisionerd(t *testing.T) { require.NoError(t, err) return nil }, - provision: func(request *sdkproto.Provision_Request, stream sdkproto.DRPCProvisioner_ProvisionStream) error { - if request.DryRun { + provision: func(stream sdkproto.DRPCProvisioner_ProvisionStream) error { + request, err := stream.Recv() + require.NoError(t, err) + if request.GetStart().DryRun { didDryRun.Store(true) } - err := stream.Send(&sdkproto.Provision_Response{ + err = stream.Send(&sdkproto.Provision_Response{ Type: &sdkproto.Provision_Response_Log{ Log: &sdkproto.Log{ Level: sdkproto.LogLevel_INFO, @@ -336,7 +338,7 @@ func TestProvisionerd(t *testing.T) { }), nil }, provisionerd.Provisioners{ "someprovisioner": createProvisionerClient(t, provisionerTestServer{ - provision: func(request *sdkproto.Provision_Request, stream sdkproto.DRPCProvisioner_ProvisionStream) error { + provision: func(stream sdkproto.DRPCProvisioner_ProvisionStream) error { err := stream.Send(&sdkproto.Provision_Response{ Type: &sdkproto.Provision_Response_Log{ Log: &sdkproto.Log{ @@ -399,7 +401,7 @@ func TestProvisionerd(t *testing.T) { }), nil }, provisionerd.Provisioners{ "someprovisioner": createProvisionerClient(t, provisionerTestServer{ - provision: func(request *sdkproto.Provision_Request, stream sdkproto.DRPCProvisioner_ProvisionStream) error { + provision: func(stream sdkproto.DRPCProvisioner_ProvisionStream) error { return stream.Send(&sdkproto.Provision_Response{ Type: &sdkproto.Provision_Response_Complete{ Complete: &sdkproto.Provision_Complete{ @@ -419,8 +421,6 @@ func TestProvisionerd(t *testing.T) { t.Parallel() updateChan := make(chan struct{}) completeChan := make(chan struct{}) - shutdownCtx, shutdownCtxCancel := context.WithCancel(context.Background()) - defer shutdownCtxCancel() server := createProvisionerd(t, func(ctx context.Context) (proto.DRPCProvisionerDaemonClient, error) { return createProvisionerDaemonClient(t, provisionerDaemonTestServer{ acquireJob: func(ctx context.Context, _ *proto.Empty) (*proto.AcquiredJob, error) { @@ -451,11 +451,10 @@ func TestProvisionerd(t *testing.T) { }), nil }, provisionerd.Provisioners{ "someprovisioner": createProvisionerClient(t, provisionerTestServer{ - shutdown: func(_ context.Context, _ *sdkproto.Empty) (*sdkproto.Empty, error) { - shutdownCtxCancel() - return &sdkproto.Empty{}, nil - }, - provision: func(request *sdkproto.Provision_Request, stream sdkproto.DRPCProvisioner_ProvisionStream) error { + provision: func(stream sdkproto.DRPCProvisioner_ProvisionStream) error { + // Ignore the first provision message! + _, _ = stream.Recv() + err := stream.Send(&sdkproto.Provision_Response{ Type: &sdkproto.Provision_Response_Log{ Log: &sdkproto.Log{ @@ -465,7 +464,11 @@ func TestProvisionerd(t *testing.T) { }, }) require.NoError(t, err) - <-shutdownCtx.Done() + + msg, err := stream.Recv() + require.NoError(t, err) + require.NotNil(t, msg.GetCancel()) + return stream.Send(&sdkproto.Provision_Response{ Type: &sdkproto.Provision_Response_Complete{ Complete: &sdkproto.Provision_Complete{ @@ -482,6 +485,75 @@ func TestProvisionerd(t *testing.T) { <-completeChan require.NoError(t, server.Close()) }) + + t.Run("ShutdownFromJob", func(t *testing.T) { + t.Parallel() + updateChan := make(chan struct{}) + completeChan := make(chan struct{}) + server := createProvisionerd(t, func(ctx context.Context) (proto.DRPCProvisionerDaemonClient, error) { + return createProvisionerDaemonClient(t, provisionerDaemonTestServer{ + acquireJob: func(ctx context.Context, _ *proto.Empty) (*proto.AcquiredJob, error) { + return &proto.AcquiredJob{ + JobId: "test", + Provisioner: "someprovisioner", + ProjectSourceArchive: createTar(t, map[string]string{ + "test.txt": "content", + }), + Type: &proto.AcquiredJob_WorkspaceBuild_{ + WorkspaceBuild: &proto.AcquiredJob_WorkspaceBuild{ + Metadata: &sdkproto.Provision_Metadata{}, + }, + }, + }, nil + }, + updateJob: func(ctx context.Context, update *proto.UpdateJobRequest) (*proto.UpdateJobResponse, error) { + if len(update.Logs) > 0 { + // Close on a log so we know when the job is in progress! + close(updateChan) + } + return &proto.UpdateJobResponse{ + Cancelled: true, + }, nil + }, + failJob: func(ctx context.Context, job *proto.FailedJob) (*proto.Empty, error) { + close(completeChan) + return &proto.Empty{}, nil + }, + }), nil + }, provisionerd.Provisioners{ + "someprovisioner": createProvisionerClient(t, provisionerTestServer{ + provision: func(stream sdkproto.DRPCProvisioner_ProvisionStream) error { + // Ignore the first provision message! + _, _ = stream.Recv() + + err := stream.Send(&sdkproto.Provision_Response{ + Type: &sdkproto.Provision_Response_Log{ + Log: &sdkproto.Log{ + Level: sdkproto.LogLevel_DEBUG, + Output: "in progress", + }, + }, + }) + require.NoError(t, err) + + msg, err := stream.Recv() + require.NoError(t, err) + require.NotNil(t, msg.GetCancel()) + + return stream.Send(&sdkproto.Provision_Response{ + Type: &sdkproto.Provision_Response_Complete{ + Complete: &sdkproto.Provision_Complete{ + Error: "some error", + }, + }, + }) + }, + }), + }) + <-updateChan + <-completeChan + require.NoError(t, server.Close()) + }) } // Creates an in-memory tar of the files provided. @@ -560,21 +632,16 @@ func createProvisionerClient(t *testing.T, server provisionerTestServer) sdkprot } type provisionerTestServer struct { - shutdown func(_ context.Context, _ *sdkproto.Empty) (*sdkproto.Empty, error) parse func(request *sdkproto.Parse_Request, stream sdkproto.DRPCProvisioner_ParseStream) error - provision func(request *sdkproto.Provision_Request, stream sdkproto.DRPCProvisioner_ProvisionStream) error -} - -func (p *provisionerTestServer) Shutdown(ctx context.Context, empty *sdkproto.Empty) (*sdkproto.Empty, error) { - return p.shutdown(ctx, empty) + provision func(stream sdkproto.DRPCProvisioner_ProvisionStream) error } func (p *provisionerTestServer) Parse(request *sdkproto.Parse_Request, stream sdkproto.DRPCProvisioner_ParseStream) error { return p.parse(request, stream) } -func (p *provisionerTestServer) Provision(request *sdkproto.Provision_Request, stream sdkproto.DRPCProvisioner_ProvisionStream) error { - return p.provision(request, stream) +func (p *provisionerTestServer) Provision(stream sdkproto.DRPCProvisioner_ProvisionStream) error { + return p.provision(stream) } // Fulfills the protobuf interface for a ProvisionerDaemon with diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go index dfe499b6ba685..f13d8301f2d04 100644 --- a/provisionersdk/proto/provisioner.pb.go +++ b/provisionersdk/proto/provisioner.pb.go @@ -1175,7 +1175,7 @@ func (x *Provision_Metadata) GetWorkspaceTransition() WorkspaceTransition { return WorkspaceTransition_START } -type Provision_Request struct { +type Provision_Start struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1187,8 +1187,8 @@ type Provision_Request struct { DryRun bool `protobuf:"varint,5,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"` } -func (x *Provision_Request) Reset() { - *x = Provision_Request{} +func (x *Provision_Start) Reset() { + *x = Provision_Start{} if protoimpl.UnsafeEnabled { mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1196,13 +1196,13 @@ func (x *Provision_Request) Reset() { } } -func (x *Provision_Request) String() string { +func (x *Provision_Start) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Provision_Request) ProtoMessage() {} +func (*Provision_Start) ProtoMessage() {} -func (x *Provision_Request) ProtoReflect() protoreflect.Message { +func (x *Provision_Start) ProtoReflect() protoreflect.Message { mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1214,46 +1214,164 @@ func (x *Provision_Request) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Provision_Request.ProtoReflect.Descriptor instead. -func (*Provision_Request) Descriptor() ([]byte, []int) { +// Deprecated: Use Provision_Start.ProtoReflect.Descriptor instead. +func (*Provision_Start) Descriptor() ([]byte, []int) { return file_provisionersdk_proto_provisioner_proto_rawDescGZIP(), []int{10, 1} } -func (x *Provision_Request) GetDirectory() string { +func (x *Provision_Start) GetDirectory() string { if x != nil { return x.Directory } return "" } -func (x *Provision_Request) GetParameterValues() []*ParameterValue { +func (x *Provision_Start) GetParameterValues() []*ParameterValue { if x != nil { return x.ParameterValues } return nil } -func (x *Provision_Request) GetMetadata() *Provision_Metadata { +func (x *Provision_Start) GetMetadata() *Provision_Metadata { if x != nil { return x.Metadata } return nil } -func (x *Provision_Request) GetState() []byte { +func (x *Provision_Start) GetState() []byte { if x != nil { return x.State } return nil } -func (x *Provision_Request) GetDryRun() bool { +func (x *Provision_Start) GetDryRun() bool { if x != nil { return x.DryRun } return false } +type Provision_Cancel struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *Provision_Cancel) Reset() { + *x = Provision_Cancel{} + if protoimpl.UnsafeEnabled { + mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Provision_Cancel) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Provision_Cancel) ProtoMessage() {} + +func (x *Provision_Cancel) ProtoReflect() protoreflect.Message { + mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[17] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Provision_Cancel.ProtoReflect.Descriptor instead. +func (*Provision_Cancel) Descriptor() ([]byte, []int) { + return file_provisionersdk_proto_provisioner_proto_rawDescGZIP(), []int{10, 2} +} + +type Provision_Request struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // Types that are assignable to Type: + // *Provision_Request_Start + // *Provision_Request_Cancel + Type isProvision_Request_Type `protobuf_oneof:"type"` +} + +func (x *Provision_Request) Reset() { + *x = Provision_Request{} + if protoimpl.UnsafeEnabled { + mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Provision_Request) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Provision_Request) ProtoMessage() {} + +func (x *Provision_Request) ProtoReflect() protoreflect.Message { + mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[18] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Provision_Request.ProtoReflect.Descriptor instead. +func (*Provision_Request) Descriptor() ([]byte, []int) { + return file_provisionersdk_proto_provisioner_proto_rawDescGZIP(), []int{10, 3} +} + +func (m *Provision_Request) GetType() isProvision_Request_Type { + if m != nil { + return m.Type + } + return nil +} + +func (x *Provision_Request) GetStart() *Provision_Start { + if x, ok := x.GetType().(*Provision_Request_Start); ok { + return x.Start + } + return nil +} + +func (x *Provision_Request) GetCancel() *Provision_Cancel { + if x, ok := x.GetType().(*Provision_Request_Cancel); ok { + return x.Cancel + } + return nil +} + +type isProvision_Request_Type interface { + isProvision_Request_Type() +} + +type Provision_Request_Start struct { + Start *Provision_Start `protobuf:"bytes,1,opt,name=start,proto3,oneof"` +} + +type Provision_Request_Cancel struct { + Cancel *Provision_Cancel `protobuf:"bytes,2,opt,name=cancel,proto3,oneof"` +} + +func (*Provision_Request_Start) isProvision_Request_Type() {} + +func (*Provision_Request_Cancel) isProvision_Request_Type() {} + type Provision_Complete struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1267,7 +1385,7 @@ type Provision_Complete struct { func (x *Provision_Complete) Reset() { *x = Provision_Complete{} if protoimpl.UnsafeEnabled { - mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[17] + mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1280,7 +1398,7 @@ func (x *Provision_Complete) String() string { func (*Provision_Complete) ProtoMessage() {} func (x *Provision_Complete) ProtoReflect() protoreflect.Message { - mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[17] + mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1293,7 +1411,7 @@ func (x *Provision_Complete) ProtoReflect() protoreflect.Message { // Deprecated: Use Provision_Complete.ProtoReflect.Descriptor instead. func (*Provision_Complete) Descriptor() ([]byte, []int) { - return file_provisionersdk_proto_provisioner_proto_rawDescGZIP(), []int{10, 2} + return file_provisionersdk_proto_provisioner_proto_rawDescGZIP(), []int{10, 4} } func (x *Provision_Complete) GetState() []byte { @@ -1331,7 +1449,7 @@ type Provision_Response struct { func (x *Provision_Response) Reset() { *x = Provision_Response{} if protoimpl.UnsafeEnabled { - mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[18] + mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1344,7 +1462,7 @@ func (x *Provision_Response) String() string { func (*Provision_Response) ProtoMessage() {} func (x *Provision_Response) ProtoReflect() protoreflect.Message { - mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[18] + mi := &file_provisionersdk_proto_provisioner_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1357,7 +1475,7 @@ func (x *Provision_Response) ProtoReflect() protoreflect.Message { // Deprecated: Use Provision_Response.ProtoReflect.Descriptor instead. func (*Provision_Response) Descriptor() ([]byte, []int) { - return file_provisionersdk_proto_provisioner_proto_rawDescGZIP(), []int{10, 3} + return file_provisionersdk_proto_provisioner_proto_rawDescGZIP(), []int{10, 5} } func (m *Provision_Response) GetType() isProvision_Response_Type { @@ -1520,7 +1638,7 @@ var file_provisionersdk_proto_provisioner_proto_rawDesc = []byte{ 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x73, 0x65, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x48, 0x00, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x70, - 0x6c, 0x65, 0x74, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0xcd, 0x04, 0x0a, + 0x6c, 0x65, 0x74, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0xd8, 0x05, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x1a, 0x7c, 0x0a, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x6f, 0x64, 0x65, 0x72, @@ -1529,60 +1647,65 @@ var file_provisionersdk_proto_provisioner_proto_rawDesc = []byte{ 0x0e, 0x32, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x13, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x54, 0x72, - 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0xdb, 0x01, 0x0a, 0x07, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, - 0x72, 0x79, 0x12, 0x46, 0x0a, 0x10, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x70, - 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, - 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x3b, 0x0a, 0x08, 0x6d, 0x65, - 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x70, - 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, - 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x08, 0x6d, - 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x17, 0x0a, - 0x07, 0x64, 0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, - 0x64, 0x72, 0x79, 0x52, 0x75, 0x6e, 0x1a, 0x6b, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, - 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0c, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x33, - 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, - 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x73, 0x1a, 0x77, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x24, 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, - 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x4c, 0x6f, 0x67, 0x48, 0x00, - 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x12, 0x3d, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, - 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x2e, - 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x48, 0x00, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x70, - 0x6c, 0x65, 0x74, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x2a, 0x3f, 0x0a, 0x08, - 0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x52, 0x41, 0x43, - 0x45, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x44, 0x45, 0x42, 0x55, 0x47, 0x10, 0x01, 0x12, 0x08, - 0x0a, 0x04, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x57, 0x41, 0x52, 0x4e, - 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x04, 0x2a, 0x37, 0x0a, - 0x13, 0x57, 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x54, 0x41, 0x52, 0x54, 0x10, 0x00, 0x12, - 0x08, 0x0a, 0x04, 0x53, 0x54, 0x4f, 0x50, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x53, - 0x54, 0x52, 0x4f, 0x59, 0x10, 0x02, 0x32, 0xd5, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x76, 0x69, - 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x12, 0x32, 0x0a, 0x08, 0x53, 0x68, 0x75, 0x74, 0x64, 0x6f, - 0x77, 0x6e, 0x12, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, - 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, - 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x42, 0x0a, 0x05, 0x50, 0x61, - 0x72, 0x73, 0x65, 0x12, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, - 0x72, 0x2e, 0x50, 0x61, 0x72, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, - 0x72, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x30, 0x01, 0x12, 0x4e, - 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x2e, 0x70, 0x72, - 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, - 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x72, - 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, - 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x30, 0x01, 0x42, 0x2d, - 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x64, - 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, - 0x6f, 0x6e, 0x65, 0x72, 0x73, 0x64, 0x6b, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0xd9, 0x01, 0x0a, 0x05, 0x53, 0x74, 0x61, + 0x72, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, + 0x12, 0x46, 0x0a, 0x10, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x70, 0x72, 0x6f, + 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, + 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, + 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x3b, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x70, 0x72, 0x6f, + 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, + 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x08, 0x6d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x64, + 0x72, 0x79, 0x5f, 0x72, 0x75, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x64, 0x72, + 0x79, 0x52, 0x75, 0x6e, 0x1a, 0x08, 0x0a, 0x06, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x1a, 0x80, + 0x01, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x34, 0x0a, 0x05, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x76, + 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, + 0x6e, 0x2e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x48, 0x00, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x12, 0x37, 0x0a, 0x06, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1d, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, + 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x48, + 0x00, 0x52, 0x06, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, + 0x65, 0x1a, 0x6b, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x14, 0x0a, + 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x73, 0x74, + 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x33, 0x0a, 0x09, 0x72, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x70, + 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x1a, 0x77, + 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x24, 0x0a, 0x03, 0x6c, 0x6f, + 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, + 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x4c, 0x6f, 0x67, 0x48, 0x00, 0x52, 0x03, 0x6c, 0x6f, 0x67, + 0x12, 0x3d, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, + 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, + 0x65, 0x74, 0x65, 0x48, 0x00, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x42, + 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x2a, 0x3f, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x4c, 0x65, + 0x76, 0x65, 0x6c, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x52, 0x41, 0x43, 0x45, 0x10, 0x00, 0x12, 0x09, + 0x0a, 0x05, 0x44, 0x45, 0x42, 0x55, 0x47, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x4e, 0x46, + 0x4f, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x57, 0x41, 0x52, 0x4e, 0x10, 0x03, 0x12, 0x09, 0x0a, + 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x04, 0x2a, 0x37, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6b, + 0x73, 0x70, 0x61, 0x63, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x09, 0x0a, 0x05, 0x53, 0x54, 0x41, 0x52, 0x54, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x54, + 0x4f, 0x50, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x53, 0x54, 0x52, 0x4f, 0x59, 0x10, + 0x02, 0x32, 0xa3, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, + 0x72, 0x12, 0x42, 0x0a, 0x05, 0x50, 0x61, 0x72, 0x73, 0x65, 0x12, 0x1a, 0x2e, 0x70, 0x72, 0x6f, + 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x73, 0x65, 0x2e, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, + 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x30, 0x01, 0x12, 0x50, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, + 0x6f, 0x6e, 0x12, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, + 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, + 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x28, 0x01, 0x30, 0x01, 0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x64, 0x65, + 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x73, 0x64, 0x6b, + 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1598,7 +1721,7 @@ func file_provisionersdk_proto_provisioner_proto_rawDescGZIP() []byte { } var file_provisionersdk_proto_provisioner_proto_enumTypes = make([]protoimpl.EnumInfo, 5) -var file_provisionersdk_proto_provisioner_proto_msgTypes = make([]protoimpl.MessageInfo, 19) +var file_provisionersdk_proto_provisioner_proto_msgTypes = make([]protoimpl.MessageInfo, 21) var file_provisionersdk_proto_provisioner_proto_goTypes = []interface{}{ (LogLevel)(0), // 0: provisioner.LogLevel (WorkspaceTransition)(0), // 1: provisioner.WorkspaceTransition @@ -1621,9 +1744,11 @@ var file_provisionersdk_proto_provisioner_proto_goTypes = []interface{}{ (*Parse_Complete)(nil), // 18: provisioner.Parse.Complete (*Parse_Response)(nil), // 19: provisioner.Parse.Response (*Provision_Metadata)(nil), // 20: provisioner.Provision.Metadata - (*Provision_Request)(nil), // 21: provisioner.Provision.Request - (*Provision_Complete)(nil), // 22: provisioner.Provision.Complete - (*Provision_Response)(nil), // 23: provisioner.Provision.Response + (*Provision_Start)(nil), // 21: provisioner.Provision.Start + (*Provision_Cancel)(nil), // 22: provisioner.Provision.Cancel + (*Provision_Request)(nil), // 23: provisioner.Provision.Request + (*Provision_Complete)(nil), // 24: provisioner.Provision.Complete + (*Provision_Response)(nil), // 25: provisioner.Provision.Response } var file_provisionersdk_proto_provisioner_proto_depIdxs = []int32{ 2, // 0: provisioner.ParameterSource.scheme:type_name -> provisioner.ParameterSource.Scheme @@ -1640,22 +1765,22 @@ var file_provisionersdk_proto_provisioner_proto_depIdxs = []int32{ 10, // 11: provisioner.Parse.Response.log:type_name -> provisioner.Log 18, // 12: provisioner.Parse.Response.complete:type_name -> provisioner.Parse.Complete 1, // 13: provisioner.Provision.Metadata.workspace_transition:type_name -> provisioner.WorkspaceTransition - 8, // 14: provisioner.Provision.Request.parameter_values:type_name -> provisioner.ParameterValue - 20, // 15: provisioner.Provision.Request.metadata:type_name -> provisioner.Provision.Metadata - 13, // 16: provisioner.Provision.Complete.resources:type_name -> provisioner.Resource - 10, // 17: provisioner.Provision.Response.log:type_name -> provisioner.Log - 22, // 18: provisioner.Provision.Response.complete:type_name -> provisioner.Provision.Complete - 5, // 19: provisioner.Provisioner.Shutdown:input_type -> provisioner.Empty - 17, // 20: provisioner.Provisioner.Parse:input_type -> provisioner.Parse.Request - 21, // 21: provisioner.Provisioner.Provision:input_type -> provisioner.Provision.Request - 5, // 22: provisioner.Provisioner.Shutdown:output_type -> provisioner.Empty + 8, // 14: provisioner.Provision.Start.parameter_values:type_name -> provisioner.ParameterValue + 20, // 15: provisioner.Provision.Start.metadata:type_name -> provisioner.Provision.Metadata + 21, // 16: provisioner.Provision.Request.start:type_name -> provisioner.Provision.Start + 22, // 17: provisioner.Provision.Request.cancel:type_name -> provisioner.Provision.Cancel + 13, // 18: provisioner.Provision.Complete.resources:type_name -> provisioner.Resource + 10, // 19: provisioner.Provision.Response.log:type_name -> provisioner.Log + 24, // 20: provisioner.Provision.Response.complete:type_name -> provisioner.Provision.Complete + 17, // 21: provisioner.Provisioner.Parse:input_type -> provisioner.Parse.Request + 23, // 22: provisioner.Provisioner.Provision:input_type -> provisioner.Provision.Request 19, // 23: provisioner.Provisioner.Parse:output_type -> provisioner.Parse.Response - 23, // 24: provisioner.Provisioner.Provision:output_type -> provisioner.Provision.Response - 22, // [22:25] is the sub-list for method output_type - 19, // [19:22] is the sub-list for method input_type - 19, // [19:19] is the sub-list for extension type_name - 19, // [19:19] is the sub-list for extension extendee - 0, // [0:19] is the sub-list for field type_name + 25, // 24: provisioner.Provisioner.Provision:output_type -> provisioner.Provision.Response + 23, // [23:25] is the sub-list for method output_type + 21, // [21:23] is the sub-list for method input_type + 21, // [21:21] is the sub-list for extension type_name + 21, // [21:21] is the sub-list for extension extendee + 0, // [0:21] is the sub-list for field type_name } func init() { file_provisionersdk_proto_provisioner_proto_init() } @@ -1845,7 +1970,7 @@ func file_provisionersdk_proto_provisioner_proto_init() { } } file_provisionersdk_proto_provisioner_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Provision_Request); i { + switch v := v.(*Provision_Start); i { case 0: return &v.state case 1: @@ -1857,7 +1982,7 @@ func file_provisionersdk_proto_provisioner_proto_init() { } } file_provisionersdk_proto_provisioner_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Provision_Complete); i { + switch v := v.(*Provision_Cancel); i { case 0: return &v.state case 1: @@ -1869,6 +1994,30 @@ func file_provisionersdk_proto_provisioner_proto_init() { } } file_provisionersdk_proto_provisioner_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Provision_Request); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_provisionersdk_proto_provisioner_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Provision_Complete); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_provisionersdk_proto_provisioner_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Provision_Response); i { case 0: return &v.state @@ -1890,6 +2039,10 @@ func file_provisionersdk_proto_provisioner_proto_init() { (*Parse_Response_Complete)(nil), } file_provisionersdk_proto_provisioner_proto_msgTypes[18].OneofWrappers = []interface{}{ + (*Provision_Request_Start)(nil), + (*Provision_Request_Cancel)(nil), + } + file_provisionersdk_proto_provisioner_proto_msgTypes[20].OneofWrappers = []interface{}{ (*Provision_Response_Log)(nil), (*Provision_Response_Complete)(nil), } @@ -1899,7 +2052,7 @@ func file_provisionersdk_proto_provisioner_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_provisionersdk_proto_provisioner_proto_rawDesc, NumEnums: 5, - NumMessages: 19, + NumMessages: 21, NumExtensions: 0, NumServices: 1, }, diff --git a/provisionersdk/proto/provisioner.proto b/provisionersdk/proto/provisioner.proto index 4ba3f2279a242..cdb976126248a 100644 --- a/provisionersdk/proto/provisioner.proto +++ b/provisionersdk/proto/provisioner.proto @@ -118,13 +118,20 @@ message Provision { string coder_url = 1; WorkspaceTransition workspace_transition = 2; } - message Request { + message Start { string directory = 1; repeated ParameterValue parameter_values = 2; Metadata metadata = 3; bytes state = 4; bool dry_run = 5; } + message Cancel {} + message Request { + oneof type { + Start start = 1; + Cancel cancel = 2; + } + } message Complete { bytes state = 1; string error = 2; @@ -139,7 +146,6 @@ message Provision { } service Provisioner { - rpc Shutdown(Empty) returns (Empty); rpc Parse(Parse.Request) returns (stream Parse.Response); - rpc Provision(Provision.Request) returns (stream Provision.Response); + rpc Provision(stream Provision.Request) returns (stream Provision.Response); } diff --git a/provisionersdk/proto/provisioner_drpc.pb.go b/provisionersdk/proto/provisioner_drpc.pb.go index 8eaa9e1c93182..c990f6f645b7f 100644 --- a/provisionersdk/proto/provisioner_drpc.pb.go +++ b/provisionersdk/proto/provisioner_drpc.pb.go @@ -38,9 +38,8 @@ func (drpcEncoding_File_provisionersdk_proto_provisioner_proto) JSONUnmarshal(bu type DRPCProvisionerClient interface { DRPCConn() drpc.Conn - Shutdown(ctx context.Context, in *Empty) (*Empty, error) Parse(ctx context.Context, in *Parse_Request) (DRPCProvisioner_ParseClient, error) - Provision(ctx context.Context, in *Provision_Request) (DRPCProvisioner_ProvisionClient, error) + Provision(ctx context.Context) (DRPCProvisioner_ProvisionClient, error) } type drpcProvisionerClient struct { @@ -53,15 +52,6 @@ func NewDRPCProvisionerClient(cc drpc.Conn) DRPCProvisionerClient { func (c *drpcProvisionerClient) DRPCConn() drpc.Conn { return c.cc } -func (c *drpcProvisionerClient) Shutdown(ctx context.Context, in *Empty) (*Empty, error) { - out := new(Empty) - err := c.cc.Invoke(ctx, "/provisioner.Provisioner/Shutdown", drpcEncoding_File_provisionersdk_proto_provisioner_proto{}, in, out) - if err != nil { - return nil, err - } - return out, nil -} - func (c *drpcProvisionerClient) Parse(ctx context.Context, in *Parse_Request) (DRPCProvisioner_ParseClient, error) { stream, err := c.cc.NewStream(ctx, "/provisioner.Provisioner/Parse", drpcEncoding_File_provisionersdk_proto_provisioner_proto{}) if err != nil { @@ -98,23 +88,18 @@ func (x *drpcProvisioner_ParseClient) RecvMsg(m *Parse_Response) error { return x.MsgRecv(m, drpcEncoding_File_provisionersdk_proto_provisioner_proto{}) } -func (c *drpcProvisionerClient) Provision(ctx context.Context, in *Provision_Request) (DRPCProvisioner_ProvisionClient, error) { +func (c *drpcProvisionerClient) Provision(ctx context.Context) (DRPCProvisioner_ProvisionClient, error) { stream, err := c.cc.NewStream(ctx, "/provisioner.Provisioner/Provision", drpcEncoding_File_provisionersdk_proto_provisioner_proto{}) if err != nil { return nil, err } x := &drpcProvisioner_ProvisionClient{stream} - if err := x.MsgSend(in, drpcEncoding_File_provisionersdk_proto_provisioner_proto{}); err != nil { - return nil, err - } - if err := x.CloseSend(); err != nil { - return nil, err - } return x, nil } type DRPCProvisioner_ProvisionClient interface { drpc.Stream + Send(*Provision_Request) error Recv() (*Provision_Response, error) } @@ -122,6 +107,10 @@ type drpcProvisioner_ProvisionClient struct { drpc.Stream } +func (x *drpcProvisioner_ProvisionClient) Send(m *Provision_Request) error { + return x.MsgSend(m, drpcEncoding_File_provisionersdk_proto_provisioner_proto{}) +} + func (x *drpcProvisioner_ProvisionClient) Recv() (*Provision_Response, error) { m := new(Provision_Response) if err := x.MsgRecv(m, drpcEncoding_File_provisionersdk_proto_provisioner_proto{}); err != nil { @@ -135,41 +124,27 @@ func (x *drpcProvisioner_ProvisionClient) RecvMsg(m *Provision_Response) error { } type DRPCProvisionerServer interface { - Shutdown(context.Context, *Empty) (*Empty, error) Parse(*Parse_Request, DRPCProvisioner_ParseStream) error - Provision(*Provision_Request, DRPCProvisioner_ProvisionStream) error + Provision(DRPCProvisioner_ProvisionStream) error } type DRPCProvisionerUnimplementedServer struct{} -func (s *DRPCProvisionerUnimplementedServer) Shutdown(context.Context, *Empty) (*Empty, error) { - return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) -} - func (s *DRPCProvisionerUnimplementedServer) Parse(*Parse_Request, DRPCProvisioner_ParseStream) error { return drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) } -func (s *DRPCProvisionerUnimplementedServer) Provision(*Provision_Request, DRPCProvisioner_ProvisionStream) error { +func (s *DRPCProvisionerUnimplementedServer) Provision(DRPCProvisioner_ProvisionStream) error { return drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) } type DRPCProvisionerDescription struct{} -func (DRPCProvisionerDescription) NumMethods() int { return 3 } +func (DRPCProvisionerDescription) NumMethods() int { return 2 } func (DRPCProvisionerDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver, interface{}, bool) { switch n { case 0: - return "/provisioner.Provisioner/Shutdown", drpcEncoding_File_provisionersdk_proto_provisioner_proto{}, - func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCProvisionerServer). - Shutdown( - ctx, - in1.(*Empty), - ) - }, DRPCProvisionerServer.Shutdown, true - case 1: return "/provisioner.Provisioner/Parse", drpcEncoding_File_provisionersdk_proto_provisioner_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return nil, srv.(DRPCProvisionerServer). @@ -178,13 +153,12 @@ func (DRPCProvisionerDescription) Method(n int) (string, drpc.Encoding, drpc.Rec &drpcProvisioner_ParseStream{in2.(drpc.Stream)}, ) }, DRPCProvisionerServer.Parse, true - case 2: + case 1: return "/provisioner.Provisioner/Provision", drpcEncoding_File_provisionersdk_proto_provisioner_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return nil, srv.(DRPCProvisionerServer). Provision( - in1.(*Provision_Request), - &drpcProvisioner_ProvisionStream{in2.(drpc.Stream)}, + &drpcProvisioner_ProvisionStream{in1.(drpc.Stream)}, ) }, DRPCProvisionerServer.Provision, true default: @@ -196,22 +170,6 @@ func DRPCRegisterProvisioner(mux drpc.Mux, impl DRPCProvisionerServer) error { return mux.Register(impl, DRPCProvisionerDescription{}) } -type DRPCProvisioner_ShutdownStream interface { - drpc.Stream - SendAndClose(*Empty) error -} - -type drpcProvisioner_ShutdownStream struct { - drpc.Stream -} - -func (x *drpcProvisioner_ShutdownStream) SendAndClose(m *Empty) error { - if err := x.MsgSend(m, drpcEncoding_File_provisionersdk_proto_provisioner_proto{}); err != nil { - return err - } - return x.CloseSend() -} - type DRPCProvisioner_ParseStream interface { drpc.Stream Send(*Parse_Response) error @@ -228,6 +186,7 @@ func (x *drpcProvisioner_ParseStream) Send(m *Parse_Response) error { type DRPCProvisioner_ProvisionStream interface { drpc.Stream Send(*Provision_Response) error + Recv() (*Provision_Request, error) } type drpcProvisioner_ProvisionStream struct { @@ -237,3 +196,15 @@ type drpcProvisioner_ProvisionStream struct { func (x *drpcProvisioner_ProvisionStream) Send(m *Provision_Response) error { return x.MsgSend(m, drpcEncoding_File_provisionersdk_proto_provisioner_proto{}) } + +func (x *drpcProvisioner_ProvisionStream) Recv() (*Provision_Request, error) { + m := new(Provision_Request) + if err := x.MsgRecv(m, drpcEncoding_File_provisionersdk_proto_provisioner_proto{}); err != nil { + return nil, err + } + return m, nil +} + +func (x *drpcProvisioner_ProvisionStream) RecvMsg(m *Provision_Request) error { + return x.MsgRecv(m, drpcEncoding_File_provisionersdk_proto_provisioner_proto{}) +} From 99c8eb180d2fd1d84bae023684e7ddfc8b3346b2 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Sun, 13 Mar 2022 16:52:57 +0000 Subject: [PATCH 07/37] Tests pass! --- coderd/provisionerdaemons.go | 6 ++++++ coderd/provisionerjobs.go | 12 ++++++++---- coderd/workspaces.go | 2 +- codersdk/provisionerdaemons.go | 3 ++- provisionerd/provisionerd.go | 27 --------------------------- 5 files changed, 17 insertions(+), 33 deletions(-) diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go index df60dda52c7bd..175d749deb374 100644 --- a/coderd/provisionerdaemons.go +++ b/coderd/provisionerdaemons.go @@ -264,6 +264,12 @@ func (server *provisionerdServer) UpdateJob(ctx context.Context, request *proto. if job.WorkerID.UUID.String() != server.ID.String() { return nil, xerrors.New("you don't own this job") } + if job.CancelledAt.Valid { + // Allows for graceful cancellation on the backend! + return &proto.UpdateJobResponse{ + Cancelled: true, + }, nil + } err = server.Database.UpdateProvisionerJobByID(ctx, database.UpdateProvisionerJobByIDParams{ ID: parsedID, UpdatedAt: database.Now(), diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go index 44bd31ff53e4f..8b603d3a24b17 100644 --- a/coderd/provisionerjobs.go +++ b/coderd/provisionerjobs.go @@ -246,8 +246,15 @@ func convertProvisionerJob(provisionerJob database.ProvisionerJob) codersdk.Prov } switch { + case database.Now().Sub(provisionerJob.UpdatedAt) > 30*time.Second: + job.Status = codersdk.ProvisionerJobFailed + job.Error = "Worker failed to update job in time." case provisionerJob.CancelledAt.Valid: - job.Status = codersdk.ProvisionerJobCancelled + if provisionerJob.CompletedAt.Valid { + job.Status = codersdk.ProvisionerJobCanceled + } else { + job.Status = codersdk.ProvisionerJobCanceling + } case !provisionerJob.StartedAt.Valid: job.Status = codersdk.ProvisionerJobPending case provisionerJob.CompletedAt.Valid: @@ -256,9 +263,6 @@ func convertProvisionerJob(provisionerJob database.ProvisionerJob) codersdk.Prov } else { job.Status = codersdk.ProvisionerJobFailed } - case database.Now().Sub(provisionerJob.UpdatedAt) > 30*time.Second: - job.Status = codersdk.ProvisionerJobFailed - job.Error = "Worker failed to update job in time." default: job.Status = codersdk.ProvisionerJobRunning } diff --git a/coderd/workspaces.go b/coderd/workspaces.go index 92a86f168b065..728de49fd2f08 100644 --- a/coderd/workspaces.go +++ b/coderd/workspaces.go @@ -107,7 +107,7 @@ func (api *api) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) { Message: fmt.Sprintf("The provided project version %q has failed to import. You cannot create workspaces using it!", projectVersion.Name), }) return - case codersdk.ProvisionerJobCancelled: + case codersdk.ProvisionerJobCanceled: httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{ Message: "The provided project version was canceled during import. You cannot create workspaces using it!", }) diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go index e3bc27ede0308..286986af7c17e 100644 --- a/codersdk/provisionerdaemons.go +++ b/codersdk/provisionerdaemons.go @@ -29,7 +29,8 @@ const ( ProvisionerJobPending ProvisionerJobStatus = "pending" ProvisionerJobRunning ProvisionerJobStatus = "running" ProvisionerJobSucceeded ProvisionerJobStatus = "succeeded" - ProvisionerJobCancelled ProvisionerJobStatus = "canceled" + ProvisionerJobCanceling ProvisionerJobStatus = "canceled" + ProvisionerJobCanceled ProvisionerJobStatus = "canceled" ProvisionerJobFailed ProvisionerJobStatus = "failed" ) diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go index e75210755ee49..fd6efaf6d75f8 100644 --- a/provisionerd/provisionerd.go +++ b/provisionerd/provisionerd.go @@ -366,20 +366,6 @@ func (p *Server) runJob(ctx context.Context, job *proto.AcquiredJob) { } func (p *Server) runProjectImport(ctx, shutdown context.Context, provisioner sdkproto.DRPCProvisionerClient, job *proto.AcquiredJob) { - _, err := p.client.UpdateJob(ctx, &proto.UpdateJobRequest{ - JobId: job.GetJobId(), - Logs: []*proto.Log{{ - Source: proto.LogSource_PROVISIONER_DAEMON, - Level: sdkproto.LogLevel_INFO, - CreatedAt: time.Now().UTC().UnixMilli(), - Output: "Parsing variables...", - }}, - }) - if err != nil { - p.failActiveJobf("write log: %s", err) - return - } - parameterSchemas, err := p.runProjectImportParse(ctx, provisioner, job) if err != nil { p.failActiveJobf("run parse: %s", err) @@ -407,19 +393,6 @@ func (p *Server) runProjectImport(ctx, shutdown context.Context, provisioner sdk } } - _, err = p.client.UpdateJob(ctx, &proto.UpdateJobRequest{ - JobId: job.GetJobId(), - Logs: []*proto.Log{{ - Source: proto.LogSource_PROVISIONER_DAEMON, - Level: sdkproto.LogLevel_INFO, - CreatedAt: time.Now().UTC().UnixMilli(), - Output: "Running start...", - }}, - }) - if err != nil { - p.failActiveJobf("write log: %s", err) - return - } startResources, err := p.runProjectImportProvision(ctx, shutdown, provisioner, job, updateResponse.ParameterValues, &sdkproto.Provision_Metadata{ CoderUrl: job.GetProjectImport().Metadata.CoderUrl, WorkspaceTransition: sdkproto.WorkspaceTransition_START, From 6b4c8b5817fa19ec013372997a2092716f8ed023 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Sun, 13 Mar 2022 18:45:41 +0000 Subject: [PATCH 08/37] Add deletion of workspaces and projects --- cli/projectcreate.go | 14 +- cli/projects.go | 2 +- cli/workspacecreate.go | 2 +- coderd/coderd.go | 5 +- coderd/coderdtest/coderdtest.go | 7 +- coderd/organizations.go | 4 +- coderd/projects.go | 76 +++++++ coderd/projects_test.go | 74 +++++++ coderd/projectversions.go | 39 ++++ coderd/projectversions_test.go | 31 +++ coderd/provisionerdaemons.go | 20 +- coderd/provisionerjobs.go | 2 +- coderd/users.go | 4 +- coderd/workspacebuilds.go | 40 ++++ coderd/workspacebuilds_test.go | 40 ++++ coderd/workspaces.go | 9 + coderd/workspaces_test.go | 61 ++++++ codersdk/projects.go | 30 +++ codersdk/projectversions.go | 13 ++ codersdk/provisionerdaemons.go | 2 +- codersdk/workspacebuilds.go | 13 ++ database/databasefake/databasefake.go | 105 +++++++++- database/dump.sql | 11 +- database/migrations/000002_projects.up.sql | 4 + database/migrations/000003_workspaces.up.sql | 7 +- database/migrations/000004_jobs.up.sql | 2 +- database/models.go | 4 +- database/querier.go | 9 +- database/query.sql | 55 ++++- database/query.sql.go | 204 ++++++++++++++++--- provisioner/terraform/provision.go | 2 +- provisionerd/proto/provisionerd.pb.go | 71 ++++--- provisionerd/proto/provisionerd.proto | 2 +- provisionerd/provisionerd.go | 28 ++- provisionerd/provisionerd_test.go | 2 +- 35 files changed, 885 insertions(+), 109 deletions(-) diff --git a/cli/projectcreate.go b/cli/projectcreate.go index 52811c52de31e..f417eec2783c0 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -4,6 +4,7 @@ import ( "errors" "fmt" "os" + "os/signal" "time" "github.com/briandowns/spinner" @@ -297,6 +298,17 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga if err != nil { return nil, err } + c := make(chan os.Signal, 1) + signal.Notify(c, os.Interrupt) + defer signal.Stop(c) + go func() { + defer signal.Stop(c) + <-c + + for sig := range c { + // sig is a ^C, handle it + } + }() spin.Suffix = " Waiting for the import to complete..." logs, err := client.ProjectVersionLogsAfter(cmd.Context(), version.ID, before) if err != nil { @@ -364,5 +376,5 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga if err != nil { return nil, err } - return &version, displayProjectImportInfo(cmd, parameterSchemas, parameterValues, resources) + return &version, displayProjectVersionInfo(cmd, parameterSchemas, parameterValues, resources) } diff --git a/cli/projects.go b/cli/projects.go index ba7836eb27db3..b37ddbe53f74e 100644 --- a/cli/projects.go +++ b/cli/projects.go @@ -40,7 +40,7 @@ func projects() *cobra.Command { return cmd } -func displayProjectImportInfo(cmd *cobra.Command, parameterSchemas []codersdk.ProjectVersionParameterSchema, parameterValues []codersdk.ProjectVersionParameter, resources []codersdk.WorkspaceResource) error { +func displayProjectVersionInfo(cmd *cobra.Command, parameterSchemas []codersdk.ProjectVersionParameterSchema, parameterValues []codersdk.ProjectVersionParameter, resources []codersdk.WorkspaceResource) error { schemaByID := map[string]codersdk.ProjectVersionParameterSchema{} for _, schema := range parameterSchemas { schemaByID[schema.ID.String()] = schema diff --git a/cli/workspacecreate.go b/cli/workspacecreate.go index 5c8766d0fb6ec..d79781ba9bfa5 100644 --- a/cli/workspacecreate.go +++ b/cli/workspacecreate.go @@ -77,7 +77,7 @@ func workspaceCreate() *cobra.Command { if err != nil { return err } - err = displayProjectImportInfo(cmd, parameterSchemas, parameterValues, resources) + err = displayProjectVersionInfo(cmd, parameterSchemas, parameterValues, resources) if err != nil { return err } diff --git a/coderd/coderd.go b/coderd/coderd.go index f794e01a77787..238852f9de51f 100644 --- a/coderd/coderd.go +++ b/coderd/coderd.go @@ -75,9 +75,10 @@ func New(options *Options) (http.Handler, func()) { httpmw.ExtractOrganizationParam(options.Database), ) r.Get("/", api.project) + r.Delete("/", api.deleteProject) r.Route("/versions", func(r chi.Router) { r.Get("/", api.projectVersionsByProject) - r.Patch("/versions", nil) + r.Patch("/", api.patchActiveProjectVersion) r.Get("/{projectversionname}", api.projectVersionByName) }) }) @@ -89,6 +90,7 @@ func New(options *Options) (http.Handler, func()) { ) r.Get("/", api.projectVersion) + r.Patch("/cancel", api.patchCancelProjectVersion) r.Get("/schema", api.projectVersionSchema) r.Get("/parameters", api.projectVersionParameters) r.Get("/resources", api.projectVersionResources) @@ -168,6 +170,7 @@ func New(options *Options) (http.Handler, func()) { httpmw.ExtractWorkspaceParam(options.Database), ) r.Get("/", api.workspaceBuild) + r.Patch("/cancel", api.patchCancelWorkspaceBuild) r.Get("/logs", api.workspaceBuildLogs) r.Get("/resources", api.workspaceBuildResources) }) diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index a9053f347c3ec..8605300345004 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -118,9 +118,10 @@ func NewProvisionerDaemon(t *testing.T, client *codersdk.Client) io.Closer { }() closer := provisionerd.New(client.ListenProvisionerDaemon, &provisionerd.Options{ - Logger: slogtest.Make(t, nil).Named("provisionerd").Leveled(slog.LevelDebug), - PollInterval: 50 * time.Millisecond, - UpdateInterval: 50 * time.Millisecond, + Logger: slogtest.Make(t, nil).Named("provisionerd").Leveled(slog.LevelDebug), + PollInterval: 50 * time.Millisecond, + UpdateInterval: 50 * time.Millisecond, + ForceCancelInterval: 50 * time.Millisecond, Provisioners: provisionerd.Provisioners{ string(database.ProvisionerTypeEcho): proto.NewDRPCProvisionerClient(provisionersdk.Conn(echoClient)), }, diff --git a/coderd/organizations.go b/coderd/organizations.go index b4d8a252b891e..03f97810aa800 100644 --- a/coderd/organizations.go +++ b/coderd/organizations.go @@ -238,7 +238,9 @@ func (api *api) postProjectsByOrganization(rw http.ResponseWriter, r *http.Reque func (api *api) projectsByOrganization(rw http.ResponseWriter, r *http.Request) { organization := httpmw.OrganizationParam(r) - projects, err := api.Database.GetProjectsByOrganization(r.Context(), organization.ID) + projects, err := api.Database.GetProjectsByOrganization(r.Context(), database.GetProjectsByOrganizationParams{ + OrganizationID: organization.ID, + }) if errors.Is(err, sql.ErrNoRows) { err = nil } diff --git a/coderd/projects.go b/coderd/projects.go index a4eb959974d5f..74cdbbe65e78d 100644 --- a/coderd/projects.go +++ b/coderd/projects.go @@ -38,6 +38,42 @@ func (api *api) project(rw http.ResponseWriter, r *http.Request) { render.JSON(rw, r, convertProject(project, count)) } +func (api *api) deleteProject(rw http.ResponseWriter, r *http.Request) { + project := httpmw.ProjectParam(r) + + workspaces, err := api.Database.GetWorkspacesByProjectID(r.Context(), database.GetWorkspacesByProjectIDParams{ + ProjectID: project.ID, + }) + if errors.Is(err, sql.ErrNoRows) { + err = nil + } + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get workspaces by project id: %s", err), + }) + return + } + if len(workspaces) > 0 { + httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{ + Message: fmt.Sprintf("All workspaces must be deleted before a project can be removed."), + }) + return + } + err = api.Database.UpdateProjectDeletedByID(r.Context(), database.UpdateProjectDeletedByIDParams{ + ID: project.ID, + Deleted: true, + }) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("update project deleted by id: %s", err), + }) + return + } + httpapi.Write(rw, http.StatusOK, httpapi.Response{ + Message: "Project has been deleted!", + }) +} + func (api *api) projectVersionsByProject(rw http.ResponseWriter, r *http.Request) { project := httpmw.ProjectParam(r) @@ -116,6 +152,46 @@ func (api *api) projectVersionByName(rw http.ResponseWriter, r *http.Request) { render.JSON(rw, r, convertProjectVersion(projectVersion, convertProvisionerJob(job))) } +func (api *api) patchActiveProjectVersion(rw http.ResponseWriter, r *http.Request) { + var req codersdk.UpdateActiveProjectVersion + if !httpapi.Read(rw, r, &req) { + return + } + project := httpmw.ProjectParam(r) + version, err := api.Database.GetProjectVersionByID(r.Context(), req.ID) + if errors.Is(err, sql.ErrNoRows) { + httpapi.Write(rw, http.StatusNotFound, httpapi.Response{ + Message: "project version not found", + }) + return + } + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get project version: %s", err), + }) + return + } + if version.ProjectID.UUID.String() != project.ID.String() { + httpapi.Write(rw, http.StatusUnauthorized, httpapi.Response{ + Message: "The provided project version doesn't belong to the specified project.", + }) + return + } + err = api.Database.UpdateProjectActiveVersionByID(r.Context(), database.UpdateProjectActiveVersionByIDParams{ + ID: project.ID, + ActiveVersionID: req.ID, + }) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("update active project version: %s", err), + }) + return + } + httpapi.Write(rw, http.StatusOK, httpapi.Response{ + Message: "Updated the active project version!", + }) +} + func convertProjects(projects []database.Project, workspaceCounts []database.GetWorkspaceOwnerCountsByProjectIDsRow) []codersdk.Project { apiProjects := make([]codersdk.Project, 0, len(projects)) for _, project := range projects { diff --git a/coderd/projects_test.go b/coderd/projects_test.go index 7d82dfbf4b1f4..d819243adfbb4 100644 --- a/coderd/projects_test.go +++ b/coderd/projects_test.go @@ -5,6 +5,7 @@ import ( "net/http" "testing" + "github.com/google/uuid" "github.com/stretchr/testify/require" "github.com/coder/coder/coderd/coderdtest" @@ -25,6 +26,35 @@ func TestProject(t *testing.T) { }) } +func TestDeleteProject(t *testing.T) { + t.Parallel() + + t.Run("NoWorkspaces", func(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + user := coderdtest.CreateFirstUser(t, client) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) + err := client.DeleteProject(context.Background(), project.ID) + require.NoError(t, err) + }) + + t.Run("Workspaces", func(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + user := coderdtest.CreateFirstUser(t, client) + coderdtest.NewProvisionerDaemon(t, client) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) + coderdtest.AwaitProjectVersionJob(t, client, version.ID) + coderdtest.CreateWorkspace(t, client, "me", project.ID) + err := client.DeleteProject(context.Background(), project.ID) + var apiErr *codersdk.Error + require.ErrorAs(t, err, &apiErr) + require.Equal(t, http.StatusPreconditionFailed, apiErr.StatusCode()) + }) +} + func TestProjectVersionsByProject(t *testing.T) { t.Parallel() t.Run("Get", func(t *testing.T) { @@ -63,3 +93,47 @@ func TestProjectVersionByName(t *testing.T) { require.NoError(t, err) }) } + +func TestPatchActiveProjectVersion(t *testing.T) { + t.Parallel() + t.Run("NotFound", func(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + user := coderdtest.CreateFirstUser(t, client) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) + err := client.UpdateActiveProjectVersion(context.Background(), project.ID, codersdk.UpdateActiveProjectVersion{ + ID: uuid.New(), + }) + var apiErr *codersdk.Error + require.ErrorAs(t, err, &apiErr) + require.Equal(t, http.StatusNotFound, apiErr.StatusCode()) + }) + + t.Run("DoesNotBelong", func(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + user := coderdtest.CreateFirstUser(t, client) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) + version = coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + err := client.UpdateActiveProjectVersion(context.Background(), project.ID, codersdk.UpdateActiveProjectVersion{ + ID: version.ID, + }) + var apiErr *codersdk.Error + require.ErrorAs(t, err, &apiErr) + require.Equal(t, http.StatusUnauthorized, apiErr.StatusCode()) + }) + + t.Run("Found", func(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + user := coderdtest.CreateFirstUser(t, client) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) + err := client.UpdateActiveProjectVersion(context.Background(), project.ID, codersdk.UpdateActiveProjectVersion{ + ID: version.ID, + }) + require.NoError(t, err) + }) +} diff --git a/coderd/projectversions.go b/coderd/projectversions.go index 3b62022dc0400..8886424975fac 100644 --- a/coderd/projectversions.go +++ b/coderd/projectversions.go @@ -28,6 +28,45 @@ func (api *api) projectVersion(rw http.ResponseWriter, r *http.Request) { render.JSON(rw, r, convertProjectVersion(projectVersion, convertProvisionerJob(job))) } +func (api *api) patchCancelProjectVersion(rw http.ResponseWriter, r *http.Request) { + projectVersion := httpmw.ProjectVersionParam(r) + job, err := api.Database.GetProvisionerJobByID(r.Context(), projectVersion.JobID) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get provisioner job: %s", err), + }) + return + } + if job.CompletedAt.Valid { + httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{ + Message: "Job has already completed!", + }) + return + } + if job.CanceledAt.Valid { + httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{ + Message: "Job has already been marked as canceled!", + }) + return + } + err = api.Database.UpdateProvisionerJobWithCancelByID(r.Context(), database.UpdateProvisionerJobWithCancelByIDParams{ + ID: job.ID, + CanceledAt: sql.NullTime{ + Time: database.Now(), + Valid: true, + }, + }) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("update provisioner job: %s", err), + }) + return + } + httpapi.Write(rw, http.StatusOK, httpapi.Response{ + Message: "Job has been marked as canceled...", + }) +} + func (api *api) projectVersionSchema(rw http.ResponseWriter, r *http.Request) { projectVersion := httpmw.ProjectVersionParam(r) job, err := api.Database.GetProvisionerJobByID(r.Context(), projectVersion.JobID) diff --git a/coderd/projectversions_test.go b/coderd/projectversions_test.go index b6efc2ad687a6..09c5a9d7092ce 100644 --- a/coderd/projectversions_test.go +++ b/coderd/projectversions_test.go @@ -27,6 +27,37 @@ func TestProjectVersion(t *testing.T) { }) } +func TestPatchCancelProjectVersion(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + user := coderdtest.CreateFirstUser(t, client) + coderdtest.NewProvisionerDaemon(t, client) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, &echo.Responses{ + Parse: echo.ParseComplete, + Provision: []*proto.Provision_Response{{ + Type: &proto.Provision_Response_Log{ + Log: &proto.Log{}, + }, + }}, + }) + require.Eventually(t, func() bool { + var err error + version, err = client.ProjectVersion(context.Background(), version.ID) + require.NoError(t, err) + return version.Job.Status == codersdk.ProvisionerJobRunning + }, 5*time.Second, 25*time.Millisecond) + err := client.CancelProjectVersion(context.Background(), version.ID) + require.NoError(t, err) + require.Eventually(t, func() bool { + var err error + version, err = client.ProjectVersion(context.Background(), version.ID) + require.NoError(t, err) + // The echo provisioner doesn't respond to a shutdown request, + // so the job cancel will time out and fail. + return version.Job.Status == codersdk.ProvisionerJobFailed + }, 5*time.Second, 25*time.Millisecond) +} + func TestProjectVersionSchema(t *testing.T) { t.Parallel() t.Run("ListRunning", func(t *testing.T) { diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go index 175d749deb374..d377e7c679c58 100644 --- a/coderd/provisionerdaemons.go +++ b/coderd/provisionerdaemons.go @@ -264,10 +264,10 @@ func (server *provisionerdServer) UpdateJob(ctx context.Context, request *proto. if job.WorkerID.UUID.String() != server.ID.String() { return nil, xerrors.New("you don't own this job") } - if job.CancelledAt.Valid { - // Allows for graceful cancellation on the backend! + if job.CanceledAt.Valid { + // Allows for graceful cancelation on the backend! return &proto.UpdateJobResponse{ - Cancelled: true, + Canceled: true, }, nil } err = server.Database.UpdateProvisionerJobByID(ctx, database.UpdateProvisionerJobByIDParams{ @@ -526,6 +526,20 @@ func (server *provisionerdServer) CompleteJob(ctx context.Context, completed *pr return xerrors.Errorf("insert provisioner job: %w", err) } } + + if workspaceBuild.Transition != database.WorkspaceTransitionDelete { + // This is for deleting a workspace! + return nil + } + + err = db.UpdateWorkspaceDeletedByID(ctx, database.UpdateWorkspaceDeletedByIDParams{ + ID: workspaceBuild.WorkspaceID, + Deleted: true, + }) + if err != nil { + return xerrors.Errorf("update workspace deleted: %w", err) + } + return nil }) if err != nil { diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go index 8b603d3a24b17..3db0e11c9aa4e 100644 --- a/coderd/provisionerjobs.go +++ b/coderd/provisionerjobs.go @@ -249,7 +249,7 @@ func convertProvisionerJob(provisionerJob database.ProvisionerJob) codersdk.Prov case database.Now().Sub(provisionerJob.UpdatedAt) > 30*time.Second: job.Status = codersdk.ProvisionerJobFailed job.Error = "Worker failed to update job in time." - case provisionerJob.CancelledAt.Valid: + case provisionerJob.CanceledAt.Valid: if provisionerJob.CompletedAt.Valid { job.Status = codersdk.ProvisionerJobCanceled } else { diff --git a/coderd/users.go b/coderd/users.go index ad9306dad16a2..4d2d8536f8d00 100644 --- a/coderd/users.go +++ b/coderd/users.go @@ -574,7 +574,9 @@ func (api *api) postWorkspacesByUser(rw http.ResponseWriter, r *http.Request) { func (api *api) workspacesByUser(rw http.ResponseWriter, r *http.Request) { user := httpmw.UserParam(r) - workspaces, err := api.Database.GetWorkspacesByUserID(r.Context(), user.ID) + workspaces, err := api.Database.GetWorkspacesByUserID(r.Context(), database.GetWorkspacesByUserIDParams{ + OwnerID: user.ID, + }) if errors.Is(err, sql.ErrNoRows) { err = nil } diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go index 455170d3f3e89..aeef258207551 100644 --- a/coderd/workspacebuilds.go +++ b/coderd/workspacebuilds.go @@ -1,6 +1,7 @@ package coderd import ( + "database/sql" "fmt" "net/http" @@ -25,6 +26,45 @@ func (api *api) workspaceBuild(rw http.ResponseWriter, r *http.Request) { render.JSON(rw, r, convertWorkspaceBuild(workspaceBuild, convertProvisionerJob(job))) } +func (api *api) patchCancelWorkspaceBuild(rw http.ResponseWriter, r *http.Request) { + workspaceBuild := httpmw.WorkspaceBuildParam(r) + job, err := api.Database.GetProvisionerJobByID(r.Context(), workspaceBuild.JobID) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get provisioner job: %s", err), + }) + return + } + if job.CompletedAt.Valid { + httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{ + Message: "Job has already completed!", + }) + return + } + if job.CanceledAt.Valid { + httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{ + Message: "Job has already been marked as canceled!", + }) + return + } + err = api.Database.UpdateProvisionerJobWithCancelByID(r.Context(), database.UpdateProvisionerJobWithCancelByIDParams{ + ID: job.ID, + CanceledAt: sql.NullTime{ + Time: database.Now(), + Valid: true, + }, + }) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("update provisioner job: %s", err), + }) + return + } + httpapi.Write(rw, http.StatusOK, httpapi.Response{ + Message: "Job has been marked as canceled...", + }) +} + func (api *api) workspaceBuildResources(rw http.ResponseWriter, r *http.Request) { workspaceBuild := httpmw.WorkspaceBuildParam(r) job, err := api.Database.GetProvisionerJobByID(r.Context(), workspaceBuild.JobID) diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go index bf135ec6e212a..dbf2fae79c940 100644 --- a/coderd/workspacebuilds_test.go +++ b/coderd/workspacebuilds_test.go @@ -33,6 +33,46 @@ func TestWorkspaceBuild(t *testing.T) { require.NoError(t, err) } +func TestPatchCancelWorkspaceBuild(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + user := coderdtest.CreateFirstUser(t, client) + coderdtest.NewProvisionerDaemon(t, client) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, &echo.Responses{ + Parse: echo.ParseComplete, + Provision: []*proto.Provision_Response{{ + Type: &proto.Provision_Response_Log{ + Log: &proto.Log{}, + }, + }}, + ProvisionDryRun: echo.ProvisionComplete, + }) + coderdtest.AwaitProjectVersionJob(t, client, version.ID) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) + workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ + ProjectVersionID: project.ActiveVersionID, + Transition: database.WorkspaceTransitionStart, + }) + require.NoError(t, err) + require.Eventually(t, func() bool { + var err error + build, err = client.WorkspaceBuild(context.Background(), build.ID) + require.NoError(t, err) + return build.Job.Status == codersdk.ProvisionerJobRunning + }, 5*time.Second, 25*time.Millisecond) + err = client.CancelWorkspaceBuild(context.Background(), build.ID) + require.NoError(t, err) + require.Eventually(t, func() bool { + var err error + build, err = client.WorkspaceBuild(context.Background(), build.ID) + require.NoError(t, err) + // The echo provisioner doesn't respond to a shutdown request, + // so the job cancel will time out and fail. + return build.Job.Status == codersdk.ProvisionerJobFailed + }, 5*time.Second, 25*time.Millisecond) +} + func TestWorkspaceBuildResources(t *testing.T) { t.Parallel() t.Run("ListRunning", func(t *testing.T) { diff --git a/coderd/workspaces.go b/coderd/workspaces.go index 728de49fd2f08..973ce4ffd1df4 100644 --- a/coderd/workspaces.go +++ b/coderd/workspaces.go @@ -29,7 +29,13 @@ func (api *api) workspaceBuilds(rw http.ResponseWriter, r *http.Request) { workspace := httpmw.WorkspaceParam(r) builds, err := api.Database.GetWorkspaceBuildByWorkspaceID(r.Context(), workspace.ID) + if errors.Is(err, sql.ErrNoRows) { + err = nil + } if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get workspace builds: %s", err), + }) return } jobIDs := make([]uuid.UUID, 0, len(builds)) @@ -37,6 +43,9 @@ func (api *api) workspaceBuilds(rw http.ResponseWriter, r *http.Request) { jobIDs = append(jobIDs, version.JobID) } jobs, err := api.Database.GetProvisionerJobsByIDs(r.Context(), jobIDs) + if errors.Is(err, sql.ErrNoRows) { + err = nil + } if err != nil { httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ Message: fmt.Sprintf("get jobs: %s", err), diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go index 15008205deaa9..1cdafe964edee 100644 --- a/coderd/workspaces_test.go +++ b/coderd/workspaces_test.go @@ -26,6 +26,39 @@ func TestWorkspace(t *testing.T) { require.NoError(t, err) } +func TestWorkspaceBuilds(t *testing.T) { + t.Parallel() + t.Run("Empty", func(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + user := coderdtest.CreateFirstUser(t, client) + job := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + project := coderdtest.CreateProject(t, client, user.OrganizationID, job.ID) + workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) + _, err := client.Workspace(context.Background(), workspace.ID) + require.NoError(t, err) + _, err = client.WorkspaceBuilds(context.Background(), workspace.ID) + require.NoError(t, err) + }) + t.Run("Single", func(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + user := coderdtest.CreateFirstUser(t, client) + coderdtest.NewProvisionerDaemon(t, client) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) + coderdtest.AwaitProjectVersionJob(t, client, version.ID) + workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) + _, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ + ProjectVersionID: project.ActiveVersionID, + Transition: database.WorkspaceTransitionStart, + }) + require.NoError(t, err) + _, err = client.WorkspaceBuilds(context.Background(), workspace.ID) + require.NoError(t, err) + }) +} + func TestPostWorkspaceBuild(t *testing.T) { t.Parallel() t.Run("NoProjectVersion", func(t *testing.T) { @@ -118,6 +151,34 @@ func TestPostWorkspaceBuild(t *testing.T) { require.NoError(t, err) require.Equal(t, secondBuild.ID.String(), firstBuild.AfterID.String()) }) + + t.Run("Delete", func(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + user := coderdtest.CreateFirstUser(t, client) + coderdtest.NewProvisionerDaemon(t, client) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) + coderdtest.AwaitProjectVersionJob(t, client, version.ID) + workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) + firstBuild, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ + ProjectVersionID: project.ActiveVersionID, + Transition: database.WorkspaceTransitionStart, + }) + require.NoError(t, err) + coderdtest.AwaitWorkspaceBuildJob(t, client, firstBuild.ID) + secondBuild, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ + ProjectVersionID: project.ActiveVersionID, + Transition: database.WorkspaceTransitionDelete, + }) + require.NoError(t, err) + require.Equal(t, firstBuild.ID.String(), secondBuild.BeforeID.String()) + coderdtest.AwaitWorkspaceBuildJob(t, client, secondBuild.ID) + + workspaces, err := client.WorkspacesByUser(context.Background(), user.UserID) + require.NoError(t, err) + require.Len(t, workspaces, 0) + }) } func TestWorkspaceBuildLatest(t *testing.T) { diff --git a/codersdk/projects.go b/codersdk/projects.go index 223ff22b97f4c..fe28afc1555dc 100644 --- a/codersdk/projects.go +++ b/codersdk/projects.go @@ -26,6 +26,10 @@ type Project struct { WorkspaceOwnerCount uint32 `json:"workspace_owner_count"` } +type UpdateActiveProjectVersion struct { + ID uuid.UUID `json:"id" validate:"required"` +} + // Project returns a single project. func (c *Client) Project(ctx context.Context, project uuid.UUID) (Project, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/projects/%s", project), nil) @@ -40,6 +44,32 @@ func (c *Client) Project(ctx context.Context, project uuid.UUID) (Project, error return resp, json.NewDecoder(res.Body).Decode(&resp) } +func (c *Client) DeleteProject(ctx context.Context, project uuid.UUID) error { + res, err := c.request(ctx, http.MethodDelete, fmt.Sprintf("/api/v2/projects/%s", project), nil) + if err != nil { + return err + } + defer res.Body.Close() + if res.StatusCode != http.StatusOK { + return readBodyAsError(res) + } + return nil +} + +// UpdateActiveProjectVersion updates the active project version to the ID provided. +// The project version must be attached to the project. +func (c *Client) UpdateActiveProjectVersion(ctx context.Context, project uuid.UUID, req UpdateActiveProjectVersion) error { + res, err := c.request(ctx, http.MethodPatch, fmt.Sprintf("/api/v2/projects/%s/versions", project), req) + if err != nil { + return nil + } + defer res.Body.Close() + if res.StatusCode != http.StatusOK { + return readBodyAsError(res) + } + return nil +} + // ProjectVersionsByProject lists versions associated with a project. func (c *Client) ProjectVersionsByProject(ctx context.Context, project uuid.UUID) ([]ProjectVersion, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/projects/%s/versions", project), nil) diff --git a/codersdk/projectversions.go b/codersdk/projectversions.go index 72e7c47f69a8d..215a14a83571d 100644 --- a/codersdk/projectversions.go +++ b/codersdk/projectversions.go @@ -43,6 +43,19 @@ func (c *Client) ProjectVersion(ctx context.Context, id uuid.UUID) (ProjectVersi return version, json.NewDecoder(res.Body).Decode(&version) } +// CancelProjectVersion marks a project version job as canceled. +func (c *Client) CancelProjectVersion(ctx context.Context, version uuid.UUID) error { + res, err := c.request(ctx, http.MethodPatch, fmt.Sprintf("/api/v2/projectversions/%s/cancel", version), nil) + if err != nil { + return err + } + defer res.Body.Close() + if res.StatusCode != http.StatusOK { + return readBodyAsError(res) + } + return nil +} + // ProjectVersionSchema returns schemas for a project version by ID. func (c *Client) ProjectVersionSchema(ctx context.Context, version uuid.UUID) ([]ProjectVersionParameterSchema, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/projectversions/%s/schema", version), nil) diff --git a/codersdk/provisionerdaemons.go b/codersdk/provisionerdaemons.go index 286986af7c17e..0a987cdbb23d5 100644 --- a/codersdk/provisionerdaemons.go +++ b/codersdk/provisionerdaemons.go @@ -29,7 +29,7 @@ const ( ProvisionerJobPending ProvisionerJobStatus = "pending" ProvisionerJobRunning ProvisionerJobStatus = "running" ProvisionerJobSucceeded ProvisionerJobStatus = "succeeded" - ProvisionerJobCanceling ProvisionerJobStatus = "canceled" + ProvisionerJobCanceling ProvisionerJobStatus = "canceling" ProvisionerJobCanceled ProvisionerJobStatus = "canceled" ProvisionerJobFailed ProvisionerJobStatus = "failed" ) diff --git a/codersdk/workspacebuilds.go b/codersdk/workspacebuilds.go index b432244692764..f4da0554a59c1 100644 --- a/codersdk/workspacebuilds.go +++ b/codersdk/workspacebuilds.go @@ -43,6 +43,19 @@ func (c *Client) WorkspaceBuild(ctx context.Context, id uuid.UUID) (WorkspaceBui return workspaceBuild, json.NewDecoder(res.Body).Decode(&workspaceBuild) } +// CancelWorkspaceBuild marks a workspace build job as canceled. +func (c *Client) CancelWorkspaceBuild(ctx context.Context, id uuid.UUID) error { + res, err := c.request(ctx, http.MethodPatch, fmt.Sprintf("/api/v2/workspacebuilds/%s/cancel", id), nil) + if err != nil { + return err + } + defer res.Body.Close() + if res.StatusCode != http.StatusOK { + return readBodyAsError(res) + } + return nil +} + // WorkspaceResourcesByBuild returns resources for a workspace build. func (c *Client) WorkspaceResourcesByBuild(ctx context.Context, build uuid.UUID) ([]WorkspaceResource, error) { res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/workspacebuilds/%s/resources", build), nil) diff --git a/database/databasefake/databasefake.go b/database/databasefake/databasefake.go index 24fd970a3a033..e2fd7eb5dc42d 100644 --- a/database/databasefake/databasefake.go +++ b/database/databasefake/databasefake.go @@ -162,6 +162,26 @@ func (q *fakeQuerier) GetUserCount(_ context.Context) (int64, error) { return int64(len(q.users)), nil } +func (q *fakeQuerier) GetWorkspacesByProjectID(ctx context.Context, arg database.GetWorkspacesByProjectIDParams) ([]database.Workspace, error) { + q.mutex.Lock() + defer q.mutex.Unlock() + + workspaces := make([]database.Workspace, 0) + for _, workspace := range q.workspace { + if workspace.ProjectID.String() != arg.ProjectID.String() { + continue + } + if workspace.Deleted != arg.Deleted { + continue + } + workspaces = append(workspaces, workspace) + } + if len(workspaces) == 0 { + return nil, sql.ErrNoRows + } + return workspaces, nil +} + func (q *fakeQuerier) GetWorkspaceByID(_ context.Context, id uuid.UUID) (database.Workspace, error) { q.mutex.Lock() defer q.mutex.Unlock() @@ -185,6 +205,9 @@ func (q *fakeQuerier) GetWorkspaceByUserIDAndName(_ context.Context, arg databas if !strings.EqualFold(workspace.Name, arg.Name) { continue } + if workspace.Deleted != arg.Deleted { + continue + } return workspace, nil } return database.Workspace{}, sql.ErrNoRows @@ -198,6 +221,9 @@ func (q *fakeQuerier) GetWorkspaceOwnerCountsByProjectIDs(_ context.Context, pro if workspace.ProjectID.String() != projectID.String() { continue } + if workspace.Deleted { + continue + } countByOwnerID, ok := counts[projectID.String()] if !ok { countByOwnerID = map[string]struct{}{} @@ -296,13 +322,16 @@ func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDAndName(_ context.Context, a return database.WorkspaceBuild{}, sql.ErrNoRows } -func (q *fakeQuerier) GetWorkspacesByUserID(_ context.Context, ownerID string) ([]database.Workspace, error) { +func (q *fakeQuerier) GetWorkspacesByUserID(_ context.Context, req database.GetWorkspacesByUserIDParams) ([]database.Workspace, error) { q.mutex.Lock() defer q.mutex.Unlock() workspaces := make([]database.Workspace, 0) for _, workspace := range q.workspace { - if workspace.OwnerID != ownerID { + if workspace.OwnerID != req.OwnerID { + continue + } + if workspace.Deleted != req.Deleted { continue } workspaces = append(workspaces, workspace) @@ -402,6 +431,9 @@ func (q *fakeQuerier) GetProjectByOrganizationAndName(_ context.Context, arg dat if !strings.EqualFold(project.Name, arg.Name) { continue } + if project.Deleted != arg.Deleted { + continue + } return project, nil } return database.Project{}, sql.ErrNoRows @@ -489,13 +521,16 @@ func (q *fakeQuerier) GetParameterValueByScopeAndName(_ context.Context, arg dat return database.ParameterValue{}, sql.ErrNoRows } -func (q *fakeQuerier) GetProjectsByOrganization(_ context.Context, organizationID string) ([]database.Project, error) { +func (q *fakeQuerier) GetProjectsByOrganization(_ context.Context, arg database.GetProjectsByOrganizationParams) ([]database.Project, error) { q.mutex.Lock() defer q.mutex.Unlock() projects := make([]database.Project, 0) for _, project := range q.project { - if project.OrganizationID == organizationID { + if project.Deleted != arg.Deleted { + continue + } + if project.OrganizationID == arg.OrganizationID { projects = append(projects, project) break } @@ -992,6 +1027,36 @@ func (q *fakeQuerier) UpdateAPIKeyByID(_ context.Context, arg database.UpdateAPI return sql.ErrNoRows } +func (q *fakeQuerier) UpdateProjectActiveVersionByID(ctx context.Context, arg database.UpdateProjectActiveVersionByIDParams) error { + q.mutex.Lock() + defer q.mutex.Unlock() + + for index, project := range q.project { + if project.ID.String() != arg.ID.String() { + continue + } + project.ActiveVersionID = arg.ActiveVersionID + q.project[index] = project + return nil + } + return sql.ErrNoRows +} + +func (q *fakeQuerier) UpdateProjectDeletedByID(ctx context.Context, arg database.UpdateProjectDeletedByIDParams) error { + q.mutex.Lock() + defer q.mutex.Unlock() + + for index, project := range q.project { + if project.ID.String() != arg.ID.String() { + continue + } + project.Deleted = arg.Deleted + q.project[index] = project + return nil + } + return sql.ErrNoRows +} + func (q *fakeQuerier) UpdateProjectVersionByID(_ context.Context, arg database.UpdateProjectVersionByIDParams) error { q.mutex.Lock() defer q.mutex.Unlock() @@ -1054,6 +1119,21 @@ func (q *fakeQuerier) UpdateProvisionerJobByID(_ context.Context, arg database.U return sql.ErrNoRows } +func (q *fakeQuerier) UpdateProvisionerJobWithCancelByID(_ context.Context, arg database.UpdateProvisionerJobWithCancelByIDParams) error { + q.mutex.Lock() + defer q.mutex.Unlock() + + for index, job := range q.provisionerJobs { + if arg.ID.String() != job.ID.String() { + continue + } + job.CanceledAt = arg.CanceledAt + q.provisionerJobs[index] = job + return nil + } + return sql.ErrNoRows +} + func (q *fakeQuerier) UpdateProvisionerJobWithCompleteByID(_ context.Context, arg database.UpdateProvisionerJobWithCompleteByIDParams) error { q.mutex.Lock() defer q.mutex.Unlock() @@ -1064,7 +1144,7 @@ func (q *fakeQuerier) UpdateProvisionerJobWithCompleteByID(_ context.Context, ar } job.UpdatedAt = arg.UpdatedAt job.CompletedAt = arg.CompletedAt - job.CancelledAt = arg.CancelledAt + job.CanceledAt = arg.CanceledAt job.Error = arg.Error q.provisionerJobs[index] = job return nil @@ -1088,3 +1168,18 @@ func (q *fakeQuerier) UpdateWorkspaceBuildByID(_ context.Context, arg database.U } return sql.ErrNoRows } + +func (q *fakeQuerier) UpdateWorkspaceDeletedByID(ctx context.Context, arg database.UpdateWorkspaceDeletedByIDParams) error { + q.mutex.Lock() + defer q.mutex.Unlock() + + for index, workspace := range q.workspace { + if workspace.ID.String() != arg.ID.String() { + continue + } + workspace.Deleted = arg.Deleted + q.workspace[index] = workspace + return nil + } + return sql.ErrNoRows +} diff --git a/database/dump.sql b/database/dump.sql index 479b878b30a6a..e0505fc57e711 100644 --- a/database/dump.sql +++ b/database/dump.sql @@ -158,6 +158,7 @@ CREATE TABLE project ( created_at timestamp with time zone NOT NULL, updated_at timestamp with time zone NOT NULL, organization_id text NOT NULL, + deleted boolean DEFAULT false NOT NULL, name character varying(64) NOT NULL, provisioner provisioner_type NOT NULL, active_version_id uuid NOT NULL @@ -188,7 +189,7 @@ CREATE TABLE provisioner_job ( created_at timestamp with time zone NOT NULL, updated_at timestamp with time zone NOT NULL, started_at timestamp with time zone, - cancelled_at timestamp with time zone, + canceled_at timestamp with time zone, completed_at timestamp with time zone, error text, organization_id text NOT NULL, @@ -238,6 +239,7 @@ CREATE TABLE workspace ( updated_at timestamp with time zone NOT NULL, owner_id text NOT NULL, project_id uuid NOT NULL, + deleted boolean DEFAULT false NOT NULL, name character varying(64) NOT NULL ); @@ -336,12 +338,13 @@ ALTER TABLE ONLY workspace_build ALTER TABLE ONLY workspace ADD CONSTRAINT workspace_id_key UNIQUE (id); -ALTER TABLE ONLY workspace - ADD CONSTRAINT workspace_owner_id_name_key UNIQUE (owner_id, name); - ALTER TABLE ONLY workspace_resource ADD CONSTRAINT workspace_resource_id_key UNIQUE (id); +CREATE UNIQUE INDEX project_organization_id_name_idx ON project USING btree (organization_id, name) WHERE (deleted = false); + +CREATE UNIQUE INDEX workspace_owner_id_name_idx ON workspace USING btree (owner_id, name) WHERE (deleted = false); + ALTER TABLE ONLY parameter_schema ADD CONSTRAINT parameter_schema_job_id_fkey FOREIGN KEY (job_id) REFERENCES provisioner_job(id) ON DELETE CASCADE; diff --git a/database/migrations/000002_projects.up.sql b/database/migrations/000002_projects.up.sql index 49222cd5d8104..587a38f835359 100644 --- a/database/migrations/000002_projects.up.sql +++ b/database/migrations/000002_projects.up.sql @@ -17,6 +17,7 @@ CREATE TABLE project ( updated_at timestamptz NOT NULL, -- Projects must be scoped to an organization. organization_id text NOT NULL, + deleted boolean NOT NULL DEFAULT FALSE, name varchar(64) NOT NULL, provisioner provisioner_type NOT NULL, -- Target's a Project Version to use for Workspaces. @@ -27,6 +28,9 @@ CREATE TABLE project ( UNIQUE(organization_id, name) ); +-- Enforces no active projects have the same name. +CREATE UNIQUE INDEX ON project (organization_id, name) WHERE deleted = FALSE; + -- Project Versions store historical project data. When a Project Version is imported, -- an "import" job is queued to parse parameters. A Project Version -- can only be used if the import job succeeds. diff --git a/database/migrations/000003_workspaces.up.sql b/database/migrations/000003_workspaces.up.sql index b06b10362c4e0..3a83c94fcbe0d 100644 --- a/database/migrations/000003_workspaces.up.sql +++ b/database/migrations/000003_workspaces.up.sql @@ -4,10 +4,13 @@ CREATE TABLE workspace ( updated_at timestamptz NOT NULL, owner_id text NOT NULL, project_id uuid NOT NULL REFERENCES project (id), - name varchar(64) NOT NULL, - UNIQUE(owner_id, name) + deleted boolean NOT NULL DEFAULT FALSE, + name varchar(64) NOT NULL ); +-- Enforces no active workspaces have the same name. +CREATE UNIQUE INDEX ON workspace (owner_id, name) WHERE deleted = FALSE; + CREATE TYPE workspace_transition AS ENUM ( 'start', 'stop', diff --git a/database/migrations/000004_jobs.up.sql b/database/migrations/000004_jobs.up.sql index 8e4ebda49119e..4304df48c4433 100644 --- a/database/migrations/000004_jobs.up.sql +++ b/database/migrations/000004_jobs.up.sql @@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS provisioner_job ( created_at timestamptz NOT NULL, updated_at timestamptz NOT NULL, started_at timestamptz, - cancelled_at timestamptz, + canceled_at timestamptz, completed_at timestamptz, error text, organization_id text NOT NULL, diff --git a/database/models.go b/database/models.go index 7a40b3649091b..888fb1652d8f0 100644 --- a/database/models.go +++ b/database/models.go @@ -338,6 +338,7 @@ type Project struct { CreatedAt time.Time `db:"created_at" json:"created_at"` UpdatedAt time.Time `db:"updated_at" json:"updated_at"` OrganizationID string `db:"organization_id" json:"organization_id"` + Deleted bool `db:"deleted" json:"deleted"` Name string `db:"name" json:"name"` Provisioner ProvisionerType `db:"provisioner" json:"provisioner"` ActiveVersionID uuid.UUID `db:"active_version_id" json:"active_version_id"` @@ -368,7 +369,7 @@ type ProvisionerJob struct { CreatedAt time.Time `db:"created_at" json:"created_at"` UpdatedAt time.Time `db:"updated_at" json:"updated_at"` StartedAt sql.NullTime `db:"started_at" json:"started_at"` - CancelledAt sql.NullTime `db:"cancelled_at" json:"cancelled_at"` + CanceledAt sql.NullTime `db:"canceled_at" json:"canceled_at"` CompletedAt sql.NullTime `db:"completed_at" json:"completed_at"` Error sql.NullString `db:"error" json:"error"` OrganizationID string `db:"organization_id" json:"organization_id"` @@ -418,6 +419,7 @@ type Workspace struct { UpdatedAt time.Time `db:"updated_at" json:"updated_at"` OwnerID string `db:"owner_id" json:"owner_id"` ProjectID uuid.UUID `db:"project_id" json:"project_id"` + Deleted bool `db:"deleted" json:"deleted"` Name string `db:"name" json:"name"` } diff --git a/database/querier.go b/database/querier.go index efe59d802276e..c394d5817d7c0 100644 --- a/database/querier.go +++ b/database/querier.go @@ -25,7 +25,7 @@ type querier interface { GetProjectVersionByID(ctx context.Context, id uuid.UUID) (ProjectVersion, error) GetProjectVersionByProjectIDAndName(ctx context.Context, arg GetProjectVersionByProjectIDAndNameParams) (ProjectVersion, error) GetProjectVersionsByProjectID(ctx context.Context, dollar_1 uuid.UUID) ([]ProjectVersion, error) - GetProjectsByOrganization(ctx context.Context, organizationID string) ([]Project, error) + GetProjectsByOrganization(ctx context.Context, arg GetProjectsByOrganizationParams) ([]Project, error) GetProvisionerDaemonByID(ctx context.Context, id uuid.UUID) (ProvisionerDaemon, error) GetProvisionerDaemons(ctx context.Context) ([]ProvisionerDaemon, error) GetProvisionerJobByID(ctx context.Context, id uuid.UUID) (ProvisionerJob, error) @@ -47,7 +47,8 @@ type querier interface { GetWorkspaceOwnerCountsByProjectIDs(ctx context.Context, ids []uuid.UUID) ([]GetWorkspaceOwnerCountsByProjectIDsRow, error) GetWorkspaceResourceByID(ctx context.Context, id uuid.UUID) (WorkspaceResource, error) GetWorkspaceResourcesByJobID(ctx context.Context, jobID uuid.UUID) ([]WorkspaceResource, error) - GetWorkspacesByUserID(ctx context.Context, ownerID string) ([]Workspace, error) + GetWorkspacesByProjectID(ctx context.Context, arg GetWorkspacesByProjectIDParams) ([]Workspace, error) + GetWorkspacesByUserID(ctx context.Context, arg GetWorkspacesByUserIDParams) ([]Workspace, error) InsertAPIKey(ctx context.Context, arg InsertAPIKeyParams) (APIKey, error) InsertFile(ctx context.Context, arg InsertFileParams) (File, error) InsertOrganization(ctx context.Context, arg InsertOrganizationParams) (Organization, error) @@ -65,12 +66,16 @@ type querier interface { InsertWorkspaceBuild(ctx context.Context, arg InsertWorkspaceBuildParams) (WorkspaceBuild, error) InsertWorkspaceResource(ctx context.Context, arg InsertWorkspaceResourceParams) (WorkspaceResource, error) UpdateAPIKeyByID(ctx context.Context, arg UpdateAPIKeyByIDParams) error + UpdateProjectActiveVersionByID(ctx context.Context, arg UpdateProjectActiveVersionByIDParams) error + UpdateProjectDeletedByID(ctx context.Context, arg UpdateProjectDeletedByIDParams) error UpdateProjectVersionByID(ctx context.Context, arg UpdateProjectVersionByIDParams) error UpdateProvisionerDaemonByID(ctx context.Context, arg UpdateProvisionerDaemonByIDParams) error UpdateProvisionerJobByID(ctx context.Context, arg UpdateProvisionerJobByIDParams) error + UpdateProvisionerJobWithCancelByID(ctx context.Context, arg UpdateProvisionerJobWithCancelByIDParams) error UpdateProvisionerJobWithCompleteByID(ctx context.Context, arg UpdateProvisionerJobWithCompleteByIDParams) error UpdateWorkspaceAgentByID(ctx context.Context, arg UpdateWorkspaceAgentByIDParams) error UpdateWorkspaceBuildByID(ctx context.Context, arg UpdateWorkspaceBuildByIDParams) error + UpdateWorkspaceDeletedByID(ctx context.Context, arg UpdateWorkspaceDeletedByIDParams) error } var _ querier = (*sqlQuerier)(nil) diff --git a/database/query.sql b/database/query.sql index daf2f0e72e6d9..e95d193f7ff32 100644 --- a/database/query.sql +++ b/database/query.sql @@ -5,7 +5,7 @@ ; -- Acquires the lock for a single job that isn't started, completed, --- cancelled, and that matches an array of provisioner types. +-- canceled, and that matches an array of provisioner types. -- -- SKIP LOCKED is used to jump over locked rows. This prevents -- multiple provisioners from acquiring the same jobs. See: @@ -25,7 +25,7 @@ WHERE provisioner_job AS nested WHERE nested.started_at IS NULL - AND nested.cancelled_at IS NULL + AND nested.canceled_at IS NULL AND nested.completed_at IS NULL AND nested.provisioner = ANY(@types :: provisioner_type [ ]) ORDER BY @@ -171,6 +171,7 @@ FROM project WHERE organization_id = @organization_id + AND deleted = @deleted AND LOWER(name) = LOWER(@name) LIMIT 1; @@ -181,7 +182,8 @@ SELECT FROM project WHERE - organization_id = $1; + organization_id = $1 + AND deleted = $2; -- name: GetParameterSchemasByJobID :many SELECT @@ -290,13 +292,23 @@ WHERE LIMIT 1; +-- name: GetWorkspacesByProjectID :many +SELECT + * +FROM + workspace +WHERE + project_id = $1 + AND deleted = $2; + -- name: GetWorkspacesByUserID :many SELECT * FROM workspace WHERE - owner_id = $1; + owner_id = $1 + AND deleted = $2; -- name: GetWorkspaceByUserIDAndName :one SELECT @@ -305,6 +317,7 @@ FROM workspace WHERE owner_id = @owner_id + AND deleted = @deleted AND LOWER(name) = LOWER(@name); -- name: GetWorkspaceOwnerCountsByProjectIDs :many @@ -662,6 +675,22 @@ SET WHERE id = $1; +-- name: UpdateProjectActiveVersionByID :exec +UPDATE + project +SET + active_version_id = $2 +WHERE + id = $1; + +-- name: UpdateProjectDeletedByID :exec +UPDATE + project +SET + deleted = $2 +WHERE + id = $1; + -- name: UpdateProjectVersionByID :exec UPDATE project_version @@ -688,17 +717,33 @@ SET WHERE id = $1; +-- name: UpdateProvisionerJobWithCancelByID :exec +UPDATE + provisioner_job +SET + canceled_at = $2 +WHERE + id = $1; + -- name: UpdateProvisionerJobWithCompleteByID :exec UPDATE provisioner_job SET updated_at = $2, completed_at = $3, - cancelled_at = $4, + canceled_at = $4, error = $5 WHERE id = $1; +-- name: UpdateWorkspaceDeletedByID :exec +UPDATE + workspace +SET + deleted = $2 +WHERE + id = $1; + -- name: UpdateWorkspaceAgentByID :exec UPDATE workspace_agent diff --git a/database/query.sql.go b/database/query.sql.go index 4868214668ae9..fbf88613f6a01 100644 --- a/database/query.sql.go +++ b/database/query.sql.go @@ -29,7 +29,7 @@ WHERE provisioner_job AS nested WHERE nested.started_at IS NULL - AND nested.cancelled_at IS NULL + AND nested.canceled_at IS NULL AND nested.completed_at IS NULL AND nested.provisioner = ANY($3 :: provisioner_type [ ]) ORDER BY @@ -38,7 +38,7 @@ WHERE SKIP LOCKED LIMIT 1 - ) RETURNING id, created_at, updated_at, started_at, cancelled_at, completed_at, error, organization_id, initiator_id, provisioner, storage_method, storage_source, type, input, worker_id + ) RETURNING id, created_at, updated_at, started_at, canceled_at, completed_at, error, organization_id, initiator_id, provisioner, storage_method, storage_source, type, input, worker_id ` type AcquireProvisionerJobParams struct { @@ -48,7 +48,7 @@ type AcquireProvisionerJobParams struct { } // Acquires the lock for a single job that isn't started, completed, -// cancelled, and that matches an array of provisioner types. +// canceled, and that matches an array of provisioner types. // // SKIP LOCKED is used to jump over locked rows. This prevents // multiple provisioners from acquiring the same jobs. See: @@ -61,7 +61,7 @@ func (q *sqlQuerier) AcquireProvisionerJob(ctx context.Context, arg AcquireProvi &i.CreatedAt, &i.UpdatedAt, &i.StartedAt, - &i.CancelledAt, + &i.CanceledAt, &i.CompletedAt, &i.Error, &i.OrganizationID, @@ -417,7 +417,7 @@ func (q *sqlQuerier) GetParameterValuesByScope(ctx context.Context, arg GetParam const getProjectByID = `-- name: GetProjectByID :one SELECT - id, created_at, updated_at, organization_id, name, provisioner, active_version_id + id, created_at, updated_at, organization_id, deleted, name, provisioner, active_version_id FROM project WHERE @@ -434,6 +434,7 @@ func (q *sqlQuerier) GetProjectByID(ctx context.Context, id uuid.UUID) (Project, &i.CreatedAt, &i.UpdatedAt, &i.OrganizationID, + &i.Deleted, &i.Name, &i.Provisioner, &i.ActiveVersionID, @@ -443,29 +444,32 @@ func (q *sqlQuerier) GetProjectByID(ctx context.Context, id uuid.UUID) (Project, const getProjectByOrganizationAndName = `-- name: GetProjectByOrganizationAndName :one SELECT - id, created_at, updated_at, organization_id, name, provisioner, active_version_id + id, created_at, updated_at, organization_id, deleted, name, provisioner, active_version_id FROM project WHERE organization_id = $1 - AND LOWER(name) = LOWER($2) + AND deleted = $2 + AND LOWER(name) = LOWER($3) LIMIT 1 ` type GetProjectByOrganizationAndNameParams struct { OrganizationID string `db:"organization_id" json:"organization_id"` + Deleted bool `db:"deleted" json:"deleted"` Name string `db:"name" json:"name"` } func (q *sqlQuerier) GetProjectByOrganizationAndName(ctx context.Context, arg GetProjectByOrganizationAndNameParams) (Project, error) { - row := q.db.QueryRowContext(ctx, getProjectByOrganizationAndName, arg.OrganizationID, arg.Name) + row := q.db.QueryRowContext(ctx, getProjectByOrganizationAndName, arg.OrganizationID, arg.Deleted, arg.Name) var i Project err := row.Scan( &i.ID, &i.CreatedAt, &i.UpdatedAt, &i.OrganizationID, + &i.Deleted, &i.Name, &i.Provisioner, &i.ActiveVersionID, @@ -572,15 +576,21 @@ func (q *sqlQuerier) GetProjectVersionsByProjectID(ctx context.Context, dollar_1 const getProjectsByOrganization = `-- name: GetProjectsByOrganization :many SELECT - id, created_at, updated_at, organization_id, name, provisioner, active_version_id + id, created_at, updated_at, organization_id, deleted, name, provisioner, active_version_id FROM project WHERE organization_id = $1 + AND deleted = $2 ` -func (q *sqlQuerier) GetProjectsByOrganization(ctx context.Context, organizationID string) ([]Project, error) { - rows, err := q.db.QueryContext(ctx, getProjectsByOrganization, organizationID) +type GetProjectsByOrganizationParams struct { + OrganizationID string `db:"organization_id" json:"organization_id"` + Deleted bool `db:"deleted" json:"deleted"` +} + +func (q *sqlQuerier) GetProjectsByOrganization(ctx context.Context, arg GetProjectsByOrganizationParams) ([]Project, error) { + rows, err := q.db.QueryContext(ctx, getProjectsByOrganization, arg.OrganizationID, arg.Deleted) if err != nil { return nil, err } @@ -593,6 +603,7 @@ func (q *sqlQuerier) GetProjectsByOrganization(ctx context.Context, organization &i.CreatedAt, &i.UpdatedAt, &i.OrganizationID, + &i.Deleted, &i.Name, &i.Provisioner, &i.ActiveVersionID, @@ -672,7 +683,7 @@ func (q *sqlQuerier) GetProvisionerDaemons(ctx context.Context) ([]ProvisionerDa const getProvisionerJobByID = `-- name: GetProvisionerJobByID :one SELECT - id, created_at, updated_at, started_at, cancelled_at, completed_at, error, organization_id, initiator_id, provisioner, storage_method, storage_source, type, input, worker_id + id, created_at, updated_at, started_at, canceled_at, completed_at, error, organization_id, initiator_id, provisioner, storage_method, storage_source, type, input, worker_id FROM provisioner_job WHERE @@ -687,7 +698,7 @@ func (q *sqlQuerier) GetProvisionerJobByID(ctx context.Context, id uuid.UUID) (P &i.CreatedAt, &i.UpdatedAt, &i.StartedAt, - &i.CancelledAt, + &i.CanceledAt, &i.CompletedAt, &i.Error, &i.OrganizationID, @@ -704,7 +715,7 @@ func (q *sqlQuerier) GetProvisionerJobByID(ctx context.Context, id uuid.UUID) (P const getProvisionerJobsByIDs = `-- name: GetProvisionerJobsByIDs :many SELECT - id, created_at, updated_at, started_at, cancelled_at, completed_at, error, organization_id, initiator_id, provisioner, storage_method, storage_source, type, input, worker_id + id, created_at, updated_at, started_at, canceled_at, completed_at, error, organization_id, initiator_id, provisioner, storage_method, storage_source, type, input, worker_id FROM provisioner_job WHERE @@ -725,7 +736,7 @@ func (q *sqlQuerier) GetProvisionerJobsByIDs(ctx context.Context, ids []uuid.UUI &i.CreatedAt, &i.UpdatedAt, &i.StartedAt, - &i.CancelledAt, + &i.CanceledAt, &i.CompletedAt, &i.Error, &i.OrganizationID, @@ -1158,7 +1169,7 @@ func (q *sqlQuerier) GetWorkspaceBuildByWorkspaceIDWithoutAfter(ctx context.Cont const getWorkspaceByID = `-- name: GetWorkspaceByID :one SELECT - id, created_at, updated_at, owner_id, project_id, name + id, created_at, updated_at, owner_id, project_id, deleted, name FROM workspace WHERE @@ -1176,6 +1187,7 @@ func (q *sqlQuerier) GetWorkspaceByID(ctx context.Context, id uuid.UUID) (Worksp &i.UpdatedAt, &i.OwnerID, &i.ProjectID, + &i.Deleted, &i.Name, ) return i, err @@ -1183,21 +1195,23 @@ func (q *sqlQuerier) GetWorkspaceByID(ctx context.Context, id uuid.UUID) (Worksp const getWorkspaceByUserIDAndName = `-- name: GetWorkspaceByUserIDAndName :one SELECT - id, created_at, updated_at, owner_id, project_id, name + id, created_at, updated_at, owner_id, project_id, deleted, name FROM workspace WHERE owner_id = $1 - AND LOWER(name) = LOWER($2) + AND deleted = $2 + AND LOWER(name) = LOWER($3) ` type GetWorkspaceByUserIDAndNameParams struct { OwnerID string `db:"owner_id" json:"owner_id"` + Deleted bool `db:"deleted" json:"deleted"` Name string `db:"name" json:"name"` } func (q *sqlQuerier) GetWorkspaceByUserIDAndName(ctx context.Context, arg GetWorkspaceByUserIDAndNameParams) (Workspace, error) { - row := q.db.QueryRowContext(ctx, getWorkspaceByUserIDAndName, arg.OwnerID, arg.Name) + row := q.db.QueryRowContext(ctx, getWorkspaceByUserIDAndName, arg.OwnerID, arg.Deleted, arg.Name) var i Workspace err := row.Scan( &i.ID, @@ -1205,6 +1219,7 @@ func (q *sqlQuerier) GetWorkspaceByUserIDAndName(ctx context.Context, arg GetWor &i.UpdatedAt, &i.OwnerID, &i.ProjectID, + &i.Deleted, &i.Name, ) return i, err @@ -1315,17 +1330,69 @@ func (q *sqlQuerier) GetWorkspaceResourcesByJobID(ctx context.Context, jobID uui return items, nil } +const getWorkspacesByProjectID = `-- name: GetWorkspacesByProjectID :many +SELECT + id, created_at, updated_at, owner_id, project_id, deleted, name +FROM + workspace +WHERE + project_id = $1 + AND deleted = $2 +` + +type GetWorkspacesByProjectIDParams struct { + ProjectID uuid.UUID `db:"project_id" json:"project_id"` + Deleted bool `db:"deleted" json:"deleted"` +} + +func (q *sqlQuerier) GetWorkspacesByProjectID(ctx context.Context, arg GetWorkspacesByProjectIDParams) ([]Workspace, error) { + rows, err := q.db.QueryContext(ctx, getWorkspacesByProjectID, arg.ProjectID, arg.Deleted) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Workspace + for rows.Next() { + var i Workspace + if err := rows.Scan( + &i.ID, + &i.CreatedAt, + &i.UpdatedAt, + &i.OwnerID, + &i.ProjectID, + &i.Deleted, + &i.Name, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + const getWorkspacesByUserID = `-- name: GetWorkspacesByUserID :many SELECT - id, created_at, updated_at, owner_id, project_id, name + id, created_at, updated_at, owner_id, project_id, deleted, name FROM workspace WHERE owner_id = $1 + AND deleted = $2 ` -func (q *sqlQuerier) GetWorkspacesByUserID(ctx context.Context, ownerID string) ([]Workspace, error) { - rows, err := q.db.QueryContext(ctx, getWorkspacesByUserID, ownerID) +type GetWorkspacesByUserIDParams struct { + OwnerID string `db:"owner_id" json:"owner_id"` + Deleted bool `db:"deleted" json:"deleted"` +} + +func (q *sqlQuerier) GetWorkspacesByUserID(ctx context.Context, arg GetWorkspacesByUserIDParams) ([]Workspace, error) { + rows, err := q.db.QueryContext(ctx, getWorkspacesByUserID, arg.OwnerID, arg.Deleted) if err != nil { return nil, err } @@ -1339,6 +1406,7 @@ func (q *sqlQuerier) GetWorkspacesByUserID(ctx context.Context, ownerID string) &i.UpdatedAt, &i.OwnerID, &i.ProjectID, + &i.Deleted, &i.Name, ); err != nil { return nil, err @@ -1732,7 +1800,7 @@ INSERT INTO active_version_id ) VALUES - ($1, $2, $3, $4, $5, $6, $7) RETURNING id, created_at, updated_at, organization_id, name, provisioner, active_version_id + ($1, $2, $3, $4, $5, $6, $7) RETURNING id, created_at, updated_at, organization_id, deleted, name, provisioner, active_version_id ` type InsertProjectParams struct { @@ -1761,6 +1829,7 @@ func (q *sqlQuerier) InsertProject(ctx context.Context, arg InsertProjectParams) &i.CreatedAt, &i.UpdatedAt, &i.OrganizationID, + &i.Deleted, &i.Name, &i.Provisioner, &i.ActiveVersionID, @@ -1870,7 +1939,7 @@ INSERT INTO input ) VALUES - ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING id, created_at, updated_at, started_at, cancelled_at, completed_at, error, organization_id, initiator_id, provisioner, storage_method, storage_source, type, input, worker_id + ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING id, created_at, updated_at, started_at, canceled_at, completed_at, error, organization_id, initiator_id, provisioner, storage_method, storage_source, type, input, worker_id ` type InsertProvisionerJobParams struct { @@ -1905,7 +1974,7 @@ func (q *sqlQuerier) InsertProvisionerJob(ctx context.Context, arg InsertProvisi &i.CreatedAt, &i.UpdatedAt, &i.StartedAt, - &i.CancelledAt, + &i.CanceledAt, &i.CompletedAt, &i.Error, &i.OrganizationID, @@ -2053,7 +2122,7 @@ INSERT INTO name ) VALUES - ($1, $2, $3, $4, $5, $6) RETURNING id, created_at, updated_at, owner_id, project_id, name + ($1, $2, $3, $4, $5, $6) RETURNING id, created_at, updated_at, owner_id, project_id, deleted, name ` type InsertWorkspaceParams struct { @@ -2081,6 +2150,7 @@ func (q *sqlQuerier) InsertWorkspace(ctx context.Context, arg InsertWorkspacePar &i.UpdatedAt, &i.OwnerID, &i.ProjectID, + &i.Deleted, &i.Name, ) return i, err @@ -2293,6 +2363,44 @@ func (q *sqlQuerier) UpdateAPIKeyByID(ctx context.Context, arg UpdateAPIKeyByIDP return err } +const updateProjectActiveVersionByID = `-- name: UpdateProjectActiveVersionByID :exec +UPDATE + project +SET + active_version_id = $2 +WHERE + id = $1 +` + +type UpdateProjectActiveVersionByIDParams struct { + ID uuid.UUID `db:"id" json:"id"` + ActiveVersionID uuid.UUID `db:"active_version_id" json:"active_version_id"` +} + +func (q *sqlQuerier) UpdateProjectActiveVersionByID(ctx context.Context, arg UpdateProjectActiveVersionByIDParams) error { + _, err := q.db.ExecContext(ctx, updateProjectActiveVersionByID, arg.ID, arg.ActiveVersionID) + return err +} + +const updateProjectDeletedByID = `-- name: UpdateProjectDeletedByID :exec +UPDATE + project +SET + deleted = $2 +WHERE + id = $1 +` + +type UpdateProjectDeletedByIDParams struct { + ID uuid.UUID `db:"id" json:"id"` + Deleted bool `db:"deleted" json:"deleted"` +} + +func (q *sqlQuerier) UpdateProjectDeletedByID(ctx context.Context, arg UpdateProjectDeletedByIDParams) error { + _, err := q.db.ExecContext(ctx, updateProjectDeletedByID, arg.ID, arg.Deleted) + return err +} + const updateProjectVersionByID = `-- name: UpdateProjectVersionByID :exec UPDATE project_version @@ -2354,13 +2462,32 @@ func (q *sqlQuerier) UpdateProvisionerJobByID(ctx context.Context, arg UpdatePro return err } +const updateProvisionerJobWithCancelByID = `-- name: UpdateProvisionerJobWithCancelByID :exec +UPDATE + provisioner_job +SET + canceled_at = $2 +WHERE + id = $1 +` + +type UpdateProvisionerJobWithCancelByIDParams struct { + ID uuid.UUID `db:"id" json:"id"` + CanceledAt sql.NullTime `db:"canceled_at" json:"canceled_at"` +} + +func (q *sqlQuerier) UpdateProvisionerJobWithCancelByID(ctx context.Context, arg UpdateProvisionerJobWithCancelByIDParams) error { + _, err := q.db.ExecContext(ctx, updateProvisionerJobWithCancelByID, arg.ID, arg.CanceledAt) + return err +} + const updateProvisionerJobWithCompleteByID = `-- name: UpdateProvisionerJobWithCompleteByID :exec UPDATE provisioner_job SET updated_at = $2, completed_at = $3, - cancelled_at = $4, + canceled_at = $4, error = $5 WHERE id = $1 @@ -2370,7 +2497,7 @@ type UpdateProvisionerJobWithCompleteByIDParams struct { ID uuid.UUID `db:"id" json:"id"` UpdatedAt time.Time `db:"updated_at" json:"updated_at"` CompletedAt sql.NullTime `db:"completed_at" json:"completed_at"` - CancelledAt sql.NullTime `db:"cancelled_at" json:"cancelled_at"` + CanceledAt sql.NullTime `db:"canceled_at" json:"canceled_at"` Error sql.NullString `db:"error" json:"error"` } @@ -2379,7 +2506,7 @@ func (q *sqlQuerier) UpdateProvisionerJobWithCompleteByID(ctx context.Context, a arg.ID, arg.UpdatedAt, arg.CompletedAt, - arg.CancelledAt, + arg.CanceledAt, arg.Error, ) return err @@ -2431,3 +2558,22 @@ func (q *sqlQuerier) UpdateWorkspaceBuildByID(ctx context.Context, arg UpdateWor ) return err } + +const updateWorkspaceDeletedByID = `-- name: UpdateWorkspaceDeletedByID :exec +UPDATE + workspace +SET + deleted = $2 +WHERE + id = $1 +` + +type UpdateWorkspaceDeletedByIDParams struct { + ID uuid.UUID `db:"id" json:"id"` + Deleted bool `db:"deleted" json:"deleted"` +} + +func (q *sqlQuerier) UpdateWorkspaceDeletedByID(ctx context.Context, arg UpdateWorkspaceDeletedByIDParams) error { + _, err := q.db.ExecContext(ctx, updateWorkspaceDeletedByID, arg.ID, arg.Deleted) + return err +} diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go index b9f09f578bfa1..75f1e5f51e33b 100644 --- a/provisioner/terraform/provision.go +++ b/provisioner/terraform/provision.go @@ -516,7 +516,7 @@ func (t *terraform) runTerraformApply(ctx, shutdown context.Context, terraform * }) } -// This couldn't use terraform-exec, because it doesn't support cancellation, and there didn't appear +// This couldn't use terraform-exec, because it doesn't support cancelation, and there didn't appear // to be a straight-forward way to add it. func runApplyCommand(ctx, shutdownCtx context.Context, transition proto.WorkspaceTransition, bin, dir string, stdout io.Writer, env, vars []string) error { args := []string{ diff --git a/provisionerd/proto/provisionerd.pb.go b/provisionerd/proto/provisionerd.pb.go index 315134e40cc9a..6cea814628fbd 100644 --- a/provisionerd/proto/provisionerd.pb.go +++ b/provisionerd/proto/provisionerd.pb.go @@ -554,7 +554,7 @@ type UpdateJobResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Cancelled bool `protobuf:"varint,1,opt,name=cancelled,proto3" json:"cancelled,omitempty"` + Canceled bool `protobuf:"varint,1,opt,name=canceled,proto3" json:"canceled,omitempty"` // If parameter schemas are sent, the job will respond // with resolved parameter values. ParameterValues []*proto.ParameterValue `protobuf:"bytes,2,rep,name=parameter_values,json=parameterValues,proto3" json:"parameter_values,omitempty"` @@ -592,9 +592,9 @@ func (*UpdateJobResponse) Descriptor() ([]byte, []int) { return file_provisionerd_proto_provisionerd_proto_rawDescGZIP(), []int{6} } -func (x *UpdateJobResponse) GetCancelled() bool { +func (x *UpdateJobResponse) GetCanceled() bool { if x != nil { - return x.Cancelled + return x.Canceled } return false } @@ -1046,39 +1046,38 @@ var file_provisionerd_proto_provisionerd_proto_rawDesc = []byte{ 0x0b, 0x32, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x10, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, - 0x73, 0x22, 0x79, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, - 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x63, 0x61, 0x6e, 0x63, 0x65, - 0x6c, 0x6c, 0x65, 0x64, 0x12, 0x46, 0x0a, 0x10, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, - 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, - 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, - 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x70, 0x61, 0x72, - 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x2a, 0x34, 0x0a, 0x09, - 0x4c, 0x6f, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x52, 0x4f, - 0x56, 0x49, 0x53, 0x49, 0x4f, 0x4e, 0x45, 0x52, 0x5f, 0x44, 0x41, 0x45, 0x4d, 0x4f, 0x4e, 0x10, - 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x50, 0x52, 0x4f, 0x56, 0x49, 0x53, 0x49, 0x4f, 0x4e, 0x45, 0x52, - 0x10, 0x01, 0x32, 0x98, 0x02, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, - 0x65, 0x72, 0x44, 0x61, 0x65, 0x6d, 0x6f, 0x6e, 0x12, 0x3c, 0x0a, 0x0a, 0x41, 0x63, 0x71, 0x75, - 0x69, 0x72, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, - 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, 0x70, 0x72, - 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x41, 0x63, 0x71, 0x75, 0x69, - 0x72, 0x65, 0x64, 0x4a, 0x6f, 0x62, 0x12, 0x4c, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x4a, 0x6f, 0x62, 0x12, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, - 0x72, 0x64, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, - 0x72, 0x64, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x46, 0x61, 0x69, 0x6c, 0x4a, 0x6f, 0x62, 0x12, - 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x46, - 0x61, 0x69, 0x6c, 0x65, 0x64, 0x4a, 0x6f, 0x62, 0x1a, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, - 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x3e, 0x0a, - 0x0b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x1a, 0x2e, 0x70, - 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6d, 0x70, - 0x6c, 0x65, 0x74, 0x65, 0x64, 0x4a, 0x6f, 0x62, 0x1a, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, - 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x2b, 0x5a, - 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x64, 0x65, - 0x72, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, - 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x73, 0x22, 0x77, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, + 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, + 0x65, 0x64, 0x12, 0x46, 0x0a, 0x10, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x70, + 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, + 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x65, 0x74, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x2a, 0x34, 0x0a, 0x09, 0x4c, 0x6f, + 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x52, 0x4f, 0x56, 0x49, + 0x53, 0x49, 0x4f, 0x4e, 0x45, 0x52, 0x5f, 0x44, 0x41, 0x45, 0x4d, 0x4f, 0x4e, 0x10, 0x00, 0x12, + 0x0f, 0x0a, 0x0b, 0x50, 0x52, 0x4f, 0x56, 0x49, 0x53, 0x49, 0x4f, 0x4e, 0x45, 0x52, 0x10, 0x01, + 0x32, 0x98, 0x02, 0x0a, 0x11, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, + 0x44, 0x61, 0x65, 0x6d, 0x6f, 0x6e, 0x12, 0x3c, 0x0a, 0x0a, 0x41, 0x63, 0x71, 0x75, 0x69, 0x72, + 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, + 0x65, 0x72, 0x64, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, 0x70, 0x72, 0x6f, 0x76, + 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x41, 0x63, 0x71, 0x75, 0x69, 0x72, 0x65, + 0x64, 0x4a, 0x6f, 0x62, 0x12, 0x4c, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, + 0x62, 0x12, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, + 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, + 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x37, 0x0a, 0x07, 0x46, 0x61, 0x69, 0x6c, 0x4a, 0x6f, 0x62, 0x12, 0x17, 0x2e, + 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x46, 0x61, 0x69, + 0x6c, 0x65, 0x64, 0x4a, 0x6f, 0x62, 0x1a, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, + 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x3e, 0x0a, 0x0b, 0x43, + 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x1a, 0x2e, 0x70, 0x72, 0x6f, + 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, + 0x74, 0x65, 0x64, 0x4a, 0x6f, 0x62, 0x1a, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, + 0x6f, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x2b, 0x5a, 0x29, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, + 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, + 0x72, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/provisionerd/proto/provisionerd.proto b/provisionerd/proto/provisionerd.proto index f03de41e7a14b..e7c76d228bdad 100644 --- a/provisionerd/proto/provisionerd.proto +++ b/provisionerd/proto/provisionerd.proto @@ -85,7 +85,7 @@ message UpdateJobRequest { } message UpdateJobResponse { - bool cancelled = 1; + bool canceled = 1; // If parameter schemas are sent, the job will respond // with resolved parameter values. repeated provisioner.ParameterValue parameter_values = 2; diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go index fd6efaf6d75f8..281c44ad00f3c 100644 --- a/provisionerd/provisionerd.go +++ b/provisionerd/provisionerd.go @@ -45,10 +45,11 @@ type Provisioners map[string]sdkproto.DRPCProvisionerClient type Options struct { Logger slog.Logger - UpdateInterval time.Duration - PollInterval time.Duration - Provisioners Provisioners - WorkDirectory string + ForceCancelInterval time.Duration + UpdateInterval time.Duration + PollInterval time.Duration + Provisioners Provisioners + WorkDirectory string } // New creates and starts a provisioner daemon. @@ -59,6 +60,9 @@ func New(clientDialer Dialer, opts *Options) *Server { if opts.UpdateInterval == 0 { opts.UpdateInterval = 5 * time.Second } + if opts.ForceCancelInterval == 0 { + opts.ForceCancelInterval = time.Minute + } ctx, ctxCancel := context.WithCancel(context.Background()) daemon := &Server{ clientDialer: clientDialer, @@ -232,7 +236,7 @@ func (p *Server) runJob(ctx context.Context, job *proto.AcquiredJob) { case <-ctx.Done(): return case <-p.shutdown: - p.opts.Logger.Info(ctx, "attempting graceful cancellation") + p.opts.Logger.Info(ctx, "attempting graceful cancelation") shutdownCancel() return case <-ticker.C: @@ -243,11 +247,21 @@ func (p *Server) runJob(ctx context.Context, job *proto.AcquiredJob) { p.failActiveJobf("send periodic update: %s", err) return } - if !resp.Cancelled { + if !resp.Canceled { return } - p.opts.Logger.Info(ctx, "attempting graceful cancellation") + p.opts.Logger.Info(ctx, "attempting graceful cancelation") shutdownCancel() + // Hard-cancel the job after a minute of pending cancelation. + timer := time.NewTimer(p.opts.ForceCancelInterval) + defer timer.Stop() + select { + case <-timer.C: + p.failActiveJobf("cancelation timed out") + return + case <-ctx.Done(): + return + } } }() defer func() { diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go index e5b204f0fb04e..4ce915349a1ce 100644 --- a/provisionerd/provisionerd_test.go +++ b/provisionerd/provisionerd_test.go @@ -512,7 +512,7 @@ func TestProvisionerd(t *testing.T) { close(updateChan) } return &proto.UpdateJobResponse{ - Cancelled: true, + Canceled: true, }, nil }, failJob: func(ctx context.Context, job *proto.FailedJob) (*proto.Empty, error) { From 21c3d1cf9e4c71408135738441c42d57236b3341 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Mon, 14 Mar 2022 18:14:49 +0000 Subject: [PATCH 09/37] Fix agent lock --- .vscode/settings.json | 1 + agent/usershell/usershell_windows.go | 6 + cli/cliui/cliui.go | 6 +- cli/configssh.go | 12 ++ cli/parametercreate.go | 74 +++++++++ cli/parameterdelete.go | 13 ++ cli/parameterlist.go | 50 ++++++ cli/parameters.go | 73 +++++++++ cli/projectclone.go | 1 + cli/projectcreate.go | 88 ++++++----- cli/projectedit.go | 12 ++ cli/projectupdate.go | 86 ++++++++++- cli/projectversions.go | 13 ++ cli/root.go | 1 + cli/ssh.go | 7 +- cli/tunnel.go | 12 ++ cli/workspacecreate.go | 10 +- cli/workspacedelete.go | 48 ++++++ cli/workspacelist.go | 55 +++++++ cli/workspaces.go | 32 +++- cli/workspaceshow.go | 35 +++++ cli/workspacestart.go | 47 ++++++ cli/workspacestop.go | 47 ++++++ cli/workspaceupdate.go | 53 +++++++ cmd/templater/main.go | 1 - coderd/coderd.go | 14 +- coderd/organizations.go | 24 ++- coderd/organizations_test.go | 2 +- coderd/parameter/validate.go | 43 ++++++ coderd/parameter/validate_test.go | 18 +++ coderd/provisionerdaemons.go | 11 ++ coderd/provisionerjobs.go | 8 +- coderd/provisionerjobs_test.go | 26 +--- coderd/users.go | 202 +++++++++++++++++++++++-- coderd/users_test.go | 24 ++- coderd/workspacebuilds_test.go | 41 +---- coderd/workspaceresourceauth_test.go | 10 +- coderd/workspaceresources.go | 104 ++++++++++--- coderd/workspaceresources_test.go | 19 +-- coderd/workspaces.go | 81 ++++++---- coderd/workspaces_test.go | 116 +++----------- codersdk/organizations.go | 5 +- codersdk/workspacebuilds.go | 8 +- codersdk/workspaceresources.go | 26 +++- codersdk/workspaces.go | 29 ++-- database/databasefake/databasefake.go | 57 ++++++- database/dump.sql | 5 +- database/migrations/000004_jobs.up.sql | 5 +- database/models.go | 5 +- database/querier.go | 5 +- database/query.sql | 31 +++- database/query.sql.go | 157 +++++++++++++++++-- go.mod | 2 +- 53 files changed, 1493 insertions(+), 368 deletions(-) create mode 100644 cli/configssh.go create mode 100644 cli/parametercreate.go create mode 100644 cli/parameterdelete.go create mode 100644 cli/parameterlist.go create mode 100644 cli/parameters.go create mode 100644 cli/projectclone.go create mode 100644 cli/projectedit.go create mode 100644 cli/projectversions.go create mode 100644 cli/tunnel.go create mode 100644 cli/workspacedelete.go create mode 100644 cli/workspacelist.go create mode 100644 cli/workspaceshow.go create mode 100644 cli/workspacestart.go create mode 100644 cli/workspacestop.go create mode 100644 cli/workspaceupdate.go create mode 100644 coderd/parameter/validate.go create mode 100644 coderd/parameter/validate_test.go diff --git a/.vscode/settings.json b/.vscode/settings.json index f7106302a001c..a5b2ac9a9aa9e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -40,6 +40,7 @@ "goleak", "gossh", "hashicorp", + "hclsyntax", "httpmw", "idtoken", "incpatch", diff --git a/agent/usershell/usershell_windows.go b/agent/usershell/usershell_windows.go index 91bff1d8297cd..8ab586743d8b5 100644 --- a/agent/usershell/usershell_windows.go +++ b/agent/usershell/usershell_windows.go @@ -1,6 +1,12 @@ package usershell +import "os/exec" + // Get returns the command prompt binary name. func Get(username string) (string, error) { + _, err := exec.LookPath("powershell.exe") + if err == nil { + return "powershell.exe", nil + } return "cmd.exe", nil } diff --git a/cli/cliui/cliui.go b/cli/cliui/cliui.go index ac920564c8c3f..aee481122033d 100644 --- a/cli/cliui/cliui.go +++ b/cli/cliui/cliui.go @@ -2,9 +2,11 @@ package cliui import ( "errors" + "fmt" "github.com/charmbracelet/charm/ui/common" "github.com/charmbracelet/lipgloss" + "github.com/spf13/cobra" ) var ( @@ -46,4 +48,6 @@ var Styles = struct { Wrap: defaultStyles.Wrap, } -// coder login +func print(cmd *cobra.Command, str string) { + _, _ = fmt.Fprint(cmd.OutOrStdout(), str) +} diff --git a/cli/configssh.go b/cli/configssh.go new file mode 100644 index 0000000000000..a1a7e62d9aab8 --- /dev/null +++ b/cli/configssh.go @@ -0,0 +1,12 @@ +package cli + +import "github.com/spf13/cobra" + +func configSSH() *cobra.Command { + return &cobra.Command{ + Use: "config-ssh", + RunE: func(cmd *cobra.Command, args []string) error { + return nil + }, + } +} diff --git a/cli/parametercreate.go b/cli/parametercreate.go new file mode 100644 index 0000000000000..f476b88636b70 --- /dev/null +++ b/cli/parametercreate.go @@ -0,0 +1,74 @@ +package cli + +import ( + "fmt" + + "github.com/coder/coder/codersdk" + "github.com/coder/coder/database" + "github.com/spf13/cobra" + "golang.org/x/xerrors" +) + +func parameterCreate() *cobra.Command { + var ( + name string + value string + scheme string + ) + cmd := &cobra.Command{ + Use: "create [name]", + Aliases: []string{"mk"}, + Args: cobra.ExactArgs(2), + 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 + } + + scopeName := "" + if len(args) >= 2 { + scopeName = args[1] + } + scope, scopeID, err := parseScopeAndID(cmd.Context(), client, organization, args[0], scopeName) + if err != nil { + return err + } + scheme, err := parseParameterScheme(scheme) + if err != nil { + return err + } + _, err = client.CreateParameter(cmd.Context(), scope, scopeID, codersdk.CreateParameterRequest{ + Name: name, + SourceValue: value, + SourceScheme: database.ParameterSourceSchemeData, + DestinationScheme: scheme, + }) + if err != nil { + return err + } + fmt.Printf("Created!\n") + return nil + }, + } + cmd.Flags().StringVarP(&name, "name", "n", "", "Name for a parameter.") + cmd.MarkFlagRequired("name") + cmd.Flags().StringVarP(&value, "value", "v", "", "Value for a parameter.") + cmd.MarkFlagRequired("value") + cmd.Flags().StringVarP(&scheme, "scheme", "s", "var", `Scheme for the parameter ("var" or "env").`) + + return cmd +} + +func parseParameterScheme(scheme string) (database.ParameterDestinationScheme, error) { + switch scheme { + case "env": + return database.ParameterDestinationSchemeEnvironmentVariable, nil + case "var": + return database.ParameterDestinationSchemeProvisionerVariable, nil + } + return database.ParameterDestinationSchemeNone, xerrors.Errorf("scheme %q not recognized", scheme) +} diff --git a/cli/parameterdelete.go b/cli/parameterdelete.go new file mode 100644 index 0000000000000..f30859a0a470d --- /dev/null +++ b/cli/parameterdelete.go @@ -0,0 +1,13 @@ +package cli + +import "github.com/spf13/cobra" + +func parameterDelete() *cobra.Command { + return &cobra.Command{ + Use: "delete", + Aliases: []string{"rm"}, + RunE: func(cmd *cobra.Command, args []string) error { + return nil + }, + } +} diff --git a/cli/parameterlist.go b/cli/parameterlist.go new file mode 100644 index 0000000000000..b1c57a16c18fb --- /dev/null +++ b/cli/parameterlist.go @@ -0,0 +1,50 @@ +package cli + +import ( + "fmt" + "text/tabwriter" + + "github.com/fatih/color" + "github.com/spf13/cobra" +) + +func parameterList() *cobra.Command { + return &cobra.Command{ + Use: "list ", + 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 + } + + name := "" + if len(args) >= 2 { + name = args[1] + } + scope, scopeID, err := parseScopeAndID(cmd.Context(), client, organization, args[0], name) + if err != nil { + return err + } + params, err := client.Parameters(cmd.Context(), scope, scopeID) + if err != nil { + return err + } + writer := tabwriter.NewWriter(cmd.OutOrStdout(), 0, 0, 4, ' ', 0) + _, _ = fmt.Fprintf(writer, "%s\t%s\t%s\n", + color.HiBlackString("Parameter"), + color.HiBlackString("Created"), + color.HiBlackString("Scheme")) + for _, param := range params { + _, _ = fmt.Fprintf(writer, "%s\t%s\t%s\n", + color.New(color.FgHiCyan).Sprint(param.Name), + color.WhiteString(param.UpdatedAt.Format("January 2, 2006")), + color.New(color.FgHiWhite).Sprint(param.DestinationScheme)) + } + return writer.Flush() + }, + } +} diff --git a/cli/parameters.go b/cli/parameters.go new file mode 100644 index 0000000000000..2a032ebfcd45c --- /dev/null +++ b/cli/parameters.go @@ -0,0 +1,73 @@ +package cli + +import ( + "context" + + "github.com/coder/coder/codersdk" + "github.com/spf13/cobra" + "golang.org/x/xerrors" +) + +func parameters() *cobra.Command { + cmd := &cobra.Command{ + Use: "parameters", + Aliases: []string{"params"}, + } + + cmd.AddCommand(parameterCreate(), parameterList(), parameterDelete()) + + return cmd +} + +func parseScopeAndID(ctx context.Context, client *codersdk.Client, organization codersdk.Organization, rawScope string, name string) (codersdk.ParameterScope, string, error) { + scope, err := parseParameterScope(rawScope) + if err != nil { + return scope, "", err + } + var scopeID string + switch scope { + case codersdk.ParameterOrganization: + if name == "" { + scopeID = organization.ID + } else { + org, err := client.OrganizationByName(ctx, "", name) + if err != nil { + return scope, "", err + } + scopeID = org.ID + } + case codersdk.ParameterProject: + project, err := client.ProjectByName(ctx, organization.ID, name) + if err != nil { + return scope, "", err + } + scopeID = project.ID.String() + case codersdk.ParameterUser: + user, err := client.User(ctx, name) + if err != nil { + return scope, "", err + } + scopeID = user.ID + case codersdk.ParameterWorkspace: + workspace, err := client.WorkspaceByName(ctx, "", name) + if err != nil { + return scope, "", err + } + scopeID = workspace.ID.String() + } + return scope, scopeID, nil +} + +func parseParameterScope(scope string) (codersdk.ParameterScope, error) { + switch scope { + case string(codersdk.ParameterOrganization): + return codersdk.ParameterOrganization, nil + case string(codersdk.ParameterProject): + return codersdk.ParameterProject, nil + case string(codersdk.ParameterUser): + return codersdk.ParameterUser, nil + case string(codersdk.ParameterWorkspace): + return codersdk.ParameterWorkspace, nil + } + return codersdk.ParameterOrganization, xerrors.Errorf("no scope found by name %q", scope) +} diff --git a/cli/projectclone.go b/cli/projectclone.go new file mode 100644 index 0000000000000..7f1e458cd3abe --- /dev/null +++ b/cli/projectclone.go @@ -0,0 +1 @@ +package cli diff --git a/cli/projectcreate.go b/cli/projectcreate.go index f417eec2783c0..fcee6c81b5f77 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "os" - "os/signal" "time" "github.com/briandowns/spinner" @@ -79,7 +78,7 @@ func projectCreate() *cobra.Command { return err } - job, err := createValidProjectVersion(cmd, client, organization, database.ProvisionerType(provisioner), archive) + job, parameters, err := createValidProjectVersion(cmd, client, organization, database.ProvisionerType(provisioner), archive) if err != nil { return err } @@ -97,8 +96,9 @@ func projectCreate() *cobra.Command { } project, err := client.CreateProject(cmd.Context(), organization.ID, codersdk.CreateProjectRequest{ - Name: selectedTemplate.ID, - VersionID: job.ID, + Name: selectedTemplate.ID, + VersionID: job.ID, + ParameterValues: parameters, }) if err != nil { return err @@ -124,13 +124,6 @@ func projectCreate() *cobra.Command { if err != nil { return err } - build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: job.ID, - Transition: database.WorkspaceTransitionStart, - }) - if err != nil { - return err - } spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) spin.Writer = cmd.OutOrStdout() @@ -141,7 +134,7 @@ func projectCreate() *cobra.Command { } spin.Start() defer spin.Stop() - logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, time.Time{}) + logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), workspace.LatestBuild.ID, time.Time{}) if err != nil { return err } @@ -153,7 +146,7 @@ func projectCreate() *cobra.Command { } logBuffer = append(logBuffer, log) } - build, err = client.WorkspaceBuild(cmd.Context(), build.ID) + build, err := client.WorkspaceBuild(cmd.Context(), workspace.LatestBuild.ID) if err != nil { return err } @@ -272,20 +265,54 @@ func projectCreate() *cobra.Command { return cmd } -func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, organization codersdk.Organization, provisioner database.ProvisionerType, archive []byte, parameters ...codersdk.CreateParameterRequest) (*codersdk.ProjectVersion, error) { +// Show computed parameters for a project version. +// Show computed parameters for a workspace build. +// +// Project Version +// +// Parameters +// gcp_credentials = us-central1-a (set by workspace) +// Set with "coder params update org --name test --value something" +// Description +// Something about GCP credentials! +// +// Valid +// - us-central1-a, us-central1-b, us-central1-c +// +// x user settable +// x sensitive +// region = us-central1-a +// - user settable +// - oneof "us-central1-a" "us-central1-b" + +// +// region +// Description +// Something about GCP credentials! +// +// +// +// Resources +// google_compute_instance +// Shuts off + +// Displaying project version information. +// Displaying workspace build information. + +func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, organization codersdk.Organization, provisioner database.ProvisionerType, archive []byte, parameters ...codersdk.CreateParameterRequest) (*codersdk.ProjectVersion, []codersdk.CreateParameterRequest, error) { spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) spin.Writer = cmd.OutOrStdout() spin.Suffix = " Uploading current directory..." err := spin.Color("fgHiGreen") if err != nil { - return nil, err + return nil, nil, err } spin.Start() defer spin.Stop() resp, err := client.Upload(cmd.Context(), codersdk.ContentTypeTar, archive) if err != nil { - return nil, err + return nil, nil, err } before := time.Now() @@ -296,23 +323,12 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga ParameterValues: parameters, }) if err != nil { - return nil, err + return nil, nil, err } - c := make(chan os.Signal, 1) - signal.Notify(c, os.Interrupt) - defer signal.Stop(c) - go func() { - defer signal.Stop(c) - <-c - - for sig := range c { - // sig is a ^C, handle it - } - }() spin.Suffix = " Waiting for the import to complete..." logs, err := client.ProjectVersionLogsAfter(cmd.Context(), version.ID, before) if err != nil { - return nil, err + return nil, nil, err } logBuffer := make([]codersdk.ProvisionerJobLog, 0, 64) for { @@ -325,15 +341,15 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga version, err = client.ProjectVersion(cmd.Context(), version.ID) if err != nil { - return nil, err + return nil, nil, err } parameterSchemas, err := client.ProjectVersionSchema(cmd.Context(), version.ID) if err != nil { - return nil, err + return nil, nil, err } parameterValues, err := client.ProjectVersionParameters(cmd.Context(), version.ID) if err != nil { - return nil, err + return nil, nil, err } spin.Stop() @@ -351,7 +367,7 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga Text: fmt.Sprintf("Enter value for %s:", color.HiCyanString(parameterSchema.Name)), }) if err != nil { - return nil, err + return nil, nil, err } parameters = append(parameters, codersdk.CreateParameterRequest{ Name: parameterSchema.Name, @@ -367,14 +383,14 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga for _, log := range logBuffer { _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s %s\n", color.HiGreenString("[tf]"), log.Output) } - return nil, xerrors.New(version.Job.Error) + return nil, nil, xerrors.New(version.Job.Error) } _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s Successfully imported project source!\n", color.HiGreenString("✓")) resources, err := client.ProjectVersionResources(cmd.Context(), version.ID) if err != nil { - return nil, err + return nil, nil, err } - return &version, displayProjectVersionInfo(cmd, parameterSchemas, parameterValues, resources) + return &version, parameters, displayProjectVersionInfo(cmd, parameterSchemas, parameterValues, resources) } diff --git a/cli/projectedit.go b/cli/projectedit.go new file mode 100644 index 0000000000000..21d0094f0d7e4 --- /dev/null +++ b/cli/projectedit.go @@ -0,0 +1,12 @@ +package cli + +import "github.com/spf13/cobra" + +func projectEdit() *cobra.Command { + return &cobra.Command{ + Use: "edit", + RunE: func(cmd *cobra.Command, args []string) error { + return nil + }, + } +} diff --git a/cli/projectupdate.go b/cli/projectupdate.go index 19f7b2b06404f..74b59841391f5 100644 --- a/cli/projectupdate.go +++ b/cli/projectupdate.go @@ -1,13 +1,93 @@ package cli -import "github.com/spf13/cobra" +import ( + "fmt" + "os" + "path/filepath" + "time" + + "github.com/coder/coder/codersdk" + "github.com/coder/coder/database" + "github.com/coder/coder/provisionersdk" + "github.com/spf13/cobra" + "golang.org/x/xerrors" +) func projectUpdate() *cobra.Command { return &cobra.Command{ - Use: "update ", + Use: "update [directory]", Args: cobra.MinimumNArgs(1), - Short: "Update a project from the current directory", + Short: "Update the source-code of a project from a directory.", 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 + } + project, err := client.ProjectByName(cmd.Context(), organization.ID, args[0]) + if err != nil { + return err + } + + directory, err := os.Getwd() + if err != nil { + return err + } + if len(args) >= 2 { + directory, err = filepath.Abs(args[1]) + if err != nil { + return err + } + } + content, err := provisionersdk.Tar(directory) + if err != nil { + return err + } + resp, err := client.Upload(cmd.Context(), codersdk.ContentTypeTar, content) + if err != nil { + return err + } + + before := time.Now() + projectVersion, err := client.CreateProjectVersion(cmd.Context(), organization.ID, codersdk.CreateProjectVersionRequest{ + ProjectID: project.ID, + StorageMethod: database.ProvisionerStorageMethodFile, + StorageSource: resp.Hash, + Provisioner: database.ProvisionerTypeTerraform, + }) + if err != nil { + return err + } + logs, err := client.ProjectVersionLogsAfter(cmd.Context(), projectVersion.ID, before) + if err != nil { + return err + } + for { + log, ok := <-logs + if !ok { + break + } + fmt.Printf("terraform (%s): %s\n", log.Level, log.Output) + } + projectVersion, err = client.ProjectVersion(cmd.Context(), projectVersion.ID) + if err != nil { + return err + } + + if projectVersion.Job.Status != codersdk.ProvisionerJobSucceeded { + return xerrors.New("job failed") + } + + err = client.UpdateActiveProjectVersion(cmd.Context(), project.ID, codersdk.UpdateActiveProjectVersion{ + ID: projectVersion.ID, + }) + if err != nil { + return err + } + fmt.Printf("Updated version!\n") return nil }, } diff --git a/cli/projectversions.go b/cli/projectversions.go new file mode 100644 index 0000000000000..b1f40e959a518 --- /dev/null +++ b/cli/projectversions.go @@ -0,0 +1,13 @@ +package cli + +import "github.com/spf13/cobra" + +func projectVersions() *cobra.Command { + return &cobra.Command{ + Use: "versions", + Aliases: []string{"version"}, + RunE: func(cmd *cobra.Command, args []string) error { + return nil + }, + } +} diff --git a/cli/root.go b/cli/root.go index 69ca4a50ae302..4d2bc7842e8a2 100644 --- a/cli/root.go +++ b/cli/root.go @@ -63,6 +63,7 @@ func Root() *cobra.Command { cmd.AddCommand(daemon()) cmd.AddCommand(login()) + cmd.AddCommand(parameters()) cmd.AddCommand(projects()) cmd.AddCommand(workspaces()) cmd.AddCommand(users()) diff --git a/cli/ssh.go b/cli/ssh.go index 52d1875bf57ee..c895f5a3b6a29 100644 --- a/cli/ssh.go +++ b/cli/ssh.go @@ -27,11 +27,7 @@ func workspaceSSH() *cobra.Command { if err != nil { return err } - build, err := client.WorkspaceBuildLatest(cmd.Context(), workspace.ID) - if err != nil { - return err - } - resources, err := client.WorkspaceResourcesByBuild(cmd.Context(), build.ID) + resources, err := client.WorkspaceResourcesByBuild(cmd.Context(), workspace.LatestBuild.ID) if err != nil { return err } @@ -64,7 +60,6 @@ func workspaceSSH() *cobra.Command { if err != nil { return err } - // Set raw term.MakeRaw(int(os.Stdin.Fd())) err = session.RequestPty("xterm-256color", 128, 128, ssh.TerminalModes{ ssh.OCRNL: 1, diff --git a/cli/tunnel.go b/cli/tunnel.go new file mode 100644 index 0000000000000..a0b5cfc7c86d0 --- /dev/null +++ b/cli/tunnel.go @@ -0,0 +1,12 @@ +package cli + +import "github.com/spf13/cobra" + +func workspaceTunnel() *cobra.Command { + return &cobra.Command{ + Use: "tunnel", + RunE: func(cmd *cobra.Command, args []string) error { + return nil + }, + } +} diff --git a/cli/workspacecreate.go b/cli/workspacecreate.go index d79781ba9bfa5..2807adeff081c 100644 --- a/cli/workspacecreate.go +++ b/cli/workspacecreate.go @@ -13,7 +13,6 @@ import ( "github.com/coder/coder/cli/cliui" "github.com/coder/coder/codersdk" - "github.com/coder/coder/database" ) func workspaceCreate() *cobra.Command { @@ -101,15 +100,8 @@ func workspaceCreate() *cobra.Command { if err != nil { return err } - version, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: projectVersion.ID, - Transition: database.WorkspaceTransitionStart, - }) - if err != nil { - return err - } - logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), version.ID, time.Time{}) + logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), workspace.LatestBuild.ID, time.Time{}) if err != nil { return err } diff --git a/cli/workspacedelete.go b/cli/workspacedelete.go new file mode 100644 index 0000000000000..cfa742d862c0e --- /dev/null +++ b/cli/workspacedelete.go @@ -0,0 +1,48 @@ +package cli + +import ( + "fmt" + "time" + + "github.com/coder/coder/codersdk" + "github.com/coder/coder/database" + "github.com/spf13/cobra" +) + +func workspaceDelete() *cobra.Command { + return &cobra.Command{ + Use: "delete ", + Aliases: []string{"rm"}, + ValidArgsFunction: validArgsWorkspaceName, + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + client, err := createClient(cmd) + if err != nil { + return err + } + workspace, err := client.WorkspaceByName(cmd.Context(), "", args[0]) + if err != nil { + return err + } + before := time.Now() + build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ + Transition: database.WorkspaceTransitionDelete, + }) + if err != nil { + return err + } + logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before) + if err != nil { + return err + } + for { + log, ok := <-logs + if !ok { + break + } + fmt.Printf("Output: %s\n", log.Output) + } + return nil + }, + } +} diff --git a/cli/workspacelist.go b/cli/workspacelist.go new file mode 100644 index 0000000000000..fec1f6c198f9c --- /dev/null +++ b/cli/workspacelist.go @@ -0,0 +1,55 @@ +package cli + +import ( + "fmt" + "text/tabwriter" + "time" + + "github.com/fatih/color" + "github.com/spf13/cobra" +) + +func workspaceList() *cobra.Command { + return &cobra.Command{ + Use: "list", + Aliases: []string{"ls"}, + RunE: func(cmd *cobra.Command, args []string) error { + client, err := createClient(cmd) + if err != nil { + return err + } + start := time.Now() + workspaces, err := client.WorkspacesByUser(cmd.Context(), "") + if err != nil { + return err + } + if len(workspaces) == 0 { + _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s No workspaces found! Create one:\n\n", caret) + _, _ = fmt.Fprintln(cmd.OutOrStdout(), color.HiMagentaString(" $ coder workspaces create \n")) + return nil + } + + _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s Workspaces found %s\n\n", + caret, + color.HiBlackString("[%dms]", + time.Since(start).Milliseconds())) + + writer := tabwriter.NewWriter(cmd.OutOrStdout(), 0, 0, 4, ' ', 0) + _, _ = fmt.Fprintf(writer, "%s\t%s\t%s\t%s\t%s\n", + color.HiBlackString("Workspace"), + color.HiBlackString("Project"), + color.HiBlackString("Status"), + color.HiBlackString("Last Built"), + color.HiBlackString("Outdated")) + for _, workspace := range workspaces { + _, _ = fmt.Fprintf(writer, "%s\t%s\t%s\t%s\t%+v\n", + color.New(color.FgHiCyan).Sprint(workspace.Name), + color.WhiteString(workspace.ProjectName), + color.WhiteString(string(workspace.LatestBuild.Transition)), + color.WhiteString(workspace.LatestBuild.Job.CompletedAt.Format("January 2, 2006")), + workspace.Outdated) + } + return writer.Flush() + }, + } +} diff --git a/cli/workspaces.go b/cli/workspaces.go index b470fc7df1c60..e5a13040f11d7 100644 --- a/cli/workspaces.go +++ b/cli/workspaces.go @@ -1,6 +1,10 @@ package cli -import "github.com/spf13/cobra" +import ( + "strings" + + "github.com/spf13/cobra" +) func workspaces() *cobra.Command { cmd := &cobra.Command{ @@ -8,6 +12,32 @@ func workspaces() *cobra.Command { } cmd.AddCommand(workspaceAgent()) cmd.AddCommand(workspaceCreate()) + cmd.AddCommand(workspaceDelete()) + cmd.AddCommand(workspaceList()) + cmd.AddCommand(workspaceShow()) + cmd.AddCommand(workspaceStop()) + cmd.AddCommand(workspaceStart()) + cmd.AddCommand(workspaceSSH()) + cmd.AddCommand(workspaceUpdate()) return cmd } + +func validArgsWorkspaceName(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + client, err := createClient(cmd) + if err != nil { + return nil, cobra.ShellCompDirectiveError + } + workspaces, err := client.WorkspacesByUser(cmd.Context(), "") + if err != nil { + return nil, cobra.ShellCompDirectiveError + } + names := make([]string, 0) + for _, workspace := range workspaces { + if !strings.HasPrefix(workspace.Name, toComplete) { + continue + } + names = append(names, workspace.Name) + } + return names, cobra.ShellCompDirectiveDefault +} diff --git a/cli/workspaceshow.go b/cli/workspaceshow.go new file mode 100644 index 0000000000000..43a68d5f34e1a --- /dev/null +++ b/cli/workspaceshow.go @@ -0,0 +1,35 @@ +package cli + +import ( + "fmt" + + "github.com/spf13/cobra" +) + +func workspaceShow() *cobra.Command { + return &cobra.Command{ + Use: "show", + RunE: func(cmd *cobra.Command, args []string) error { + client, err := createClient(cmd) + if err != nil { + return err + } + workspace, err := client.WorkspaceByName(cmd.Context(), "", args[0]) + if err != nil { + return err + } + resources, err := client.WorkspaceResourcesByBuild(cmd.Context(), workspace.LatestBuild.ID) + if err != nil { + return err + } + for _, resource := range resources { + if resource.Agent == nil { + continue + } + + fmt.Printf("Agent: %+v\n", resource.Agent) + } + return nil + }, + } +} diff --git a/cli/workspacestart.go b/cli/workspacestart.go new file mode 100644 index 0000000000000..22ed4acfa32ad --- /dev/null +++ b/cli/workspacestart.go @@ -0,0 +1,47 @@ +package cli + +import ( + "fmt" + "time" + + "github.com/coder/coder/codersdk" + "github.com/coder/coder/database" + "github.com/spf13/cobra" +) + +func workspaceStart() *cobra.Command { + return &cobra.Command{ + Use: "start ", + ValidArgsFunction: validArgsWorkspaceName, + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + client, err := createClient(cmd) + if err != nil { + return err + } + workspace, err := client.WorkspaceByName(cmd.Context(), "", args[0]) + if err != nil { + return err + } + before := time.Now() + build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ + Transition: database.WorkspaceTransitionStart, + }) + if err != nil { + return err + } + logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before) + if err != nil { + return err + } + for { + log, ok := <-logs + if !ok { + break + } + fmt.Printf("Output: %s\n", log.Output) + } + return nil + }, + } +} diff --git a/cli/workspacestop.go b/cli/workspacestop.go new file mode 100644 index 0000000000000..7e6d3f69d5fb4 --- /dev/null +++ b/cli/workspacestop.go @@ -0,0 +1,47 @@ +package cli + +import ( + "fmt" + "time" + + "github.com/coder/coder/codersdk" + "github.com/coder/coder/database" + "github.com/spf13/cobra" +) + +func workspaceStop() *cobra.Command { + return &cobra.Command{ + Use: "stop ", + ValidArgsFunction: validArgsWorkspaceName, + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + client, err := createClient(cmd) + if err != nil { + return err + } + workspace, err := client.WorkspaceByName(cmd.Context(), "", args[0]) + if err != nil { + return err + } + before := time.Now() + build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ + Transition: database.WorkspaceTransitionStop, + }) + if err != nil { + return err + } + logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before) + if err != nil { + return err + } + for { + log, ok := <-logs + if !ok { + break + } + fmt.Printf("Output: %s\n", log.Output) + } + return nil + }, + } +} diff --git a/cli/workspaceupdate.go b/cli/workspaceupdate.go new file mode 100644 index 0000000000000..9c88072d42b0e --- /dev/null +++ b/cli/workspaceupdate.go @@ -0,0 +1,53 @@ +package cli + +import ( + "fmt" + "time" + + "github.com/coder/coder/codersdk" + "github.com/spf13/cobra" +) + +func workspaceUpdate() *cobra.Command { + return &cobra.Command{ + Use: "update", + RunE: func(cmd *cobra.Command, args []string) error { + client, err := createClient(cmd) + if err != nil { + return err + } + workspace, err := client.WorkspaceByName(cmd.Context(), "", args[0]) + if err != nil { + return err + } + if !workspace.Outdated { + fmt.Printf("Workspace isn't outdated!\n") + return nil + } + project, err := client.Project(cmd.Context(), workspace.ProjectID) + if err != nil { + return nil + } + before := time.Now() + build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ + ProjectVersionID: project.ActiveVersionID, + Transition: workspace.LatestBuild.Transition, + }) + if err != nil { + return err + } + logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before) + if err != nil { + return err + } + for { + log, ok := <-logs + if !ok { + break + } + fmt.Printf("Output: %s\n", log.Output) + } + return nil + }, + } +} diff --git a/cmd/templater/main.go b/cmd/templater/main.go index 925825a3d7386..b41d33a9ba10d 100644 --- a/cmd/templater/main.go +++ b/cmd/templater/main.go @@ -138,7 +138,6 @@ func parse(cmd *cobra.Command, args []string, parameters []codersdk.CreateParame before := time.Now() version, err := client.CreateProjectVersion(cmd.Context(), created.OrganizationID, codersdk.CreateProjectVersionRequest{ - ProjectID: nil, StorageMethod: database.ProvisionerStorageMethodFile, StorageSource: resp.Hash, Provisioner: database.ProvisionerTypeTerraform, diff --git a/coderd/coderd.go b/coderd/coderd.go index 238852f9de51f..708dc4157e55f 100644 --- a/coderd/coderd.go +++ b/coderd/coderd.go @@ -4,6 +4,7 @@ import ( "net/http" "net/url" "sync" + "time" "github.com/go-chi/chi/v5" "google.golang.org/api/idtoken" @@ -17,10 +18,11 @@ import ( // Options are requires parameters for Coder to start. type Options struct { - AccessURL *url.URL - Logger slog.Logger - Database database.Store - Pubsub database.Pubsub + AgentConnectionUpdateFrequency time.Duration + AccessURL *url.URL + Logger slog.Logger + Database database.Store + Pubsub database.Pubsub GoogleTokenValidator *idtoken.Validator } @@ -30,6 +32,9 @@ type Options struct { // A wait function is returned to handle awaiting closure // of hijacked HTTP requests. func New(options *Options) (http.Handler, func()) { + if options.AgentConnectionUpdateFrequency == 0 { + options.AgentConnectionUpdateFrequency = 3 * time.Second + } api := &api{ Options: options, } @@ -159,7 +164,6 @@ func New(options *Options) (http.Handler, func()) { r.Route("/builds", func(r chi.Router) { r.Get("/", api.workspaceBuilds) r.Post("/", api.postWorkspaceBuilds) - r.Get("/latest", api.workspaceBuildLatest) r.Get("/{workspacebuildname}", api.workspaceBuildByName) }) }) diff --git a/coderd/organizations.go b/coderd/organizations.go index 03f97810aa800..dc1e091f015ae 100644 --- a/coderd/organizations.go +++ b/coderd/organizations.go @@ -50,8 +50,8 @@ func (api *api) postProjectVersionsByOrganization(rw http.ResponseWriter, r *htt if !httpapi.Read(rw, r, &req) { return } - if req.ProjectID != nil { - _, err := api.Database.GetProjectByID(r.Context(), *req.ProjectID) + if req.ProjectID != uuid.Nil { + _, err := api.Database.GetProjectByID(r.Context(), req.ProjectID) if errors.Is(err, sql.ErrNoRows) { httpapi.Write(rw, http.StatusNotFound, httpapi.Response{ Message: "project does not exist", @@ -118,9 +118,9 @@ func (api *api) postProjectVersionsByOrganization(rw http.ResponseWriter, r *htt } var projectID uuid.NullUUID - if req.ProjectID != nil { + if req.ProjectID != uuid.Nil { projectID = uuid.NullUUID{ - UUID: *req.ProjectID, + UUID: req.ProjectID, Valid: true, } } @@ -222,6 +222,22 @@ func (api *api) postProjectsByOrganization(rw http.ResponseWriter, r *http.Reque if err != nil { return xerrors.Errorf("insert project version: %s", err) } + for _, parameterValue := range createProject.ParameterValues { + _, err = db.InsertParameterValue(r.Context(), database.InsertParameterValueParams{ + ID: uuid.New(), + Name: parameterValue.Name, + CreatedAt: database.Now(), + UpdatedAt: database.Now(), + Scope: database.ParameterScopeProject, + ScopeID: project.ID.String(), + SourceScheme: parameterValue.SourceScheme, + SourceValue: parameterValue.SourceValue, + DestinationScheme: parameterValue.DestinationScheme, + }) + if err != nil { + return xerrors.Errorf("insert parameter value: %w", err) + } + } project = convertProject(dbProject, 0) return nil }) diff --git a/coderd/organizations_test.go b/coderd/organizations_test.go index 822cacce4a95d..e8b3061f0d461 100644 --- a/coderd/organizations_test.go +++ b/coderd/organizations_test.go @@ -40,7 +40,7 @@ func TestPostProjectVersionsByOrganization(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) projectID := uuid.New() _, err := client.CreateProjectVersion(context.Background(), user.OrganizationID, codersdk.CreateProjectVersionRequest{ - ProjectID: &projectID, + ProjectID: projectID, StorageMethod: database.ProvisionerStorageMethodFile, StorageSource: "hash", Provisioner: database.ProvisionerTypeEcho, diff --git a/coderd/parameter/validate.go b/coderd/parameter/validate.go new file mode 100644 index 0000000000000..6b7f7ea08a524 --- /dev/null +++ b/coderd/parameter/validate.go @@ -0,0 +1,43 @@ +package parameter + +import ( + "sort" + + "github.com/hashicorp/hcl/v2" + "github.com/hashicorp/hcl/v2/hclsyntax" + "golang.org/x/xerrors" +) + +// Contains parses possible values for a conditional. +func Contains(condition string) ([]string, bool, error) { + if condition == "" { + return nil, false, nil + } + expression, diags := hclsyntax.ParseExpression([]byte(condition), "", hcl.InitialPos) + if len(diags) > 0 { + return nil, false, xerrors.Errorf("parse condition: %s", diags.Error()) + } + functionCallExpression, valid := expression.(*hclsyntax.FunctionCallExpr) + if !valid { + return nil, false, nil + } + if functionCallExpression.Name != "contains" { + return nil, false, nil + } + if len(functionCallExpression.Args) < 2 { + return nil, false, nil + } + value, diags := functionCallExpression.Args[0].Value(&hcl.EvalContext{}) + if len(diags) > 0 { + return nil, false, xerrors.Errorf("parse value: %s", diags.Error()) + } + possible := make([]string, 0) + for _, subValue := range value.AsValueSlice() { + if subValue.Type().FriendlyName() != "string" { + continue + } + possible = append(possible, subValue.AsString()) + } + sort.Strings(possible) + return possible, true, nil +} diff --git a/coderd/parameter/validate_test.go b/coderd/parameter/validate_test.go new file mode 100644 index 0000000000000..b53e6b683aa66 --- /dev/null +++ b/coderd/parameter/validate_test.go @@ -0,0 +1,18 @@ +package parameter_test + +import ( + "testing" + + "github.com/coder/coder/coderd/parameter" + "github.com/stretchr/testify/require" +) + +func TestValidate(t *testing.T) { + t.Parallel() + t.Run("Contains", func(t *testing.T) { + values, valid, err := parameter.Contains(`contains(["us-east1-a", "us-central1-a"], var.region)`) + require.NoError(t, err) + require.True(t, valid) + require.Len(t, values, 2) + }) +} diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go index d377e7c679c58..620f9683ff7d8 100644 --- a/coderd/provisionerdaemons.go +++ b/coderd/provisionerdaemons.go @@ -362,8 +362,18 @@ func (server *provisionerdServer) UpdateJob(ctx context.Context, request *proto. } } + var projectID uuid.NullUUID + if job.Type == database.ProvisionerJobTypeProjectVersionImport { + projectVersion, err := server.Database.GetProjectVersionByJobID(ctx, job.ID) + if err != nil { + return nil, xerrors.Errorf("get project version by job id: %w", err) + } + projectID = projectVersion.ProjectID + } + parameters, err := parameter.Compute(ctx, server.Database, parameter.ComputeScope{ ProjectImportJobID: job.ID, + ProjectID: projectID, OrganizationID: job.OrganizationID, UserID: job.InitiatorID, }, nil) @@ -599,6 +609,7 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid. _, err := db.InsertWorkspaceAgent(ctx, database.InsertWorkspaceAgentParams{ ID: resource.AgentID.UUID, CreatedAt: database.Now(), + UpdatedAt: database.Now(), ResourceID: resource.ID, AuthToken: authToken, AuthInstanceID: instanceID, diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go index 3db0e11c9aa4e..aefd678fe585f 100644 --- a/coderd/provisionerjobs.go +++ b/coderd/provisionerjobs.go @@ -205,7 +205,7 @@ func (api *api) provisionerJobResources(rw http.ResponseWriter, r *http.Request, }) return } - apiAgent, err := convertWorkspaceAgent(agent) + apiAgent, err := convertWorkspaceAgent(agent, api.AgentConnectionUpdateFrequency) if err != nil { httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ Message: fmt.Sprintf("convert provisioner job agent: %s", err), @@ -246,9 +246,6 @@ func convertProvisionerJob(provisionerJob database.ProvisionerJob) codersdk.Prov } switch { - case database.Now().Sub(provisionerJob.UpdatedAt) > 30*time.Second: - job.Status = codersdk.ProvisionerJobFailed - job.Error = "Worker failed to update job in time." case provisionerJob.CanceledAt.Valid: if provisionerJob.CompletedAt.Valid { job.Status = codersdk.ProvisionerJobCanceled @@ -263,6 +260,9 @@ func convertProvisionerJob(provisionerJob database.ProvisionerJob) codersdk.Prov } else { job.Status = codersdk.ProvisionerJobFailed } + case database.Now().Sub(provisionerJob.UpdatedAt) > 30*time.Second: + job.Status = codersdk.ProvisionerJobFailed + job.Error = "Worker failed to update job in time." default: job.Status = codersdk.ProvisionerJobRunning } diff --git a/coderd/provisionerjobs_test.go b/coderd/provisionerjobs_test.go index 9cff1b1f4af77..0265d5097bee4 100644 --- a/coderd/provisionerjobs_test.go +++ b/coderd/provisionerjobs_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/require" "github.com/coder/coder/coderd/coderdtest" - "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/provisioner/echo" "github.com/coder/coder/provisionersdk/proto" @@ -40,16 +39,11 @@ func TestProvisionerJobLogs(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) before := time.Now().UTC() - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) ctx, cancelFunc := context.WithCancel(context.Background()) t.Cleanup(cancelFunc) - logs, err := client.WorkspaceBuildLogsAfter(ctx, build.ID, before) + logs, err := client.WorkspaceBuildLogsAfter(ctx, workspace.LatestBuild.ID, before) require.NoError(t, err) log, ok := <-logs require.True(t, ok) @@ -83,14 +77,9 @@ func TestProvisionerJobLogs(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) before := database.Now() - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) ctx, cancelFunc := context.WithCancel(context.Background()) t.Cleanup(cancelFunc) - logs, err := client.WorkspaceBuildLogsAfter(ctx, build.ID, before) + logs, err := client.WorkspaceBuildLogsAfter(ctx, workspace.LatestBuild.ID, before) require.NoError(t, err) log := <-logs require.Equal(t, "log-output", log.Output) @@ -121,13 +110,8 @@ func TestProvisionerJobLogs(t *testing.T) { project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) - logs, err := client.WorkspaceBuildLogsBefore(context.Background(), build.ID, time.Now()) + coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + logs, err := client.WorkspaceBuildLogsBefore(context.Background(), workspace.LatestBuild.ID, time.Now()) require.NoError(t, err) require.Len(t, logs, 1) }) diff --git a/coderd/users.go b/coderd/users.go index 4d2d8536f8d00..b5d22d58d640f 100644 --- a/coderd/users.go +++ b/coderd/users.go @@ -3,6 +3,7 @@ package coderd import ( "crypto/sha256" "database/sql" + "encoding/json" "errors" "fmt" "net/http" @@ -11,6 +12,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" "github.com/google/uuid" + "github.com/moby/moby/pkg/namesgenerator" "golang.org/x/xerrors" "github.com/coder/coder/coderd/userpassword" @@ -552,24 +554,103 @@ func (api *api) postWorkspacesByUser(rw http.ResponseWriter, r *http.Request) { return } - // Workspaces are created without any versions. - workspace, err = api.Database.InsertWorkspace(r.Context(), database.InsertWorkspaceParams{ - ID: uuid.New(), - CreatedAt: database.Now(), - UpdatedAt: database.Now(), - OwnerID: apiKey.UserID, - ProjectID: project.ID, - Name: createWorkspace.Name, + projectVersion, err := api.Database.GetProjectVersionByID(r.Context(), project.ActiveVersionID) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get project version: %s", err), + }) + return + } + projectVersionJob, err := api.Database.GetProvisionerJobByID(r.Context(), projectVersion.JobID) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get project version job: %s", err), + }) + return + } + projectVersionJobStatus := convertProvisionerJob(projectVersionJob).Status + switch projectVersionJobStatus { + case codersdk.ProvisionerJobPending, codersdk.ProvisionerJobRunning: + httpapi.Write(rw, http.StatusNotAcceptable, httpapi.Response{ + Message: fmt.Sprintf("The provided project version is %s. Wait for it to complete importing!", projectVersionJobStatus), + }) + return + case codersdk.ProvisionerJobFailed: + httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{ + Message: fmt.Sprintf("The provided project version %q has failed to import. You cannot create workspaces using it!", projectVersion.Name), + }) + return + case codersdk.ProvisionerJobCanceled: + httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{ + Message: "The provided project version was canceled during import. You cannot create workspaces using it!", + }) + return + } + + var provisionerJob database.ProvisionerJob + var workspaceBuild database.WorkspaceBuild + err = api.Database.InTx(func(db database.Store) error { + workspaceBuildID := uuid.New() + // Workspaces are created without any versions. + workspace, err = db.InsertWorkspace(r.Context(), database.InsertWorkspaceParams{ + ID: uuid.New(), + CreatedAt: database.Now(), + UpdatedAt: database.Now(), + OwnerID: apiKey.UserID, + ProjectID: project.ID, + Name: createWorkspace.Name, + }) + if err != nil { + return xerrors.Errorf("insert workspace: %w", err) + } + + input, err := json.Marshal(workspaceProvisionJob{ + WorkspaceBuildID: workspaceBuildID, + }) + if err != nil { + return xerrors.Errorf("marshal provision job: %w", err) + } + provisionerJob, err = db.InsertProvisionerJob(r.Context(), database.InsertProvisionerJobParams{ + ID: uuid.New(), + CreatedAt: database.Now(), + UpdatedAt: database.Now(), + InitiatorID: apiKey.UserID, + OrganizationID: project.OrganizationID, + Provisioner: project.Provisioner, + Type: database.ProvisionerJobTypeWorkspaceBuild, + StorageMethod: projectVersionJob.StorageMethod, + StorageSource: projectVersionJob.StorageSource, + Input: input, + }) + if err != nil { + return xerrors.Errorf("insert provisioner job: %w", err) + } + workspaceBuild, err = db.InsertWorkspaceBuild(r.Context(), database.InsertWorkspaceBuildParams{ + ID: workspaceBuildID, + CreatedAt: database.Now(), + UpdatedAt: database.Now(), + WorkspaceID: workspace.ID, + ProjectVersionID: projectVersion.ID, + Name: namesgenerator.GetRandomName(1), + Initiator: apiKey.UserID, + Transition: database.WorkspaceTransitionStart, + JobID: provisionerJob.ID, + }) + if err != nil { + return xerrors.Errorf("insert workspace build: %w", err) + } + return nil }) if err != nil { httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ - Message: fmt.Sprintf("insert workspace: %s", err), + Message: fmt.Sprintf("create workspace: %s", err), }) return } render.Status(r, http.StatusCreated) - render.JSON(rw, r, convertWorkspace(workspace)) + render.JSON(rw, r, convertWorkspace(workspace, + convertWorkspaceBuild(workspaceBuild, convertProvisionerJob(projectVersionJob)), project)) } func (api *api) workspacesByUser(rw http.ResponseWriter, r *http.Request) { @@ -586,9 +667,84 @@ func (api *api) workspacesByUser(rw http.ResponseWriter, r *http.Request) { }) return } + workspaceIDs := make([]uuid.UUID, 0, len(workspaces)) + projectIDs := make([]uuid.UUID, 0, len(workspaces)) + for _, workspace := range workspaces { + workspaceIDs = append(workspaceIDs, workspace.ID) + projectIDs = append(projectIDs, workspace.ProjectID) + } + workspaceBuilds, err := api.Database.GetWorkspaceBuildsByWorkspaceIDsWithoutAfter(r.Context(), workspaceIDs) + if errors.Is(err, sql.ErrNoRows) { + err = nil + } + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get workspace builds: %s", err), + }) + return + } + projects, err := api.Database.GetProjectsByIDs(r.Context(), projectIDs) + if errors.Is(err, sql.ErrNoRows) { + err = nil + } + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get projects: %s", err), + }) + return + } + jobIDs := make([]uuid.UUID, 0, len(workspaceBuilds)) + for _, build := range workspaceBuilds { + jobIDs = append(jobIDs, build.JobID) + } + jobs, err := api.Database.GetProvisionerJobsByIDs(r.Context(), jobIDs) + if errors.Is(err, sql.ErrNoRows) { + err = nil + } + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get provisioner jobs: %s", err), + }) + return + } + + buildByWorkspaceID := map[string]database.WorkspaceBuild{} + for _, workspaceBuild := range workspaceBuilds { + buildByWorkspaceID[workspaceBuild.WorkspaceID.String()] = workspaceBuild + } + projectByID := map[string]database.Project{} + for _, project := range projects { + projectByID[project.ID.String()] = project + } + jobByID := map[string]database.ProvisionerJob{} + for _, job := range jobs { + jobByID[job.ID.String()] = job + } apiWorkspaces := make([]codersdk.Workspace, 0, len(workspaces)) for _, workspace := range workspaces { - apiWorkspaces = append(apiWorkspaces, convertWorkspace(workspace)) + build, exists := buildByWorkspaceID[workspace.ID.String()] + if !exists { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("build not found for workspace %q", workspace.Name), + }) + return + } + project, exists := projectByID[workspace.ProjectID.String()] + if !exists { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("project not found for workspace %q", workspace.Name), + }) + return + } + job, exists := jobByID[build.JobID.String()] + if !exists { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("build job not found for workspace %q", workspace.Name), + }) + return + } + apiWorkspaces = append(apiWorkspaces, + convertWorkspace(workspace, convertWorkspaceBuild(build, convertProvisionerJob(job)), project)) } render.Status(r, http.StatusOK) render.JSON(rw, r, apiWorkspaces) @@ -613,9 +769,31 @@ func (api *api) workspaceByUserAndName(rw http.ResponseWriter, r *http.Request) }) return } + build, err := api.Database.GetWorkspaceBuildByWorkspaceIDWithoutAfter(r.Context(), workspace.ID) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get workspace build: %s", err), + }) + return + } + job, err := api.Database.GetProvisionerJobByID(r.Context(), build.JobID) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get provisioner job: %s", err), + }) + return + } + project, err := api.Database.GetProjectByID(r.Context(), workspace.ProjectID) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get project: %s", err), + }) + return + } render.Status(r, http.StatusOK) - render.JSON(rw, r, convertWorkspace(workspace)) + render.JSON(rw, r, convertWorkspace(workspace, + convertWorkspaceBuild(build, convertProvisionerJob(job)), project)) } // Generates a new ID and secret for an API key. diff --git a/coderd/users_test.go b/coderd/users_test.go index 8f51bf5bafabf..841ed7dc5cba6 100644 --- a/coderd/users_test.go +++ b/coderd/users_test.go @@ -350,9 +350,11 @@ func TestPostWorkspacesByUser(t *testing.T) { t.Run("AlreadyExists", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) + coderdtest.NewProvisionerDaemon(t, client) user := coderdtest.CreateFirstUser(t, client) - job := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) - project := coderdtest.CreateProject(t, client, user.OrganizationID, job.ID) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) + coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) _, err := client.CreateWorkspace(context.Background(), "", codersdk.CreateWorkspaceRequest{ ProjectID: project.ID, @@ -367,9 +369,11 @@ func TestPostWorkspacesByUser(t *testing.T) { t.Run("Create", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) + coderdtest.NewProvisionerDaemon(t, client) user := coderdtest.CreateFirstUser(t, client) - job := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) - project := coderdtest.CreateProject(t, client, user.OrganizationID, job.ID) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) + coderdtest.AwaitProjectVersionJob(t, client, version.ID) _ = coderdtest.CreateWorkspace(t, client, "", project.ID) }) } @@ -386,9 +390,11 @@ func TestWorkspacesByUser(t *testing.T) { t.Run("List", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) + coderdtest.NewProvisionerDaemon(t, client) user := coderdtest.CreateFirstUser(t, client) - job := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) - project := coderdtest.CreateProject(t, client, user.OrganizationID, job.ID) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + coderdtest.AwaitProjectVersionJob(t, client, version.ID) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) _ = coderdtest.CreateWorkspace(t, client, "", project.ID) workspaces, err := client.WorkspacesByUser(context.Background(), "") require.NoError(t, err) @@ -410,9 +416,11 @@ func TestWorkspaceByUserAndName(t *testing.T) { t.Run("Get", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) + coderdtest.NewProvisionerDaemon(t, client) user := coderdtest.CreateFirstUser(t, client) - job := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) - project := coderdtest.CreateProject(t, client, user.OrganizationID, job.ID) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + coderdtest.AwaitProjectVersionJob(t, client, version.ID) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) _, err := client.WorkspaceByName(context.Background(), "", workspace.Name) require.NoError(t, err) diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go index dbf2fae79c940..2e9814cf713b8 100644 --- a/coderd/workspacebuilds_test.go +++ b/coderd/workspacebuilds_test.go @@ -10,7 +10,6 @@ import ( "github.com/coder/coder/coderd/coderdtest" "github.com/coder/coder/codersdk" - "github.com/coder/coder/database" "github.com/coder/coder/provisioner/echo" "github.com/coder/coder/provisionersdk/proto" ) @@ -24,12 +23,7 @@ func TestWorkspaceBuild(t *testing.T) { project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) - _, err = client.WorkspaceBuild(context.Background(), build.ID) + _, err := client.WorkspaceBuild(context.Background(), workspace.LatestBuild.ID) require.NoError(t, err) } @@ -50,18 +44,14 @@ func TestPatchCancelWorkspaceBuild(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) + var build codersdk.WorkspaceBuild require.Eventually(t, func() bool { var err error - build, err = client.WorkspaceBuild(context.Background(), build.ID) + build, err = client.WorkspaceBuild(context.Background(), workspace.LatestBuild.ID) require.NoError(t, err) return build.Job.Status == codersdk.ProvisionerJobRunning }, 5*time.Second, 25*time.Millisecond) - err = client.CancelWorkspaceBuild(context.Background(), build.ID) + err := client.CancelWorkspaceBuild(context.Background(), build.ID) require.NoError(t, err) require.Eventually(t, func() bool { var err error @@ -85,12 +75,7 @@ func TestWorkspaceBuildResources(t *testing.T) { closeDaemon.Close() project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) - _, err = client.WorkspaceResourcesByBuild(context.Background(), build.ID) + _, err := client.WorkspaceResourcesByBuild(context.Background(), workspace.LatestBuild.ID) var apiErr *codersdk.Error require.ErrorAs(t, err, &apiErr) require.Equal(t, http.StatusPreconditionFailed, apiErr.StatusCode()) @@ -123,13 +108,8 @@ func TestWorkspaceBuildResources(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) - resources, err := client.WorkspaceResourcesByBuild(context.Background(), build.ID) + coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + resources, err := client.WorkspaceResourcesByBuild(context.Background(), workspace.LatestBuild.ID) require.NoError(t, err) require.NotNil(t, resources) require.Len(t, resources, 2) @@ -175,14 +155,9 @@ func TestWorkspaceBuildLogs(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) ctx, cancelFunc := context.WithCancel(context.Background()) t.Cleanup(cancelFunc) - logs, err := client.WorkspaceBuildLogsAfter(ctx, build.ID, before) + logs, err := client.WorkspaceBuildLogsAfter(ctx, workspace.LatestBuild.ID, before) require.NoError(t, err) log := <-logs require.Equal(t, "example", log.Output) diff --git a/coderd/workspaceresourceauth_test.go b/coderd/workspaceresourceauth_test.go index 1240e8ac236d6..99592eb90c26e 100644 --- a/coderd/workspaceresourceauth_test.go +++ b/coderd/workspaceresourceauth_test.go @@ -22,7 +22,6 @@ import ( "github.com/coder/coder/coderd/coderdtest" "github.com/coder/coder/codersdk" "github.com/coder/coder/cryptorand" - "github.com/coder/coder/database" "github.com/coder/coder/provisioner/echo" "github.com/coder/coder/provisionersdk/proto" ) @@ -105,14 +104,9 @@ func TestPostWorkspaceAuthGoogleInstanceIdentity(t *testing.T) { project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) - _, err = client.AuthWorkspaceGoogleInstanceIdentity(context.Background(), "", createMetadataClient(signedKey)) + _, err := client.AuthWorkspaceGoogleInstanceIdentity(context.Background(), "", createMetadataClient(signedKey)) require.NoError(t, err) }) } diff --git a/coderd/workspaceresources.go b/coderd/workspaceresources.go index 59b572ce70537..1a2c7321bb83d 100644 --- a/coderd/workspaceresources.go +++ b/coderd/workspaceresources.go @@ -49,7 +49,7 @@ func (api *api) workspaceResource(rw http.ResponseWriter, r *http.Request) { }) return } - convertedAgent, err := convertWorkspaceAgent(agent) + convertedAgent, err := convertWorkspaceAgent(agent, api.AgentConnectionUpdateFrequency) if err != nil { httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ Message: fmt.Sprintf("convert provisioner job agent: %s", err), @@ -155,31 +155,57 @@ func (api *api) workspaceAgentListen(rw http.ResponseWriter, r *http.Request) { return } defer closer.Close() - err = api.Database.UpdateWorkspaceAgentByID(r.Context(), database.UpdateWorkspaceAgentByIDParams{ - ID: agent.ID, - UpdatedAt: sql.NullTime{ + firstConnectedAt := agent.FirstConnectedAt + if !firstConnectedAt.Valid { + firstConnectedAt = sql.NullTime{ Time: database.Now(), Valid: true, - }, - }) + } + } + lastConnectedAt := sql.NullTime{ + Time: database.Now(), + Valid: true, + } + disconnectedAt := agent.DisconnectedAt + updateConnectionTimes := func() error { + err = api.Database.UpdateWorkspaceAgentConnectionByID(r.Context(), database.UpdateWorkspaceAgentConnectionByIDParams{ + ID: agent.ID, + FirstConnectedAt: firstConnectedAt, + LastConnectedAt: lastConnectedAt, + DisconnectedAt: disconnectedAt, + }) + if err != nil { + return err + } + return nil + } + + defer func() { + disconnectedAt = sql.NullTime{ + Time: database.Now(), + Valid: true, + } + _ = updateConnectionTimes() + }() + + err = updateConnectionTimes() if err != nil { _ = conn.Close(websocket.StatusAbnormalClosure, err.Error()) return } - ticker := time.NewTicker(5 * time.Second) + + ticker := time.NewTicker(api.AgentConnectionUpdateFrequency) defer ticker.Stop() for { select { case <-session.CloseChan(): return case <-ticker.C: - err = api.Database.UpdateWorkspaceAgentByID(r.Context(), database.UpdateWorkspaceAgentByIDParams{ - ID: agent.ID, - UpdatedAt: sql.NullTime{ - Time: database.Now(), - Valid: true, - }, - }) + lastConnectedAt = sql.NullTime{ + Time: database.Now(), + Valid: true, + } + err = updateConnectionTimes() if err != nil { _ = conn.Close(websocket.StatusAbnormalClosure, err.Error()) return @@ -188,21 +214,49 @@ func (api *api) workspaceAgentListen(rw http.ResponseWriter, r *http.Request) { } } -func convertWorkspaceAgent(agent database.WorkspaceAgent) (codersdk.WorkspaceAgent, error) { +func convertWorkspaceAgent(dbAgent database.WorkspaceAgent, agentUpdateFrequency time.Duration) (codersdk.WorkspaceAgent, error) { var envs map[string]string - if agent.EnvironmentVariables.Valid { - err := json.Unmarshal(agent.EnvironmentVariables.RawMessage, &envs) + if dbAgent.EnvironmentVariables.Valid { + err := json.Unmarshal(dbAgent.EnvironmentVariables.RawMessage, &envs) if err != nil { return codersdk.WorkspaceAgent{}, xerrors.Errorf("unmarshal: %w", err) } } - return codersdk.WorkspaceAgent{ - ID: agent.ID, - CreatedAt: agent.CreatedAt, - UpdatedAt: agent.UpdatedAt.Time, - ResourceID: agent.ResourceID, - InstanceID: agent.AuthInstanceID.String, - StartupScript: agent.StartupScript.String, + agent := codersdk.WorkspaceAgent{ + ID: dbAgent.ID, + CreatedAt: dbAgent.CreatedAt, + UpdatedAt: dbAgent.UpdatedAt, + ResourceID: dbAgent.ResourceID, + InstanceID: dbAgent.AuthInstanceID.String, + StartupScript: dbAgent.StartupScript.String, EnvironmentVariables: envs, - }, nil + } + if dbAgent.FirstConnectedAt.Valid { + agent.FirstConnectedAt = &dbAgent.FirstConnectedAt.Time + } + if dbAgent.LastConnectedAt.Valid { + agent.LastConnectedAt = &dbAgent.LastConnectedAt.Time + } + if dbAgent.DisconnectedAt.Valid { + agent.DisconnectedAt = &dbAgent.DisconnectedAt.Time + } + switch { + case !dbAgent.FirstConnectedAt.Valid: + // If the agent never connected, it's waiting for the compute + // to start up. + agent.Status = codersdk.WorkspaceAgentWaiting + case dbAgent.DisconnectedAt.Time.After(dbAgent.LastConnectedAt.Time): + // If we've disconnected after our last connection, we know the + // agent is no longer connected. + agent.Status = codersdk.WorkspaceAgentDisconnected + case agentUpdateFrequency*2 >= database.Now().Sub(dbAgent.LastConnectedAt.Time): + // The connection updated it's timestamp within the update frequency. + // We multiply by two to allow for some lag. + agent.Status = codersdk.WorkspaceAgentConnected + case database.Now().Sub(dbAgent.LastConnectedAt.Time) > agentUpdateFrequency*2: + // The connection died without updating the last connected. + agent.Status = codersdk.WorkspaceAgentDisconnected + } + + return agent, nil } diff --git a/coderd/workspaceresources_test.go b/coderd/workspaceresources_test.go index ac9982906a0fa..809e9eaf0b68d 100644 --- a/coderd/workspaceresources_test.go +++ b/coderd/workspaceresources_test.go @@ -13,7 +13,6 @@ import ( "github.com/coder/coder/agent" "github.com/coder/coder/coderd/coderdtest" "github.com/coder/coder/codersdk" - "github.com/coder/coder/database" "github.com/coder/coder/peer" "github.com/coder/coder/peerbroker" "github.com/coder/coder/provisioner/echo" @@ -47,13 +46,8 @@ func TestWorkspaceResource(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) - resources, err := client.WorkspaceResourcesByBuild(context.Background(), build.ID) + coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + resources, err := client.WorkspaceResourcesByBuild(context.Background(), workspace.LatestBuild.ID) require.NoError(t, err) _, err = client.WorkspaceResource(context.Background(), resources[0].ID) require.NoError(t, err) @@ -89,12 +83,7 @@ func TestWorkspaceAgentListen(t *testing.T) { project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) + coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) daemonCloser.Close() agentClient := codersdk.New(client.URL) @@ -105,7 +94,7 @@ func TestWorkspaceAgentListen(t *testing.T) { t.Cleanup(func() { _ = agentCloser.Close() }) - resources := coderdtest.AwaitWorkspaceAgents(t, client, build.ID) + resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID) workspaceClient, err := client.DialWorkspaceAgent(context.Background(), resources[0].ID) require.NoError(t, err) t.Cleanup(func() { diff --git a/coderd/workspaces.go b/coderd/workspaces.go index 973ce4ffd1df4..e97710f6a0dd3 100644 --- a/coderd/workspaces.go +++ b/coderd/workspaces.go @@ -19,10 +19,32 @@ import ( "github.com/coder/coder/httpmw" ) -func (*api) workspace(rw http.ResponseWriter, r *http.Request) { +func (api *api) workspace(rw http.ResponseWriter, r *http.Request) { workspace := httpmw.WorkspaceParam(r) render.Status(r, http.StatusOK) - render.JSON(rw, r, convertWorkspace(workspace)) + + build, err := api.Database.GetWorkspaceBuildByWorkspaceIDWithoutAfter(r.Context(), workspace.ID) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get workspace build: %s", err), + }) + return + } + job, err := api.Database.GetProvisionerJobByID(r.Context(), build.JobID) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get workspace build job: %s", err), + }) + return + } + project, err := api.Database.GetProjectByID(r.Context(), workspace.ProjectID) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get project: %s", err), + }) + return + } + render.JSON(rw, r, convertWorkspace(workspace, convertWorkspaceBuild(build, convertProvisionerJob(job)), project)) } func (api *api) workspaceBuilds(rw http.ResponseWriter, r *http.Request) { @@ -80,6 +102,16 @@ func (api *api) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) { if !httpapi.Read(rw, r, &createBuild) { return } + if createBuild.ProjectVersionID == uuid.Nil { + latestBuild, err := api.Database.GetWorkspaceBuildByWorkspaceIDWithoutAfter(r.Context(), workspace.ID) + if err != nil { + httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ + Message: fmt.Sprintf("get latest workspace build: %s", err), + }) + return + } + createBuild.ProjectVersionID = latestBuild.ProjectVersionID + } projectVersion, err := api.Database.GetProjectVersionByID(r.Context(), createBuild.ProjectVersionID) if errors.Is(err, sql.ErrNoRows) { httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{ @@ -113,12 +145,12 @@ func (api *api) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) { return case codersdk.ProvisionerJobFailed: httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{ - Message: fmt.Sprintf("The provided project version %q has failed to import. You cannot create workspaces using it!", projectVersion.Name), + Message: fmt.Sprintf("The provided project version %q has failed to import: %q. You cannot build workspaces with it!", projectVersion.Name, projectVersionJob.Error.String), }) return case codersdk.ProvisionerJobCanceled: httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{ - Message: "The provided project version was canceled during import. You cannot create workspaces using it!", + Message: "The provided project version was canceled during import. You cannot builds workspaces with it!", }) return } @@ -227,33 +259,6 @@ func (api *api) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) { render.JSON(rw, r, convertWorkspaceBuild(workspaceBuild, convertProvisionerJob(provisionerJob))) } -func (api *api) workspaceBuildLatest(rw http.ResponseWriter, r *http.Request) { - workspace := httpmw.WorkspaceParam(r) - workspaceBuild, err := api.Database.GetWorkspaceBuildByWorkspaceIDWithoutAfter(r.Context(), workspace.ID) - if errors.Is(err, sql.ErrNoRows) { - httpapi.Write(rw, http.StatusNotFound, httpapi.Response{ - Message: "no workspace build found", - }) - return - } - if err != nil { - httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ - Message: fmt.Sprintf("get workspace build by name: %s", err), - }) - return - } - job, err := api.Database.GetProvisionerJobByID(r.Context(), workspaceBuild.JobID) - if err != nil { - httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{ - Message: fmt.Sprintf("get provisioner job: %s", err), - }) - return - } - - render.Status(r, http.StatusOK) - render.JSON(rw, r, convertWorkspaceBuild(workspaceBuild, convertProvisionerJob(job))) -} - func (api *api) workspaceBuildByName(rw http.ResponseWriter, r *http.Request) { workspace := httpmw.WorkspaceParam(r) workspaceBuildName := chi.URLParam(r, "workspacebuildname") @@ -285,6 +290,16 @@ func (api *api) workspaceBuildByName(rw http.ResponseWriter, r *http.Request) { render.JSON(rw, r, convertWorkspaceBuild(workspaceBuild, convertProvisionerJob(job))) } -func convertWorkspace(workspace database.Workspace) codersdk.Workspace { - return codersdk.Workspace(workspace) +func convertWorkspace(workspace database.Workspace, workspaceBuild codersdk.WorkspaceBuild, project database.Project) codersdk.Workspace { + return codersdk.Workspace{ + ID: workspace.ID, + CreatedAt: workspace.CreatedAt, + UpdatedAt: workspace.UpdatedAt, + OwnerID: workspace.OwnerID, + ProjectID: workspace.ProjectID, + LatestBuild: workspaceBuild, + ProjectName: project.Name, + Outdated: workspaceBuild.ProjectVersionID.String() != project.ActiveVersionID.String(), + Name: workspace.Name, + } } diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go index 1cdafe964edee..7bcc003cca5ff 100644 --- a/coderd/workspaces_test.go +++ b/coderd/workspaces_test.go @@ -19,8 +19,10 @@ func TestWorkspace(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) user := coderdtest.CreateFirstUser(t, client) - job := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) - project := coderdtest.CreateProject(t, client, user.OrganizationID, job.ID) + coderdtest.NewProvisionerDaemon(t, client) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + coderdtest.AwaitProjectVersionJob(t, client, version.ID) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) _, err := client.Workspace(context.Background(), workspace.ID) require.NoError(t, err) @@ -28,18 +30,6 @@ func TestWorkspace(t *testing.T) { func TestWorkspaceBuilds(t *testing.T) { t.Parallel() - t.Run("Empty", func(t *testing.T) { - t.Parallel() - client := coderdtest.New(t, nil) - user := coderdtest.CreateFirstUser(t, client) - job := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) - project := coderdtest.CreateProject(t, client, user.OrganizationID, job.ID) - workspace := coderdtest.CreateWorkspace(t, client, "", project.ID) - _, err := client.Workspace(context.Background(), workspace.ID) - require.NoError(t, err) - _, err = client.WorkspaceBuilds(context.Background(), workspace.ID) - require.NoError(t, err) - }) t.Run("Single", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) @@ -49,12 +39,7 @@ func TestWorkspaceBuilds(t *testing.T) { project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - _, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) - _, err = client.WorkspaceBuilds(context.Background(), workspace.ID) + _, err := client.WorkspaceBuilds(context.Background(), workspace.ID) require.NoError(t, err) }) } @@ -64,9 +49,11 @@ func TestPostWorkspaceBuild(t *testing.T) { t.Run("NoProjectVersion", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) + coderdtest.NewProvisionerDaemon(t, client) user := coderdtest.CreateFirstUser(t, client) - job := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) - project := coderdtest.CreateProject(t, client, user.OrganizationID, job.ID) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) + coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) _, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: uuid.New(), @@ -88,12 +75,10 @@ func TestPostWorkspaceBuild(t *testing.T) { }) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) - workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - _, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, + _, err := client.CreateWorkspace(context.Background(), "", codersdk.CreateWorkspaceRequest{ + ProjectID: project.ID, + Name: "workspace", }) - require.Error(t, err) var apiErr *codersdk.Error require.ErrorAs(t, err, &apiErr) require.Equal(t, http.StatusPreconditionFailed, apiErr.StatusCode()) @@ -114,11 +99,6 @@ func TestPostWorkspaceBuild(t *testing.T) { ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) - require.NoError(t, err) - _, err = client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) require.Error(t, err) var apiErr *codersdk.Error require.ErrorAs(t, err, &apiErr) @@ -134,22 +114,17 @@ func TestPostWorkspaceBuild(t *testing.T) { project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - firstBuild, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, firstBuild.ID) - secondBuild, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ + coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: project.ActiveVersionID, Transition: database.WorkspaceTransitionStart, }) require.NoError(t, err) - require.Equal(t, firstBuild.ID.String(), secondBuild.BeforeID.String()) + require.Equal(t, workspace.LatestBuild.ID.String(), build.BeforeID.String()) - firstBuild, err = client.WorkspaceBuild(context.Background(), firstBuild.ID) + firstBuild, err := client.WorkspaceBuild(context.Background(), workspace.LatestBuild.ID) require.NoError(t, err) - require.Equal(t, secondBuild.ID.String(), firstBuild.AfterID.String()) + require.Equal(t, build.ID.String(), firstBuild.AfterID.String()) }) t.Run("Delete", func(t *testing.T) { @@ -161,19 +136,13 @@ func TestPostWorkspaceBuild(t *testing.T) { project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) coderdtest.AwaitProjectVersionJob(t, client, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - firstBuild, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, firstBuild.ID) - secondBuild, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionDelete, + coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ + Transition: database.WorkspaceTransitionDelete, }) require.NoError(t, err) - require.Equal(t, firstBuild.ID.String(), secondBuild.BeforeID.String()) - coderdtest.AwaitWorkspaceBuildJob(t, client, secondBuild.ID) + require.Equal(t, workspace.LatestBuild.ID.String(), build.BeforeID.String()) + coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) workspaces, err := client.WorkspacesByUser(context.Background(), user.UserID) require.NoError(t, err) @@ -181,42 +150,6 @@ func TestPostWorkspaceBuild(t *testing.T) { }) } -func TestWorkspaceBuildLatest(t *testing.T) { - t.Parallel() - t.Run("None", func(t *testing.T) { - t.Parallel() - client := coderdtest.New(t, nil) - user := coderdtest.CreateFirstUser(t, client) - coderdtest.NewProvisionerDaemon(t, client) - version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) - project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) - coderdtest.AwaitProjectVersionJob(t, client, version.ID) - workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - _, err := client.WorkspaceBuildLatest(context.Background(), workspace.ID) - var apiErr *codersdk.Error - require.ErrorAs(t, err, &apiErr) - require.Equal(t, http.StatusNotFound, apiErr.StatusCode()) - }) - - t.Run("Found", func(t *testing.T) { - t.Parallel() - client := coderdtest.New(t, nil) - user := coderdtest.CreateFirstUser(t, client) - coderdtest.NewProvisionerDaemon(t, client) - version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitProjectVersionJob(t, client, version.ID) - project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) - workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - _, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) - _, err = client.WorkspaceBuildLatest(context.Background(), workspace.ID) - require.NoError(t, err) - }) -} - func TestWorkspaceBuildByName(t *testing.T) { t.Parallel() t.Run("NotFound", func(t *testing.T) { @@ -243,10 +176,7 @@ func TestWorkspaceBuildByName(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) + build, err := client.WorkspaceBuild(context.Background(), workspace.LatestBuild.ID) require.NoError(t, err) _, err = client.WorkspaceBuildByName(context.Background(), workspace.ID, build.Name) require.NoError(t, err) diff --git a/codersdk/organizations.go b/codersdk/organizations.go index ac3e0baed1de0..8a55a38d21abe 100644 --- a/codersdk/organizations.go +++ b/codersdk/organizations.go @@ -23,7 +23,7 @@ type Organization struct { // CreateProjectVersionRequest enables callers to create a new Project Version. type CreateProjectVersionRequest struct { // ProjectID optionally associates a version with a project. - ProjectID *uuid.UUID `json:"project_id"` + ProjectID uuid.UUID `json:"project_id"` StorageMethod database.ProvisionerStorageMethod `json:"storage_method" validate:"oneof=file,required"` StorageSource string `json:"storage_source" validate:"required"` @@ -43,7 +43,8 @@ type CreateProjectRequest struct { // This is required on creation to enable a user-flow of validating a // project works. There is no reason the data-model cannot support // empty projects, but it doesn't make sense for users. - VersionID uuid.UUID `json:"project_version_id" validate:"required"` + VersionID uuid.UUID `json:"project_version_id" validate:"required"` + ParameterValues []CreateParameterRequest `json:"parameter_values"` } func (c *Client) Organization(ctx context.Context, id string) (Organization, error) { diff --git a/codersdk/workspacebuilds.go b/codersdk/workspacebuilds.go index f4da0554a59c1..916ed2e60b231 100644 --- a/codersdk/workspacebuilds.go +++ b/codersdk/workspacebuilds.go @@ -71,11 +71,11 @@ func (c *Client) WorkspaceResourcesByBuild(ctx context.Context, build uuid.UUID) } // WorkspaceBuildLogsBefore returns logs that occurred before a specific time. -func (c *Client) WorkspaceBuildLogsBefore(ctx context.Context, version uuid.UUID, before time.Time) ([]ProvisionerJobLog, error) { - return c.provisionerJobLogsBefore(ctx, fmt.Sprintf("/api/v2/workspacebuilds/%s/logs", version), before) +func (c *Client) WorkspaceBuildLogsBefore(ctx context.Context, build uuid.UUID, before time.Time) ([]ProvisionerJobLog, error) { + return c.provisionerJobLogsBefore(ctx, fmt.Sprintf("/api/v2/workspacebuilds/%s/logs", build), before) } // WorkspaceBuildLogsAfter streams logs for a workspace build that occurred after a specific time. -func (c *Client) WorkspaceBuildLogsAfter(ctx context.Context, version uuid.UUID, after time.Time) (<-chan ProvisionerJobLog, error) { - return c.provisionerJobLogsAfter(ctx, fmt.Sprintf("/api/v2/workspacebuilds/%s/logs", version), after) +func (c *Client) WorkspaceBuildLogsAfter(ctx context.Context, build uuid.UUID, after time.Time) (<-chan ProvisionerJobLog, error) { + return c.provisionerJobLogsAfter(ctx, fmt.Sprintf("/api/v2/workspacebuilds/%s/logs", build), after) } diff --git a/codersdk/workspaceresources.go b/codersdk/workspaceresources.go index f4b13b40adc1f..5d82180685dec 100644 --- a/codersdk/workspaceresources.go +++ b/codersdk/workspaceresources.go @@ -23,6 +23,14 @@ import ( "github.com/coder/coder/provisionersdk" ) +type WorkspaceAgentStatus string + +const ( + WorkspaceAgentWaiting WorkspaceAgentStatus = "waiting" + WorkspaceAgentConnected WorkspaceAgentStatus = "connected" + WorkspaceAgentDisconnected WorkspaceAgentStatus = "disconnected" +) + type WorkspaceResource struct { ID uuid.UUID `json:"id"` CreatedAt time.Time `json:"created_at"` @@ -34,13 +42,17 @@ type WorkspaceResource struct { } type WorkspaceAgent struct { - ID uuid.UUID `json:"id"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` - ResourceID uuid.UUID `json:"resource_id"` - InstanceID string `json:"instance_id,omitempty"` - EnvironmentVariables map[string]string `json:"environment_variables"` - StartupScript string `json:"startup_script,omitempty"` + ID uuid.UUID `json:"id"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` + FirstConnectedAt *time.Time `json:"first_connected_at,omitempty"` + LastConnectedAt *time.Time `json:"last_connected_at,omitempty"` + DisconnectedAt *time.Time `json:"disconnected_at,omitempty"` + Status WorkspaceAgentStatus `json:"status"` + ResourceID uuid.UUID `json:"resource_id"` + InstanceID string `json:"instance_id,omitempty"` + EnvironmentVariables map[string]string `json:"environment_variables"` + StartupScript string `json:"startup_script,omitempty"` } type WorkspaceAgentResourceMetadata struct { diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go index 2c7013674c3d9..0615ba97548da 100644 --- a/codersdk/workspaces.go +++ b/codersdk/workspaces.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" "net/http" + "time" "github.com/google/uuid" @@ -13,12 +14,23 @@ import ( // Workspace is a per-user deployment of a project. It tracks // project versions, and can be updated. -type Workspace database.Workspace +type Workspace struct { + ID uuid.UUID `json:"id"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` + OwnerID string `json:"owner_id"` + ProjectID uuid.UUID `json:"project_id"` + ProjectName string `json:"project_name"` + LatestBuild WorkspaceBuild `json:"latest_build"` + Outdated bool `json:"outdated"` + Name string `json:"name"` +} // CreateWorkspaceBuildRequest provides options to update the latest workspace build. type CreateWorkspaceBuildRequest struct { - ProjectVersionID uuid.UUID `json:"project_version_id" validate:"required"` + ProjectVersionID uuid.UUID `json:"project_version_id"` Transition database.WorkspaceTransition `json:"transition" validate:"oneof=create start stop delete,required"` + DryRun bool `json:"dry_run"` } // Workspace returns a single workspace. @@ -74,16 +86,3 @@ func (c *Client) WorkspaceBuildByName(ctx context.Context, workspace uuid.UUID, var workspaceBuild WorkspaceBuild return workspaceBuild, json.NewDecoder(res.Body).Decode(&workspaceBuild) } - -func (c *Client) WorkspaceBuildLatest(ctx context.Context, workspace uuid.UUID) (WorkspaceBuild, error) { - res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/workspaces/%s/builds/latest", workspace), nil) - if err != nil { - return WorkspaceBuild{}, err - } - defer res.Body.Close() - if res.StatusCode != http.StatusOK { - return WorkspaceBuild{}, readBodyAsError(res) - } - var workspaceBuild WorkspaceBuild - return workspaceBuild, json.NewDecoder(res.Body).Decode(&workspaceBuild) -} diff --git a/database/databasefake/databasefake.go b/database/databasefake/databasefake.go index e2fd7eb5dc42d..1ce3e56394e21 100644 --- a/database/databasefake/databasefake.go +++ b/database/databasefake/databasefake.go @@ -290,6 +290,25 @@ func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDWithoutAfter(_ context.Conte return database.WorkspaceBuild{}, sql.ErrNoRows } +func (q *fakeQuerier) GetWorkspaceBuildsByWorkspaceIDsWithoutAfter(ctx context.Context, ids []uuid.UUID) ([]database.WorkspaceBuild, error) { + q.mutex.Lock() + defer q.mutex.Unlock() + + builds := make([]database.WorkspaceBuild, 0) + for _, workspaceBuild := range q.workspaceBuild { + for _, id := range ids { + if id.String() != workspaceBuild.WorkspaceID.String() { + continue + } + builds = append(builds, workspaceBuild) + } + } + if len(builds) == 0 { + return nil, sql.ErrNoRows + } + return builds, nil +} + func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceID(_ context.Context, workspaceID uuid.UUID) ([]database.WorkspaceBuild, error) { q.mutex.Lock() defer q.mutex.Unlock() @@ -485,6 +504,19 @@ func (q *fakeQuerier) GetProjectVersionByID(_ context.Context, projectVersionID return database.ProjectVersion{}, sql.ErrNoRows } +func (q *fakeQuerier) GetProjectVersionByJobID(ctx context.Context, jobID uuid.UUID) (database.ProjectVersion, error) { + q.mutex.Lock() + defer q.mutex.Unlock() + + for _, projectVersion := range q.projectVersion { + if projectVersion.JobID.String() != jobID.String() { + continue + } + return projectVersion, nil + } + return database.ProjectVersion{}, sql.ErrNoRows +} + func (q *fakeQuerier) GetParameterSchemasByJobID(_ context.Context, jobID uuid.UUID) ([]database.ParameterSchema, error) { q.mutex.Lock() defer q.mutex.Unlock() @@ -541,6 +573,25 @@ func (q *fakeQuerier) GetProjectsByOrganization(_ context.Context, arg database. return projects, nil } +func (q *fakeQuerier) GetProjectsByIDs(ctx context.Context, ids []uuid.UUID) ([]database.Project, error) { + q.mutex.Lock() + defer q.mutex.Unlock() + + projects := make([]database.Project, 0) + for _, project := range q.project { + for _, id := range ids { + if project.ID.String() != id.String() { + continue + } + projects = append(projects, project) + } + } + if len(projects) == 0 { + return nil, sql.ErrNoRows + } + return projects, nil +} + func (q *fakeQuerier) GetOrganizationMemberByUserID(_ context.Context, arg database.GetOrganizationMemberByUserIDParams) (database.OrganizationMember, error) { q.mutex.Lock() defer q.mutex.Unlock() @@ -1089,7 +1140,7 @@ func (q *fakeQuerier) UpdateProvisionerDaemonByID(_ context.Context, arg databas return sql.ErrNoRows } -func (q *fakeQuerier) UpdateWorkspaceAgentByID(_ context.Context, arg database.UpdateWorkspaceAgentByIDParams) error { +func (q *fakeQuerier) UpdateWorkspaceAgentConnectionByID(_ context.Context, arg database.UpdateWorkspaceAgentConnectionByIDParams) error { q.mutex.Lock() defer q.mutex.Unlock() @@ -1097,7 +1148,9 @@ func (q *fakeQuerier) UpdateWorkspaceAgentByID(_ context.Context, arg database.U if agent.ID.String() != arg.ID.String() { continue } - agent.UpdatedAt = arg.UpdatedAt + agent.FirstConnectedAt = arg.FirstConnectedAt + agent.LastConnectedAt = arg.LastConnectedAt + agent.DisconnectedAt = arg.DisconnectedAt q.provisionerJobAgent[index] = agent return nil } diff --git a/database/dump.sql b/database/dump.sql index e0505fc57e711..6c0eb11f25e20 100644 --- a/database/dump.sql +++ b/database/dump.sql @@ -246,7 +246,10 @@ CREATE TABLE workspace ( CREATE TABLE workspace_agent ( id uuid NOT NULL, created_at timestamp with time zone NOT NULL, - updated_at timestamp with time zone, + updated_at timestamp with time zone NOT NULL, + first_connected_at timestamp with time zone, + last_connected_at timestamp with time zone, + disconnected_at timestamp with time zone, resource_id uuid NOT NULL, auth_token uuid NOT NULL, auth_instance_id character varying(64), diff --git a/database/migrations/000004_jobs.up.sql b/database/migrations/000004_jobs.up.sql index 4304df48c4433..cd45a879a2fbb 100644 --- a/database/migrations/000004_jobs.up.sql +++ b/database/migrations/000004_jobs.up.sql @@ -69,7 +69,10 @@ CREATE TABLE workspace_resource ( CREATE TABLE workspace_agent ( id uuid NOT NULL UNIQUE, created_at timestamptz NOT NULL, - updated_at timestamptz, + updated_at timestamptz NOT NULL, + first_connected_at timestamptz, + last_connected_at timestamptz, + disconnected_at timestamptz, resource_id uuid NOT NULL REFERENCES workspace_resource (id) ON DELETE CASCADE, auth_token uuid NOT NULL UNIQUE, auth_instance_id varchar(64), diff --git a/database/models.go b/database/models.go index 888fb1652d8f0..23df7205341a3 100644 --- a/database/models.go +++ b/database/models.go @@ -426,7 +426,10 @@ type Workspace struct { type WorkspaceAgent struct { ID uuid.UUID `db:"id" json:"id"` CreatedAt time.Time `db:"created_at" json:"created_at"` - UpdatedAt sql.NullTime `db:"updated_at" json:"updated_at"` + UpdatedAt time.Time `db:"updated_at" json:"updated_at"` + FirstConnectedAt sql.NullTime `db:"first_connected_at" json:"first_connected_at"` + LastConnectedAt sql.NullTime `db:"last_connected_at" json:"last_connected_at"` + DisconnectedAt sql.NullTime `db:"disconnected_at" json:"disconnected_at"` ResourceID uuid.UUID `db:"resource_id" json:"resource_id"` AuthToken uuid.UUID `db:"auth_token" json:"auth_token"` AuthInstanceID sql.NullString `db:"auth_instance_id" json:"auth_instance_id"` diff --git a/database/querier.go b/database/querier.go index c394d5817d7c0..019cce2fdbda6 100644 --- a/database/querier.go +++ b/database/querier.go @@ -23,8 +23,10 @@ type querier interface { GetProjectByID(ctx context.Context, id uuid.UUID) (Project, error) GetProjectByOrganizationAndName(ctx context.Context, arg GetProjectByOrganizationAndNameParams) (Project, error) GetProjectVersionByID(ctx context.Context, id uuid.UUID) (ProjectVersion, error) + GetProjectVersionByJobID(ctx context.Context, jobID uuid.UUID) (ProjectVersion, error) GetProjectVersionByProjectIDAndName(ctx context.Context, arg GetProjectVersionByProjectIDAndNameParams) (ProjectVersion, error) GetProjectVersionsByProjectID(ctx context.Context, dollar_1 uuid.UUID) ([]ProjectVersion, error) + GetProjectsByIDs(ctx context.Context, ids []uuid.UUID) ([]Project, error) GetProjectsByOrganization(ctx context.Context, arg GetProjectsByOrganizationParams) ([]Project, error) GetProvisionerDaemonByID(ctx context.Context, id uuid.UUID) (ProvisionerDaemon, error) GetProvisionerDaemons(ctx context.Context) ([]ProvisionerDaemon, error) @@ -42,6 +44,7 @@ type querier interface { GetWorkspaceBuildByWorkspaceID(ctx context.Context, workspaceID uuid.UUID) ([]WorkspaceBuild, error) GetWorkspaceBuildByWorkspaceIDAndName(ctx context.Context, arg GetWorkspaceBuildByWorkspaceIDAndNameParams) (WorkspaceBuild, error) GetWorkspaceBuildByWorkspaceIDWithoutAfter(ctx context.Context, workspaceID uuid.UUID) (WorkspaceBuild, error) + GetWorkspaceBuildsByWorkspaceIDsWithoutAfter(ctx context.Context, ids []uuid.UUID) ([]WorkspaceBuild, error) GetWorkspaceByID(ctx context.Context, id uuid.UUID) (Workspace, error) GetWorkspaceByUserIDAndName(ctx context.Context, arg GetWorkspaceByUserIDAndNameParams) (Workspace, error) GetWorkspaceOwnerCountsByProjectIDs(ctx context.Context, ids []uuid.UUID) ([]GetWorkspaceOwnerCountsByProjectIDsRow, error) @@ -73,7 +76,7 @@ type querier interface { UpdateProvisionerJobByID(ctx context.Context, arg UpdateProvisionerJobByIDParams) error UpdateProvisionerJobWithCancelByID(ctx context.Context, arg UpdateProvisionerJobWithCancelByIDParams) error UpdateProvisionerJobWithCompleteByID(ctx context.Context, arg UpdateProvisionerJobWithCompleteByIDParams) error - UpdateWorkspaceAgentByID(ctx context.Context, arg UpdateWorkspaceAgentByIDParams) error + UpdateWorkspaceAgentConnectionByID(ctx context.Context, arg UpdateWorkspaceAgentConnectionByIDParams) error UpdateWorkspaceBuildByID(ctx context.Context, arg UpdateWorkspaceBuildByIDParams) error UpdateWorkspaceDeletedByID(ctx context.Context, arg UpdateWorkspaceDeletedByIDParams) error } diff --git a/database/query.sql b/database/query.sql index e95d193f7ff32..9d670b71a1ec7 100644 --- a/database/query.sql +++ b/database/query.sql @@ -164,6 +164,14 @@ WHERE LIMIT 1; +-- name: GetProjectsByIDs :many +SELECT + * +FROM + project +WHERE + id = ANY(@ids :: uuid [ ]); + -- name: GetProjectByOrganizationAndName :one SELECT * @@ -201,6 +209,14 @@ FROM WHERE project_id = $1 :: uuid; +-- name: GetProjectVersionByJobID :one +SELECT + * +FROM + project_version +WHERE + job_id = $1; + -- name: GetProjectVersionByProjectIDAndName :one SELECT * @@ -380,6 +396,15 @@ WHERE LIMIT 1; +-- name: GetWorkspaceBuildsByWorkspaceIDsWithoutAfter :many +SELECT + * +FROM + workspace_build +WHERE + workspace_id = ANY(@ids :: uuid [ ]) + AND after_id IS NULL; + -- name: GetWorkspaceResourceByID :one SELECT * @@ -744,11 +769,13 @@ SET WHERE id = $1; --- name: UpdateWorkspaceAgentByID :exec +-- name: UpdateWorkspaceAgentConnectionByID :exec UPDATE workspace_agent SET - updated_at = $2 + first_connected_at = $2, + last_connected_at = $3, + disconnected_at = $4 WHERE id = $1; diff --git a/database/query.sql.go b/database/query.sql.go index fbf88613f6a01..e690aafc4834c 100644 --- a/database/query.sql.go +++ b/database/query.sql.go @@ -502,6 +502,31 @@ func (q *sqlQuerier) GetProjectVersionByID(ctx context.Context, id uuid.UUID) (P return i, err } +const getProjectVersionByJobID = `-- name: GetProjectVersionByJobID :one +SELECT + id, project_id, organization_id, created_at, updated_at, name, description, job_id +FROM + project_version +WHERE + job_id = $1 +` + +func (q *sqlQuerier) GetProjectVersionByJobID(ctx context.Context, jobID uuid.UUID) (ProjectVersion, error) { + row := q.db.QueryRowContext(ctx, getProjectVersionByJobID, jobID) + var i ProjectVersion + err := row.Scan( + &i.ID, + &i.ProjectID, + &i.OrganizationID, + &i.CreatedAt, + &i.UpdatedAt, + &i.Name, + &i.Description, + &i.JobID, + ) + return i, err +} + const getProjectVersionByProjectIDAndName = `-- name: GetProjectVersionByProjectIDAndName :one SELECT id, project_id, organization_id, created_at, updated_at, name, description, job_id @@ -574,6 +599,47 @@ func (q *sqlQuerier) GetProjectVersionsByProjectID(ctx context.Context, dollar_1 return items, nil } +const getProjectsByIDs = `-- name: GetProjectsByIDs :many +SELECT + id, created_at, updated_at, organization_id, deleted, name, provisioner, active_version_id +FROM + project +WHERE + id = ANY($1 :: uuid [ ]) +` + +func (q *sqlQuerier) GetProjectsByIDs(ctx context.Context, ids []uuid.UUID) ([]Project, error) { + rows, err := q.db.QueryContext(ctx, getProjectsByIDs, pq.Array(ids)) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Project + for rows.Next() { + var i Project + if err := rows.Scan( + &i.ID, + &i.CreatedAt, + &i.UpdatedAt, + &i.OrganizationID, + &i.Deleted, + &i.Name, + &i.Provisioner, + &i.ActiveVersionID, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + const getProjectsByOrganization = `-- name: GetProjectsByOrganization :many SELECT id, created_at, updated_at, organization_id, deleted, name, provisioner, active_version_id @@ -910,7 +976,7 @@ func (q *sqlQuerier) GetUserCount(ctx context.Context) (int64, error) { const getWorkspaceAgentByAuthToken = `-- name: GetWorkspaceAgentByAuthToken :one SELECT - id, created_at, updated_at, resource_id, auth_token, auth_instance_id, environment_variables, startup_script, instance_metadata, resource_metadata + id, created_at, updated_at, first_connected_at, last_connected_at, disconnected_at, resource_id, auth_token, auth_instance_id, environment_variables, startup_script, instance_metadata, resource_metadata FROM workspace_agent WHERE @@ -926,6 +992,9 @@ func (q *sqlQuerier) GetWorkspaceAgentByAuthToken(ctx context.Context, authToken &i.ID, &i.CreatedAt, &i.UpdatedAt, + &i.FirstConnectedAt, + &i.LastConnectedAt, + &i.DisconnectedAt, &i.ResourceID, &i.AuthToken, &i.AuthInstanceID, @@ -939,7 +1008,7 @@ func (q *sqlQuerier) GetWorkspaceAgentByAuthToken(ctx context.Context, authToken const getWorkspaceAgentByInstanceID = `-- name: GetWorkspaceAgentByInstanceID :one SELECT - id, created_at, updated_at, resource_id, auth_token, auth_instance_id, environment_variables, startup_script, instance_metadata, resource_metadata + id, created_at, updated_at, first_connected_at, last_connected_at, disconnected_at, resource_id, auth_token, auth_instance_id, environment_variables, startup_script, instance_metadata, resource_metadata FROM workspace_agent WHERE @@ -955,6 +1024,9 @@ func (q *sqlQuerier) GetWorkspaceAgentByInstanceID(ctx context.Context, authInst &i.ID, &i.CreatedAt, &i.UpdatedAt, + &i.FirstConnectedAt, + &i.LastConnectedAt, + &i.DisconnectedAt, &i.ResourceID, &i.AuthToken, &i.AuthInstanceID, @@ -968,7 +1040,7 @@ func (q *sqlQuerier) GetWorkspaceAgentByInstanceID(ctx context.Context, authInst const getWorkspaceAgentByResourceID = `-- name: GetWorkspaceAgentByResourceID :one SELECT - id, created_at, updated_at, resource_id, auth_token, auth_instance_id, environment_variables, startup_script, instance_metadata, resource_metadata + id, created_at, updated_at, first_connected_at, last_connected_at, disconnected_at, resource_id, auth_token, auth_instance_id, environment_variables, startup_script, instance_metadata, resource_metadata FROM workspace_agent WHERE @@ -982,6 +1054,9 @@ func (q *sqlQuerier) GetWorkspaceAgentByResourceID(ctx context.Context, resource &i.ID, &i.CreatedAt, &i.UpdatedAt, + &i.FirstConnectedAt, + &i.LastConnectedAt, + &i.DisconnectedAt, &i.ResourceID, &i.AuthToken, &i.AuthInstanceID, @@ -1167,6 +1242,52 @@ func (q *sqlQuerier) GetWorkspaceBuildByWorkspaceIDWithoutAfter(ctx context.Cont return i, err } +const getWorkspaceBuildsByWorkspaceIDsWithoutAfter = `-- name: GetWorkspaceBuildsByWorkspaceIDsWithoutAfter :many +SELECT + id, created_at, updated_at, workspace_id, project_version_id, name, before_id, after_id, transition, initiator, provisioner_state, job_id +FROM + workspace_build +WHERE + workspace_id = ANY($1 :: uuid [ ]) + AND after_id IS NULL +` + +func (q *sqlQuerier) GetWorkspaceBuildsByWorkspaceIDsWithoutAfter(ctx context.Context, ids []uuid.UUID) ([]WorkspaceBuild, error) { + rows, err := q.db.QueryContext(ctx, getWorkspaceBuildsByWorkspaceIDsWithoutAfter, pq.Array(ids)) + if err != nil { + return nil, err + } + defer rows.Close() + var items []WorkspaceBuild + for rows.Next() { + var i WorkspaceBuild + if err := rows.Scan( + &i.ID, + &i.CreatedAt, + &i.UpdatedAt, + &i.WorkspaceID, + &i.ProjectVersionID, + &i.Name, + &i.BeforeID, + &i.AfterID, + &i.Transition, + &i.Initiator, + &i.ProvisionerState, + &i.JobID, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + const getWorkspaceByID = `-- name: GetWorkspaceByID :one SELECT id, created_at, updated_at, owner_id, project_id, deleted, name @@ -2171,13 +2292,13 @@ INSERT INTO resource_metadata ) VALUES - ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING id, created_at, updated_at, resource_id, auth_token, auth_instance_id, environment_variables, startup_script, instance_metadata, resource_metadata + ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING id, created_at, updated_at, first_connected_at, last_connected_at, disconnected_at, resource_id, auth_token, auth_instance_id, environment_variables, startup_script, instance_metadata, resource_metadata ` type InsertWorkspaceAgentParams struct { ID uuid.UUID `db:"id" json:"id"` CreatedAt time.Time `db:"created_at" json:"created_at"` - UpdatedAt sql.NullTime `db:"updated_at" json:"updated_at"` + UpdatedAt time.Time `db:"updated_at" json:"updated_at"` ResourceID uuid.UUID `db:"resource_id" json:"resource_id"` AuthToken uuid.UUID `db:"auth_token" json:"auth_token"` AuthInstanceID sql.NullString `db:"auth_instance_id" json:"auth_instance_id"` @@ -2205,6 +2326,9 @@ func (q *sqlQuerier) InsertWorkspaceAgent(ctx context.Context, arg InsertWorkspa &i.ID, &i.CreatedAt, &i.UpdatedAt, + &i.FirstConnectedAt, + &i.LastConnectedAt, + &i.DisconnectedAt, &i.ResourceID, &i.AuthToken, &i.AuthInstanceID, @@ -2512,22 +2636,31 @@ func (q *sqlQuerier) UpdateProvisionerJobWithCompleteByID(ctx context.Context, a return err } -const updateWorkspaceAgentByID = `-- name: UpdateWorkspaceAgentByID :exec +const updateWorkspaceAgentConnectionByID = `-- name: UpdateWorkspaceAgentConnectionByID :exec UPDATE workspace_agent SET - updated_at = $2 + first_connected_at = $2, + last_connected_at = $3, + disconnected_at = $4 WHERE id = $1 ` -type UpdateWorkspaceAgentByIDParams struct { - ID uuid.UUID `db:"id" json:"id"` - UpdatedAt sql.NullTime `db:"updated_at" json:"updated_at"` +type UpdateWorkspaceAgentConnectionByIDParams struct { + ID uuid.UUID `db:"id" json:"id"` + FirstConnectedAt sql.NullTime `db:"first_connected_at" json:"first_connected_at"` + LastConnectedAt sql.NullTime `db:"last_connected_at" json:"last_connected_at"` + DisconnectedAt sql.NullTime `db:"disconnected_at" json:"disconnected_at"` } -func (q *sqlQuerier) UpdateWorkspaceAgentByID(ctx context.Context, arg UpdateWorkspaceAgentByIDParams) error { - _, err := q.db.ExecContext(ctx, updateWorkspaceAgentByID, arg.ID, arg.UpdatedAt) +func (q *sqlQuerier) UpdateWorkspaceAgentConnectionByID(ctx context.Context, arg UpdateWorkspaceAgentConnectionByIDParams) error { + _, err := q.db.ExecContext(ctx, updateWorkspaceAgentConnectionByID, + arg.ID, + arg.FirstConnectedAt, + arg.LastConnectedAt, + arg.DisconnectedAt, + ) return err } diff --git a/go.mod b/go.mod index 2485d19d978f5..a233c5c505b30 100644 --- a/go.mod +++ b/go.mod @@ -78,6 +78,7 @@ require ( golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70 golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 google.golang.org/api v0.71.0 google.golang.org/protobuf v1.27.1 @@ -216,7 +217,6 @@ require ( golang.org/x/mod v0.5.1 // indirect golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/tools v0.1.9 // indirect google.golang.org/appengine v1.6.7 // indirect From 8d24602cf5d1a36321a3003b940078911e401306 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Mon, 14 Mar 2022 19:48:22 +0000 Subject: [PATCH 10/37] Add clog --- agent/agent.go | 140 ++++++++++++------------- cli/clog/clog.go | 126 ++++++++++++++++++++++ cli/clog/clog_test.go | 73 +++++++++++++ cli/configssh.go | 113 +++++++++++++++++++- cli/projectcreate.go | 34 ------ cli/projectcreate_test.go | 6 ++ cli/ssh.go | 11 +- cmd/cliui/main.go | 28 +++++ coderd/parameter/validate_test.go | 3 +- coderd/provisionerdaemons.go | 20 +++- coderd/workspacebuilds.go | 1 + codersdk/workspaceresources.go | 1 + database/databasefake/databasefake.go | 1 + database/dump.sql | 3 +- database/migrations/000004_jobs.up.sql | 3 +- database/models.go | 1 + database/query.sql | 3 +- database/query.sql.go | 12 ++- provisionersdk/resources.go | 49 +++++++++ provisionersdk/resources_test.go | 59 +++++++++++ 20 files changed, 566 insertions(+), 121 deletions(-) create mode 100644 cli/clog/clog.go create mode 100644 cli/clog/clog_test.go create mode 100644 provisionersdk/resources.go create mode 100644 provisionersdk/resources_test.go diff --git a/agent/agent.go b/agent/agent.go index 0ac2d267e9f0d..5e342c3359ae9 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -86,6 +86,76 @@ type server struct { sshServer *ssh.Server } +func (s *server) run(ctx context.Context) { + var peerListener *peerbroker.Listener + var err error + // An exponential back-off occurs when the connection is failing to dial. + // This is to prevent server spam in case of a coderd outage. + for retrier := retry.New(50*time.Millisecond, 10*time.Second); retrier.Wait(ctx); { + peerListener, err = s.clientDialer(ctx, s.options) + if err != nil { + if errors.Is(err, context.Canceled) { + return + } + if s.isClosed() { + return + } + s.options.Logger.Warn(context.Background(), "failed to dial", slog.Error(err)) + continue + } + s.options.Logger.Debug(context.Background(), "connected") + break + } + select { + case <-ctx.Done(): + return + default: + } + + for { + conn, err := peerListener.Accept() + if err != nil { + if s.isClosed() { + return + } + s.options.Logger.Debug(ctx, "peer listener accept exited; restarting connection", slog.Error(err)) + s.run(ctx) + return + } + s.closeMutex.Lock() + s.connCloseWait.Add(1) + s.closeMutex.Unlock() + go s.handlePeerConn(ctx, conn) + } +} + +func (s *server) handlePeerConn(ctx context.Context, conn *peer.Conn) { + go func() { + <-conn.Closed() + s.connCloseWait.Done() + }() + for { + channel, err := conn.Accept(ctx) + if err != nil { + if errors.Is(err, peer.ErrClosed) || s.isClosed() { + return + } + s.options.Logger.Debug(ctx, "accept channel from peer connection", slog.Error(err)) + return + } + + switch channel.Protocol() { + case "ssh": + s.sshServer.HandleConn(channel.NetConn()) + default: + s.options.Logger.Warn(ctx, "unhandled protocol from channel", + slog.F("protocol", channel.Protocol()), + slog.F("label", channel.Label()), + ) + } + } +} + func (s *server) init(ctx context.Context) { // Clients' should ignore the host key when connecting. // The agent needs to authenticate with coderd to SSH, @@ -245,76 +315,6 @@ func (*server) handleSSHSession(session ssh.Session) error { return nil } -func (s *server) run(ctx context.Context) { - var peerListener *peerbroker.Listener - var err error - // An exponential back-off occurs when the connection is failing to dial. - // This is to prevent server spam in case of a coderd outage. - for retrier := retry.New(50*time.Millisecond, 10*time.Second); retrier.Wait(ctx); { - peerListener, err = s.clientDialer(ctx, s.options) - if err != nil { - if errors.Is(err, context.Canceled) { - return - } - if s.isClosed() { - return - } - s.options.Logger.Warn(context.Background(), "failed to dial", slog.Error(err)) - continue - } - s.options.Logger.Debug(context.Background(), "connected") - break - } - select { - case <-ctx.Done(): - return - default: - } - - for { - conn, err := peerListener.Accept() - if err != nil { - if s.isClosed() { - return - } - s.options.Logger.Debug(ctx, "peer listener accept exited; restarting connection", slog.Error(err)) - s.run(ctx) - return - } - s.closeMutex.Lock() - s.connCloseWait.Add(1) - s.closeMutex.Unlock() - go s.handlePeerConn(ctx, conn) - } -} - -func (s *server) handlePeerConn(ctx context.Context, conn *peer.Conn) { - go func() { - <-conn.Closed() - s.connCloseWait.Done() - }() - for { - channel, err := conn.Accept(ctx) - if err != nil { - if errors.Is(err, peer.ErrClosed) || s.isClosed() { - return - } - s.options.Logger.Debug(ctx, "accept channel from peer connection", slog.Error(err)) - return - } - - switch channel.Protocol() { - case "ssh": - s.sshServer.HandleConn(channel.NetConn()) - default: - s.options.Logger.Warn(ctx, "unhandled protocol from channel", - slog.F("protocol", channel.Protocol()), - slog.F("label", channel.Label()), - ) - } - } -} - // isClosed returns whether the API is closed or not. func (s *server) isClosed() bool { select { diff --git a/cli/clog/clog.go b/cli/clog/clog.go new file mode 100644 index 0000000000000..8a04edb11c6c9 --- /dev/null +++ b/cli/clog/clog.go @@ -0,0 +1,126 @@ +package clog + +import ( + "fmt" + "io" + "strings" + + "github.com/charmbracelet/lipgloss" + "golang.org/x/xerrors" +) + +// CLIMessage provides a human-readable message for CLI errors and messages. +type CLIMessage struct { + Level string + Color lipgloss.Color + Header string + Lines []string +} + +// CLIError wraps a CLIMessage and allows consumers to treat it as a normal error. +type CLIError struct { + CLIMessage + error +} + +// String formats the CLI message for consumption by a human. +func (m CLIMessage) String() string { + var str strings.Builder + _, _ = fmt.Fprintf(&str, "%s: %s\r\n", + lipgloss.NewStyle().Foreground(m.Color).Render(m.Level), + Bold(m.Header)) + for _, line := range m.Lines { + _, _ = fmt.Fprintf(&str, " %s %s\r\n", lipgloss.NewStyle().Foreground(m.Color).Render("|"), line) + } + return str.String() +} + +// Log logs the given error to stderr, defaulting to "fatal" if the error is not a CLIError. +// If the error is a CLIError, the plain error chain is ignored and the CLIError +// is logged on its own. +func Log(writer io.Writer, err error) { + var cliErr CLIError + if !xerrors.As(err, &cliErr) { + cliErr = Fatal(err.Error()) + } + _, _ = fmt.Fprintln(writer, cliErr.String()) +} + +// LogInfo prints the given info message to stderr. +func LogInfo(writer io.Writer, header string, lines ...string) { + _, _ = fmt.Fprint(writer, CLIMessage{ + Level: "info", + Color: lipgloss.Color("34"), + Header: header, + Lines: lines, + }.String()) +} + +// LogSuccess prints the given info message to stderr. +func LogSuccess(writer io.Writer, header string, lines ...string) { + _, _ = fmt.Fprint(writer, CLIMessage{ + Level: "success", + Color: lipgloss.Color("32"), + Header: header, + Lines: lines, + }.String()) +} + +// LogWarn prints the given warn message to stderr. +func LogWarn(writer io.Writer, header string, lines ...string) { + _, _ = fmt.Fprint(writer, CLIMessage{ + Level: "warning", + Color: lipgloss.Color("33"), + Header: header, + Lines: lines, + }.String()) +} + +// Error creates an error with the level "error". +func Error(header string, lines ...string) CLIError { + return CLIError{ + CLIMessage: CLIMessage{ + Color: lipgloss.Color("31"), + Level: "error", + Header: header, + Lines: lines, + }, + error: xerrors.New(header), + } +} + +// Fatal creates an error with the level "fatal". +func Fatal(header string, lines ...string) CLIError { + return CLIError{ + CLIMessage: CLIMessage{ + Color: lipgloss.Color("31"), + Level: "fatal", + Header: header, + Lines: lines, + }, + error: xerrors.New(header), + } +} + +// Bold provides a convenience wrapper around color.New for brevity when logging. +func Bold(a string) string { + return lipgloss.NewStyle().Bold(true).Render(a) +} + +// Tipf formats according to the given format specifier and prepends a bolded "tip: " header. +func Tipf(format string, a ...interface{}) string { + return fmt.Sprintf("%s %s", Bold("tip:"), fmt.Sprintf(format, a...)) +} + +// Hintf formats according to the given format specifier and prepends a bolded "hint: " header. +func Hintf(format string, a ...interface{}) string { + return fmt.Sprintf("%s %s", Bold("hint:"), fmt.Sprintf(format, a...)) +} + +// Causef formats according to the given format specifier and prepends a bolded "cause: " header. +func Causef(format string, a ...interface{}) string { + return fmt.Sprintf("%s %s", Bold("cause:"), fmt.Sprintf(format, a...)) +} + +// BlankLine is an empty string meant to be used in CLIMessage and CLIError construction. +const BlankLine = "" diff --git a/cli/clog/clog_test.go b/cli/clog/clog_test.go new file mode 100644 index 0000000000000..f54bf3ef59ec8 --- /dev/null +++ b/cli/clog/clog_test.go @@ -0,0 +1,73 @@ +package clog_test + +import ( + "bytes" + "io" + "io/ioutil" + "testing" + + "github.com/stretchr/testify/require" + "golang.org/x/xerrors" + + "github.com/coder/coder/cli/clog" +) + +func TestError(t *testing.T) { + t.Parallel() + t.Run("oneline", func(t *testing.T) { + t.Parallel() + var mockErr error = clog.Error("fake error") + mockErr = xerrors.Errorf("wrap 1: %w", mockErr) + mockErr = xerrors.Errorf("wrap 2: %w", mockErr) + + var buf bytes.Buffer + clog.Log(&buf, mockErr) + + output, err := ioutil.ReadAll(&buf) + require.NoError(t, err, "read all stderr output") + require.Equal(t, "error: "+clog.Bold("fake error")+"\r\n\n", string(output), "output is as expected") + }) + + t.Run("plain-error", func(t *testing.T) { + t.Parallel() + mockErr := xerrors.Errorf("base error") + mockErr = xerrors.Errorf("wrap 1: %w", mockErr) + + var buf bytes.Buffer + clog.Log(&buf, mockErr) + + output, err := ioutil.ReadAll(&buf) + require.NoError(t, err, "read all stderr output") + + require.Equal(t, "fatal: "+clog.Bold("wrap 1: base error")+"\r\n\n", string(output), "output is as expected") + }) + + t.Run("message", func(t *testing.T) { + for _, f := range []struct { + f func(io.Writer, string, ...string) + level string + }{{clog.LogInfo, "info"}, {clog.LogSuccess, "success"}, {clog.LogWarn, "warning"}} { + var buf bytes.Buffer + f.f(&buf, "testing", clog.Hintf("maybe do %q", "this"), clog.BlankLine, clog.Causef("what happened was %q", "this")) + + output, err := ioutil.ReadAll(&buf) + require.NoError(t, err, "read all stderr output") + + require.Equal(t, f.level+": "+clog.Bold("testing")+"\r\n | "+clog.Bold("hint:")+" maybe do \"this\"\r\n | \r\n | "+clog.Bold("cause:")+" what happened was \"this\"\r\n", string(output), "output is as expected") + } + }) + + t.Run("multi-line", func(t *testing.T) { + var mockErr error = clog.Error("fake header", "next line", clog.BlankLine, clog.Tipf("content of fake tip")) + mockErr = xerrors.Errorf("wrap 1: %w", mockErr) + mockErr = xerrors.Errorf("wrap 1: %w", mockErr) + + var buf bytes.Buffer + clog.Log(&buf, mockErr) + + output, err := ioutil.ReadAll(&buf) + require.NoError(t, err, "read all stderr output") + + require.Equal(t, "error: "+clog.Bold("fake header")+"\r\n | next line\r\n | \r\n | "+clog.Bold("tip:")+" content of fake tip\r\n\n", string(output), "output is as expected") + }) +} diff --git a/cli/configssh.go b/cli/configssh.go index a1a7e62d9aab8..6dcc6d729f264 100644 --- a/cli/configssh.go +++ b/cli/configssh.go @@ -1,12 +1,121 @@ package cli -import "github.com/spf13/cobra" +import ( + "fmt" + "io" + "os" + "path/filepath" + "runtime" + "strings" + + "github.com/cli/safeexec" + "github.com/coder/coder/cli/clog" + "github.com/spf13/cobra" + "golang.org/x/xerrors" +) + +const sshStartToken = "# ------------START-CODER-----------" +const sshStartMessage = `# This was generated by "coder config-ssh". +# +# To remove this blob, run: +# +# coder config-ssh --remove +# +# You should not hand-edit this section, unless you are deleting it.` +const sshEndToken = "# ------------END-CODER------------" func configSSH() *cobra.Command { - return &cobra.Command{ + cmd := &cobra.Command{ Use: "config-ssh", RunE: func(cmd *cobra.Command, args []string) error { + binPath(cmd.OutOrStdout()) + return nil }, } + + return cmd +} + +// removeOldConfig removes the old ssh configuration from the user's sshconfig. +// Returns true if the config was modified. +func removeOldConfig(config string) (string, bool) { + startIndex := strings.Index(config, sshStartToken) + endIndex := strings.Index(config, sshEndToken) + + if startIndex == -1 || endIndex == -1 { + return config, false + } + if startIndex == 0 { + return config[endIndex+len(sshEndToken)+1:], true + } + return config[:startIndex-1] + config[endIndex+len(sshEndToken)+1:], true +} + +func makeSSHConfig(userID, binPath, workspaceName, privateKeyFilepath string, additionalOptions []string) string { + // Custom user options come first to maximizessh customization. + options := []string{} + if len(additionalOptions) > 0 { + options = []string{ + "# Custom options. Duplicated values will always prefer the first!", + } + options = append(options, additionalOptions...) + options = append(options, "# End custom options.") + } + options = append(options, + fmt.Sprintf("HostName coder.%s", workspaceName), + fmt.Sprintf("ProxyCommand %s", fmt.Sprintf(`"%s" ssh %s`, binPath, workspaceName)), + "StrictHostKeyChecking no", + "ConnectTimeout=0", + "IdentitiesOnly yes", + fmt.Sprintf("IdentityFile=%q", privateKeyFilepath), + ) + + return fmt.Sprintf("Host coder.%s\n\t%s\n\n", workspaceName, strings.Join(options, "\n\t")) +} + +// binPath returns the path to the coder binary suitable for use in ssh ProxyCommand. +func binPath(logWriter io.Writer) (string, error) { + exePath, err := os.Executable() + if err != nil { + return "", xerrors.Errorf("get executable path: %w", err) + } + + // On Windows, the coder-cli executable must be in $PATH for both Msys2/Git + // Bash and OpenSSH for Windows (used by Powershell and VS Code) to function + // correctly. Check if the current executable is in $PATH, and warn the user + // if it isn't. + if runtime.GOOS == goosWindows { + binName := filepath.Base(exePath) + + // We use safeexec instead of os/exec because os/exec returns paths in + // the current working directory, which we will run into very often when + // looking for our own path. + pathPath, err := safeexec.LookPath(binName) + if err != nil { + clog.LogWarn(logWriter, + "The current executable is not in $PATH.", + "This may lead to problems connecting to your workspace via SSH.", + fmt.Sprintf("Please move %q to a location in your $PATH (such as System32) and run `%s config-ssh` again.", binName, binName), + ) + // Return the exePath so SSH at least works outside of Msys2. + return exePath, nil + } + + // Warn the user if the current executable is not the same as the one in + // $PATH. + if filepath.Clean(pathPath) != filepath.Clean(exePath) { + clog.LogWarn(logWriter, + "The current executable path does not match the executable path found in $PATH.", + "This may lead to problems connecting to your workspace via SSH.", + fmt.Sprintf("\t Current executable path: %q", exePath), + fmt.Sprintf("\tExecutable path in $PATH: %q", pathPath), + ) + } + + return binName, nil + } + + // On platforms other than Windows we can use the full path to the binary. + return exePath, nil } diff --git a/cli/projectcreate.go b/cli/projectcreate.go index fcee6c81b5f77..3991dec347717 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -265,40 +265,6 @@ func projectCreate() *cobra.Command { return cmd } -// Show computed parameters for a project version. -// Show computed parameters for a workspace build. -// -// Project Version -// -// Parameters -// gcp_credentials = us-central1-a (set by workspace) -// Set with "coder params update org --name test --value something" -// Description -// Something about GCP credentials! -// -// Valid -// - us-central1-a, us-central1-b, us-central1-c -// -// x user settable -// x sensitive -// region = us-central1-a -// - user settable -// - oneof "us-central1-a" "us-central1-b" - -// -// region -// Description -// Something about GCP credentials! -// -// -// -// Resources -// google_compute_instance -// Shuts off - -// Displaying project version information. -// Displaying workspace build information. - func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, organization codersdk.Organization, provisioner database.ProvisionerType, archive []byte, parameters ...codersdk.CreateParameterRequest) (*codersdk.ProjectVersion, []codersdk.CreateParameterRequest, error) { spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) spin.Writer = cmd.OutOrStdout() diff --git a/cli/projectcreate_test.go b/cli/projectcreate_test.go index c15d1416b2524..faf7f8f256571 100644 --- a/cli/projectcreate_test.go +++ b/cli/projectcreate_test.go @@ -1,6 +1,7 @@ package cli_test import ( + "runtime" "testing" "github.com/stretchr/testify/require" @@ -15,6 +16,11 @@ import ( func TestProjectCreate(t *testing.T) { t.Parallel() + if runtime.GOOS == "windows" { + t.Skip() + return + } + t.Run("NoParameters", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) diff --git a/cli/ssh.go b/cli/ssh.go index c895f5a3b6a29..5835d3f58cd26 100644 --- a/cli/ssh.go +++ b/cli/ssh.go @@ -15,14 +15,16 @@ import ( ) func workspaceSSH() *cobra.Command { - return &cobra.Command{ - Use: "ssh", + var ( + stdio bool + ) + cmd := &cobra.Command{ + Use: "ssh [resource]", RunE: func(cmd *cobra.Command, args []string) error { client, err := createClient(cmd) if err != nil { return err } - workspace, err := client.WorkspaceByName(cmd.Context(), "", args[0]) if err != nil { return err @@ -31,6 +33,7 @@ func workspaceSSH() *cobra.Command { if err != nil { return err } + for _, resource := range resources { fmt.Printf("Got resource: %+v\n", resource) if resource.Agent == nil { @@ -83,4 +86,6 @@ func workspaceSSH() *cobra.Command { return nil }, } + + return cmd } diff --git a/cmd/cliui/main.go b/cmd/cliui/main.go index 3fc31668eaf3b..4aa2dab41c34d 100644 --- a/cmd/cliui/main.go +++ b/cmd/cliui/main.go @@ -9,6 +9,8 @@ import ( "github.com/spf13/cobra" "github.com/coder/coder/cli/cliui" + "github.com/coder/coder/codersdk" + "github.com/coder/coder/database" ) func main() { @@ -67,6 +69,32 @@ func main() { }, }) + root.AddCommand(&cobra.Command{ + Use: "parameter", + RunE: func(cmd *cobra.Command, args []string) error { + return cliui.Parameter(cmd, codersdk.ProjectVersionParameterSchema{ + Name: "region", + ValidationCondition: `contains(["us-east-1", "us-central-1"], var.region)`, + ValidationTypeSystem: database.ParameterTypeSystemHCL, + RedisplayValue: true, + DefaultSourceScheme: database.ParameterSourceSchemeData, + DefaultSourceValue: "us-east-1", + AllowOverrideSource: true, + DefaultDestinationScheme: database.ParameterDestinationSchemeProvisionerVariable, + Description: `Specify a region for your workspace to live! + https://cloud.google.com/compute/docs/regions-zones#available`, + }, codersdk.ProjectVersionParameter{ + ParameterValue: database.ParameterValue{ + Scope: database.ParameterScopeProject, + ScopeID: "something", + SourceScheme: database.ParameterSourceSchemeData, + SourceValue: "", + }, + DefaultSourceValue: true, + }) + }, + }) + err := root.Execute() if err != nil { fmt.Println(err.Error()) diff --git a/coderd/parameter/validate_test.go b/coderd/parameter/validate_test.go index b53e6b683aa66..0a90d20a63a41 100644 --- a/coderd/parameter/validate_test.go +++ b/coderd/parameter/validate_test.go @@ -3,8 +3,9 @@ package parameter_test import ( "testing" - "github.com/coder/coder/coderd/parameter" "github.com/stretchr/testify/require" + + "github.com/coder/coder/coderd/parameter" ) func TestValidate(t *testing.T) { diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go index 620f9683ff7d8..a3683528f83ab 100644 --- a/coderd/provisionerdaemons.go +++ b/coderd/provisionerdaemons.go @@ -27,6 +27,7 @@ import ( "github.com/coder/coder/database" "github.com/coder/coder/httpapi" "github.com/coder/coder/provisionerd/proto" + "github.com/coder/coder/provisionersdk" sdkproto "github.com/coder/coder/provisionersdk/proto" ) @@ -468,14 +469,18 @@ func (server *provisionerdServer) CompleteJob(ctx context.Context, completed *pr database.WorkspaceTransitionStart: jobType.ProjectImport.StartResources, database.WorkspaceTransitionStop: jobType.ProjectImport.StopResources, } { - for _, resource := range resources { + addresses, err := provisionersdk.ResourceAddresses(resources) + if err != nil { + return nil, xerrors.Errorf("compute resource addresses: %w", err) + } + for index, resource := range resources { server.Logger.Info(ctx, "inserting project import job resource", slog.F("job_id", job.ID.String()), slog.F("resource_name", resource.Name), slog.F("resource_type", resource.Type), slog.F("transition", transition)) - err = insertWorkspaceResource(ctx, server.Database, jobID, transition, resource) + err = insertWorkspaceResource(ctx, server.Database, jobID, transition, resource, addresses[index]) if err != nil { return nil, xerrors.Errorf("insert resource: %w", err) } @@ -529,9 +534,13 @@ func (server *provisionerdServer) CompleteJob(ctx context.Context, completed *pr if err != nil { return xerrors.Errorf("update workspace build: %w", err) } + addresses, err := provisionersdk.ResourceAddresses(jobType.WorkspaceBuild.Resources) + if err != nil { + return xerrors.Errorf("compute resource addresses: %w", err) + } // This could be a bulk insert to improve performance. - for _, protoResource := range jobType.WorkspaceBuild.Resources { - err = insertWorkspaceResource(ctx, db, job.ID, workspaceBuild.Transition, protoResource) + for index, protoResource := range jobType.WorkspaceBuild.Resources { + err = insertWorkspaceResource(ctx, db, job.ID, workspaceBuild.Transition, protoResource, addresses[index]) if err != nil { return xerrors.Errorf("insert provisioner job: %w", err) } @@ -563,12 +572,13 @@ func (server *provisionerdServer) CompleteJob(ctx context.Context, completed *pr return &proto.Empty{}, nil } -func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.UUID, transition database.WorkspaceTransition, protoResource *sdkproto.Resource) error { +func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.UUID, transition database.WorkspaceTransition, protoResource *sdkproto.Resource, address string) error { resource, err := db.InsertWorkspaceResource(ctx, database.InsertWorkspaceResourceParams{ ID: uuid.New(), CreatedAt: database.Now(), JobID: jobID, Transition: transition, + Address: address, Type: protoResource.Type, Name: protoResource.Name, AgentID: uuid.NullUUID{ diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go index aeef258207551..45bf221e560f9 100644 --- a/coderd/workspacebuilds.go +++ b/coderd/workspacebuilds.go @@ -112,6 +112,7 @@ func convertWorkspaceResource(resource database.WorkspaceResource, agent *coders CreatedAt: resource.CreatedAt, JobID: resource.JobID, Transition: resource.Transition, + Address: resource.Address, Type: resource.Type, Name: resource.Name, Agent: agent, diff --git a/codersdk/workspaceresources.go b/codersdk/workspaceresources.go index 5d82180685dec..5a86efd442810 100644 --- a/codersdk/workspaceresources.go +++ b/codersdk/workspaceresources.go @@ -36,6 +36,7 @@ type WorkspaceResource struct { CreatedAt time.Time `json:"created_at"` JobID uuid.UUID `json:"job_id"` Transition database.WorkspaceTransition `json:"workspace_transition"` + Address string `json:"address"` Type string `json:"type"` Name string `json:"name"` Agent *WorkspaceAgent `json:"agent,omitempty"` diff --git a/database/databasefake/databasefake.go b/database/databasefake/databasefake.go index 1ce3e56394e21..2265b4f473623 100644 --- a/database/databasefake/databasefake.go +++ b/database/databasefake/databasefake.go @@ -995,6 +995,7 @@ func (q *fakeQuerier) InsertWorkspaceResource(_ context.Context, arg database.In CreatedAt: arg.CreatedAt, JobID: arg.JobID, Transition: arg.Transition, + Address: arg.Address, Type: arg.Type, Name: arg.Name, AgentID: arg.AgentID, diff --git a/database/dump.sql b/database/dump.sql index 6c0eb11f25e20..b7766b0859b7f 100644 --- a/database/dump.sql +++ b/database/dump.sql @@ -279,7 +279,8 @@ CREATE TABLE workspace_resource ( created_at timestamp with time zone NOT NULL, job_id uuid NOT NULL, transition workspace_transition NOT NULL, - type character varying(256) NOT NULL, + address character varying(256) NOT NULL, + type character varying(192) NOT NULL, name character varying(64) NOT NULL, agent_id uuid ); diff --git a/database/migrations/000004_jobs.up.sql b/database/migrations/000004_jobs.up.sql index cd45a879a2fbb..199f5e568f4e5 100644 --- a/database/migrations/000004_jobs.up.sql +++ b/database/migrations/000004_jobs.up.sql @@ -61,7 +61,8 @@ CREATE TABLE workspace_resource ( created_at timestamptz NOT NULL, job_id uuid NOT NULL REFERENCES provisioner_job(id) ON DELETE CASCADE, transition workspace_transition NOT NULL, - type varchar(256) NOT NULL, + address varchar(256) NOT NULL, + type varchar(192) NOT NULL, name varchar(64) NOT NULL, agent_id uuid ); diff --git a/database/models.go b/database/models.go index 23df7205341a3..2296fec308c6d 100644 --- a/database/models.go +++ b/database/models.go @@ -459,6 +459,7 @@ type WorkspaceResource struct { CreatedAt time.Time `db:"created_at" json:"created_at"` JobID uuid.UUID `db:"job_id" json:"job_id"` Transition WorkspaceTransition `db:"transition" json:"transition"` + Address string `db:"address" json:"address"` Type string `db:"type" json:"type"` Name string `db:"name" json:"name"` AgentID uuid.NullUUID `db:"agent_id" json:"agent_id"` diff --git a/database/query.sql b/database/query.sql index 9d670b71a1ec7..69405669a9f52 100644 --- a/database/query.sql +++ b/database/query.sql @@ -539,12 +539,13 @@ INSERT INTO created_at, job_id, transition, + address, type, name, agent_id ) VALUES - ($1, $2, $3, $4, $5, $6, $7) RETURNING *; + ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING *; -- name: InsertProjectVersion :one INSERT INTO diff --git a/database/query.sql.go b/database/query.sql.go index e690aafc4834c..6c83bd698d90a 100644 --- a/database/query.sql.go +++ b/database/query.sql.go @@ -1389,7 +1389,7 @@ func (q *sqlQuerier) GetWorkspaceOwnerCountsByProjectIDs(ctx context.Context, id const getWorkspaceResourceByID = `-- name: GetWorkspaceResourceByID :one SELECT - id, created_at, job_id, transition, type, name, agent_id + id, created_at, job_id, transition, address, type, name, agent_id FROM workspace_resource WHERE @@ -1404,6 +1404,7 @@ func (q *sqlQuerier) GetWorkspaceResourceByID(ctx context.Context, id uuid.UUID) &i.CreatedAt, &i.JobID, &i.Transition, + &i.Address, &i.Type, &i.Name, &i.AgentID, @@ -1413,7 +1414,7 @@ func (q *sqlQuerier) GetWorkspaceResourceByID(ctx context.Context, id uuid.UUID) const getWorkspaceResourcesByJobID = `-- name: GetWorkspaceResourcesByJobID :many SELECT - id, created_at, job_id, transition, type, name, agent_id + id, created_at, job_id, transition, address, type, name, agent_id FROM workspace_resource WHERE @@ -1434,6 +1435,7 @@ func (q *sqlQuerier) GetWorkspaceResourcesByJobID(ctx context.Context, jobID uui &i.CreatedAt, &i.JobID, &i.Transition, + &i.Address, &i.Type, &i.Name, &i.AgentID, @@ -2412,12 +2414,13 @@ INSERT INTO created_at, job_id, transition, + address, type, name, agent_id ) VALUES - ($1, $2, $3, $4, $5, $6, $7) RETURNING id, created_at, job_id, transition, type, name, agent_id + ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING id, created_at, job_id, transition, address, type, name, agent_id ` type InsertWorkspaceResourceParams struct { @@ -2425,6 +2428,7 @@ type InsertWorkspaceResourceParams struct { CreatedAt time.Time `db:"created_at" json:"created_at"` JobID uuid.UUID `db:"job_id" json:"job_id"` Transition WorkspaceTransition `db:"transition" json:"transition"` + Address string `db:"address" json:"address"` Type string `db:"type" json:"type"` Name string `db:"name" json:"name"` AgentID uuid.NullUUID `db:"agent_id" json:"agent_id"` @@ -2436,6 +2440,7 @@ func (q *sqlQuerier) InsertWorkspaceResource(ctx context.Context, arg InsertWork arg.CreatedAt, arg.JobID, arg.Transition, + arg.Address, arg.Type, arg.Name, arg.AgentID, @@ -2446,6 +2451,7 @@ func (q *sqlQuerier) InsertWorkspaceResource(ctx context.Context, arg InsertWork &i.CreatedAt, &i.JobID, &i.Transition, + &i.Address, &i.Type, &i.Name, &i.AgentID, diff --git a/provisionersdk/resources.go b/provisionersdk/resources.go new file mode 100644 index 0000000000000..b84786d889e0e --- /dev/null +++ b/provisionersdk/resources.go @@ -0,0 +1,49 @@ +package provisionersdk + +import ( + "fmt" + + "golang.org/x/xerrors" + + "github.com/coder/coder/provisionersdk/proto" +) + +// ResourceAddresses returns an index-matching slice of unique addresses +// to access resources. +func ResourceAddresses(resources []*proto.Resource) ([]string, error) { + resourcesByHost := map[string]*proto.Resource{} + for _, resource := range resources { + otherByName, exists := resourcesByHost[resource.Name] + if !exists { + resourcesByHost[resource.Name] = resource + continue + } + // If we have conflicting names, to reduce confusion we prepend the types. + delete(resourcesByHost, otherByName.Name) + otherAddress := fmt.Sprintf("%s.%s", otherByName.Type, otherByName.Name) + resourcesByHost[otherAddress] = otherByName + address := fmt.Sprintf("%s.%s", resource.Type, resource.Name) + _, exists = resourcesByHost[address] + if !exists { + resourcesByHost[address] = resource + continue + } + return nil, xerrors.Errorf("found resource with conflicting address %q", otherAddress) + } + + addresses := make([]string, 0, len(resources)) + for _, resource := range resources { + found := false + for host, other := range resourcesByHost { + if resource != other { + continue + } + found = true + addresses = append(addresses, host) + } + if !found { + panic(fmt.Sprintf("dev error: resource %s.%s wasn't given an address", resource.Type, resource.Name)) + } + } + return addresses, nil +} diff --git a/provisionersdk/resources_test.go b/provisionersdk/resources_test.go new file mode 100644 index 0000000000000..b870fe0bda338 --- /dev/null +++ b/provisionersdk/resources_test.go @@ -0,0 +1,59 @@ +package provisionersdk_test + +import ( + "testing" + + "github.com/stretchr/testify/require" + + "github.com/coder/coder/provisionersdk" + "github.com/coder/coder/provisionersdk/proto" +) + +func TestResourceAddresses(t *testing.T) { + t.Parallel() + t.Run("Single", func(t *testing.T) { + addresses, err := provisionersdk.ResourceAddresses([]*proto.Resource{{ + Type: "google_compute_instance", + Name: "dev", + }}) + require.NoError(t, err) + require.Len(t, addresses, 1) + require.Equal(t, addresses[0], "dev") + }) + t.Run("Multiple", func(t *testing.T) { + addresses, err := provisionersdk.ResourceAddresses([]*proto.Resource{{ + Type: "google_compute_instance", + Name: "linux", + }, { + Type: "google_compute_instance", + Name: "windows", + }}) + require.NoError(t, err) + require.Len(t, addresses, 2) + require.Equal(t, addresses[0], "linux") + require.Equal(t, addresses[1], "windows") + }) + t.Run("ConflictingDifferent", func(t *testing.T) { + addresses, err := provisionersdk.ResourceAddresses([]*proto.Resource{{ + Type: "google_compute_instance", + Name: "dev", + }, { + Type: "kubernetes_pod", + Name: "dev", + }}) + require.NoError(t, err) + require.Len(t, addresses, 2) + require.Equal(t, addresses[0], "google_compute_instance.dev") + require.Equal(t, addresses[1], "kubernetes_pod.dev") + }) + t.Run("ConflictingSame", func(t *testing.T) { + _, err := provisionersdk.ResourceAddresses([]*proto.Resource{{ + Type: "google_compute_instance", + Name: "dev", + }, { + Type: "google_compute_instance", + Name: "dev", + }}) + require.Error(t, err) + }) +} From cfffbe5c652f2e78226abd30b4146e4bac3f7c23 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Mon, 14 Mar 2022 21:21:16 +0000 Subject: [PATCH 11/37] Fix linting errors --- cli/cliui/cliui.go | 13 +- cli/cliui/list.go | 27 +-- cli/cliui/prompt_test.go | 6 +- cli/clog/clog.go | 126 ------------ cli/clog/clog_test.go | 73 ------- cli/configssh.go | 113 +---------- cli/daemon.go | 2 +- cli/parametercreate.go | 11 +- cli/parameters.go | 3 +- cli/projects.go | 2 + cli/projectupdate.go | 9 +- cli/root.go | 18 +- cli/ssh.go | 7 +- cli/workspacedelete.go | 5 +- cli/workspaces.go | 2 +- cli/workspaceshow.go | 2 +- cli/workspacestart.go | 5 +- cli/workspacestop.go | 5 +- cli/workspaceupdate.go | 7 +- cmd/cliui/main.go | 37 +--- cmd/templater/main.go | 17 +- coderd/parameter/validate_test.go | 1 + coderd/projects.go | 2 +- coderd/templates.go | 4 +- coderd/tunnel/tunnel.go | 24 ++- coderd/tunnel/tunnel_test.go | 1 + database/databasefake/databasefake.go | 14 +- httpmw/workspaceparam.go | 2 +- provisioner/terraform/provision.go | 282 +++++++++----------------- provisionersdk/resources_test.go | 4 + template/template.go | 4 +- 31 files changed, 221 insertions(+), 607 deletions(-) delete mode 100644 cli/clog/clog.go delete mode 100644 cli/clog/clog_test.go diff --git a/cli/cliui/cliui.go b/cli/cliui/cliui.go index aee481122033d..d48539a48392b 100644 --- a/cli/cliui/cliui.go +++ b/cli/cliui/cliui.go @@ -1,16 +1,13 @@ package cliui import ( - "errors" - "fmt" - "github.com/charmbracelet/charm/ui/common" "github.com/charmbracelet/lipgloss" - "github.com/spf13/cobra" + "golang.org/x/xerrors" ) var ( - Canceled = errors.New("canceled") + Canceled = xerrors.New("canceled") defaultStyles = common.DefaultStyles() ) @@ -20,7 +17,7 @@ type Validate func(string) error // ValidateNotEmpty is a helper function to disallow empty inputs! func ValidateNotEmpty(s string) error { if s == "" { - return errors.New("Must be provided!") + return xerrors.New("Must be provided!") } return nil } @@ -47,7 +44,3 @@ var Styles = struct { Logo: defaultStyles.Logo.SetString("Coder"), Wrap: defaultStyles.Wrap, } - -func print(cmd *cobra.Command, str string) { - _, _ = fmt.Fprint(cmd.OutOrStdout(), str) -} diff --git a/cli/cliui/list.go b/cli/cliui/list.go index c07c7af7d5fc7..c9ccf8b4fe84b 100644 --- a/cli/cliui/list.go +++ b/cli/cliui/list.go @@ -69,41 +69,42 @@ func (l teaItem) Description() string { return l.description } type listModel struct { opts ListOptions model list.Model - err string selected *teaItem } -func (m *listModel) Init() tea.Cmd { +func (*listModel) Init() tea.Cmd { return tea.EnterAltScreen } -func (m *listModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { +func (l *listModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { var cmds []tea.Cmd switch msg := msg.(type) { case tea.WindowSizeMsg: // topGap, rightGap, bottomGap, leftGap := appStyle.GetPadding() - m.model.SetSize(msg.Width, msg.Height) + l.model.SetSize(msg.Width, msg.Height) case tea.KeyMsg: // Don't match any of the keys below if we're actively filtering. - if m.model.FilterState() == list.Filtering { + if l.model.FilterState() == list.Filtering { break } - switch msg.Type { - case tea.KeyEnter: - item := m.model.SelectedItem().(teaItem) - m.selected = &item - return m, tea.Quit + if msg.Type == tea.KeyEnter { + item, valid := l.model.SelectedItem().(teaItem) + if !valid { + panic("dev error: invalid item type") + } + l.selected = &item + return l, tea.Quit } } // This will also call our delegate's update function. - newListModel, cmd := m.model.Update(msg) - m.model = newListModel + newListModel, cmd := l.model.Update(msg) + l.model = newListModel cmds = append(cmds, cmd) - return m, tea.Batch(cmds...) + return l, tea.Batch(cmds...) } func (l *listModel) View() string { diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go index e4b32d3427d21..72c018a3077c7 100644 --- a/cli/cliui/prompt_test.go +++ b/cli/cliui/prompt_test.go @@ -31,18 +31,18 @@ func TestPrompt(t *testing.T) { t.Run("Confirm", func(t *testing.T) { t.Parallel() ptty := ptytest.New(t) - ch := make(chan string, 0) + doneChan := make(chan string) go func() { resp, err := prompt(ptty, cliui.PromptOptions{ Text: "Example", IsConfirm: true, }) require.NoError(t, err) - ch <- resp + doneChan <- resp }() ptty.ExpectMatch("Example") ptty.WriteLine("yes") - require.Equal(t, "yes", <-ch) + require.Equal(t, "yes", <-doneChan) }) } diff --git a/cli/clog/clog.go b/cli/clog/clog.go deleted file mode 100644 index 8a04edb11c6c9..0000000000000 --- a/cli/clog/clog.go +++ /dev/null @@ -1,126 +0,0 @@ -package clog - -import ( - "fmt" - "io" - "strings" - - "github.com/charmbracelet/lipgloss" - "golang.org/x/xerrors" -) - -// CLIMessage provides a human-readable message for CLI errors and messages. -type CLIMessage struct { - Level string - Color lipgloss.Color - Header string - Lines []string -} - -// CLIError wraps a CLIMessage and allows consumers to treat it as a normal error. -type CLIError struct { - CLIMessage - error -} - -// String formats the CLI message for consumption by a human. -func (m CLIMessage) String() string { - var str strings.Builder - _, _ = fmt.Fprintf(&str, "%s: %s\r\n", - lipgloss.NewStyle().Foreground(m.Color).Render(m.Level), - Bold(m.Header)) - for _, line := range m.Lines { - _, _ = fmt.Fprintf(&str, " %s %s\r\n", lipgloss.NewStyle().Foreground(m.Color).Render("|"), line) - } - return str.String() -} - -// Log logs the given error to stderr, defaulting to "fatal" if the error is not a CLIError. -// If the error is a CLIError, the plain error chain is ignored and the CLIError -// is logged on its own. -func Log(writer io.Writer, err error) { - var cliErr CLIError - if !xerrors.As(err, &cliErr) { - cliErr = Fatal(err.Error()) - } - _, _ = fmt.Fprintln(writer, cliErr.String()) -} - -// LogInfo prints the given info message to stderr. -func LogInfo(writer io.Writer, header string, lines ...string) { - _, _ = fmt.Fprint(writer, CLIMessage{ - Level: "info", - Color: lipgloss.Color("34"), - Header: header, - Lines: lines, - }.String()) -} - -// LogSuccess prints the given info message to stderr. -func LogSuccess(writer io.Writer, header string, lines ...string) { - _, _ = fmt.Fprint(writer, CLIMessage{ - Level: "success", - Color: lipgloss.Color("32"), - Header: header, - Lines: lines, - }.String()) -} - -// LogWarn prints the given warn message to stderr. -func LogWarn(writer io.Writer, header string, lines ...string) { - _, _ = fmt.Fprint(writer, CLIMessage{ - Level: "warning", - Color: lipgloss.Color("33"), - Header: header, - Lines: lines, - }.String()) -} - -// Error creates an error with the level "error". -func Error(header string, lines ...string) CLIError { - return CLIError{ - CLIMessage: CLIMessage{ - Color: lipgloss.Color("31"), - Level: "error", - Header: header, - Lines: lines, - }, - error: xerrors.New(header), - } -} - -// Fatal creates an error with the level "fatal". -func Fatal(header string, lines ...string) CLIError { - return CLIError{ - CLIMessage: CLIMessage{ - Color: lipgloss.Color("31"), - Level: "fatal", - Header: header, - Lines: lines, - }, - error: xerrors.New(header), - } -} - -// Bold provides a convenience wrapper around color.New for brevity when logging. -func Bold(a string) string { - return lipgloss.NewStyle().Bold(true).Render(a) -} - -// Tipf formats according to the given format specifier and prepends a bolded "tip: " header. -func Tipf(format string, a ...interface{}) string { - return fmt.Sprintf("%s %s", Bold("tip:"), fmt.Sprintf(format, a...)) -} - -// Hintf formats according to the given format specifier and prepends a bolded "hint: " header. -func Hintf(format string, a ...interface{}) string { - return fmt.Sprintf("%s %s", Bold("hint:"), fmt.Sprintf(format, a...)) -} - -// Causef formats according to the given format specifier and prepends a bolded "cause: " header. -func Causef(format string, a ...interface{}) string { - return fmt.Sprintf("%s %s", Bold("cause:"), fmt.Sprintf(format, a...)) -} - -// BlankLine is an empty string meant to be used in CLIMessage and CLIError construction. -const BlankLine = "" diff --git a/cli/clog/clog_test.go b/cli/clog/clog_test.go deleted file mode 100644 index f54bf3ef59ec8..0000000000000 --- a/cli/clog/clog_test.go +++ /dev/null @@ -1,73 +0,0 @@ -package clog_test - -import ( - "bytes" - "io" - "io/ioutil" - "testing" - - "github.com/stretchr/testify/require" - "golang.org/x/xerrors" - - "github.com/coder/coder/cli/clog" -) - -func TestError(t *testing.T) { - t.Parallel() - t.Run("oneline", func(t *testing.T) { - t.Parallel() - var mockErr error = clog.Error("fake error") - mockErr = xerrors.Errorf("wrap 1: %w", mockErr) - mockErr = xerrors.Errorf("wrap 2: %w", mockErr) - - var buf bytes.Buffer - clog.Log(&buf, mockErr) - - output, err := ioutil.ReadAll(&buf) - require.NoError(t, err, "read all stderr output") - require.Equal(t, "error: "+clog.Bold("fake error")+"\r\n\n", string(output), "output is as expected") - }) - - t.Run("plain-error", func(t *testing.T) { - t.Parallel() - mockErr := xerrors.Errorf("base error") - mockErr = xerrors.Errorf("wrap 1: %w", mockErr) - - var buf bytes.Buffer - clog.Log(&buf, mockErr) - - output, err := ioutil.ReadAll(&buf) - require.NoError(t, err, "read all stderr output") - - require.Equal(t, "fatal: "+clog.Bold("wrap 1: base error")+"\r\n\n", string(output), "output is as expected") - }) - - t.Run("message", func(t *testing.T) { - for _, f := range []struct { - f func(io.Writer, string, ...string) - level string - }{{clog.LogInfo, "info"}, {clog.LogSuccess, "success"}, {clog.LogWarn, "warning"}} { - var buf bytes.Buffer - f.f(&buf, "testing", clog.Hintf("maybe do %q", "this"), clog.BlankLine, clog.Causef("what happened was %q", "this")) - - output, err := ioutil.ReadAll(&buf) - require.NoError(t, err, "read all stderr output") - - require.Equal(t, f.level+": "+clog.Bold("testing")+"\r\n | "+clog.Bold("hint:")+" maybe do \"this\"\r\n | \r\n | "+clog.Bold("cause:")+" what happened was \"this\"\r\n", string(output), "output is as expected") - } - }) - - t.Run("multi-line", func(t *testing.T) { - var mockErr error = clog.Error("fake header", "next line", clog.BlankLine, clog.Tipf("content of fake tip")) - mockErr = xerrors.Errorf("wrap 1: %w", mockErr) - mockErr = xerrors.Errorf("wrap 1: %w", mockErr) - - var buf bytes.Buffer - clog.Log(&buf, mockErr) - - output, err := ioutil.ReadAll(&buf) - require.NoError(t, err, "read all stderr output") - - require.Equal(t, "error: "+clog.Bold("fake header")+"\r\n | next line\r\n | \r\n | "+clog.Bold("tip:")+" content of fake tip\r\n\n", string(output), "output is as expected") - }) -} diff --git a/cli/configssh.go b/cli/configssh.go index 6dcc6d729f264..83c08fbb514dd 100644 --- a/cli/configssh.go +++ b/cli/configssh.go @@ -1,121 +1,26 @@ package cli import ( - "fmt" - "io" - "os" - "path/filepath" - "runtime" - "strings" - - "github.com/cli/safeexec" - "github.com/coder/coder/cli/clog" "github.com/spf13/cobra" - "golang.org/x/xerrors" ) -const sshStartToken = "# ------------START-CODER-----------" -const sshStartMessage = `# This was generated by "coder config-ssh". -# -# To remove this blob, run: -# -# coder config-ssh --remove -# -# You should not hand-edit this section, unless you are deleting it.` -const sshEndToken = "# ------------END-CODER------------" +// const sshStartToken = "# ------------START-CODER-----------" +// const sshStartMessage = `# This was generated by "coder config-ssh". +// # +// # To remove this blob, run: +// # +// # coder config-ssh --remove +// # +// # You should not hand-edit this section, unless you are deleting it.` +// const sshEndToken = "# ------------END-CODER------------" func configSSH() *cobra.Command { cmd := &cobra.Command{ Use: "config-ssh", RunE: func(cmd *cobra.Command, args []string) error { - binPath(cmd.OutOrStdout()) - return nil }, } return cmd } - -// removeOldConfig removes the old ssh configuration from the user's sshconfig. -// Returns true if the config was modified. -func removeOldConfig(config string) (string, bool) { - startIndex := strings.Index(config, sshStartToken) - endIndex := strings.Index(config, sshEndToken) - - if startIndex == -1 || endIndex == -1 { - return config, false - } - if startIndex == 0 { - return config[endIndex+len(sshEndToken)+1:], true - } - return config[:startIndex-1] + config[endIndex+len(sshEndToken)+1:], true -} - -func makeSSHConfig(userID, binPath, workspaceName, privateKeyFilepath string, additionalOptions []string) string { - // Custom user options come first to maximizessh customization. - options := []string{} - if len(additionalOptions) > 0 { - options = []string{ - "# Custom options. Duplicated values will always prefer the first!", - } - options = append(options, additionalOptions...) - options = append(options, "# End custom options.") - } - options = append(options, - fmt.Sprintf("HostName coder.%s", workspaceName), - fmt.Sprintf("ProxyCommand %s", fmt.Sprintf(`"%s" ssh %s`, binPath, workspaceName)), - "StrictHostKeyChecking no", - "ConnectTimeout=0", - "IdentitiesOnly yes", - fmt.Sprintf("IdentityFile=%q", privateKeyFilepath), - ) - - return fmt.Sprintf("Host coder.%s\n\t%s\n\n", workspaceName, strings.Join(options, "\n\t")) -} - -// binPath returns the path to the coder binary suitable for use in ssh ProxyCommand. -func binPath(logWriter io.Writer) (string, error) { - exePath, err := os.Executable() - if err != nil { - return "", xerrors.Errorf("get executable path: %w", err) - } - - // On Windows, the coder-cli executable must be in $PATH for both Msys2/Git - // Bash and OpenSSH for Windows (used by Powershell and VS Code) to function - // correctly. Check if the current executable is in $PATH, and warn the user - // if it isn't. - if runtime.GOOS == goosWindows { - binName := filepath.Base(exePath) - - // We use safeexec instead of os/exec because os/exec returns paths in - // the current working directory, which we will run into very often when - // looking for our own path. - pathPath, err := safeexec.LookPath(binName) - if err != nil { - clog.LogWarn(logWriter, - "The current executable is not in $PATH.", - "This may lead to problems connecting to your workspace via SSH.", - fmt.Sprintf("Please move %q to a location in your $PATH (such as System32) and run `%s config-ssh` again.", binName, binName), - ) - // Return the exePath so SSH at least works outside of Msys2. - return exePath, nil - } - - // Warn the user if the current executable is not the same as the one in - // $PATH. - if filepath.Clean(pathPath) != filepath.Clean(exePath) { - clog.LogWarn(logWriter, - "The current executable path does not match the executable path found in $PATH.", - "This may lead to problems connecting to your workspace via SSH.", - fmt.Sprintf("\t Current executable path: %q", exePath), - fmt.Sprintf("\tExecutable path in $PATH: %q", pathPath), - ) - } - - return binName, nil - } - - // On platforms other than Windows we can use the full path to the binary. - return exePath, nil -} diff --git a/cli/daemon.go b/cli/daemon.go index 417a4a2987357..5618e2ab3b08d 100644 --- a/cli/daemon.go +++ b/cli/daemon.go @@ -62,7 +62,7 @@ func daemon() *cobra.Command { return xerrors.Errorf("parse: %w", err) } - fmt.Fprintf(cmd.OutOrStdout(), ` ▄█▀ ▀█▄ + _, _ = fmt.Fprintf(cmd.OutOrStdout(), ` ▄█▀ ▀█▄ ▄▄ ▀▀▀ █▌ ██▀▀█▄ ▐█ ▄▄██▀▀█▄▄▄ ██ ██ █▀▀█ ▐█▀▀██ ▄█▀▀█ █▀▀ █▌ ▄▌ ▐█ █▌ ▀█▄▄▄█▌ █ █ ▐█ ██ ██▀▀ █ diff --git a/cli/parametercreate.go b/cli/parametercreate.go index f476b88636b70..f98445aef64ac 100644 --- a/cli/parametercreate.go +++ b/cli/parametercreate.go @@ -3,10 +3,11 @@ package cli import ( "fmt" - "github.com/coder/coder/codersdk" - "github.com/coder/coder/database" "github.com/spf13/cobra" "golang.org/x/xerrors" + + "github.com/coder/coder/codersdk" + "github.com/coder/coder/database" ) func parameterCreate() *cobra.Command { @@ -50,14 +51,14 @@ func parameterCreate() *cobra.Command { if err != nil { return err } - fmt.Printf("Created!\n") + _, _ = fmt.Printf("Created!\n") return nil }, } cmd.Flags().StringVarP(&name, "name", "n", "", "Name for a parameter.") - cmd.MarkFlagRequired("name") + _ = cmd.MarkFlagRequired("name") cmd.Flags().StringVarP(&value, "value", "v", "", "Value for a parameter.") - cmd.MarkFlagRequired("value") + _ = cmd.MarkFlagRequired("value") cmd.Flags().StringVarP(&scheme, "scheme", "s", "var", `Scheme for the parameter ("var" or "env").`) return cmd diff --git a/cli/parameters.go b/cli/parameters.go index 2a032ebfcd45c..71690ba4b1b2e 100644 --- a/cli/parameters.go +++ b/cli/parameters.go @@ -3,9 +3,10 @@ package cli import ( "context" - "github.com/coder/coder/codersdk" "github.com/spf13/cobra" "golang.org/x/xerrors" + + "github.com/coder/coder/codersdk" ) func parameters() *cobra.Command { diff --git a/cli/projects.go b/cli/projects.go index b37ddbe53f74e..b422a2aefea50 100644 --- a/cli/projects.go +++ b/cli/projects.go @@ -32,9 +32,11 @@ func projects() *cobra.Command { } cmd.AddCommand( projectCreate(), + projectEdit(), projectList(), projectPlan(), projectUpdate(), + projectVersions(), ) return cmd diff --git a/cli/projectupdate.go b/cli/projectupdate.go index 74b59841391f5..239dd381d4e7a 100644 --- a/cli/projectupdate.go +++ b/cli/projectupdate.go @@ -6,11 +6,12 @@ import ( "path/filepath" "time" + "github.com/spf13/cobra" + "golang.org/x/xerrors" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" "github.com/coder/coder/provisionersdk" - "github.com/spf13/cobra" - "golang.org/x/xerrors" ) func projectUpdate() *cobra.Command { @@ -70,7 +71,7 @@ func projectUpdate() *cobra.Command { if !ok { break } - fmt.Printf("terraform (%s): %s\n", log.Level, log.Output) + _, _ = fmt.Printf("terraform (%s): %s\n", log.Level, log.Output) } projectVersion, err = client.ProjectVersion(cmd.Context(), projectVersion.ID) if err != nil { @@ -87,7 +88,7 @@ func projectUpdate() *cobra.Command { if err != nil { return err } - fmt.Printf("Updated version!\n") + _, _ = fmt.Printf("Updated version!\n") return nil }, } diff --git a/cli/root.go b/cli/root.go index 4d2bc7842e8a2..7489dde9e466d 100644 --- a/cli/root.go +++ b/cli/root.go @@ -61,13 +61,17 @@ func Root() *cobra.Command { `Additional help topics:`, header.Sprint("Additional help:"), ).Replace(cmd.UsageTemplate())) - cmd.AddCommand(daemon()) - cmd.AddCommand(login()) - cmd.AddCommand(parameters()) - cmd.AddCommand(projects()) - cmd.AddCommand(workspaces()) - cmd.AddCommand(users()) - cmd.AddCommand(workspaceSSH()) + cmd.AddCommand( + configSSH(), + daemon(), + login(), + parameters(), + projects(), + users(), + workspaces(), + workspaceSSH(), + workspaceTunnel(), + ) cmd.PersistentFlags().String(varGlobalConfig, configdir.LocalConfig("coderv2"), "Path to the global `coder` config directory") cmd.PersistentFlags().Bool(varForceTty, false, "Force the `coder` command to run as if connected to a TTY") diff --git a/cli/ssh.go b/cli/ssh.go index 5835d3f58cd26..91612c7403ef5 100644 --- a/cli/ssh.go +++ b/cli/ssh.go @@ -15,9 +15,6 @@ import ( ) func workspaceSSH() *cobra.Command { - var ( - stdio bool - ) cmd := &cobra.Command{ Use: "ssh [resource]", RunE: func(cmd *cobra.Command, args []string) error { @@ -35,7 +32,7 @@ func workspaceSSH() *cobra.Command { } for _, resource := range resources { - fmt.Printf("Got resource: %+v\n", resource) + _, _ = fmt.Printf("Got resource: %+v\n", resource) if resource.Agent == nil { continue } @@ -63,7 +60,7 @@ func workspaceSSH() *cobra.Command { if err != nil { return err } - term.MakeRaw(int(os.Stdin.Fd())) + _, _ = term.MakeRaw(int(os.Stdin.Fd())) err = session.RequestPty("xterm-256color", 128, 128, ssh.TerminalModes{ ssh.OCRNL: 1, }) diff --git a/cli/workspacedelete.go b/cli/workspacedelete.go index cfa742d862c0e..4819d13fdff6e 100644 --- a/cli/workspacedelete.go +++ b/cli/workspacedelete.go @@ -4,9 +4,10 @@ import ( "fmt" "time" + "github.com/spf13/cobra" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" - "github.com/spf13/cobra" ) func workspaceDelete() *cobra.Command { @@ -40,7 +41,7 @@ func workspaceDelete() *cobra.Command { if !ok { break } - fmt.Printf("Output: %s\n", log.Output) + _, _ = fmt.Printf("Output: %s\n", log.Output) } return nil }, diff --git a/cli/workspaces.go b/cli/workspaces.go index e5a13040f11d7..69f0ccbde8824 100644 --- a/cli/workspaces.go +++ b/cli/workspaces.go @@ -23,7 +23,7 @@ func workspaces() *cobra.Command { return cmd } -func validArgsWorkspaceName(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { +func validArgsWorkspaceName(cmd *cobra.Command, _ []string, toComplete string) ([]string, cobra.ShellCompDirective) { client, err := createClient(cmd) if err != nil { return nil, cobra.ShellCompDirectiveError diff --git a/cli/workspaceshow.go b/cli/workspaceshow.go index 43a68d5f34e1a..987ce6b94c09c 100644 --- a/cli/workspaceshow.go +++ b/cli/workspaceshow.go @@ -27,7 +27,7 @@ func workspaceShow() *cobra.Command { continue } - fmt.Printf("Agent: %+v\n", resource.Agent) + _, _ = fmt.Printf("Agent: %+v\n", resource.Agent) } return nil }, diff --git a/cli/workspacestart.go b/cli/workspacestart.go index 22ed4acfa32ad..2ed139543144f 100644 --- a/cli/workspacestart.go +++ b/cli/workspacestart.go @@ -4,9 +4,10 @@ import ( "fmt" "time" + "github.com/spf13/cobra" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" - "github.com/spf13/cobra" ) func workspaceStart() *cobra.Command { @@ -39,7 +40,7 @@ func workspaceStart() *cobra.Command { if !ok { break } - fmt.Printf("Output: %s\n", log.Output) + _, _ = fmt.Printf("Output: %s\n", log.Output) } return nil }, diff --git a/cli/workspacestop.go b/cli/workspacestop.go index 7e6d3f69d5fb4..5d82b88e2a0e8 100644 --- a/cli/workspacestop.go +++ b/cli/workspacestop.go @@ -4,9 +4,10 @@ import ( "fmt" "time" + "github.com/spf13/cobra" + "github.com/coder/coder/codersdk" "github.com/coder/coder/database" - "github.com/spf13/cobra" ) func workspaceStop() *cobra.Command { @@ -39,7 +40,7 @@ func workspaceStop() *cobra.Command { if !ok { break } - fmt.Printf("Output: %s\n", log.Output) + _, _ = fmt.Printf("Output: %s\n", log.Output) } return nil }, diff --git a/cli/workspaceupdate.go b/cli/workspaceupdate.go index 9c88072d42b0e..36cd10142299e 100644 --- a/cli/workspaceupdate.go +++ b/cli/workspaceupdate.go @@ -4,8 +4,9 @@ import ( "fmt" "time" - "github.com/coder/coder/codersdk" "github.com/spf13/cobra" + + "github.com/coder/coder/codersdk" ) func workspaceUpdate() *cobra.Command { @@ -21,7 +22,7 @@ func workspaceUpdate() *cobra.Command { return err } if !workspace.Outdated { - fmt.Printf("Workspace isn't outdated!\n") + _, _ = fmt.Printf("Workspace isn't outdated!\n") return nil } project, err := client.Project(cmd.Context(), workspace.ProjectID) @@ -45,7 +46,7 @@ func workspaceUpdate() *cobra.Command { if !ok { break } - fmt.Printf("Output: %s\n", log.Output) + _, _ = fmt.Printf("Output: %s\n", log.Output) } return nil }, diff --git a/cmd/cliui/main.go b/cmd/cliui/main.go index 4aa2dab41c34d..2e3c2ecd1d9b5 100644 --- a/cmd/cliui/main.go +++ b/cmd/cliui/main.go @@ -7,10 +7,9 @@ import ( "strings" "github.com/spf13/cobra" + "golang.org/x/xerrors" "github.com/coder/coder/cli/cliui" - "github.com/coder/coder/codersdk" - "github.com/coder/coder/database" ) func main() { @@ -22,7 +21,7 @@ func main() { root.AddCommand(&cobra.Command{ Use: "list", RunE: func(cmd *cobra.Command, args []string) error { - cliui.List(cmd, cliui.ListOptions{ + _, err := cliui.List(cmd, cliui.ListOptions{ Items: []cliui.ListItem{{ Title: "Example", Description: "Something...", @@ -31,7 +30,7 @@ func main() { Description: "Another exciting description!", }}, }) - return nil + return err }, }) @@ -43,7 +42,7 @@ func main() { Default: "acme-corp", Validate: func(s string) error { if !strings.EqualFold(s, "coder") { - return errors.New("Err... nope!") + return xerrors.New("Err... nope!") } return nil }, @@ -69,35 +68,9 @@ func main() { }, }) - root.AddCommand(&cobra.Command{ - Use: "parameter", - RunE: func(cmd *cobra.Command, args []string) error { - return cliui.Parameter(cmd, codersdk.ProjectVersionParameterSchema{ - Name: "region", - ValidationCondition: `contains(["us-east-1", "us-central-1"], var.region)`, - ValidationTypeSystem: database.ParameterTypeSystemHCL, - RedisplayValue: true, - DefaultSourceScheme: database.ParameterSourceSchemeData, - DefaultSourceValue: "us-east-1", - AllowOverrideSource: true, - DefaultDestinationScheme: database.ParameterDestinationSchemeProvisionerVariable, - Description: `Specify a region for your workspace to live! - https://cloud.google.com/compute/docs/regions-zones#available`, - }, codersdk.ProjectVersionParameter{ - ParameterValue: database.ParameterValue{ - Scope: database.ParameterScopeProject, - ScopeID: "something", - SourceScheme: database.ParameterSourceSchemeData, - SourceValue: "", - }, - DefaultSourceValue: true, - }) - }, - }) - err := root.Execute() if err != nil { - fmt.Println(err.Error()) + _, _ = fmt.Println(err.Error()) os.Exit(1) } } diff --git a/cmd/templater/main.go b/cmd/templater/main.go index b41d33a9ba10d..ee4be03fe3bd6 100644 --- a/cmd/templater/main.go +++ b/cmd/templater/main.go @@ -50,7 +50,7 @@ func main() { DestinationScheme: database.ParameterDestinationSchemeProvisionerVariable, }) } - return parse(cmd, args, parameters) + return parse(cmd, parameters) }, } cmd.Flags().StringArrayVarP(&rawParameters, "parameter", "p", []string{}, "Specify parameters to pass in a template.") @@ -60,7 +60,7 @@ func main() { } } -func parse(cmd *cobra.Command, args []string, parameters []codersdk.CreateParameterRequest) error { +func parse(cmd *cobra.Command, parameters []codersdk.CreateParameterRequest) error { srv := httptest.NewUnstartedServer(nil) srv.Config.BaseContext = func(_ net.Listener) context.Context { return cmd.Context() @@ -155,7 +155,7 @@ func parse(cmd *cobra.Command, args []string, parameters []codersdk.CreateParame if !ok { break } - fmt.Printf("terraform (%s): %s\n", log.Level, log.Output) + _, _ = fmt.Printf("terraform (%s): %s\n", log.Level, log.Output) } version, err = client.ProjectVersion(cmd.Context(), version.ID) if err != nil { @@ -230,7 +230,10 @@ func parse(cmd *cobra.Command, args []string, parameters []codersdk.CreateParame if err != nil { return err } - os.WriteFile(filepath.Base(dir)+".json", data, 0600) + err = os.WriteFile(filepath.Base(dir)+".json", data, 0600) + if err != nil { + return err + } project, err := client.CreateProject(cmd.Context(), created.OrganizationID, codersdk.CreateProjectRequest{ Name: "test", @@ -264,7 +267,7 @@ func parse(cmd *cobra.Command, args []string, parameters []codersdk.CreateParame if !ok { break } - fmt.Printf("terraform (%s): %s\n", log.Level, log.Output) + _, _ = fmt.Printf("terraform (%s): %s\n", log.Level, log.Output) } resources, err = client.WorkspaceResourcesByBuild(cmd.Context(), build.ID) @@ -297,10 +300,10 @@ func parse(cmd *cobra.Command, args []string, parameters []codersdk.CreateParame if !ok { break } - fmt.Printf("terraform (%s): %s\n", log.Level, log.Output) + _, _ = fmt.Printf("terraform (%s): %s\n", log.Level, log.Output) } - daemonClose.Close() + _ = daemonClose.Close() srv.Close() closeWait() return nil diff --git a/coderd/parameter/validate_test.go b/coderd/parameter/validate_test.go index 0a90d20a63a41..35364044a1d0f 100644 --- a/coderd/parameter/validate_test.go +++ b/coderd/parameter/validate_test.go @@ -11,6 +11,7 @@ import ( func TestValidate(t *testing.T) { t.Parallel() t.Run("Contains", func(t *testing.T) { + t.Parallel() values, valid, err := parameter.Contains(`contains(["us-east1-a", "us-central1-a"], var.region)`) require.NoError(t, err) require.True(t, valid) diff --git a/coderd/projects.go b/coderd/projects.go index 74cdbbe65e78d..8884e6bfba2d5 100644 --- a/coderd/projects.go +++ b/coderd/projects.go @@ -55,7 +55,7 @@ func (api *api) deleteProject(rw http.ResponseWriter, r *http.Request) { } if len(workspaces) > 0 { httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{ - Message: fmt.Sprintf("All workspaces must be deleted before a project can be removed."), + Message: "All workspaces must be deleted before a project can be removed.", }) return } diff --git a/coderd/templates.go b/coderd/templates.go index 466b51b07c446..f11f5a98d7418 100644 --- a/coderd/templates.go +++ b/coderd/templates.go @@ -11,12 +11,12 @@ import ( "github.com/coder/coder/template" ) -func (api *api) listTemplates(rw http.ResponseWriter, r *http.Request) { +func (*api) listTemplates(rw http.ResponseWriter, r *http.Request) { render.Status(r, http.StatusOK) render.JSON(rw, r, template.List()) } -func (api *api) templateArchive(rw http.ResponseWriter, r *http.Request) { +func (*api) templateArchive(rw http.ResponseWriter, r *http.Request) { id := chi.URLParam(r, "id") archive, exists := template.Archive(id) if !exists { diff --git a/coderd/tunnel/tunnel.go b/coderd/tunnel/tunnel.go index 3408de9738ad3..d3a1adbc3ce38 100644 --- a/coderd/tunnel/tunnel.go +++ b/coderd/tunnel/tunnel.go @@ -13,9 +13,9 @@ import ( "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel" "github.com/cloudflare/cloudflared/connection" "github.com/google/uuid" - "github.com/pkg/errors" "github.com/rs/zerolog" "github.com/urfave/cli/v2" + "golang.org/x/xerrors" ) // New creates a new tunnel pointing at the URL provided. @@ -39,20 +39,24 @@ func New(ctx context.Context, url string) (string, <-chan error, error) { // Taken from: // https://github.com/cloudflare/cloudflared/blob/22cd8ceb8cf279afc1c412ae7f98308ffcfdd298/cmd/cloudflared/tunnel/quick_tunnel.go#L38 - resp, err := client.Post("https://api.trycloudflare.com/tunnel", "application/json", nil) + req, err := http.NewRequestWithContext(ctx, http.MethodPost, "https://api.trycloudflare.com/tunnel", nil) if err != nil { - return "", nil, errors.Wrap(err, "failed to request quick Tunnel") + return "", nil, xerrors.Errorf("create request: %w", err) + } + req.Header.Set("Content-Type", "application/json") + resp, err := client.Do(req) + if err != nil { + return "", nil, xerrors.Errorf("request quick tunnel: %w", err) } defer resp.Body.Close() - var data quickTunnelResponse - if err := json.NewDecoder(resp.Body).Decode(&data); err != nil { - return "", nil, errors.Wrap(err, "failed to unmarshal quick Tunnel") + err = json.NewDecoder(resp.Body).Decode(&data) + if err != nil { + return "", nil, xerrors.Errorf("decode: %w", err) } - tunnelID, err := uuid.Parse(data.Result.ID) if err != nil { - return "", nil, errors.Wrap(err, "failed to parse quick Tunnel ID") + return "", nil, xerrors.Errorf("parse tunnel id: %w", err) } credentials := connection.Credentials{ @@ -72,8 +76,8 @@ func New(ctx context.Context, url string) (string, <-chan error, error) { set.Int("retries", 5, "") appCtx := cli.NewContext(&cli.App{}, set, nil) appCtx.Context = ctx - appCtx.Set("url", url) - appCtx.Set("protocol", "quic") + _ = appCtx.Set("url", url) + _ = appCtx.Set("protocol", "quic") logger := zerolog.New(os.Stdout).Level(zerolog.Disabled) errCh := make(chan error, 1) go func() { diff --git a/coderd/tunnel/tunnel_test.go b/coderd/tunnel/tunnel_test.go index 45240b02e5c64..6369fa4154d19 100644 --- a/coderd/tunnel/tunnel_test.go +++ b/coderd/tunnel/tunnel_test.go @@ -46,6 +46,7 @@ func TestTunnel(t *testing.T) { return false } require.NoError(t, err) + defer res.Body.Close() return res.StatusCode == http.StatusOK }, time.Minute, 3*time.Second) } diff --git a/database/databasefake/databasefake.go b/database/databasefake/databasefake.go index 2265b4f473623..5ee57b996768f 100644 --- a/database/databasefake/databasefake.go +++ b/database/databasefake/databasefake.go @@ -162,7 +162,7 @@ func (q *fakeQuerier) GetUserCount(_ context.Context) (int64, error) { return int64(len(q.users)), nil } -func (q *fakeQuerier) GetWorkspacesByProjectID(ctx context.Context, arg database.GetWorkspacesByProjectIDParams) ([]database.Workspace, error) { +func (q *fakeQuerier) GetWorkspacesByProjectID(_ context.Context, arg database.GetWorkspacesByProjectIDParams) ([]database.Workspace, error) { q.mutex.Lock() defer q.mutex.Unlock() @@ -290,7 +290,7 @@ func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDWithoutAfter(_ context.Conte return database.WorkspaceBuild{}, sql.ErrNoRows } -func (q *fakeQuerier) GetWorkspaceBuildsByWorkspaceIDsWithoutAfter(ctx context.Context, ids []uuid.UUID) ([]database.WorkspaceBuild, error) { +func (q *fakeQuerier) GetWorkspaceBuildsByWorkspaceIDsWithoutAfter(_ context.Context, ids []uuid.UUID) ([]database.WorkspaceBuild, error) { q.mutex.Lock() defer q.mutex.Unlock() @@ -504,7 +504,7 @@ func (q *fakeQuerier) GetProjectVersionByID(_ context.Context, projectVersionID return database.ProjectVersion{}, sql.ErrNoRows } -func (q *fakeQuerier) GetProjectVersionByJobID(ctx context.Context, jobID uuid.UUID) (database.ProjectVersion, error) { +func (q *fakeQuerier) GetProjectVersionByJobID(_ context.Context, jobID uuid.UUID) (database.ProjectVersion, error) { q.mutex.Lock() defer q.mutex.Unlock() @@ -573,7 +573,7 @@ func (q *fakeQuerier) GetProjectsByOrganization(_ context.Context, arg database. return projects, nil } -func (q *fakeQuerier) GetProjectsByIDs(ctx context.Context, ids []uuid.UUID) ([]database.Project, error) { +func (q *fakeQuerier) GetProjectsByIDs(_ context.Context, ids []uuid.UUID) ([]database.Project, error) { q.mutex.Lock() defer q.mutex.Unlock() @@ -1079,7 +1079,7 @@ func (q *fakeQuerier) UpdateAPIKeyByID(_ context.Context, arg database.UpdateAPI return sql.ErrNoRows } -func (q *fakeQuerier) UpdateProjectActiveVersionByID(ctx context.Context, arg database.UpdateProjectActiveVersionByIDParams) error { +func (q *fakeQuerier) UpdateProjectActiveVersionByID(_ context.Context, arg database.UpdateProjectActiveVersionByIDParams) error { q.mutex.Lock() defer q.mutex.Unlock() @@ -1094,7 +1094,7 @@ func (q *fakeQuerier) UpdateProjectActiveVersionByID(ctx context.Context, arg da return sql.ErrNoRows } -func (q *fakeQuerier) UpdateProjectDeletedByID(ctx context.Context, arg database.UpdateProjectDeletedByIDParams) error { +func (q *fakeQuerier) UpdateProjectDeletedByID(_ context.Context, arg database.UpdateProjectDeletedByIDParams) error { q.mutex.Lock() defer q.mutex.Unlock() @@ -1223,7 +1223,7 @@ func (q *fakeQuerier) UpdateWorkspaceBuildByID(_ context.Context, arg database.U return sql.ErrNoRows } -func (q *fakeQuerier) UpdateWorkspaceDeletedByID(ctx context.Context, arg database.UpdateWorkspaceDeletedByIDParams) error { +func (q *fakeQuerier) UpdateWorkspaceDeletedByID(_ context.Context, arg database.UpdateWorkspaceDeletedByIDParams) error { q.mutex.Lock() defer q.mutex.Unlock() diff --git a/httpmw/workspaceparam.go b/httpmw/workspaceparam.go index 4c1f852d97015..e37589aa32a1f 100644 --- a/httpmw/workspaceparam.go +++ b/httpmw/workspaceparam.go @@ -33,7 +33,7 @@ func ExtractWorkspaceParam(db database.Store) func(http.Handler) http.Handler { workspace, err := db.GetWorkspaceByID(r.Context(), workspaceID) if errors.Is(err, sql.ErrNoRows) { httpapi.Write(rw, http.StatusNotFound, httpapi.Response{ - Message: fmt.Sprintf("workspace %q does not exist", workspace), + Message: fmt.Sprintf("workspace %q does not exist", workspaceID), }) return } diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go index 75f1e5f51e33b..3f75546214904 100644 --- a/provisioner/terraform/provision.go +++ b/provisioner/terraform/provision.go @@ -17,8 +17,6 @@ import ( "github.com/mitchellh/mapstructure" "golang.org/x/xerrors" - "cdr.dev/slog" - "github.com/coder/coder/provisionersdk" "github.com/coder/coder/provisionersdk/proto" ) @@ -98,44 +96,30 @@ func (t *terraform) Provision(stream proto.DRPCProvisioner_ProvisionStream) erro } t.logger.Debug(shutdown, "ran initialization") - if start.DryRun { - return t.runTerraformPlan(stream.Context(), shutdown, terraform, start, stream) - } - return t.runTerraformApply(stream.Context(), shutdown, terraform, start, stream, statefilePath) -} - -func (t *terraform) runTerraformPlan(ctx, shutdown context.Context, terraform *tfexec.Terraform, request *proto.Provision_Start, stream proto.DRPCProvisioner_ProvisionStream) error { - env := map[string]string{} - for _, envEntry := range os.Environ() { - parts := strings.SplitN(envEntry, "=", 2) - env[parts[0]] = parts[1] - } + env := os.Environ() + env = append(env, + "CODER_URL="+start.Metadata.CoderUrl, + "CODER_WORKSPACE_TRANSITION="+strings.ToLower(start.Metadata.WorkspaceTransition.String()), + ) for key, value := range provisionersdk.AgentScriptEnv() { - env[key] = value + env = append(env, key+"="+value) } - env["CODER_URL"] = request.Metadata.CoderUrl - env["CODER_WORKSPACE_TRANSITION"] = strings.ToLower(request.Metadata.WorkspaceTransition.String()) - planfilePath := filepath.Join(request.Directory, "terraform.tfplan") - options := []tfexec.PlanOption{tfexec.JSON(true), tfexec.Out(planfilePath)} - for _, param := range request.ParameterValues { + vars := []string{} + for _, param := range start.ParameterValues { switch param.DestinationScheme { case proto.ParameterDestination_ENVIRONMENT_VARIABLE: - env[param.Name] = param.Value + env = append(env, fmt.Sprintf("%s=%s", param.Name, param.Value)) case proto.ParameterDestination_PROVISIONER_VARIABLE: - options = append(options, tfexec.Var(fmt.Sprintf("%s=%s", param.Name, param.Value))) + vars = append(vars, fmt.Sprintf("%s=%s", param.Name, param.Value)) default: return xerrors.Errorf("unsupported parameter type %q for %q", param.DestinationScheme, param.Name) } } - err := terraform.SetEnv(env) - if err != nil { - return xerrors.Errorf("apply environment variables: %w", err) - } - reader, writer := io.Pipe() + closeChan := make(chan struct{}) + reader, writer = io.Pipe() defer reader.Close() defer writer.Close() - closeChan := make(chan struct{}) go func() { defer close(closeChan) decoder := json.NewDecoder(reader) @@ -180,20 +164,87 @@ func (t *terraform) runTerraformPlan(ctx, shutdown context.Context, terraform *t } }() - terraform.SetStdout(writer) - t.logger.Debug(ctx, "running plan") - _, err = terraform.Plan(ctx, options...) + planfilePath := filepath.Join(start.Directory, "terraform.tfplan") + var args []string + if start.DryRun { + args = []string{ + "plan", + "-no-color", + "-input=false", + "-json", + "-refresh=true", + "-out=" + planfilePath, + } + } else { + args = []string{ + "apply", + "-no-color", + "-auto-approve", + "-input=false", + "-json", + "-refresh=true", + } + } + if start.Metadata.WorkspaceTransition == proto.WorkspaceTransition_DESTROY { + args = append(args, "-destroy") + } + for _, variable := range vars { + args = append(args, "-var", variable) + } + // #nosec + cmd := exec.CommandContext(stream.Context(), t.binaryPath, args...) + go func() { + select { + case <-stream.Context().Done(): + return + case <-shutdown.Done(): + _ = cmd.Process.Signal(os.Kill) + } + }() + cmd.Stdout = writer + cmd.Env = env + cmd.Dir = terraform.WorkingDir() + err = cmd.Run() if err != nil { - return xerrors.Errorf("plan terraform: %w", err) + if start.DryRun { + return xerrors.Errorf("plan terraform: %w", err) + } + errorMessage := err.Error() + // Terraform can fail and apply and still need to store it's state. + // In this case, we return Complete with an explicit error message. + statefileContent, err := os.ReadFile(statefilePath) + if err != nil { + return xerrors.Errorf("read file %q: %w", statefilePath, err) + } + return stream.Send(&proto.Provision_Response{ + Type: &proto.Provision_Response_Complete{ + Complete: &proto.Provision_Complete{ + State: statefileContent, + Error: errorMessage, + }, + }, + }) } - t.logger.Debug(ctx, "ran plan") + _ = reader.Close() + <-closeChan + var resp *proto.Provision_Response + if start.DryRun { + resp, err = parseTerraformPlan(stream.Context(), terraform, planfilePath) + } else { + resp, err = parseTerraformApply(stream.Context(), terraform, statefilePath) + } + if err != nil { + return err + } + return stream.Send(resp) +} + +func parseTerraformPlan(ctx context.Context, terraform *tfexec.Terraform, planfilePath string) (*proto.Provision_Response, error) { plan, err := terraform.ShowPlanFile(ctx, planfilePath) if err != nil { - return xerrors.Errorf("show terraform plan file: %w", err) + return nil, xerrors.Errorf("show terraform plan file: %w", err) } - _ = reader.Close() - <-closeChan // Maps resource dependencies to expression references. // This is *required* for a plan, because "DependsOn" @@ -232,14 +283,14 @@ func (t *terraform) runTerraformPlan(ctx, shutdown context.Context, terraform *t if envRaw, has := resource.Expressions["env"]; has { env, ok := envRaw.ConstantValue.(map[string]string) if !ok { - return xerrors.Errorf("unexpected type %q for env map", reflect.TypeOf(envRaw.ConstantValue).String()) + return nil, xerrors.Errorf("unexpected type %q for env map", reflect.TypeOf(envRaw.ConstantValue).String()) } agent.Env = env } if startupScriptRaw, has := resource.Expressions["startup_script"]; has { startupScript, ok := startupScriptRaw.ConstantValue.(string) if !ok { - return xerrors.Errorf("unexpected type %q for startup script", reflect.TypeOf(startupScriptRaw.ConstantValue).String()) + return nil, xerrors.Errorf("unexpected type %q for startup script", reflect.TypeOf(startupScriptRaw.ConstantValue).String()) } agent.StartupScript = startupScript } @@ -250,7 +301,7 @@ func (t *terraform) runTerraformPlan(ctx, shutdown context.Context, terraform *t if has { authTypeValue, valid := authType.ConstantValue.(string) if !valid { - return xerrors.Errorf("unexpected type %q for auth type", reflect.TypeOf(authType.ConstantValue)) + return nil, xerrors.Errorf("unexpected type %q for auth type", reflect.TypeOf(authType.ConstantValue)) } switch authTypeValue { case "google-instance-identity": @@ -261,7 +312,7 @@ func (t *terraform) runTerraformPlan(ctx, shutdown context.Context, terraform *t }, } default: - return xerrors.Errorf("unknown auth type: %q", authTypeValue) + return nil, xerrors.Errorf("unknown auth type: %q", authTypeValue) } } } @@ -305,110 +356,23 @@ func (t *terraform) runTerraformPlan(ctx, shutdown context.Context, terraform *t }) } - return stream.Send(&proto.Provision_Response{ + return &proto.Provision_Response{ Type: &proto.Provision_Response_Complete{ Complete: &proto.Provision_Complete{ Resources: resources, }, }, - }) + }, nil } -func (t *terraform) runTerraformApply(ctx, shutdown context.Context, terraform *tfexec.Terraform, request *proto.Provision_Start, stream proto.DRPCProvisioner_ProvisionStream, statefilePath string) error { - env := os.Environ() - env = append(env, - "CODER_URL="+request.Metadata.CoderUrl, - "CODER_WORKSPACE_TRANSITION="+strings.ToLower(request.Metadata.WorkspaceTransition.String()), - ) - for key, value := range provisionersdk.AgentScriptEnv() { - env = append(env, key+"="+value) - } - vars := []string{} - for _, param := range request.ParameterValues { - switch param.DestinationScheme { - case proto.ParameterDestination_ENVIRONMENT_VARIABLE: - env = append(env, fmt.Sprintf("%s=%s", param.Name, param.Value)) - case proto.ParameterDestination_PROVISIONER_VARIABLE: - vars = append(vars, fmt.Sprintf("%s=%s", param.Name, param.Value)) - default: - return xerrors.Errorf("unsupported parameter type %q for %q", param.DestinationScheme, param.Name) - } - } - - reader, writer := io.Pipe() - defer reader.Close() - defer writer.Close() - go func() { - decoder := json.NewDecoder(reader) - for { - var log terraformProvisionLog - err := decoder.Decode(&log) - if err != nil { - return - } - - logLevel, err := convertTerraformLogLevel(log.Level) - if err != nil { - // Not a big deal, but we should handle this at some point! - continue - } - _ = stream.Send(&proto.Provision_Response{ - Type: &proto.Provision_Response_Log{ - Log: &proto.Log{ - Level: logLevel, - Output: log.Message, - }, - }, - }) - - if log.Diagnostic == nil { - continue - } - - // If the diagnostic is provided, let's provide a bit more info! - logLevel, err = convertTerraformLogLevel(log.Diagnostic.Severity) - if err != nil { - continue - } - _ = stream.Send(&proto.Provision_Response{ - Type: &proto.Provision_Response_Log{ - Log: &proto.Log{ - Level: logLevel, - Output: log.Diagnostic.Detail, - }, - }, - }) - } - }() - - t.logger.Debug(ctx, "running apply", slog.F("vars", len(vars)), slog.F("env", len(env))) - err := runApplyCommand(ctx, shutdown, request.Metadata.WorkspaceTransition, terraform.ExecPath(), terraform.WorkingDir(), writer, env, vars) - if err != nil { - errorMessage := err.Error() - // Terraform can fail and apply and still need to store it's state. - // In this case, we return Complete with an explicit error message. - statefileContent, err := os.ReadFile(statefilePath) - if err != nil { - return xerrors.Errorf("read file %q: %w", statefilePath, err) - } - return stream.Send(&proto.Provision_Response{ - Type: &proto.Provision_Response_Complete{ - Complete: &proto.Provision_Complete{ - State: statefileContent, - Error: errorMessage, - }, - }, - }) - } - t.logger.Debug(ctx, "ran apply") - +func parseTerraformApply(ctx context.Context, terraform *tfexec.Terraform, statefilePath string) (*proto.Provision_Response, error) { statefileContent, err := os.ReadFile(statefilePath) if err != nil { - return xerrors.Errorf("read file %q: %w", statefilePath, err) + return nil, xerrors.Errorf("read file %q: %w", statefilePath, err) } state, err := terraform.ShowStateFile(ctx, statefilePath) if err != nil { - return xerrors.Errorf("show state file %q: %w", statefilePath, err) + return nil, xerrors.Errorf("show state file %q: %w", statefilePath, err) } resources := make([]*proto.Resource, 0) if state.Values != nil { @@ -433,7 +397,7 @@ func (t *terraform) runTerraformApply(ctx, shutdown context.Context, terraform * var attrs agentAttributes err = mapstructure.Decode(resource.AttributeValues, &attrs) if err != nil { - return xerrors.Errorf("decode agent attributes: %w", err) + return nil, xerrors.Errorf("decode agent attributes: %w", err) } agent := &proto.Agent{ Id: attrs.ID, @@ -453,7 +417,7 @@ func (t *terraform) runTerraformApply(ctx, shutdown context.Context, terraform * }, } default: - return xerrors.Errorf("unknown auth type: %q", auth.Type) + return nil, xerrors.Errorf("unknown auth type: %q", auth.Type) } } resourceKey := strings.Join([]string{resource.Type, resource.Name}, ".") @@ -506,46 +470,14 @@ func (t *terraform) runTerraformApply(ctx, shutdown context.Context, terraform * } } - return stream.Send(&proto.Provision_Response{ + return &proto.Provision_Response{ Type: &proto.Provision_Response_Complete{ Complete: &proto.Provision_Complete{ State: statefileContent, Resources: resources, }, }, - }) -} - -// This couldn't use terraform-exec, because it doesn't support cancelation, and there didn't appear -// to be a straight-forward way to add it. -func runApplyCommand(ctx, shutdownCtx context.Context, transition proto.WorkspaceTransition, bin, dir string, stdout io.Writer, env, vars []string) error { - args := []string{ - "apply", - "-no-color", - "-auto-approve", - "-input=false", - "-json", - "-refresh=true", - } - if transition == proto.WorkspaceTransition_DESTROY { - args = append(args, "-destroy") - } - for _, variable := range vars { - args = append(args, "-var", variable) - } - cmd := exec.CommandContext(ctx, bin, args...) - go func() { - select { - case <-ctx.Done(): - return - case <-shutdownCtx.Done(): - _ = cmd.Process.Signal(os.Kill) - } - }() - cmd.Stdout = stdout - cmd.Env = env - cmd.Dir = dir - return cmd.Run() + }, nil } type terraformProvisionLog struct { @@ -577,17 +509,3 @@ func convertTerraformLogLevel(logLevel string) (proto.LogLevel, error) { return proto.LogLevel(0), xerrors.Errorf("invalid log level %q", logLevel) } } - -func combineContexts(ctx1, ctx2 context.Context) context.Context { - ctx, cancelFunc := context.WithCancel(ctx1) - go func() { - defer cancelFunc() - select { - case <-ctx.Done(): - return - case <-ctx2.Done(): - return - } - }() - return ctx -} diff --git a/provisionersdk/resources_test.go b/provisionersdk/resources_test.go index b870fe0bda338..a379389f8ba83 100644 --- a/provisionersdk/resources_test.go +++ b/provisionersdk/resources_test.go @@ -12,6 +12,7 @@ import ( func TestResourceAddresses(t *testing.T) { t.Parallel() t.Run("Single", func(t *testing.T) { + t.Parallel() addresses, err := provisionersdk.ResourceAddresses([]*proto.Resource{{ Type: "google_compute_instance", Name: "dev", @@ -21,6 +22,7 @@ func TestResourceAddresses(t *testing.T) { require.Equal(t, addresses[0], "dev") }) t.Run("Multiple", func(t *testing.T) { + t.Parallel() addresses, err := provisionersdk.ResourceAddresses([]*proto.Resource{{ Type: "google_compute_instance", Name: "linux", @@ -34,6 +36,7 @@ func TestResourceAddresses(t *testing.T) { require.Equal(t, addresses[1], "windows") }) t.Run("ConflictingDifferent", func(t *testing.T) { + t.Parallel() addresses, err := provisionersdk.ResourceAddresses([]*proto.Resource{{ Type: "google_compute_instance", Name: "dev", @@ -47,6 +50,7 @@ func TestResourceAddresses(t *testing.T) { require.Equal(t, addresses[1], "kubernetes_pod.dev") }) t.Run("ConflictingSame", func(t *testing.T) { + t.Parallel() _, err := provisionersdk.ResourceAddresses([]*proto.Resource{{ Type: "google_compute_instance", Name: "dev", diff --git a/template/template.go b/template/template.go index 18bd495790088..e1c528e95002d 100644 --- a/template/template.go +++ b/template/template.go @@ -19,8 +19,8 @@ var ( //go:embed */*.tf files embed.FS - list []codersdk.Template = make([]codersdk.Template, 0) - archives map[string][]byte = map[string][]byte{} + list = make([]codersdk.Template, 0) + archives = map[string][]byte{} ) // Parses templates from the embedded archive and inserts them into the map. From 926e59ea9d78d83b4210d1d5d77239f7dbda56eb Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Mon, 14 Mar 2022 21:25:46 +0000 Subject: [PATCH 12/37] Remove unused CLI tests --- cli/projectcreate_test.go | 107 --------------------------- cli/projectlist_test.go | 56 -------------- cli/workspacecreate_test.go | 63 ---------------- coderd/coderdtest/coderdtest.go | 2 +- coderd/coderdtest/coderdtest_test.go | 14 +--- 5 files changed, 3 insertions(+), 239 deletions(-) delete mode 100644 cli/projectcreate_test.go delete mode 100644 cli/projectlist_test.go delete mode 100644 cli/workspacecreate_test.go diff --git a/cli/projectcreate_test.go b/cli/projectcreate_test.go deleted file mode 100644 index faf7f8f256571..0000000000000 --- a/cli/projectcreate_test.go +++ /dev/null @@ -1,107 +0,0 @@ -package cli_test - -import ( - "runtime" - "testing" - - "github.com/stretchr/testify/require" - - "github.com/coder/coder/cli/clitest" - "github.com/coder/coder/coderd/coderdtest" - "github.com/coder/coder/database" - "github.com/coder/coder/provisioner/echo" - "github.com/coder/coder/provisionersdk/proto" - "github.com/coder/coder/pty/ptytest" -) - -func TestProjectCreate(t *testing.T) { - t.Parallel() - if runtime.GOOS == "windows" { - t.Skip() - return - } - - t.Run("NoParameters", func(t *testing.T) { - t.Parallel() - client := coderdtest.New(t, nil) - coderdtest.CreateFirstUser(t, client) - source := clitest.CreateProjectVersionSource(t, &echo.Responses{ - Parse: echo.ParseComplete, - Provision: echo.ProvisionComplete, - }) - cmd, root := clitest.New(t, "projects", "create", "--directory", source, "--provisioner", string(database.ProvisionerTypeEcho)) - clitest.SetupConfig(t, client, root) - _ = coderdtest.NewProvisionerDaemon(t, client) - pty := ptytest.New(t) - cmd.SetIn(pty.Input().Reader) - cmd.SetOut(pty.Output()) - closeChan := make(chan struct{}) - go func() { - err := cmd.Execute() - require.NoError(t, err) - close(closeChan) - }() - - matches := []string{ - "organization?", "yes", - "name?", "test-project", - "project?", "yes", - "created!", "n", - } - for i := 0; i < len(matches); i += 2 { - match := matches[i] - value := matches[i+1] - pty.ExpectMatch(match) - pty.WriteLine(value) - } - <-closeChan - }) - - t.Run("Parameter", func(t *testing.T) { - t.Parallel() - client := coderdtest.New(t, nil) - coderdtest.CreateFirstUser(t, client) - source := clitest.CreateProjectVersionSource(t, &echo.Responses{ - Parse: []*proto.Parse_Response{{ - Type: &proto.Parse_Response_Complete{ - Complete: &proto.Parse_Complete{ - ParameterSchemas: []*proto.ParameterSchema{{ - Name: "somevar", - DefaultDestination: &proto.ParameterDestination{ - Scheme: proto.ParameterDestination_PROVISIONER_VARIABLE, - }, - }}, - }, - }, - }}, - Provision: echo.ProvisionComplete, - }) - cmd, root := clitest.New(t, "projects", "create", "--directory", source, "--provisioner", string(database.ProvisionerTypeEcho)) - clitest.SetupConfig(t, client, root) - coderdtest.NewProvisionerDaemon(t, client) - pty := ptytest.New(t) - cmd.SetIn(pty.Input().Reader) - cmd.SetOut(pty.Output()) - closeChan := make(chan struct{}) - go func() { - err := cmd.Execute() - require.NoError(t, err) - close(closeChan) - }() - - matches := []string{ - "organization?", "yes", - "name?", "test-project", - "somevar", "value", - "project?", "yes", - "created!", "n", - } - for i := 0; i < len(matches); i += 2 { - match := matches[i] - value := matches[i+1] - pty.ExpectMatch(match) - pty.WriteLine(value) - } - <-closeChan - }) -} diff --git a/cli/projectlist_test.go b/cli/projectlist_test.go deleted file mode 100644 index db2392bf2797d..0000000000000 --- a/cli/projectlist_test.go +++ /dev/null @@ -1,56 +0,0 @@ -package cli_test - -import ( - "testing" - - "github.com/stretchr/testify/require" - - "github.com/coder/coder/cli/clitest" - "github.com/coder/coder/coderd/coderdtest" - "github.com/coder/coder/pty/ptytest" -) - -func TestProjectList(t *testing.T) { - t.Parallel() - t.Run("None", func(t *testing.T) { - t.Parallel() - client := coderdtest.New(t, nil) - coderdtest.CreateFirstUser(t, client) - cmd, root := clitest.New(t, "projects", "list") - clitest.SetupConfig(t, client, root) - pty := ptytest.New(t) - cmd.SetIn(pty.Input()) - cmd.SetOut(pty.Output()) - closeChan := make(chan struct{}) - go func() { - err := cmd.Execute() - require.NoError(t, err) - close(closeChan) - }() - pty.ExpectMatch("No projects found") - <-closeChan - }) - t.Run("List", func(t *testing.T) { - t.Parallel() - client := coderdtest.New(t, nil) - user := coderdtest.CreateFirstUser(t, client) - daemon := coderdtest.NewProvisionerDaemon(t, client) - version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) - coderdtest.AwaitProjectVersionJob(t, client, version.ID) - _ = daemon.Close() - project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) - cmd, root := clitest.New(t, "projects", "list") - clitest.SetupConfig(t, client, root) - pty := ptytest.New(t) - cmd.SetIn(pty.Input()) - cmd.SetOut(pty.Output()) - closeChan := make(chan struct{}) - go func() { - err := cmd.Execute() - require.NoError(t, err) - close(closeChan) - }() - pty.ExpectMatch(project.Name) - <-closeChan - }) -} diff --git a/cli/workspacecreate_test.go b/cli/workspacecreate_test.go deleted file mode 100644 index b700045a5ce67..0000000000000 --- a/cli/workspacecreate_test.go +++ /dev/null @@ -1,63 +0,0 @@ -package cli_test - -import ( - "testing" - - "github.com/stretchr/testify/require" - - "github.com/coder/coder/cli/clitest" - "github.com/coder/coder/coderd/coderdtest" - "github.com/coder/coder/provisioner/echo" - "github.com/coder/coder/provisionersdk/proto" - "github.com/coder/coder/pty/ptytest" -) - -func TestWorkspaceCreate(t *testing.T) { - t.Parallel() - t.Run("Create", func(t *testing.T) { - t.Parallel() - client := coderdtest.New(t, nil) - user := coderdtest.CreateFirstUser(t, client) - _ = coderdtest.NewProvisionerDaemon(t, client) - version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, &echo.Responses{ - Parse: echo.ParseComplete, - Provision: []*proto.Provision_Response{{ - Type: &proto.Provision_Response_Complete{ - Complete: &proto.Provision_Complete{ - Resources: []*proto.Resource{{ - Name: "example", - Type: "aws_instance", - }}, - }, - }, - }}, - }) - coderdtest.AwaitProjectVersionJob(t, client, version.ID) - project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) - cmd, root := clitest.New(t, "workspaces", "create", project.Name) - clitest.SetupConfig(t, client, root) - - pty := ptytest.New(t) - cmd.SetIn(pty.Input().Reader) - cmd.SetOut(pty.Output()) - closeChan := make(chan struct{}) - go func() { - err := cmd.Execute() - require.NoError(t, err) - close(closeChan) - }() - - matches := []string{ - "name?", "workspace-name", - "Create workspace", "yes", - } - for i := 0; i < len(matches); i += 2 { - match := matches[i] - value := matches[i+1] - pty.ExpectMatch(match) - pty.WriteLine(value) - } - pty.ExpectMatch("Create") - <-closeChan - }) -} diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index 8605300345004..0e1b9ef034987 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -239,7 +239,7 @@ func AwaitWorkspaceAgents(t *testing.T, client *codersdk.Client, build uuid.UUID if resource.Agent == nil { continue } - if resource.Agent.UpdatedAt.IsZero() { + if resource.Agent.FirstConnectedAt == nil { return false } } diff --git a/coderd/coderdtest/coderdtest_test.go b/coderd/coderdtest/coderdtest_test.go index 40cecf63bca82..f0f0653434869 100644 --- a/coderd/coderdtest/coderdtest_test.go +++ b/coderd/coderdtest/coderdtest_test.go @@ -1,16 +1,11 @@ package coderdtest_test import ( - "context" "testing" "go.uber.org/goleak" - "github.com/stretchr/testify/require" - "github.com/coder/coder/coderd/coderdtest" - "github.com/coder/coder/codersdk" - "github.com/coder/coder/database" ) func TestMain(m *testing.M) { @@ -26,12 +21,7 @@ func TestNew(t *testing.T) { coderdtest.AwaitProjectVersionJob(t, client, version.ID) project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID) - build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: project.ActiveVersionID, - Transition: database.WorkspaceTransitionStart, - }) - require.NoError(t, err) - coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID) - coderdtest.AwaitWorkspaceAgents(t, client, build.ID) + coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) + coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID) closer.Close() } From 1c9e124d6cd0e698728c62ff985575b4491edeee Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Mon, 14 Mar 2022 22:22:39 +0000 Subject: [PATCH 13/37] Rename daemon to start --- cli/projectclone.go | 5 +++++ cli/projectversions.go | 2 ++ cli/root.go | 2 +- cli/{daemon.go => start.go} | 6 +++--- cli/{daemon_test.go => start_test.go} | 4 ++-- develop.sh | 2 +- images/coder/run.sh | 2 +- site/e2e/playwright.config.ts | 2 +- 8 files changed, 16 insertions(+), 9 deletions(-) rename cli/{daemon.go => start.go} (97%) rename cli/{daemon_test.go => start_test.go} (81%) diff --git a/cli/projectclone.go b/cli/projectclone.go index 7f1e458cd3abe..32d8c96893d7c 100644 --- a/cli/projectclone.go +++ b/cli/projectclone.go @@ -1 +1,6 @@ package cli + +// coder projects inspect +// coder projects update +// coder projects edit +// coder projects clone [dir] diff --git a/cli/projectversions.go b/cli/projectversions.go index b1f40e959a518..9bdc3bb25efa6 100644 --- a/cli/projectversions.go +++ b/cli/projectversions.go @@ -11,3 +11,5 @@ func projectVersions() *cobra.Command { }, } } + +// coder project versions diff --git a/cli/root.go b/cli/root.go index 7489dde9e466d..758f2cbe88698 100644 --- a/cli/root.go +++ b/cli/root.go @@ -63,7 +63,7 @@ func Root() *cobra.Command { cmd.AddCommand( configSSH(), - daemon(), + start(), login(), parameters(), projects(), diff --git a/cli/daemon.go b/cli/start.go similarity index 97% rename from cli/daemon.go rename to cli/start.go index 5618e2ab3b08d..2076e45b81389 100644 --- a/cli/daemon.go +++ b/cli/start.go @@ -30,13 +30,13 @@ import ( "github.com/coder/coder/provisionersdk/proto" ) -func daemon() *cobra.Command { +func start() *cobra.Command { var ( address string dev bool ) root := &cobra.Command{ - Use: "daemon", + Use: "start", RunE: func(cmd *cobra.Command, args []string) error { logger := slog.Make(sloghuman.Sink(os.Stderr)) listener, err := net.Listen("tcp", address) @@ -117,7 +117,7 @@ func daemon() *cobra.Command { defaultAddress = "127.0.0.1:3000" } root.Flags().StringVarP(&address, "address", "a", defaultAddress, "The address to serve the API and dashboard.") - root.Flags().BoolVarP(&dev, "dev", "d", false, "Serve Coder in dev mode for tinkering.") + root.Flags().BoolVarP(&dev, "dev", "", false, "Serve Coder in dev mode for tinkering.") return root } diff --git a/cli/daemon_test.go b/cli/start_test.go similarity index 81% rename from cli/daemon_test.go rename to cli/start_test.go index 30fad0a4366c4..a6d84aa445b5e 100644 --- a/cli/daemon_test.go +++ b/cli/start_test.go @@ -9,11 +9,11 @@ import ( "github.com/coder/coder/cli/clitest" ) -func TestDaemon(t *testing.T) { +func TestStart(t *testing.T) { t.Parallel() ctx, cancelFunc := context.WithCancel(context.Background()) go cancelFunc() - root, _ := clitest.New(t, "daemon") + root, _ := clitest.New(t, "start") err := root.ExecuteContext(ctx) require.ErrorIs(t, err, context.Canceled) } diff --git a/develop.sh b/develop.sh index 8ccfad6332b87..3da4301573e38 100755 --- a/develop.sh +++ b/develop.sh @@ -31,5 +31,5 @@ function create_initial_user() { trap 'kill 0' SIGINT create_initial_user & CODERV2_HOST=http://127.0.0.1:3000 yarn --cwd=./site dev & - go run cmd/coder/main.go daemon + go run cmd/coder/main.go start ) diff --git a/images/coder/run.sh b/images/coder/run.sh index 4e5193657accb..3eac591270060 100755 --- a/images/coder/run.sh +++ b/images/coder/run.sh @@ -26,5 +26,5 @@ function create_initial_user() { ( trap 'kill 0' SIGINT create_initial_user & - /coder daemon --address=":$PORT" + /coder start --address=":$PORT" ) diff --git a/site/e2e/playwright.config.ts b/site/e2e/playwright.config.ts index 7388bd5ca210e..bbe0abb3b43ef 100644 --- a/site/e2e/playwright.config.ts +++ b/site/e2e/playwright.config.ts @@ -17,7 +17,7 @@ const config: PlaywrightTestConfig = { // https://playwright.dev/docs/test-advanced#launching-a-development-web-server-during-the-tests webServer: { // Run the coder daemon directly. - command: `go run ${path.join(__dirname, "../../cmd/coder/main.go")} daemon`, + command: `go run ${path.join(__dirname, "../../cmd/coder/main.go")} start`, port: 3000, timeout: 120 * 10000, reuseExistingServer: false, From 2b9a849f054b10f0a251505f872943828e44150b Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Mon, 14 Mar 2022 22:47:58 +0000 Subject: [PATCH 14/37] Fix leaking command --- cli/cliui/prompt.go | 7 +++++++ cli/login_test.go | 17 ++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/cli/cliui/prompt.go b/cli/cliui/prompt.go index ee4685e3f3b17..9eb6ba28c5f8f 100644 --- a/cli/cliui/prompt.go +++ b/cli/cliui/prompt.go @@ -1,6 +1,7 @@ package cliui import ( + "context" "strings" "github.com/charmbracelet/bubbles/textinput" @@ -30,7 +31,13 @@ func Prompt(cmd *cobra.Command, opts PromptOptions) (string, error) { input.model.EchoMode = opts.EchoMode input.model.Focus() + ctx, cancelFunc := context.WithCancel(cmd.Context()) + defer cancelFunc() program := tea.NewProgram(input, tea.WithInput(cmd.InOrStdin()), tea.WithOutput(cmd.OutOrStdout())) + go func() { + <-ctx.Done() + program.Quit() + }() err := program.Start() if err != nil { return "", err diff --git a/cli/login_test.go b/cli/login_test.go index b875f2c387c86..8f0b725417abd 100644 --- a/cli/login_test.go +++ b/cli/login_test.go @@ -1,6 +1,8 @@ package cli_test import ( + "context" + "fmt" "testing" "github.com/stretchr/testify/require" @@ -26,11 +28,13 @@ func TestLogin(t *testing.T) { // The --force-tty flag is required on Windows, because the `isatty` library does not // accurately detect Windows ptys when they are not attached to a process: // https://github.com/mattn/go-isatty/issues/59 + doneChan := make(chan struct{}) root, _ := clitest.New(t, "login", client.URL.String(), "--force-tty") pty := ptytest.New(t) root.SetIn(pty.Input().Reader) root.SetOut(pty.Output()) go func() { + defer close(doneChan) err := root.Execute() require.NoError(t, err) }() @@ -48,6 +52,7 @@ func TestLogin(t *testing.T) { pty.WriteLine(value) } pty.ExpectMatch("Welcome to Coder") + <-doneChan }) t.Run("ExistingUserValidTokenTTY", func(t *testing.T) { @@ -55,11 +60,13 @@ func TestLogin(t *testing.T) { client := coderdtest.New(t, nil) coderdtest.CreateFirstUser(t, client) + doneChan := make(chan struct{}) root, _ := clitest.New(t, "login", client.URL.String(), "--force-tty", "--no-open") pty := ptytest.New(t) root.SetIn(pty.Input().Reader) root.SetOut(pty.Output()) go func() { + defer close(doneChan) err := root.Execute() require.NoError(t, err) }() @@ -67,6 +74,7 @@ func TestLogin(t *testing.T) { pty.ExpectMatch("Paste your token here:") pty.WriteLine(client.SessionToken) pty.ExpectMatch("Welcome to Coder") + <-doneChan }) t.Run("ExistingUserInvalidTokenTTY", func(t *testing.T) { @@ -74,18 +82,25 @@ func TestLogin(t *testing.T) { client := coderdtest.New(t, nil) coderdtest.CreateFirstUser(t, client) + ctx, cancelFunc := context.WithCancel(context.Background()) + defer cancelFunc() + doneChan := make(chan struct{}) root, _ := clitest.New(t, "login", client.URL.String(), "--force-tty", "--no-open") pty := ptytest.New(t) root.SetIn(pty.Input().Reader) root.SetOut(pty.Output()) go func() { - err := root.Execute() + defer close(doneChan) + err := root.ExecuteContext(ctx) // An error is expected in this case, since the login wasn't successful: require.Error(t, err) + fmt.Printf("Is this here?\n") }() pty.ExpectMatch("Paste your token here:") pty.WriteLine("an-invalid-token") pty.ExpectMatch("That's not a valid token!") + cancelFunc() + <-doneChan }) } From f895d1f11fdaae481a6352ea0b95e8b50316ba69 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Mon, 14 Mar 2022 23:04:37 +0000 Subject: [PATCH 15/37] Fix promptui test --- cli/cliui/prompt_test.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go index 72c018a3077c7..d346b35704faf 100644 --- a/cli/cliui/prompt_test.go +++ b/cli/cliui/prompt_test.go @@ -1,6 +1,7 @@ package cliui_test import ( + "context" "testing" "github.com/spf13/cobra" @@ -47,8 +48,15 @@ func TestPrompt(t *testing.T) { } func prompt(ptty *ptytest.PTY, opts cliui.PromptOptions) (string, error) { - cmd := &cobra.Command{} + value := "" + cmd := &cobra.Command{ + RunE: func(cmd *cobra.Command, args []string) error { + var err error + value, err = cliui.Prompt(cmd, opts) + return err + }, + } cmd.SetOutput(ptty.Output()) cmd.SetIn(ptty.Input().Reader) - return cliui.Prompt(cmd, opts) + return value, cmd.ExecuteContext(context.Background()) } From 72bc74cb0a2df2ae41d81a1f8885a5d42d8fe3a2 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Tue, 15 Mar 2022 14:21:48 +0000 Subject: [PATCH 16/37] Update agent connection frequency --- coderd/coderdtest/coderdtest.go | 9 +++++---- coderd/projectversions_test.go | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index 0e1b9ef034987..6065a6759a4b1 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -84,10 +84,11 @@ func New(t *testing.T, options *Options) *codersdk.Client { var closeWait func() // We set the handler after server creation for the access URL. srv.Config.Handler, closeWait = coderd.New(&coderd.Options{ - AccessURL: serverURL, - Logger: slogtest.Make(t, nil).Leveled(slog.LevelDebug), - Database: db, - Pubsub: pubsub, + AgentConnectionUpdateFrequency: 25 * time.Millisecond, + AccessURL: serverURL, + Logger: slogtest.Make(t, nil).Leveled(slog.LevelDebug), + Database: db, + Pubsub: pubsub, GoogleTokenValidator: options.GoogleTokenValidator, }) diff --git a/coderd/projectversions_test.go b/coderd/projectversions_test.go index 09c5a9d7092ce..c7bbf3d706998 100644 --- a/coderd/projectversions_test.go +++ b/coderd/projectversions_test.go @@ -44,6 +44,7 @@ func TestPatchCancelProjectVersion(t *testing.T) { var err error version, err = client.ProjectVersion(context.Background(), version.ID) require.NoError(t, err) + t.Logf("Status: %s", version.Job.Status) return version.Job.Status == codersdk.ProvisionerJobRunning }, 5*time.Second, 25*time.Millisecond) err := client.CancelProjectVersion(context.Background(), version.ID) From e79f9b05dabf27a15b4b408ff81df35365db0541 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Tue, 15 Mar 2022 14:40:20 +0000 Subject: [PATCH 17/37] Skip login tests on Windows --- cli/login_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cli/login_test.go b/cli/login_test.go index 8f0b725417abd..4c4c55870859c 100644 --- a/cli/login_test.go +++ b/cli/login_test.go @@ -3,6 +3,7 @@ package cli_test import ( "context" "fmt" + "runtime" "testing" "github.com/stretchr/testify/require" @@ -14,6 +15,11 @@ import ( func TestLogin(t *testing.T) { t.Parallel() + if runtime.GOOS == "windows" { + t.Skip() + return + } + t.Run("InitialUserNoTTY", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) From 55a0160c2ccc1ed5793e18f1ad7f89888490d904 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Tue, 15 Mar 2022 16:43:36 +0000 Subject: [PATCH 18/37] Increase tunnel connect timeout --- coderd/tunnel/tunnel_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coderd/tunnel/tunnel_test.go b/coderd/tunnel/tunnel_test.go index 6369fa4154d19..2ed51f2432a59 100644 --- a/coderd/tunnel/tunnel_test.go +++ b/coderd/tunnel/tunnel_test.go @@ -35,6 +35,7 @@ func TestTunnel(t *testing.T) { defer cancelFunc() url, _, err := tunnel.New(ctx, srv.URL) require.NoError(t, err) + t.Log(url) require.Eventually(t, func() bool { req, err := http.NewRequestWithContext(ctx, "GET", url, nil) @@ -48,5 +49,5 @@ func TestTunnel(t *testing.T) { require.NoError(t, err) defer res.Body.Close() return res.StatusCode == http.StatusOK - }, time.Minute, 3*time.Second) + }, 5*time.Minute, 3*time.Second) } From 6ac95bfca671f086ba5709f1afec19e02d2a98ba Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Tue, 15 Mar 2022 17:40:24 +0000 Subject: [PATCH 19/37] Fix templater --- cmd/templater/main.go | 17 +-- database/databasefake/databasefake.go | 165 +++++++++++++------------- template/gcp-linux/gcp-linux.json | 9 +- 3 files changed, 95 insertions(+), 96 deletions(-) diff --git a/cmd/templater/main.go b/cmd/templater/main.go index ee4be03fe3bd6..06d35a81cb8fe 100644 --- a/cmd/templater/main.go +++ b/cmd/templater/main.go @@ -201,6 +201,7 @@ func parse(cmd *cobra.Command, parameters []codersdk.CreateParameterRequest) err resource.Agent.ID = uuid.UUID{} resource.Agent.ResourceID = uuid.UUID{} resource.Agent.CreatedAt = time.Time{} + resource.Agent.UpdatedAt = time.Time{} } resources[index] = resource } @@ -250,15 +251,7 @@ func parse(cmd *cobra.Command, parameters []codersdk.CreateParameterRequest) err if err != nil { return err } - - build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ - ProjectVersionID: version.ID, - Transition: database.WorkspaceTransitionStart, - }) - if err != nil { - return err - } - logs, err = client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before) + logs, err = client.WorkspaceBuildLogsAfter(cmd.Context(), workspace.LatestBuild.ID, before) if err != nil { return err } @@ -270,7 +263,7 @@ func parse(cmd *cobra.Command, parameters []codersdk.CreateParameterRequest) err _, _ = fmt.Printf("terraform (%s): %s\n", log.Level, log.Output) } - resources, err = client.WorkspaceResourcesByBuild(cmd.Context(), build.ID) + resources, err = client.WorkspaceResourcesByBuild(cmd.Context(), workspace.LatestBuild.ID) if err != nil { return err } @@ -284,7 +277,7 @@ func parse(cmd *cobra.Command, parameters []codersdk.CreateParameterRequest) err } } - build, err = client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ + build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{ ProjectVersionID: version.ID, Transition: database.WorkspaceTransitionDelete, }) @@ -321,7 +314,7 @@ func awaitAgent(ctx context.Context, client *codersdk.Client, resource codersdk. if err != nil { return err } - if resource.Agent.UpdatedAt.IsZero() { + if resource.Agent.FirstConnectedAt == nil { continue } return nil diff --git a/database/databasefake/databasefake.go b/database/databasefake/databasefake.go index 5ee57b996768f..5f9733daeb69a 100644 --- a/database/databasefake/databasefake.go +++ b/database/databasefake/databasefake.go @@ -36,7 +36,7 @@ func New() database.Store { // fakeQuerier replicates database functionality to enable quick testing. type fakeQuerier struct { - mutex sync.Mutex + mutex sync.RWMutex // Legacy tables apiKeys []database.APIKey @@ -108,8 +108,8 @@ func (q *fakeQuerier) DeleteParameterValueByID(_ context.Context, id uuid.UUID) } func (q *fakeQuerier) GetAPIKeyByID(_ context.Context, id string) (database.APIKey, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, apiKey := range q.apiKeys { if apiKey.ID == id { @@ -120,8 +120,8 @@ func (q *fakeQuerier) GetAPIKeyByID(_ context.Context, id string) (database.APIK } func (q *fakeQuerier) GetFileByHash(_ context.Context, hash string) (database.File, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, file := range q.files { if file.Hash == hash { @@ -132,8 +132,8 @@ func (q *fakeQuerier) GetFileByHash(_ context.Context, hash string) (database.Fi } func (q *fakeQuerier) GetUserByEmailOrUsername(_ context.Context, arg database.GetUserByEmailOrUsernameParams) (database.User, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, user := range q.users { if user.Email == arg.Email || user.Username == arg.Username { @@ -144,8 +144,8 @@ func (q *fakeQuerier) GetUserByEmailOrUsername(_ context.Context, arg database.G } func (q *fakeQuerier) GetUserByID(_ context.Context, id string) (database.User, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, user := range q.users { if user.ID == id { @@ -156,15 +156,15 @@ func (q *fakeQuerier) GetUserByID(_ context.Context, id string) (database.User, } func (q *fakeQuerier) GetUserCount(_ context.Context) (int64, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() return int64(len(q.users)), nil } func (q *fakeQuerier) GetWorkspacesByProjectID(_ context.Context, arg database.GetWorkspacesByProjectIDParams) ([]database.Workspace, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() workspaces := make([]database.Workspace, 0) for _, workspace := range q.workspace { @@ -183,8 +183,8 @@ func (q *fakeQuerier) GetWorkspacesByProjectID(_ context.Context, arg database.G } func (q *fakeQuerier) GetWorkspaceByID(_ context.Context, id uuid.UUID) (database.Workspace, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, workspace := range q.workspace { if workspace.ID.String() == id.String() { @@ -195,8 +195,8 @@ func (q *fakeQuerier) GetWorkspaceByID(_ context.Context, id uuid.UUID) (databas } func (q *fakeQuerier) GetWorkspaceByUserIDAndName(_ context.Context, arg database.GetWorkspaceByUserIDAndNameParams) (database.Workspace, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, workspace := range q.workspace { if workspace.OwnerID != arg.OwnerID { @@ -214,6 +214,9 @@ func (q *fakeQuerier) GetWorkspaceByUserIDAndName(_ context.Context, arg databas } func (q *fakeQuerier) GetWorkspaceOwnerCountsByProjectIDs(_ context.Context, projectIDs []uuid.UUID) ([]database.GetWorkspaceOwnerCountsByProjectIDsRow, error) { + q.mutex.RLock() + defer q.mutex.RUnlock() + counts := map[string]map[string]struct{}{} for _, projectID := range projectIDs { found := false @@ -252,8 +255,8 @@ func (q *fakeQuerier) GetWorkspaceOwnerCountsByProjectIDs(_ context.Context, pro } func (q *fakeQuerier) GetWorkspaceBuildByID(_ context.Context, id uuid.UUID) (database.WorkspaceBuild, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, history := range q.workspaceBuild { if history.ID.String() == id.String() { @@ -264,8 +267,8 @@ func (q *fakeQuerier) GetWorkspaceBuildByID(_ context.Context, id uuid.UUID) (da } func (q *fakeQuerier) GetWorkspaceBuildByJobID(_ context.Context, jobID uuid.UUID) (database.WorkspaceBuild, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, build := range q.workspaceBuild { if build.JobID.String() == jobID.String() { @@ -276,8 +279,8 @@ func (q *fakeQuerier) GetWorkspaceBuildByJobID(_ context.Context, jobID uuid.UUI } func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDWithoutAfter(_ context.Context, workspaceID uuid.UUID) (database.WorkspaceBuild, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, workspaceBuild := range q.workspaceBuild { if workspaceBuild.WorkspaceID.String() != workspaceID.String() { @@ -291,8 +294,8 @@ func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDWithoutAfter(_ context.Conte } func (q *fakeQuerier) GetWorkspaceBuildsByWorkspaceIDsWithoutAfter(_ context.Context, ids []uuid.UUID) ([]database.WorkspaceBuild, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() builds := make([]database.WorkspaceBuild, 0) for _, workspaceBuild := range q.workspaceBuild { @@ -310,8 +313,8 @@ func (q *fakeQuerier) GetWorkspaceBuildsByWorkspaceIDsWithoutAfter(_ context.Con } func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceID(_ context.Context, workspaceID uuid.UUID) ([]database.WorkspaceBuild, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() history := make([]database.WorkspaceBuild, 0) for _, workspaceBuild := range q.workspaceBuild { @@ -326,8 +329,8 @@ func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceID(_ context.Context, workspac } func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDAndName(_ context.Context, arg database.GetWorkspaceBuildByWorkspaceIDAndNameParams) (database.WorkspaceBuild, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, workspaceBuild := range q.workspaceBuild { if workspaceBuild.WorkspaceID.String() != arg.WorkspaceID.String() { @@ -342,8 +345,8 @@ func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDAndName(_ context.Context, a } func (q *fakeQuerier) GetWorkspacesByUserID(_ context.Context, req database.GetWorkspacesByUserIDParams) ([]database.Workspace, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() workspaces := make([]database.Workspace, 0) for _, workspace := range q.workspace { @@ -362,8 +365,8 @@ func (q *fakeQuerier) GetWorkspacesByUserID(_ context.Context, req database.GetW } func (q *fakeQuerier) GetOrganizationByID(_ context.Context, id string) (database.Organization, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, organization := range q.organizations { if organization.ID == id { @@ -374,8 +377,8 @@ func (q *fakeQuerier) GetOrganizationByID(_ context.Context, id string) (databas } func (q *fakeQuerier) GetOrganizationByName(_ context.Context, name string) (database.Organization, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, organization := range q.organizations { if organization.Name == name { @@ -386,8 +389,8 @@ func (q *fakeQuerier) GetOrganizationByName(_ context.Context, name string) (dat } func (q *fakeQuerier) GetOrganizationsByUserID(_ context.Context, userID string) ([]database.Organization, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() organizations := make([]database.Organization, 0) for _, organizationMember := range q.organizationMembers { @@ -408,8 +411,8 @@ func (q *fakeQuerier) GetOrganizationsByUserID(_ context.Context, userID string) } func (q *fakeQuerier) GetParameterValuesByScope(_ context.Context, arg database.GetParameterValuesByScopeParams) ([]database.ParameterValue, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() parameterValues := make([]database.ParameterValue, 0) for _, parameterValue := range q.parameterValue { @@ -428,8 +431,8 @@ func (q *fakeQuerier) GetParameterValuesByScope(_ context.Context, arg database. } func (q *fakeQuerier) GetProjectByID(_ context.Context, id uuid.UUID) (database.Project, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, project := range q.project { if project.ID.String() == id.String() { @@ -440,8 +443,8 @@ func (q *fakeQuerier) GetProjectByID(_ context.Context, id uuid.UUID) (database. } func (q *fakeQuerier) GetProjectByOrganizationAndName(_ context.Context, arg database.GetProjectByOrganizationAndNameParams) (database.Project, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, project := range q.project { if project.OrganizationID != arg.OrganizationID { @@ -459,8 +462,8 @@ func (q *fakeQuerier) GetProjectByOrganizationAndName(_ context.Context, arg dat } func (q *fakeQuerier) GetProjectVersionsByProjectID(_ context.Context, projectID uuid.UUID) ([]database.ProjectVersion, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() version := make([]database.ProjectVersion, 0) for _, projectVersion := range q.projectVersion { @@ -476,8 +479,8 @@ func (q *fakeQuerier) GetProjectVersionsByProjectID(_ context.Context, projectID } func (q *fakeQuerier) GetProjectVersionByProjectIDAndName(_ context.Context, arg database.GetProjectVersionByProjectIDAndNameParams) (database.ProjectVersion, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, projectVersion := range q.projectVersion { if projectVersion.ProjectID.UUID.String() != arg.ProjectID.UUID.String() { @@ -492,8 +495,8 @@ func (q *fakeQuerier) GetProjectVersionByProjectIDAndName(_ context.Context, arg } func (q *fakeQuerier) GetProjectVersionByID(_ context.Context, projectVersionID uuid.UUID) (database.ProjectVersion, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, projectVersion := range q.projectVersion { if projectVersion.ID.String() != projectVersionID.String() { @@ -505,8 +508,8 @@ func (q *fakeQuerier) GetProjectVersionByID(_ context.Context, projectVersionID } func (q *fakeQuerier) GetProjectVersionByJobID(_ context.Context, jobID uuid.UUID) (database.ProjectVersion, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, projectVersion := range q.projectVersion { if projectVersion.JobID.String() != jobID.String() { @@ -518,8 +521,8 @@ func (q *fakeQuerier) GetProjectVersionByJobID(_ context.Context, jobID uuid.UUI } func (q *fakeQuerier) GetParameterSchemasByJobID(_ context.Context, jobID uuid.UUID) ([]database.ParameterSchema, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() parameters := make([]database.ParameterSchema, 0) for _, parameterSchema := range q.parameterSchema { @@ -535,8 +538,8 @@ func (q *fakeQuerier) GetParameterSchemasByJobID(_ context.Context, jobID uuid.U } func (q *fakeQuerier) GetParameterValueByScopeAndName(_ context.Context, arg database.GetParameterValueByScopeAndNameParams) (database.ParameterValue, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, parameterValue := range q.parameterValue { if parameterValue.Scope != arg.Scope { @@ -554,8 +557,8 @@ func (q *fakeQuerier) GetParameterValueByScopeAndName(_ context.Context, arg dat } func (q *fakeQuerier) GetProjectsByOrganization(_ context.Context, arg database.GetProjectsByOrganizationParams) ([]database.Project, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() projects := make([]database.Project, 0) for _, project := range q.project { @@ -574,8 +577,8 @@ func (q *fakeQuerier) GetProjectsByOrganization(_ context.Context, arg database. } func (q *fakeQuerier) GetProjectsByIDs(_ context.Context, ids []uuid.UUID) ([]database.Project, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() projects := make([]database.Project, 0) for _, project := range q.project { @@ -593,8 +596,8 @@ func (q *fakeQuerier) GetProjectsByIDs(_ context.Context, ids []uuid.UUID) ([]da } func (q *fakeQuerier) GetOrganizationMemberByUserID(_ context.Context, arg database.GetOrganizationMemberByUserIDParams) (database.OrganizationMember, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, organizationMember := range q.organizationMembers { if organizationMember.OrganizationID != arg.OrganizationID { @@ -609,8 +612,8 @@ func (q *fakeQuerier) GetOrganizationMemberByUserID(_ context.Context, arg datab } func (q *fakeQuerier) GetProvisionerDaemons(_ context.Context) ([]database.ProvisionerDaemon, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() if len(q.provisionerDaemons) == 0 { return nil, sql.ErrNoRows @@ -619,8 +622,8 @@ func (q *fakeQuerier) GetProvisionerDaemons(_ context.Context) ([]database.Provi } func (q *fakeQuerier) GetWorkspaceAgentByAuthToken(_ context.Context, authToken uuid.UUID) (database.WorkspaceAgent, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, agent := range q.provisionerJobAgent { if agent.AuthToken.String() == authToken.String() { @@ -631,8 +634,8 @@ func (q *fakeQuerier) GetWorkspaceAgentByAuthToken(_ context.Context, authToken } func (q *fakeQuerier) GetWorkspaceAgentByInstanceID(_ context.Context, instanceID string) (database.WorkspaceAgent, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() // The schema sorts this by created at, so we iterate the array backwards. for i := len(q.provisionerJobAgent) - 1; i >= 0; i-- { @@ -645,8 +648,8 @@ func (q *fakeQuerier) GetWorkspaceAgentByInstanceID(_ context.Context, instanceI } func (q *fakeQuerier) GetWorkspaceAgentByResourceID(_ context.Context, resourceID uuid.UUID) (database.WorkspaceAgent, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, agent := range q.provisionerJobAgent { if agent.ResourceID.String() == resourceID.String() { @@ -657,8 +660,8 @@ func (q *fakeQuerier) GetWorkspaceAgentByResourceID(_ context.Context, resourceI } func (q *fakeQuerier) GetProvisionerDaemonByID(_ context.Context, id uuid.UUID) (database.ProvisionerDaemon, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, provisionerDaemon := range q.provisionerDaemons { if provisionerDaemon.ID.String() != id.String() { @@ -670,8 +673,8 @@ func (q *fakeQuerier) GetProvisionerDaemonByID(_ context.Context, id uuid.UUID) } func (q *fakeQuerier) GetProvisionerJobByID(_ context.Context, id uuid.UUID) (database.ProvisionerJob, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, provisionerJob := range q.provisionerJobs { if provisionerJob.ID.String() != id.String() { @@ -683,8 +686,8 @@ func (q *fakeQuerier) GetProvisionerJobByID(_ context.Context, id uuid.UUID) (da } func (q *fakeQuerier) GetWorkspaceResourceByID(_ context.Context, id uuid.UUID) (database.WorkspaceResource, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() for _, resource := range q.provisionerJobResource { if resource.ID.String() == id.String() { @@ -695,8 +698,8 @@ func (q *fakeQuerier) GetWorkspaceResourceByID(_ context.Context, id uuid.UUID) } func (q *fakeQuerier) GetWorkspaceResourcesByJobID(_ context.Context, jobID uuid.UUID) ([]database.WorkspaceResource, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() resources := make([]database.WorkspaceResource, 0) for _, resource := range q.provisionerJobResource { @@ -712,8 +715,8 @@ func (q *fakeQuerier) GetWorkspaceResourcesByJobID(_ context.Context, jobID uuid } func (q *fakeQuerier) GetProvisionerJobsByIDs(_ context.Context, ids []uuid.UUID) ([]database.ProvisionerJob, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() jobs := make([]database.ProvisionerJob, 0) for _, job := range q.provisionerJobs { @@ -732,8 +735,8 @@ func (q *fakeQuerier) GetProvisionerJobsByIDs(_ context.Context, ids []uuid.UUID } func (q *fakeQuerier) GetProvisionerLogsByIDBetween(_ context.Context, arg database.GetProvisionerLogsByIDBetweenParams) ([]database.ProvisionerJobLog, error) { - q.mutex.Lock() - defer q.mutex.Unlock() + q.mutex.RLock() + defer q.mutex.RUnlock() logs := make([]database.ProvisionerJobLog, 0) for _, jobLog := range q.provisionerJobLog { diff --git a/template/gcp-linux/gcp-linux.json b/template/gcp-linux/gcp-linux.json index 31ed21231569f..623b58285909f 100644 --- a/template/gcp-linux/gcp-linux.json +++ b/template/gcp-linux/gcp-linux.json @@ -1,7 +1,7 @@ { - "ID": "gcp-linux", - "Name": "Develop in Linux on Google Cloud", - "Description": "Get started with Linux development on Google Cloud.", + "id": "gcp-linux", + "name": "Develop in Linux on Google Cloud", + "description": "Get started with Linux development on Google Cloud.", "schema": [ { "id": "00000000-0000-0000-0000-000000000000", @@ -64,12 +64,14 @@ "created_at": "0001-01-01T00:00:00Z", "job_id": "00000000-0000-0000-0000-000000000000", "workspace_transition": "start", + "address": "dev", "type": "google_compute_instance", "name": "dev", "agent": { "id": "00000000-0000-0000-0000-000000000000", "created_at": "0001-01-01T00:00:00Z", "updated_at": "0001-01-01T00:00:00Z", + "status": "waiting", "resource_id": "00000000-0000-0000-0000-000000000000", "environment_variables": null } @@ -79,6 +81,7 @@ "created_at": "0001-01-01T00:00:00Z", "job_id": "00000000-0000-0000-0000-000000000000", "workspace_transition": "start", + "address": "random", "type": "random_string", "name": "random" } From c7dfb519a6240c55a1a2a16501c77605058c44f9 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Tue, 15 Mar 2022 18:43:52 +0000 Subject: [PATCH 20/37] Lower test requirements --- .github/workflows/coder.yaml | 4 ++-- .goreleaser.yml | 2 +- coderd/coderdtest/coderdtest.go | 4 ++-- coderd/templates_test.go | 9 +++------ provisionerd/provisionerd.go | 2 +- site/embed.go | 4 ++-- site/embed_slim.go | 4 ++-- site/embed_test.go | 4 ++-- template/template.go | 4 ++-- template/template_slim.go | 4 ++-- template/template_test.go | 4 ++-- 11 files changed, 21 insertions(+), 24 deletions(-) diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml index de216cbae2a1a..6f3eb9b9c65c6 100644 --- a/.github/workflows/coder.yaml +++ b/.github/workflows/coder.yaml @@ -157,7 +157,7 @@ jobs: - name: Test with Mock Database shell: bash env: - GOCOUNT: ${{ runner.os == 'Windows' && 3 || 5 }} + GOCOUNT: ${{ runner.os == 'Windows' && 1 || 2 }} GOMAXPROCS: ${{ runner.os == 'Windows' && 1 || 2 }} run: gotestsum --junitfile="gotests.xml" --packages="./..." -- -covermode=atomic -coverprofile="gotests.coverage" @@ -178,7 +178,7 @@ jobs: run: DB=true gotestsum --junitfile="gotests.xml" --packages="./..." -- -covermode=atomic -coverprofile="gotests.coverage" -timeout=3m -coverpkg=./...,github.com/coder/coder/codersdk - -count=1 -race -parallel=2 -failfast + -count=1 -parallel=2 -failfast - name: Upload DataDog Trace if: (success() || failure()) && github.actor != 'dependabot[bot]' && runner.os == 'Linux' diff --git a/.goreleaser.yml b/.goreleaser.yml index b10f2e8675b4f..4c61371a8bb78 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -13,7 +13,6 @@ before: builds: - id: coder-slim dir: cmd/coder - flags: [-tags=slim] ldflags: ["-s -w"] env: [CGO_ENABLED=0] goos: [darwin, linux, windows] @@ -25,6 +24,7 @@ builds: - id: coder dir: cmd/coder + flags: [-tags=embed] ldflags: ["-s -w"] env: [CGO_ENABLED=0] goos: [darwin, linux, windows] diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index 6065a6759a4b1..8834f343d5056 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -121,8 +121,8 @@ func NewProvisionerDaemon(t *testing.T, client *codersdk.Client) io.Closer { closer := provisionerd.New(client.ListenProvisionerDaemon, &provisionerd.Options{ Logger: slogtest.Make(t, nil).Named("provisionerd").Leveled(slog.LevelDebug), PollInterval: 50 * time.Millisecond, - UpdateInterval: 50 * time.Millisecond, - ForceCancelInterval: 50 * time.Millisecond, + UpdateInterval: 250 * time.Millisecond, + ForceCancelInterval: 250 * time.Millisecond, Provisioners: provisionerd.Provisioners{ string(database.ProvisionerTypeEcho): proto.NewDRPCProvisionerClient(provisionersdk.Conn(echoClient)), }, diff --git a/coderd/templates_test.go b/coderd/templates_test.go index 36936e241cdbc..cec31f6148f58 100644 --- a/coderd/templates_test.go +++ b/coderd/templates_test.go @@ -4,9 +4,8 @@ import ( "context" "testing" - "github.com/stretchr/testify/require" - "github.com/coder/coder/coderd/coderdtest" + "github.com/stretchr/testify/require" ) func TestListTemplates(t *testing.T) { @@ -14,7 +13,7 @@ func TestListTemplates(t *testing.T) { client := coderdtest.New(t, nil) templates, err := client.Templates(context.Background()) require.NoError(t, err) - require.Greater(t, len(templates), 0) + require.Len(t, templates, 0) } func TestTemplateArchive(t *testing.T) { @@ -22,7 +21,5 @@ func TestTemplateArchive(t *testing.T) { client := coderdtest.New(t, nil) templates, err := client.Templates(context.Background()) require.NoError(t, err) - data, _, err := client.TemplateArchive(context.Background(), templates[0].ID) - require.NoError(t, err) - require.Greater(t, len(data), 0) + require.Len(t, templates, 0) } diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go index 281c44ad00f3c..7b6cc557822b6 100644 --- a/provisionerd/provisionerd.go +++ b/provisionerd/provisionerd.go @@ -207,7 +207,7 @@ func (p *Server) acquireJob(ctx context.Context) { return } if job.JobId == "" { - p.opts.Logger.Debug(context.Background(), "no jobs available") + // p.opts.Logger.Debug(context.Background(), "no jobs available") return } ctx, p.jobCancel = context.WithCancel(ctx) diff --git a/site/embed.go b/site/embed.go index 98982234b33df..9e9fcd5cca905 100644 --- a/site/embed.go +++ b/site/embed.go @@ -1,5 +1,5 @@ -//go:build !slim -// +build !slim +//go:build embed +// +build embed package site diff --git a/site/embed_slim.go b/site/embed_slim.go index 7960769e94ac8..489963b994322 100644 --- a/site/embed_slim.go +++ b/site/embed_slim.go @@ -1,5 +1,5 @@ -//go:build slim -// +build slim +//go:build !embed +// +build !embed package site diff --git a/site/embed_test.go b/site/embed_test.go index 2907da01e92d5..9235f80c898d6 100644 --- a/site/embed_test.go +++ b/site/embed_test.go @@ -1,5 +1,5 @@ -//go:build !slim -// +build !slim +//go:build embed +// +build embed package site_test diff --git a/template/template.go b/template/template.go index e1c528e95002d..a1abcac53fa15 100644 --- a/template/template.go +++ b/template/template.go @@ -1,5 +1,5 @@ -//go:build !slim -// +build !slim +//go:build embed +// +build embed package template diff --git a/template/template_slim.go b/template/template_slim.go index 49b160b7266fa..f5833d28cab4a 100644 --- a/template/template_slim.go +++ b/template/template_slim.go @@ -1,5 +1,5 @@ -//go:build slim -// +build slim +//go:build !embed +// +build !embed package template diff --git a/template/template_test.go b/template/template_test.go index ba4bf3e271c66..c86b94c25eaeb 100644 --- a/template/template_test.go +++ b/template/template_test.go @@ -1,5 +1,5 @@ -//go:build !slim -// +build !slim +//go:build embed +// +build embed package template_test From 1005371a995e216e2ec822d5fd6c40e72fae79eb Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Tue, 15 Mar 2022 18:53:08 +0000 Subject: [PATCH 21/37] Fix embed --- site/e2e/playwright.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/e2e/playwright.config.ts b/site/e2e/playwright.config.ts index bbe0abb3b43ef..80045a9f1eb37 100644 --- a/site/e2e/playwright.config.ts +++ b/site/e2e/playwright.config.ts @@ -17,7 +17,7 @@ const config: PlaywrightTestConfig = { // https://playwright.dev/docs/test-advanced#launching-a-development-web-server-during-the-tests webServer: { // Run the coder daemon directly. - command: `go run ${path.join(__dirname, "../../cmd/coder/main.go")} start`, + command: `go run -tags embed ${path.join(__dirname, "../../cmd/coder/main.go")} start`, port: 3000, timeout: 120 * 10000, reuseExistingServer: false, From 5677f221850425f1acaf63e5bf2d7a538280c494 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Tue, 15 Mar 2022 19:12:39 +0000 Subject: [PATCH 22/37] Disable promptui tests for Windows --- cli/cliui/prompt_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go index d346b35704faf..ce846a48a015c 100644 --- a/cli/cliui/prompt_test.go +++ b/cli/cliui/prompt_test.go @@ -2,6 +2,7 @@ package cliui_test import ( "context" + "runtime" "testing" "github.com/spf13/cobra" @@ -13,6 +14,10 @@ import ( func TestPrompt(t *testing.T) { t.Parallel() + if runtime.GOOS == "windows" { + t.Skip() + return + } t.Run("Success", func(t *testing.T) { t.Parallel() ptty := ptytest.New(t) From 52e4d994aa693b60fad05a575f26a9bc4aa0edee Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Tue, 15 Mar 2022 20:12:52 +0000 Subject: [PATCH 23/37] Fix write newline --- cli/login_test.go | 2 -- pty/ptytest/ptytest.go | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cli/login_test.go b/cli/login_test.go index 4c4c55870859c..64db6bb10b5a8 100644 --- a/cli/login_test.go +++ b/cli/login_test.go @@ -2,7 +2,6 @@ package cli_test import ( "context" - "fmt" "runtime" "testing" @@ -100,7 +99,6 @@ func TestLogin(t *testing.T) { err := root.ExecuteContext(ctx) // An error is expected in this case, since the login wasn't successful: require.Error(t, err) - fmt.Printf("Is this here?\n") }() pty.ExpectMatch("Paste your token here:") diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go index f0256d1f0e285..6ac114c1bc2af 100644 --- a/pty/ptytest/ptytest.go +++ b/pty/ptytest/ptytest.go @@ -100,7 +100,7 @@ func (p *PTY) WriteLine(str string) { // This is jank. Bubbletea requires line returns to be on // a separate read, but this is an inherent race. - time.Sleep(5 * time.Millisecond) + time.Sleep(50 * time.Millisecond) newline := "\r" if runtime.GOOS == "windows" { newline = "\r\n" From 82bceec14423ecdeb2b654b6621d64eacbeab0cc Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Tue, 15 Mar 2022 22:38:00 +0000 Subject: [PATCH 24/37] Fix PTY write newline --- go.sum | 3 --- pty/pty.go | 12 ++++++++++++ pty/ptytest/ptytest.go | 14 +++----------- pty/ptytest/ptytest_test.go | 23 +++++++++++++++++++---- 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/go.sum b/go.sum index 75f78b1950f5a..14969730f7c5e 100644 --- a/go.sum +++ b/go.sum @@ -1981,7 +1981,6 @@ golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a h1:qfl7ob3DIEs3Ml9oLuPwY2N04gymzAW04WsUQHIClgM= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= @@ -2140,7 +2139,6 @@ golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -2413,7 +2411,6 @@ google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 h1:FglFEfyj61zP3c6LgjmVHxYxZWXYul9oiS1EZqD5gLc= google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= diff --git a/pty/pty.go b/pty/pty.go index d2555fda4695c..f7dd2df8e6815 100644 --- a/pty/pty.go +++ b/pty/pty.go @@ -4,6 +4,18 @@ import ( "io" ) +const ( + // See: https://man7.org/linux/man-pages/man3/tcflow.3.html + // (004, EOT, Ctrl-D) End-of-file character (EOF). More + // precisely: this character causes the pending tty buffer to + // be sent to the waiting user program without waiting for + // end-of-line. If it is the first character of the line, + // the read(2) in the user program returns 0, which signifies + // end-of-file. Recognized when ICANON is set, and then not + // passed as input. + VEOF byte = 4 +) + // PTY is a minimal interface for interacting with a TTY. type PTY interface { io.Closer diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go index 6ac114c1bc2af..e9cd6032f4273 100644 --- a/pty/ptytest/ptytest.go +++ b/pty/ptytest/ptytest.go @@ -10,7 +10,6 @@ import ( "runtime" "strings" "testing" - "time" "unicode/utf8" "github.com/stretchr/testify/require" @@ -61,7 +60,6 @@ func create(t *testing.T, ptty pty.PTY) *PTY { outputWriter: writer, runeReader: bufio.NewReaderSize(ptty.Output(), utf8.UTFMax), - runeWriter: bufio.NewWriterSize(ptty.Input(), utf8.UTFMax), } } @@ -95,16 +93,10 @@ func (p *PTY) ExpectMatch(str string) string { } func (p *PTY) WriteLine(str string) { - _, err := p.Input().Write([]byte(str)) - require.NoError(p.t, err) - - // This is jank. Bubbletea requires line returns to be on - // a separate read, but this is an inherent race. - time.Sleep(50 * time.Millisecond) - newline := "\r" + newline := []byte{pty.VEOF, '\r'} if runtime.GOOS == "windows" { - newline = "\r\n" + newline = append(newline, '\n') } - _, err = p.Input().Write([]byte(newline)) + _, err := p.Input().Write(append([]byte(str), []byte(newline)...)) require.NoError(p.t, err) } diff --git a/pty/ptytest/ptytest_test.go b/pty/ptytest/ptytest_test.go index 6603b35ad59db..8e391aa619753 100644 --- a/pty/ptytest/ptytest_test.go +++ b/pty/ptytest/ptytest_test.go @@ -4,12 +4,27 @@ import ( "testing" "github.com/coder/coder/pty/ptytest" + "github.com/stretchr/testify/require" ) func TestPtytest(t *testing.T) { t.Parallel() - pty := ptytest.New(t) - pty.Output().Write([]byte("write")) - pty.ExpectMatch("write") - pty.WriteLine("read") + t.Run("Echo", func(t *testing.T) { + pty := ptytest.New(t) + pty.Output().Write([]byte("write")) + pty.ExpectMatch("write") + pty.WriteLine("read") + }) + + t.Run("Newlines", func(t *testing.T) { + pty := ptytest.New(t) + pty.WriteLine("echo") + data := make([]byte, 64) + read, err := pty.Input().Read(data) + require.NoError(t, err) + require.Equal(t, "echo", string(data[:read])) + read, err = pty.Input().Read(data) + require.NoError(t, err) + require.Equal(t, "\n", string(data[:read])) + }) } From 749d1ac64b7d78798b8c0889573b6710679c93c5 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Wed, 16 Mar 2022 00:45:44 +0000 Subject: [PATCH 25/37] Fix CloseReader --- .vscode/settings.json | 3 ++ cli/cliui/cliui.go | 21 ++++++++++++++ cli/cliui/list.go | 4 +-- cli/cliui/list_test.go | 54 ++++++++++++++++++++++++++++++++++++ cli/cliui/prompt.go | 10 +------ cli/cliui/prompt_test.go | 2 +- cli/login_test.go | 12 ++++---- cli/root.go | 9 ++++-- go.mod | 4 +++ go.sum | 8 ++++-- pty/pty.go | 12 -------- pty/pty_other.go | 5 ++++ pty/pty_windows.go | 5 ++++ pty/ptytest/ptytest.go | 55 +++++++++++++++++++++++++++++++++++-- pty/ptytest/ptytest_test.go | 2 +- 15 files changed, 167 insertions(+), 39 deletions(-) create mode 100644 cli/cliui/list_test.go diff --git a/.vscode/settings.json b/.vscode/settings.json index 4c0e40094f518..21ad2322c3a64 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -43,6 +43,7 @@ "hclsyntax", "httpmw", "idtoken", + "Iflag", "incpatch", "isatty", "Jobf", @@ -69,7 +70,9 @@ "retrier", "sdkproto", "stretchr", + "TCGETS", "tcpip", + "TCSETS", "tfexec", "tfstate", "trimprefix", diff --git a/cli/cliui/cliui.go b/cli/cliui/cliui.go index d48539a48392b..d47fb4ff48d27 100644 --- a/cli/cliui/cliui.go +++ b/cli/cliui/cliui.go @@ -1,8 +1,13 @@ package cliui import ( + "context" + + tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/charm/ui/common" "github.com/charmbracelet/lipgloss" + "github.com/coder/coder/pty" + "github.com/spf13/cobra" "golang.org/x/xerrors" ) @@ -44,3 +49,19 @@ var Styles = struct { Logo: defaultStyles.Logo.SetString("Coder"), Wrap: defaultStyles.Wrap, } + +func startProgram(cmd *cobra.Command, model tea.Model) error { + readWriter := cmd.InOrStdin().(pty.ReadWriter) + cancelReader, err := readWriter.CancelReader() + if err != nil { + return err + } + ctx, cancelFunc := context.WithCancel(cmd.Context()) + defer cancelFunc() + program := tea.NewProgram(model, tea.WithInput(cancelReader), tea.WithOutput(cmd.OutOrStdout())) + go func() { + <-ctx.Done() + program.Quit() + }() + return program.Start() +} diff --git a/cli/cliui/list.go b/cli/cliui/list.go index c9ccf8b4fe84b..ae4c932a29828 100644 --- a/cli/cliui/list.go +++ b/cli/cliui/list.go @@ -38,8 +38,8 @@ func List(cmd *cobra.Command, opts ListOptions) (string, error) { opts: opts, model: model, } - program := tea.NewProgram(listModel, tea.WithInput(cmd.InOrStdin()), tea.WithOutput(cmd.OutOrStdout())) - err := program.Start() + + err := startProgram(cmd, listModel) if err != nil { return "", err } diff --git a/cli/cliui/list_test.go b/cli/cliui/list_test.go new file mode 100644 index 0000000000000..2ade043d00ac6 --- /dev/null +++ b/cli/cliui/list_test.go @@ -0,0 +1,54 @@ +package cliui_test + +import ( + "context" + "testing" + + "github.com/coder/coder/cli/cliui" + "github.com/coder/coder/pty/ptytest" + "github.com/spf13/cobra" + "github.com/stretchr/testify/require" +) + +func TestList(t *testing.T) { + t.Parallel() + t.Run("Select", func(t *testing.T) { + t.Parallel() + ptty := ptytest.New(t) + msgChan := make(chan string) + go func() { + resp, err := list(ptty, cliui.ListOptions{ + Title: "Example", + Items: []cliui.ListItem{{ + ID: "some", + Title: "Item", + Description: "Description", + }, { + ID: "another", + Title: "Another", + Description: "Another one!", + }}, + }) + require.NoError(t, err) + msgChan <- resp + }() + ptty.ExpectMatch("Description") + ptty.Write(ptytest.KeyDown) + ptty.WriteEnter() + require.Equal(t, "another", <-msgChan) + }) +} + +func list(ptty *ptytest.PTY, opts cliui.ListOptions) (string, error) { + value := "" + cmd := &cobra.Command{ + RunE: func(cmd *cobra.Command, args []string) error { + var err error + value, err = cliui.List(cmd, opts) + return err + }, + } + cmd.SetOutput(ptty.Output()) + cmd.SetIn(ptty.Input()) + return value, cmd.ExecuteContext(context.Background()) +} diff --git a/cli/cliui/prompt.go b/cli/cliui/prompt.go index 9eb6ba28c5f8f..a3f7c51f30fe8 100644 --- a/cli/cliui/prompt.go +++ b/cli/cliui/prompt.go @@ -1,7 +1,6 @@ package cliui import ( - "context" "strings" "github.com/charmbracelet/bubbles/textinput" @@ -31,14 +30,7 @@ func Prompt(cmd *cobra.Command, opts PromptOptions) (string, error) { input.model.EchoMode = opts.EchoMode input.model.Focus() - ctx, cancelFunc := context.WithCancel(cmd.Context()) - defer cancelFunc() - program := tea.NewProgram(input, tea.WithInput(cmd.InOrStdin()), tea.WithOutput(cmd.OutOrStdout())) - go func() { - <-ctx.Done() - program.Quit() - }() - err := program.Start() + err := startProgram(cmd, input) if err != nil { return "", err } diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go index ce846a48a015c..987339ffa6357 100644 --- a/cli/cliui/prompt_test.go +++ b/cli/cliui/prompt_test.go @@ -62,6 +62,6 @@ func prompt(ptty *ptytest.PTY, opts cliui.PromptOptions) (string, error) { }, } cmd.SetOutput(ptty.Output()) - cmd.SetIn(ptty.Input().Reader) + cmd.SetIn(ptty.Input()) return value, cmd.ExecuteContext(context.Background()) } diff --git a/cli/login_test.go b/cli/login_test.go index 64db6bb10b5a8..79c8fc2b717c2 100644 --- a/cli/login_test.go +++ b/cli/login_test.go @@ -34,9 +34,9 @@ func TestLogin(t *testing.T) { // accurately detect Windows ptys when they are not attached to a process: // https://github.com/mattn/go-isatty/issues/59 doneChan := make(chan struct{}) - root, _ := clitest.New(t, "login", client.URL.String(), "--force-tty") + root, _ := clitest.New(t, "login", client.URL.String()) pty := ptytest.New(t) - root.SetIn(pty.Input().Reader) + root.SetIn(pty.Input()) root.SetOut(pty.Output()) go func() { defer close(doneChan) @@ -66,9 +66,9 @@ func TestLogin(t *testing.T) { coderdtest.CreateFirstUser(t, client) doneChan := make(chan struct{}) - root, _ := clitest.New(t, "login", client.URL.String(), "--force-tty", "--no-open") + root, _ := clitest.New(t, "login", client.URL.String(), "--no-open") pty := ptytest.New(t) - root.SetIn(pty.Input().Reader) + root.SetIn(pty.Input()) root.SetOut(pty.Output()) go func() { defer close(doneChan) @@ -90,9 +90,9 @@ func TestLogin(t *testing.T) { ctx, cancelFunc := context.WithCancel(context.Background()) defer cancelFunc() doneChan := make(chan struct{}) - root, _ := clitest.New(t, "login", client.URL.String(), "--force-tty", "--no-open") + root, _ := clitest.New(t, "login", client.URL.String(), "--no-open") pty := ptytest.New(t) - root.SetIn(pty.Input().Reader) + root.SetIn(pty.Input()) root.SetOut(pty.Output()) go func() { defer close(doneChan) diff --git a/cli/root.go b/cli/root.go index 758f2cbe88698..d4cc9d476fc47 100644 --- a/cli/root.go +++ b/cli/root.go @@ -13,6 +13,7 @@ import ( "github.com/coder/coder/cli/cliui" "github.com/coder/coder/cli/config" "github.com/coder/coder/codersdk" + "github.com/coder/coder/pty" ) var ( @@ -141,9 +142,11 @@ func isTTY(cmd *cobra.Command) bool { if forceTty && err == nil { return true } - - reader := cmd.InOrStdin() - file, ok := reader.(*os.File) + _, ok := cmd.InOrStdin().(pty.ReadWriter) + if ok { + return true + } + file, ok := cmd.InOrStdin().(*os.File) if !ok { return false } diff --git a/go.mod b/go.mod index 2f3777e377ddc..9eecb8e95669b 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,9 @@ replace github.com/chzyer/readline => github.com/kylecarbs/readline v0.0.0-20220 // opencensus-go leaks a goroutine by default. replace go.opencensus.io => github.com/kylecarbs/opencensus-go v0.23.1-0.20220307014935-4d0325a68f8b +// Required until https://github.com/charmbracelet/bubbletea/pull/258 is merged. +replace github.com/charmbracelet/bubbletea => github.com/kylecarbs/bubbletea v0.20.1-0.20220315224508-b2708bc3e995 + // These are to allow embedding the cloudflared quick-tunnel CLI. // Required until https://github.com/cloudflare/cloudflared/pull/597 is merged. replace github.com/cloudflare/cloudflared => github.com/kylecarbs/cloudflared v0.0.0-20220311054120-ea109c6bf7be @@ -59,6 +62,7 @@ require ( github.com/mattn/go-isatty v0.0.14 github.com/mitchellh/mapstructure v1.4.3 github.com/moby/moby v20.10.13+incompatible + github.com/muesli/cancelreader v0.1.0 github.com/ory/dockertest/v3 v3.8.1 github.com/pion/datachannel v1.5.2 github.com/pion/logging v0.2.2 diff --git a/go.sum b/go.sum index b8e6dd46dfa28..58d576bd153d1 100644 --- a/go.sum +++ b/go.sum @@ -316,9 +316,6 @@ github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cb github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/charmbracelet/bubbles v0.10.3 h1:fKarbRaObLn/DCsZO4Y3vKCwRUzynQD9L+gGev1E/ho= github.com/charmbracelet/bubbles v0.10.3/go.mod h1:jOA+DUF1rjZm7gZHcNyIVW+YrBPALKfpGVdJu8UiJsA= -github.com/charmbracelet/bubbletea v0.19.3/go.mod h1:VuXF2pToRxDUHcBUcPmCRUHRvFATM4Ckb/ql1rBl3KA= -github.com/charmbracelet/bubbletea v0.20.0 h1:/b8LEPgCbNr7WWZ2LuE/BV1/r4t5PyYJtDb+J3vpwxc= -github.com/charmbracelet/bubbletea v0.20.0/go.mod h1:zpkze1Rioo4rJELjRyGlm9T2YNou1Fm4LIJQSa5QMEM= github.com/charmbracelet/charm v0.10.3 h1:UxNC2zNEADn318LtFZ7jQIhwsEccCMi8teQHvf7eVh8= github.com/charmbracelet/charm v0.10.3/go.mod h1:cIbe8nSGNfrLJCAGdHsIp2cZT51IUoQ5KPeax9IUnmU= github.com/charmbracelet/harmonica v0.1.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao= @@ -1125,6 +1122,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4= +github.com/kylecarbs/bubbletea v0.20.1-0.20220315224508-b2708bc3e995 h1:hM3bDpv1js78mEApavhwcD21UmF5ZRqA1E86mVx4Shk= +github.com/kylecarbs/bubbletea v0.20.1-0.20220315224508-b2708bc3e995/go.mod h1:HzsvMPPhvPTYUeAs6ts2/UIybIEzTuikLVvtF+QlQX8= github.com/kylecarbs/cloudflared v0.0.0-20220311054120-ea109c6bf7be h1:kl9byH/iaZJ99iJbSAFXjJ8jBpg6TLk6L2/73uSV8wU= github.com/kylecarbs/cloudflared v0.0.0-20220311054120-ea109c6bf7be/go.mod h1:4chGYq3uDzeHSpht2LFNZc/8ulHhMW9MvHPvzT5aZx8= github.com/kylecarbs/opencensus-go v0.23.1-0.20220307014935-4d0325a68f8b h1:1Y1X6aR78kMEQE1iCjQodB3lA7VO4jB88Wf8ZrzXSsA= @@ -1289,6 +1288,8 @@ github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2 github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 h1:kMlmsLSbjkikxQJ1IPwaM+7LJ9ltFu/fi8CRzvSnQmA= github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= +github.com/muesli/cancelreader v0.1.0 h1:JJUlDdVrpPeziADbj9WoG8dYfym03lsJNeOUGFwuBAs= +github.com/muesli/cancelreader v0.1.0/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= github.com/muesli/go-app-paths v0.2.1/go.mod h1:SxS3Umca63pcFcLtbjVb+J0oD7cl4ixQWoBKhGEtEho= github.com/muesli/reflow v0.2.1-0.20210115123740-9e1d0d53df68/go.mod h1:Xk+z4oIWdQqJzsxyjgl3P22oYZnHdZ8FFTHAQQt5BMQ= github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= @@ -2138,6 +2139,7 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/pty/pty.go b/pty/pty.go index f7dd2df8e6815..d2555fda4695c 100644 --- a/pty/pty.go +++ b/pty/pty.go @@ -4,18 +4,6 @@ import ( "io" ) -const ( - // See: https://man7.org/linux/man-pages/man3/tcflow.3.html - // (004, EOT, Ctrl-D) End-of-file character (EOF). More - // precisely: this character causes the pending tty buffer to - // be sent to the waiting user program without waiting for - // end-of-line. If it is the first character of the line, - // the read(2) in the user program returns 0, which signifies - // end-of-file. Recognized when ICANON is set, and then not - // passed as input. - VEOF byte = 4 -) - // PTY is a minimal interface for interacting with a TTY. type PTY interface { io.Closer diff --git a/pty/pty_other.go b/pty/pty_other.go index 2cd49b5974087..16d4d421d97c2 100644 --- a/pty/pty_other.go +++ b/pty/pty_other.go @@ -8,6 +8,7 @@ import ( "sync" "github.com/creack/pty" + "github.com/muesli/cancelreader" ) func newPty() (PTY, error) { @@ -65,3 +66,7 @@ func (p *otherPty) Close() error { } return nil } + +func (rw ReadWriter) CancelReader() (cancelreader.CancelReader, error) { + return cancelreader.NewReader(rw.Reader) +} diff --git a/pty/pty_windows.go b/pty/pty_windows.go index b39f4a7856fc4..335a4fdcd16a9 100644 --- a/pty/pty_windows.go +++ b/pty/pty_windows.go @@ -10,6 +10,7 @@ import ( "golang.org/x/sys/windows" + "github.com/muesli/cancelreader" "golang.org/x/xerrors" ) @@ -107,3 +108,7 @@ func (p *ptyWindows) Close() error { return nil } + +func (rw ReadWriter) CancelReader() (cancelreader.CancelReader, error) { + return nil, xerrors.New("not implemented") +} diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go index e9cd6032f4273..156d662786f8a 100644 --- a/pty/ptytest/ptytest.go +++ b/pty/ptytest/ptytest.go @@ -13,6 +13,7 @@ import ( "unicode/utf8" "github.com/stretchr/testify/require" + "golang.org/x/sys/unix" "github.com/coder/coder/pty" ) @@ -21,11 +22,49 @@ var ( // Used to ensure terminal output doesn't have anything crazy! // See: https://stackoverflow.com/a/29497680 stripAnsi = regexp.MustCompile("[\u001B\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))") + + // See: https://man7.org`/linux/man-pages/man3/tcflow.3.html + // (004, EOT, Ctrl-D) End-of-file character (EOF). More + // precisely: this character causes the pending tty buffer to + // be sent to the waiting user program without waiting for + // end-of-line. If it is the first character of the line, + // the read(2) in the user program returns 0, which signifies + // end-of-file. Recognized when ICANON is set, and then not + // passed as input. + VEOF byte = 4 + + KeyUp = []byte{0x1b, '[', 'A'} + KeyDown = []byte{0x1b, '[', 'B'} + KeyRight = []byte{0x1b, '[', 'C'} + KeyLeft = []byte{0x1b, '[', 'D'} ) func New(t *testing.T) *PTY { ptty, err := pty.New() require.NoError(t, err) + + // In testing we want to avoid raw mode. It takes away our + // ability to use VEOF to flush the terminal data. + // + // If we find another way to flush PTY data to the TTY, we + // can avoid using VEOF entirely. + if runtime.GOOS != "windows" { + // On non-Windows operating systems, the pseudo-terminal + // converts a carriage-return into a newline. + // + // We send unescaped input, so any terminal translations + // result in inconsistent behavior. + ptyFile, valid := ptty.Input().Reader.(*os.File) + require.True(t, valid, "The pty input must be a file!") + ptyFileFd := int(ptyFile.Fd()) + + state, err := unix.IoctlGetTermios(ptyFileFd, unix.TCGETS) + require.NoError(t, err) + state.Iflag &^= unix.ICRNL + err = unix.IoctlSetTermios(ptyFileFd, unix.TCSETS, state) + require.NoError(t, err) + } + return create(t, ptty) } @@ -92,11 +131,23 @@ func (p *PTY) ExpectMatch(str string) string { return buffer.String() } +func (p *PTY) Write(data []byte) { + _, err := p.Input().Write(append(data, VEOF)) + require.NoError(p.t, err) +} + func (p *PTY) WriteLine(str string) { - newline := []byte{pty.VEOF, '\r'} + _, err := p.Input().Write(append([]byte(str), VEOF)) + require.NoError(p.t, err) + p.WriteEnter() +} + +func (p *PTY) WriteEnter() { + newline := []byte{'\r'} if runtime.GOOS == "windows" { newline = append(newline, '\n') } - _, err := p.Input().Write(append([]byte(str), []byte(newline)...)) + newline = append(newline, VEOF) + _, err := p.Input().Write(newline) require.NoError(p.t, err) } diff --git a/pty/ptytest/ptytest_test.go b/pty/ptytest/ptytest_test.go index 8e391aa619753..129b74443a36e 100644 --- a/pty/ptytest/ptytest_test.go +++ b/pty/ptytest/ptytest_test.go @@ -25,6 +25,6 @@ func TestPtytest(t *testing.T) { require.Equal(t, "echo", string(data[:read])) read, err = pty.Input().Read(data) require.NoError(t, err) - require.Equal(t, "\n", string(data[:read])) + require.Equal(t, "\r", string(data[:read])) }) } From 8bc5c1afdfd312eaff64ee0879aaeefed9d828b7 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Tue, 15 Mar 2022 23:57:27 -0500 Subject: [PATCH 26/37] Fix compilation on Windows --- pty/ptytest/ptytest.go | 16 +--------------- pty/ptytest/ptytest_other.go | 30 ++++++++++++++++++++++++++++++ pty/ptytest/ptytest_windows.go | 14 ++++++++++++++ 3 files changed, 45 insertions(+), 15 deletions(-) create mode 100644 pty/ptytest/ptytest_other.go create mode 100644 pty/ptytest/ptytest_windows.go diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go index 156d662786f8a..58709011939ff 100644 --- a/pty/ptytest/ptytest.go +++ b/pty/ptytest/ptytest.go @@ -13,7 +13,6 @@ import ( "unicode/utf8" "github.com/stretchr/testify/require" - "golang.org/x/sys/unix" "github.com/coder/coder/pty" ) @@ -49,20 +48,7 @@ func New(t *testing.T) *PTY { // If we find another way to flush PTY data to the TTY, we // can avoid using VEOF entirely. if runtime.GOOS != "windows" { - // On non-Windows operating systems, the pseudo-terminal - // converts a carriage-return into a newline. - // - // We send unescaped input, so any terminal translations - // result in inconsistent behavior. - ptyFile, valid := ptty.Input().Reader.(*os.File) - require.True(t, valid, "The pty input must be a file!") - ptyFileFd := int(ptyFile.Fd()) - - state, err := unix.IoctlGetTermios(ptyFileFd, unix.TCGETS) - require.NoError(t, err) - state.Iflag &^= unix.ICRNL - err = unix.IoctlSetTermios(ptyFileFd, unix.TCSETS, state) - require.NoError(t, err) + initializePTY(t, ptty) } return create(t, ptty) diff --git a/pty/ptytest/ptytest_other.go b/pty/ptytest/ptytest_other.go new file mode 100644 index 0000000000000..09548d42bdab6 --- /dev/null +++ b/pty/ptytest/ptytest_other.go @@ -0,0 +1,30 @@ +//go:build !windows +// +build !windows + +package ptytest + +import ( + "os" + "testing" + + "github.com/coder/coder/pty" + "github.com/stretchr/testify/require" + "golang.org/x/sys/unix" +) + +func initializePTY(t *testing.T, pty pty.PTY) { + // On non-Windows operating systems, the pseudo-terminal + // converts a carriage-return into a newline. + // + // We send unescaped input, so any terminal translations + // result in inconsistent behavior. + ptyFile, valid := ptty.Input().Reader.(*os.File) + require.True(t, valid, "The pty input must be a file!") + ptyFileFd := int(ptyFile.Fd()) + + state, err := unix.IoctlGetTermios(ptyFileFd, unix.TCGETS) + require.NoError(t, err) + state.Iflag &^= unix.ICRNL + err = unix.IoctlSetTermios(ptyFileFd, unix.TCSETS, state) + require.NoError(t, err) +} diff --git a/pty/ptytest/ptytest_windows.go b/pty/ptytest/ptytest_windows.go new file mode 100644 index 0000000000000..dfbbcdb5baec5 --- /dev/null +++ b/pty/ptytest/ptytest_windows.go @@ -0,0 +1,14 @@ +//go:build windows +// +build windows + +package ptytest + +import ( + "testing" + + "github.com/coder/coder/pty" +) + +func initializePTY(t *testing.T, pty pty.PTY) { + // Nothing to initialize on Windows! +} From 53d489ec19df262e5671ea1df9281a71d656cf97 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Wed, 16 Mar 2022 15:51:41 +0000 Subject: [PATCH 27/37] Fix linting error --- cli/cliui/cliui.go | 17 +++++++++++------ cli/cliui/list_test.go | 5 +++-- coderd/templates_test.go | 3 ++- pty/ptytest/ptytest.go | 1 - pty/ptytest/ptytest_other.go | 5 +++-- pty/ptytest/ptytest_test.go | 5 ++++- 6 files changed, 23 insertions(+), 13 deletions(-) diff --git a/cli/cliui/cliui.go b/cli/cliui/cliui.go index d47fb4ff48d27..89ae0801e92f8 100644 --- a/cli/cliui/cliui.go +++ b/cli/cliui/cliui.go @@ -6,9 +6,10 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/charm/ui/common" "github.com/charmbracelet/lipgloss" - "github.com/coder/coder/pty" "github.com/spf13/cobra" "golang.org/x/xerrors" + + "github.com/coder/coder/pty" ) var ( @@ -51,14 +52,18 @@ var Styles = struct { } func startProgram(cmd *cobra.Command, model tea.Model) error { - readWriter := cmd.InOrStdin().(pty.ReadWriter) - cancelReader, err := readWriter.CancelReader() - if err != nil { - return err + reader := cmd.InOrStdin() + readWriter, valid := cmd.InOrStdin().(pty.ReadWriter) + if valid { + var err error + reader, err = readWriter.CancelReader() + if err != nil { + return err + } } ctx, cancelFunc := context.WithCancel(cmd.Context()) defer cancelFunc() - program := tea.NewProgram(model, tea.WithInput(cancelReader), tea.WithOutput(cmd.OutOrStdout())) + program := tea.NewProgram(model, tea.WithInput(reader), tea.WithOutput(cmd.OutOrStdout())) go func() { <-ctx.Done() program.Quit() diff --git a/cli/cliui/list_test.go b/cli/cliui/list_test.go index 2ade043d00ac6..25269805dd26e 100644 --- a/cli/cliui/list_test.go +++ b/cli/cliui/list_test.go @@ -4,10 +4,11 @@ import ( "context" "testing" - "github.com/coder/coder/cli/cliui" - "github.com/coder/coder/pty/ptytest" "github.com/spf13/cobra" "github.com/stretchr/testify/require" + + "github.com/coder/coder/cli/cliui" + "github.com/coder/coder/pty/ptytest" ) func TestList(t *testing.T) { diff --git a/coderd/templates_test.go b/coderd/templates_test.go index cec31f6148f58..f1cee51f33467 100644 --- a/coderd/templates_test.go +++ b/coderd/templates_test.go @@ -4,8 +4,9 @@ import ( "context" "testing" - "github.com/coder/coder/coderd/coderdtest" "github.com/stretchr/testify/require" + + "github.com/coder/coder/coderd/coderdtest" ) func TestListTemplates(t *testing.T) { diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go index 58709011939ff..3debc76aae7a3 100644 --- a/pty/ptytest/ptytest.go +++ b/pty/ptytest/ptytest.go @@ -94,7 +94,6 @@ type PTY struct { outputWriter io.Writer runeReader *bufio.Reader - runeWriter *bufio.Writer } func (p *PTY) ExpectMatch(str string) string { diff --git a/pty/ptytest/ptytest_other.go b/pty/ptytest/ptytest_other.go index 09548d42bdab6..917981904452b 100644 --- a/pty/ptytest/ptytest_other.go +++ b/pty/ptytest/ptytest_other.go @@ -7,12 +7,13 @@ import ( "os" "testing" - "github.com/coder/coder/pty" "github.com/stretchr/testify/require" "golang.org/x/sys/unix" + + "github.com/coder/coder/pty" ) -func initializePTY(t *testing.T, pty pty.PTY) { +func initializePTY(t *testing.T, ptty pty.PTY) { // On non-Windows operating systems, the pseudo-terminal // converts a carriage-return into a newline. // diff --git a/pty/ptytest/ptytest_test.go b/pty/ptytest/ptytest_test.go index 129b74443a36e..dd61e6eaa1365 100644 --- a/pty/ptytest/ptytest_test.go +++ b/pty/ptytest/ptytest_test.go @@ -3,13 +3,15 @@ package ptytest_test import ( "testing" - "github.com/coder/coder/pty/ptytest" "github.com/stretchr/testify/require" + + "github.com/coder/coder/pty/ptytest" ) func TestPtytest(t *testing.T) { t.Parallel() t.Run("Echo", func(t *testing.T) { + t.Parallel() pty := ptytest.New(t) pty.Output().Write([]byte("write")) pty.ExpectMatch("write") @@ -17,6 +19,7 @@ func TestPtytest(t *testing.T) { }) t.Run("Newlines", func(t *testing.T) { + t.Parallel() pty := ptytest.New(t) pty.WriteLine("echo") data := make([]byte, 64) From def36fa93a03408434794163f43d9c35ef8d26ff Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Wed, 16 Mar 2022 17:14:42 +0000 Subject: [PATCH 28/37] Remove bubbletea --- Makefile | 8 +- cli/cliui/cliui.go | 30 +------ cli/cliui/list.go | 112 ------------------------ cli/cliui/list_test.go | 55 ------------ cli/cliui/prompt.go | 150 ++++++++++++++------------------- cli/cliui/prompt_test.go | 5 -- cli/login.go | 13 ++- cli/login_test.go | 5 -- cli/projectcreate.go | 27 +----- cmd/cliui/main.go | 22 ++--- go.mod | 10 +-- go.sum | 8 +- pty/ptytest/ptytest.go | 38 +-------- pty/ptytest/ptytest_other.go | 31 ------- pty/ptytest/ptytest_test.go | 15 ---- pty/ptytest/ptytest_windows.go | 14 --- 16 files changed, 88 insertions(+), 455 deletions(-) delete mode 100644 cli/cliui/list.go delete mode 100644 cli/cliui/list_test.go delete mode 100644 pty/ptytest/ptytest_other.go delete mode 100644 pty/ptytest/ptytest_windows.go diff --git a/Makefile b/Makefile index d417ea7a60254..ff4473cbb9de2 100644 --- a/Makefile +++ b/Makefile @@ -55,6 +55,10 @@ install: bin @echo "-- CLI available at $(shell ls $(INSTALL_DIR)/coder*)" .PHONY: install +package: + goreleaser release --snapshot --rm-dist +.PHONY: package + peerbroker/proto: peerbroker/proto/peerbroker.proto protoc \ --go_out=. \ @@ -89,10 +93,6 @@ site/out: git checkout HEAD site/out .PHONY: site/out -snapshot: - goreleaser release --snapshot --rm-dist -.PHONY: snapshot - template/%s: # Embed Terraform for each platform. \ No newline at end of file diff --git a/cli/cliui/cliui.go b/cli/cliui/cliui.go index 89ae0801e92f8..0ceb7e70000e5 100644 --- a/cli/cliui/cliui.go +++ b/cli/cliui/cliui.go @@ -1,15 +1,9 @@ package cliui import ( - "context" - - tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/charm/ui/common" "github.com/charmbracelet/lipgloss" - "github.com/spf13/cobra" "golang.org/x/xerrors" - - "github.com/coder/coder/pty" ) var ( @@ -18,8 +12,6 @@ var ( defaultStyles = common.DefaultStyles() ) -type Validate func(string) error - // ValidateNotEmpty is a helper function to disallow empty inputs! func ValidateNotEmpty(s string) error { if s == "" { @@ -35,6 +27,7 @@ var Styles = struct { Field, Keyword, Paragraph, + Placeholder, Prompt, FocusedPrompt, Logo, @@ -45,28 +38,9 @@ var Styles = struct { Field: defaultStyles.Code.Copy().Foreground(lipgloss.AdaptiveColor{Light: "#000000", Dark: "#FFFFFF"}), Keyword: defaultStyles.Keyword, Paragraph: defaultStyles.Paragraph, + Placeholder: lipgloss.NewStyle().Foreground(lipgloss.Color("240")), Prompt: defaultStyles.Prompt.Foreground(lipgloss.AdaptiveColor{Light: "#9B9B9B", Dark: "#5C5C5C"}), FocusedPrompt: defaultStyles.FocusedPrompt.Foreground(lipgloss.Color("#651fff")), Logo: defaultStyles.Logo.SetString("Coder"), Wrap: defaultStyles.Wrap, } - -func startProgram(cmd *cobra.Command, model tea.Model) error { - reader := cmd.InOrStdin() - readWriter, valid := cmd.InOrStdin().(pty.ReadWriter) - if valid { - var err error - reader, err = readWriter.CancelReader() - if err != nil { - return err - } - } - ctx, cancelFunc := context.WithCancel(cmd.Context()) - defer cancelFunc() - program := tea.NewProgram(model, tea.WithInput(reader), tea.WithOutput(cmd.OutOrStdout())) - go func() { - <-ctx.Done() - program.Quit() - }() - return program.Start() -} diff --git a/cli/cliui/list.go b/cli/cliui/list.go deleted file mode 100644 index ae4c932a29828..0000000000000 --- a/cli/cliui/list.go +++ /dev/null @@ -1,112 +0,0 @@ -package cliui - -import ( - "github.com/charmbracelet/bubbles/key" - "github.com/charmbracelet/bubbles/list" - tea "github.com/charmbracelet/bubbletea" - "github.com/spf13/cobra" -) - -type ListItem struct { - ID string - Title string - Description string -} - -type ListOptions struct { - Title string - Items []ListItem -} - -func List(cmd *cobra.Command, opts ListOptions) (string, error) { - items := make([]list.Item, 0) - for _, item := range opts.Items { - items = append(items, teaItem{ - id: item.ID, - title: item.Title, - description: item.Description, - }) - } - model := list.New(items, list.NewDefaultDelegate(), 0, 0) - model.Title = "Select Template" - model.AdditionalShortHelpKeys = func() []key.Binding { - return []key.Binding{ - key.NewBinding(key.WithKeys("enter"), key.WithHelp("enter", "select")), - } - } - listModel := &listModel{ - opts: opts, - model: model, - } - - err := startProgram(cmd, listModel) - if err != nil { - return "", err - } - if listModel.selected != nil { - for _, item := range opts.Items { - if item.ID == listModel.selected.id { - return item.ID, nil - } - } - } - - return "", Canceled -} - -// teaItem fulfills the "DefaultItem" interface which allows the title -// and description to display! -type teaItem struct { - id string - title string - description string -} - -func (l teaItem) FilterValue() string { return l.title + "\n" + l.description } -func (l teaItem) Title() string { return l.title } -func (l teaItem) Description() string { return l.description } - -type listModel struct { - opts ListOptions - model list.Model - selected *teaItem -} - -func (*listModel) Init() tea.Cmd { - return tea.EnterAltScreen -} - -func (l *listModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { - var cmds []tea.Cmd - - switch msg := msg.(type) { - case tea.WindowSizeMsg: - // topGap, rightGap, bottomGap, leftGap := appStyle.GetPadding() - l.model.SetSize(msg.Width, msg.Height) - - case tea.KeyMsg: - // Don't match any of the keys below if we're actively filtering. - if l.model.FilterState() == list.Filtering { - break - } - if msg.Type == tea.KeyEnter { - item, valid := l.model.SelectedItem().(teaItem) - if !valid { - panic("dev error: invalid item type") - } - l.selected = &item - return l, tea.Quit - } - } - - // This will also call our delegate's update function. - newListModel, cmd := l.model.Update(msg) - l.model = newListModel - cmds = append(cmds, cmd) - - return l, tea.Batch(cmds...) -} - -func (l *listModel) View() string { - return l.model.View() -} diff --git a/cli/cliui/list_test.go b/cli/cliui/list_test.go deleted file mode 100644 index 25269805dd26e..0000000000000 --- a/cli/cliui/list_test.go +++ /dev/null @@ -1,55 +0,0 @@ -package cliui_test - -import ( - "context" - "testing" - - "github.com/spf13/cobra" - "github.com/stretchr/testify/require" - - "github.com/coder/coder/cli/cliui" - "github.com/coder/coder/pty/ptytest" -) - -func TestList(t *testing.T) { - t.Parallel() - t.Run("Select", func(t *testing.T) { - t.Parallel() - ptty := ptytest.New(t) - msgChan := make(chan string) - go func() { - resp, err := list(ptty, cliui.ListOptions{ - Title: "Example", - Items: []cliui.ListItem{{ - ID: "some", - Title: "Item", - Description: "Description", - }, { - ID: "another", - Title: "Another", - Description: "Another one!", - }}, - }) - require.NoError(t, err) - msgChan <- resp - }() - ptty.ExpectMatch("Description") - ptty.Write(ptytest.KeyDown) - ptty.WriteEnter() - require.Equal(t, "another", <-msgChan) - }) -} - -func list(ptty *ptytest.PTY, opts cliui.ListOptions) (string, error) { - value := "" - cmd := &cobra.Command{ - RunE: func(cmd *cobra.Command, args []string) error { - var err error - value, err = cliui.List(cmd, opts) - return err - }, - } - cmd.SetOutput(ptty.Output()) - cmd.SetIn(ptty.Input()) - return value, cmd.ExecuteContext(context.Background()) -} diff --git a/cli/cliui/prompt.go b/cli/cliui/prompt.go index a3f7c51f30fe8..4e1a80e3f44ed 100644 --- a/cli/cliui/prompt.go +++ b/cli/cliui/prompt.go @@ -1,106 +1,82 @@ package cliui import ( + "bufio" + "fmt" + "os" + "os/signal" "strings" - "github.com/charmbracelet/bubbles/textinput" - tea "github.com/charmbracelet/bubbletea" + "github.com/bgentry/speakeasy" + "github.com/mattn/go-isatty" "github.com/spf13/cobra" ) +// PromptOptions supply a set of options to the prompt. type PromptOptions struct { - Text string - Default string - CharLimit int - Validate Validate - EchoMode textinput.EchoMode - EchoCharacter rune - IsConfirm bool + Text string + Default string + Secret bool + IsConfirm bool + Validate func(string) error } +// Prompt asks the user for input. func Prompt(cmd *cobra.Command, opts PromptOptions) (string, error) { - input := &inputModel{ - opts: opts, - model: textinput.New(), + _, _ = fmt.Fprint(cmd.OutOrStdout(), Styles.FocusedPrompt.String()+opts.Text+" ") + if opts.IsConfirm { + opts.Default = "yes" + _, _ = fmt.Fprint(cmd.OutOrStdout(), Styles.Placeholder.Render("("+Styles.Bold.Render("yes")+Styles.Placeholder.Render("/no) "))) + } else if opts.Default != "" { + _, _ = fmt.Fprint(cmd.OutOrStdout(), Styles.Placeholder.Render("("+opts.Default+") ")) } - input.model.Prompt = opts.Text + " " - input.model.Placeholder = opts.Default - input.model.CharLimit = opts.CharLimit - input.model.EchoCharacter = opts.EchoCharacter - input.model.EchoMode = opts.EchoMode - input.model.Focus() + interrupt := make(chan os.Signal, 1) + signal.Notify(interrupt, os.Interrupt) + defer signal.Stop(interrupt) - err := startProgram(cmd, input) - if err != nil { - return "", err - } - if input.canceled { - return "", Canceled - } - if opts.IsConfirm && !strings.EqualFold(input.model.Value(), "yes") { - return "", Canceled - } - return input.model.Value(), nil -} - -type inputModel struct { - opts PromptOptions - model textinput.Model - err string - canceled bool -} - -func (*inputModel) Init() tea.Cmd { - return textinput.Blink -} - -func (i *inputModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { - var cmd tea.Cmd - switch msg := msg.(type) { - case tea.KeyMsg: - switch msg.Type { - case tea.KeyEnter: - // Apply the default placeholder value. - if i.model.Value() == "" && i.model.Placeholder != "" { - i.model.SetValue(i.model.Placeholder) - } + errCh := make(chan error) + lineCh := make(chan string) + go func() { + var line string + var err error + inFile, valid := cmd.InOrStdin().(*os.File) + if opts.Secret && valid && isatty.IsTerminal(inFile.Fd()) { + line, err = speakeasy.Ask("") + } else { + reader := bufio.NewReader(cmd.InOrStdin()) + line, err = reader.ReadString('\n') + } + if err != nil { + errCh <- err + return + } + line = strings.TrimRight(line, "\r\n") + if line == "" { + line = opts.Default + } + lineCh <- line + }() - // Validate the value. - if i.opts.Validate != nil { - err := i.opts.Validate(i.model.Value()) - if err != nil { - i.err = err.Error() - return i, nil - } + select { + case err := <-errCh: + return "", err + case line := <-lineCh: + if opts.IsConfirm && line != "yes" { + return line, Canceled + } + if opts.Validate != nil { + err := opts.Validate(line) + if err != nil { + _, _ = fmt.Fprintln(cmd.OutOrStdout(), defaultStyles.Error.Render(err.Error())) + return Prompt(cmd, opts) } - i.err = "" - i.model.SetCursorMode(textinput.CursorHide) - - return i, tea.Quit - case tea.KeyCtrlC, tea.KeyEsc: - i.canceled = true - i.model.SetCursorMode(textinput.CursorHide) - return i, tea.Quit } - - // We handle errors just like any other message - case error: - i.err = msg.Error() - return i, nil - } - - i.model, cmd = i.model.Update(msg) - return i, cmd -} - -func (i *inputModel) View() string { - prompt := Styles.FocusedPrompt - if i.model.CursorMode() == textinput.CursorHide { - prompt = Styles.Prompt - } - validate := "" - if i.err != "" { - validate = "\n" + defaultStyles.Error.Render("▲ "+i.err) + return line, nil + case <-cmd.Context().Done(): + return "", cmd.Context().Err() + case <-interrupt: + // Print a newline so that any further output starts properly on a new line. + fmt.Fprintln(cmd.OutOrStdout()) + return "", Canceled } - return prompt.String() + i.model.View() + "\n" + validate } diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go index 987339ffa6357..04f7fbe1a0564 100644 --- a/cli/cliui/prompt_test.go +++ b/cli/cliui/prompt_test.go @@ -2,7 +2,6 @@ package cliui_test import ( "context" - "runtime" "testing" "github.com/spf13/cobra" @@ -14,10 +13,6 @@ import ( func TestPrompt(t *testing.T) { t.Parallel() - if runtime.GOOS == "windows" { - t.Skip() - return - } t.Run("Success", func(t *testing.T) { t.Parallel() ptty := ptytest.New(t) diff --git a/cli/login.go b/cli/login.go index 4f1f8d401f2f7..65db0be5c0d14 100644 --- a/cli/login.go +++ b/cli/login.go @@ -10,7 +10,6 @@ import ( "runtime" "strings" - "github.com/charmbracelet/bubbles/textinput" "github.com/go-playground/validator/v10" "github.com/pkg/browser" "github.com/spf13/cobra" @@ -110,10 +109,9 @@ func login() *cobra.Command { } password, err := cliui.Prompt(cmd, cliui.PromptOptions{ - Text: "Enter a " + cliui.Styles.Field.Render("password") + ":", - EchoMode: textinput.EchoPassword, - EchoCharacter: '*', - Validate: cliui.ValidateNotEmpty, + Text: "Enter a " + cliui.Styles.Field.Render("password") + ":", + Secret: true, + Validate: cliui.ValidateNotEmpty, }) if err != nil { return xerrors.Errorf("specify password prompt: %w", err) @@ -164,9 +162,8 @@ func login() *cobra.Command { } sessionToken, err := cliui.Prompt(cmd, cliui.PromptOptions{ - Text: "Paste your token here:", - EchoMode: textinput.EchoPassword, - EchoCharacter: '*', + Text: "Paste your token here:", + Secret: true, Validate: func(token string) error { client.SessionToken = token _, err := client.User(cmd.Context(), "me") diff --git a/cli/login_test.go b/cli/login_test.go index 79c8fc2b717c2..12712fe0ba689 100644 --- a/cli/login_test.go +++ b/cli/login_test.go @@ -2,7 +2,6 @@ package cli_test import ( "context" - "runtime" "testing" "github.com/stretchr/testify/require" @@ -14,10 +13,6 @@ import ( func TestLogin(t *testing.T) { t.Parallel() - if runtime.GOOS == "windows" { - t.Skip() - return - } t.Run("InitialUserNoTTY", func(t *testing.T) { t.Parallel() diff --git a/cli/projectcreate.go b/cli/projectcreate.go index 3991dec347717..0425b530bb6bc 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -46,32 +46,7 @@ func projectCreate() *cobra.Command { if err != nil { return err } - - items := make([]cliui.ListItem, 0) - for _, template := range templates { - items = append(items, cliui.ListItem{ - ID: template.ID, - Title: template.Name, - Description: template.Description, - }) - } - selectedItem, err := cliui.List(cmd, cliui.ListOptions{ - Title: "Select a Template", - Items: items, - }) - if err != nil { - if errors.Is(err, cliui.Canceled) { - return nil - } - return err - } - var selectedTemplate codersdk.Template - for _, template := range templates { - if template.ID == selectedItem { - selectedTemplate = template - break - } - } + selectedTemplate := templates[0] archive, _, err := client.TemplateArchive(cmd.Context(), selectedTemplate.ID) if err != nil { diff --git a/cmd/cliui/main.go b/cmd/cliui/main.go index 2e3c2ecd1d9b5..030685ffcc029 100644 --- a/cmd/cliui/main.go +++ b/cmd/cliui/main.go @@ -18,22 +18,6 @@ func main() { Short: "Used for visually testing UI components for the CLI.", } - root.AddCommand(&cobra.Command{ - Use: "list", - RunE: func(cmd *cobra.Command, args []string) error { - _, err := cliui.List(cmd, cliui.ListOptions{ - Items: []cliui.ListItem{{ - Title: "Example", - Description: "Something...", - }, { - Title: "Wow, here's another!", - Description: "Another exciting description!", - }}, - }) - return err - }, - }) - root.AddCommand(&cobra.Command{ Use: "prompt", RunE: func(cmd *cobra.Command, args []string) error { @@ -64,7 +48,11 @@ func main() { if err != nil { return err } - return nil + _, err = cliui.Prompt(cmd, cliui.PromptOptions{ + Text: "Enter password", + Secret: true, + }) + return err }, }) diff --git a/go.mod b/go.mod index f9b3f1d6a1401..f2f4d1023938e 100644 --- a/go.mod +++ b/go.mod @@ -17,9 +17,6 @@ replace github.com/chzyer/readline => github.com/kylecarbs/readline v0.0.0-20220 // opencensus-go leaks a goroutine by default. replace go.opencensus.io => github.com/kylecarbs/opencensus-go v0.23.1-0.20220307014935-4d0325a68f8b -// Required until https://github.com/charmbracelet/bubbletea/pull/258 is merged. -replace github.com/charmbracelet/bubbletea => github.com/kylecarbs/bubbletea v0.20.1-0.20220315224508-b2708bc3e995 - // These are to allow embedding the cloudflared quick-tunnel CLI. // Required until https://github.com/cloudflare/cloudflared/pull/597 is merged. replace github.com/cloudflare/cloudflared => github.com/kylecarbs/cloudflared v0.0.0-20220311054120-ea109c6bf7be @@ -31,9 +28,8 @@ replace github.com/rivo/tview => github.com/kylecarbs/tview v0.0.0-2022030920223 require ( cdr.dev/slog v1.4.1 cloud.google.com/go/compute v1.5.0 + github.com/bgentry/speakeasy v0.1.0 github.com/briandowns/spinner v1.18.1 - github.com/charmbracelet/bubbles v0.10.3 - github.com/charmbracelet/bubbletea v0.20.0 github.com/charmbracelet/charm v0.10.3 github.com/charmbracelet/lipgloss v0.5.0 github.com/cloudflare/cloudflared v0.0.0-20220308214351-5352b3cf0489 @@ -100,11 +96,12 @@ require ( github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect github.com/apparentlymart/go-cidr v1.1.0 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect - github.com/atotto/clipboard v0.1.4 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.1.2 // indirect github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/charmbracelet/bubbles v0.10.3 // indirect + github.com/charmbracelet/bubbletea v0.20.0 // indirect github.com/cheekybits/genny v1.0.0 // indirect github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect github.com/clbanning/mxj/v2 v2.5.5 // indirect @@ -206,7 +203,6 @@ require ( github.com/rivo/tview v0.0.0-20200712113419-c65badfc3d92 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/sahilm/fuzzy v0.1.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/afero v1.8.1 // indirect github.com/spf13/cast v1.4.1 // indirect diff --git a/go.sum b/go.sum index 0881d81b9f6b6..35628eedd14f9 100644 --- a/go.sum +++ b/go.sum @@ -229,7 +229,6 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/auth0/go-jwt-middleware/v2 v2.0.0-beta/go.mod h1:dWL9pw5FgrzT1Hhmt+D0W8XmDDulGHN3yMMQl1Oq4RM= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= @@ -279,6 +278,7 @@ github.com/bep/golibsass v1.0.0/go.mod h1:DL87K8Un/+pWUS75ggYv41bliGiolxzDKWJAq3 github.com/bep/gowebp v0.1.0/go.mod h1:ZhFodwdiFp8ehGJpF4LdPl6unxZm9lLFjxD3z2h2AgI= github.com/bep/tmc v0.5.1/go.mod h1:tGYHN8fS85aJPhDLgXETVKp+PR382OvFi2+q2GkGsq0= github.com/bep/workers v1.0.0/go.mod h1:7kIESOB86HfR2379pwoMWNy8B50D7r99fRLUyPSNyCs= +github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= @@ -316,6 +316,9 @@ github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cb github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/charmbracelet/bubbles v0.10.3 h1:fKarbRaObLn/DCsZO4Y3vKCwRUzynQD9L+gGev1E/ho= github.com/charmbracelet/bubbles v0.10.3/go.mod h1:jOA+DUF1rjZm7gZHcNyIVW+YrBPALKfpGVdJu8UiJsA= +github.com/charmbracelet/bubbletea v0.19.3/go.mod h1:VuXF2pToRxDUHcBUcPmCRUHRvFATM4Ckb/ql1rBl3KA= +github.com/charmbracelet/bubbletea v0.20.0 h1:/b8LEPgCbNr7WWZ2LuE/BV1/r4t5PyYJtDb+J3vpwxc= +github.com/charmbracelet/bubbletea v0.20.0/go.mod h1:zpkze1Rioo4rJELjRyGlm9T2YNou1Fm4LIJQSa5QMEM= github.com/charmbracelet/charm v0.10.3 h1:UxNC2zNEADn318LtFZ7jQIhwsEccCMi8teQHvf7eVh8= github.com/charmbracelet/charm v0.10.3/go.mod h1:cIbe8nSGNfrLJCAGdHsIp2cZT51IUoQ5KPeax9IUnmU= github.com/charmbracelet/harmonica v0.1.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao= @@ -1122,8 +1125,6 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4= -github.com/kylecarbs/bubbletea v0.20.1-0.20220315224508-b2708bc3e995 h1:hM3bDpv1js78mEApavhwcD21UmF5ZRqA1E86mVx4Shk= -github.com/kylecarbs/bubbletea v0.20.1-0.20220315224508-b2708bc3e995/go.mod h1:HzsvMPPhvPTYUeAs6ts2/UIybIEzTuikLVvtF+QlQX8= github.com/kylecarbs/cloudflared v0.0.0-20220311054120-ea109c6bf7be h1:kl9byH/iaZJ99iJbSAFXjJ8jBpg6TLk6L2/73uSV8wU= github.com/kylecarbs/cloudflared v0.0.0-20220311054120-ea109c6bf7be/go.mod h1:4chGYq3uDzeHSpht2LFNZc/8ulHhMW9MvHPvzT5aZx8= github.com/kylecarbs/opencensus-go v0.23.1-0.20220307014935-4d0325a68f8b h1:1Y1X6aR78kMEQE1iCjQodB3lA7VO4jB88Wf8ZrzXSsA= @@ -1549,7 +1550,6 @@ github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= -github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI= github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= github.com/sanity-io/litter v1.5.2/go.mod h1:5Z71SvaYy5kcGtyglXOC9rrUi3c1E8CamFWjQsazTh0= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go index 3debc76aae7a3..c145c885b1ad2 100644 --- a/pty/ptytest/ptytest.go +++ b/pty/ptytest/ptytest.go @@ -21,36 +21,12 @@ var ( // Used to ensure terminal output doesn't have anything crazy! // See: https://stackoverflow.com/a/29497680 stripAnsi = regexp.MustCompile("[\u001B\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))") - - // See: https://man7.org`/linux/man-pages/man3/tcflow.3.html - // (004, EOT, Ctrl-D) End-of-file character (EOF). More - // precisely: this character causes the pending tty buffer to - // be sent to the waiting user program without waiting for - // end-of-line. If it is the first character of the line, - // the read(2) in the user program returns 0, which signifies - // end-of-file. Recognized when ICANON is set, and then not - // passed as input. - VEOF byte = 4 - - KeyUp = []byte{0x1b, '[', 'A'} - KeyDown = []byte{0x1b, '[', 'B'} - KeyRight = []byte{0x1b, '[', 'C'} - KeyLeft = []byte{0x1b, '[', 'D'} ) func New(t *testing.T) *PTY { ptty, err := pty.New() require.NoError(t, err) - // In testing we want to avoid raw mode. It takes away our - // ability to use VEOF to flush the terminal data. - // - // If we find another way to flush PTY data to the TTY, we - // can avoid using VEOF entirely. - if runtime.GOOS != "windows" { - initializePTY(t, ptty) - } - return create(t, ptty) } @@ -116,23 +92,11 @@ func (p *PTY) ExpectMatch(str string) string { return buffer.String() } -func (p *PTY) Write(data []byte) { - _, err := p.Input().Write(append(data, VEOF)) - require.NoError(p.t, err) -} - func (p *PTY) WriteLine(str string) { - _, err := p.Input().Write(append([]byte(str), VEOF)) - require.NoError(p.t, err) - p.WriteEnter() -} - -func (p *PTY) WriteEnter() { newline := []byte{'\r'} if runtime.GOOS == "windows" { newline = append(newline, '\n') } - newline = append(newline, VEOF) - _, err := p.Input().Write(newline) + _, err := p.Input().Write(append([]byte(str), newline...)) require.NoError(p.t, err) } diff --git a/pty/ptytest/ptytest_other.go b/pty/ptytest/ptytest_other.go deleted file mode 100644 index 917981904452b..0000000000000 --- a/pty/ptytest/ptytest_other.go +++ /dev/null @@ -1,31 +0,0 @@ -//go:build !windows -// +build !windows - -package ptytest - -import ( - "os" - "testing" - - "github.com/stretchr/testify/require" - "golang.org/x/sys/unix" - - "github.com/coder/coder/pty" -) - -func initializePTY(t *testing.T, ptty pty.PTY) { - // On non-Windows operating systems, the pseudo-terminal - // converts a carriage-return into a newline. - // - // We send unescaped input, so any terminal translations - // result in inconsistent behavior. - ptyFile, valid := ptty.Input().Reader.(*os.File) - require.True(t, valid, "The pty input must be a file!") - ptyFileFd := int(ptyFile.Fd()) - - state, err := unix.IoctlGetTermios(ptyFileFd, unix.TCGETS) - require.NoError(t, err) - state.Iflag &^= unix.ICRNL - err = unix.IoctlSetTermios(ptyFileFd, unix.TCSETS, state) - require.NoError(t, err) -} diff --git a/pty/ptytest/ptytest_test.go b/pty/ptytest/ptytest_test.go index dd61e6eaa1365..5792492c6df1e 100644 --- a/pty/ptytest/ptytest_test.go +++ b/pty/ptytest/ptytest_test.go @@ -3,8 +3,6 @@ package ptytest_test import ( "testing" - "github.com/stretchr/testify/require" - "github.com/coder/coder/pty/ptytest" ) @@ -17,17 +15,4 @@ func TestPtytest(t *testing.T) { pty.ExpectMatch("write") pty.WriteLine("read") }) - - t.Run("Newlines", func(t *testing.T) { - t.Parallel() - pty := ptytest.New(t) - pty.WriteLine("echo") - data := make([]byte, 64) - read, err := pty.Input().Read(data) - require.NoError(t, err) - require.Equal(t, "echo", string(data[:read])) - read, err = pty.Input().Read(data) - require.NoError(t, err) - require.Equal(t, "\r", string(data[:read])) - }) } diff --git a/pty/ptytest/ptytest_windows.go b/pty/ptytest/ptytest_windows.go deleted file mode 100644 index dfbbcdb5baec5..0000000000000 --- a/pty/ptytest/ptytest_windows.go +++ /dev/null @@ -1,14 +0,0 @@ -//go:build windows -// +build windows - -package ptytest - -import ( - "testing" - - "github.com/coder/coder/pty" -) - -func initializePTY(t *testing.T, pty pty.PTY) { - // Nothing to initialize on Windows! -} From fc8c9505291ce85ecd9599dde13dbf01ecd96770 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Wed, 16 Mar 2022 17:18:26 +0000 Subject: [PATCH 29/37] Cleanup readwriter --- cli/login_test.go | 5 ++--- cli/projectcreate.go | 2 +- cli/root.go | 5 ----- pty/pty.go | 9 +++------ pty/pty_other.go | 14 +++++--------- pty/pty_windows.go | 12 ++++-------- 6 files changed, 15 insertions(+), 32 deletions(-) diff --git a/cli/login_test.go b/cli/login_test.go index 12712fe0ba689..32e9fcae55e52 100644 --- a/cli/login_test.go +++ b/cli/login_test.go @@ -13,7 +13,6 @@ import ( func TestLogin(t *testing.T) { t.Parallel() - t.Run("InitialUserNoTTY", func(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) @@ -29,7 +28,7 @@ func TestLogin(t *testing.T) { // accurately detect Windows ptys when they are not attached to a process: // https://github.com/mattn/go-isatty/issues/59 doneChan := make(chan struct{}) - root, _ := clitest.New(t, "login", client.URL.String()) + root, _ := clitest.New(t, "login", "--force-tty", client.URL.String()) pty := ptytest.New(t) root.SetIn(pty.Input()) root.SetOut(pty.Output()) @@ -61,7 +60,7 @@ func TestLogin(t *testing.T) { coderdtest.CreateFirstUser(t, client) doneChan := make(chan struct{}) - root, _ := clitest.New(t, "login", client.URL.String(), "--no-open") + root, _ := clitest.New(t, "login", "--force-tty", client.URL.String(), "--no-open") pty := ptytest.New(t) root.SetIn(pty.Input()) root.SetOut(pty.Output()) diff --git a/cli/projectcreate.go b/cli/projectcreate.go index 0425b530bb6bc..604a8788f5c82 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -30,7 +30,7 @@ func projectCreate() *cobra.Command { provisioner string ) cmd := &cobra.Command{ - Use: "create", + Use: "create ", Short: "Create a project from the current directory", RunE: func(cmd *cobra.Command, args []string) error { client, err := createClient(cmd) diff --git a/cli/root.go b/cli/root.go index d4cc9d476fc47..416cc88c95fdd 100644 --- a/cli/root.go +++ b/cli/root.go @@ -13,7 +13,6 @@ import ( "github.com/coder/coder/cli/cliui" "github.com/coder/coder/cli/config" "github.com/coder/coder/codersdk" - "github.com/coder/coder/pty" ) var ( @@ -142,10 +141,6 @@ func isTTY(cmd *cobra.Command) bool { if forceTty && err == nil { return true } - _, ok := cmd.InOrStdin().(pty.ReadWriter) - if ok { - return true - } file, ok := cmd.InOrStdin().(*os.File) if !ok { return false diff --git a/pty/pty.go b/pty/pty.go index d2555fda4695c..0086bfba56c15 100644 --- a/pty/pty.go +++ b/pty/pty.go @@ -14,7 +14,7 @@ type PTY interface { // uses the output stream for writing. // // The same stream could be read to validate output. - Output() ReadWriter + Output() io.ReadWriter // Input handles TTY input. // @@ -22,7 +22,7 @@ type PTY interface { // uses the PTY input for reading. // // The same stream would be used to provide user input: pty.Input().Write(...) - Input() ReadWriter + Input() io.ReadWriter // Resize sets the size of the PTY. Resize(cols uint16, rows uint16) error @@ -33,10 +33,7 @@ func New() (PTY, error) { return newPty() } -// ReadWriter implements io.ReadWriter, but is intentionally avoids -// using the interface to allow for direct access to the reader or -// writer. This is to enable a caller to grab file descriptors. -type ReadWriter struct { +type readWriter struct { io.Reader io.Writer } diff --git a/pty/pty_other.go b/pty/pty_other.go index 16d4d421d97c2..c3933878456cb 100644 --- a/pty/pty_other.go +++ b/pty/pty_other.go @@ -4,11 +4,11 @@ package pty import ( + "io" "os" "sync" "github.com/creack/pty" - "github.com/muesli/cancelreader" ) func newPty() (PTY, error) { @@ -28,15 +28,15 @@ type otherPty struct { pty, tty *os.File } -func (p *otherPty) Input() ReadWriter { - return ReadWriter{ +func (p *otherPty) Input() io.ReadWriter { + return readWriter{ Reader: p.tty, Writer: p.pty, } } -func (p *otherPty) Output() ReadWriter { - return ReadWriter{ +func (p *otherPty) Output() io.ReadWriter { + return readWriter{ Reader: p.pty, Writer: p.tty, } @@ -66,7 +66,3 @@ func (p *otherPty) Close() error { } return nil } - -func (rw ReadWriter) CancelReader() (cancelreader.CancelReader, error) { - return cancelreader.NewReader(rw.Reader) -} diff --git a/pty/pty_windows.go b/pty/pty_windows.go index 335a4fdcd16a9..db783bb33ad2c 100644 --- a/pty/pty_windows.go +++ b/pty/pty_windows.go @@ -67,15 +67,15 @@ type ptyWindows struct { closed bool } -func (p *ptyWindows) Output() ReadWriter { - return ReadWriter{ +func (p *ptyWindows) Output() io.ReadWriter { + return readWriter{ Reader: p.outputRead, Writer: p.outputWrite, } } -func (p *ptyWindows) Input() ReadWriter { - return ReadWriter{ +func (p *ptyWindows) Input() io.ReadWriter { + return readWriter{ Reader: p.inputRead, Writer: p.inputWrite, } @@ -108,7 +108,3 @@ func (p *ptyWindows) Close() error { return nil } - -func (rw ReadWriter) CancelReader() (cancelreader.CancelReader, error) { - return nil, xerrors.New("not implemented") -} From 2cc902f5257f5c790b8cb1238c4f090a56417bdc Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Wed, 16 Mar 2022 20:54:10 +0000 Subject: [PATCH 30/37] Use embedded templates instead of serving over API --- .vscode/settings.json | 1 + cli/cliui/prompt.go | 2 +- cli/cliui/prompt_test.go | 6 +- cli/cliui/select.go | 68 +++++++ cli/cliui/select_test.go | 47 +++++ cli/projectclone.go | 6 - cli/projectcreate.go | 192 +++--------------- cli/projectcreate_test.go | 47 +++++ cli/projectinit.go | 81 ++++++++ cli/projectinit_test.go | 34 ++++ cli/projects.go | 1 + cli/workspacecreate.go | 76 +++---- cmd/cliui/main.go | 12 ++ cmd/templater/main.go | 72 ------- coderd/coderd.go | 4 - coderd/templates.go | 32 --- coderd/templates_test.go | 26 --- codersdk/templates.go | 41 +--- go.mod | 2 +- provisionersdk/archive.go | 34 ++++ provisionersdk/archive_test.go | 17 ++ pty/ptytest/ptytest.go | 5 + .../gcp-linux/{gcp-linux.md => README.md} | 0 template/gcp-linux/gcp-linux.json | 89 -------- template/gcp-linux/{gcp-linux.tf => main.tf} | 0 .../gcp-windows/{gcp-windows.md => README.md} | 0 template/gcp-windows/gcp-windows.json | 89 -------- .../gcp-windows/{gcp-windows.tf => main.tf} | 0 template/template.go | 168 ++++++++++----- template/template_slim.go | 16 -- template/template_test.go | 10 +- 31 files changed, 543 insertions(+), 635 deletions(-) create mode 100644 cli/cliui/select.go create mode 100644 cli/cliui/select_test.go delete mode 100644 cli/projectclone.go create mode 100644 cli/projectcreate_test.go create mode 100644 cli/projectinit.go create mode 100644 cli/projectinit_test.go delete mode 100644 coderd/templates.go delete mode 100644 coderd/templates_test.go rename template/gcp-linux/{gcp-linux.md => README.md} (100%) delete mode 100644 template/gcp-linux/gcp-linux.json rename template/gcp-linux/{gcp-linux.tf => main.tf} (100%) rename template/gcp-windows/{gcp-windows.md => README.md} (100%) delete mode 100644 template/gcp-windows/gcp-windows.json rename template/gcp-windows/{gcp-windows.tf => main.tf} (100%) delete mode 100644 template/template_slim.go diff --git a/.vscode/settings.json b/.vscode/settings.json index 21ad2322c3a64..7964449fd48d5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -77,6 +77,7 @@ "tfstate", "trimprefix", "unconvert", + "Untar", "webrtc", "xerrors", "yamux" diff --git a/cli/cliui/prompt.go b/cli/cliui/prompt.go index 4e1a80e3f44ed..406e167ed7eba 100644 --- a/cli/cliui/prompt.go +++ b/cli/cliui/prompt.go @@ -61,7 +61,7 @@ func Prompt(cmd *cobra.Command, opts PromptOptions) (string, error) { case err := <-errCh: return "", err case line := <-lineCh: - if opts.IsConfirm && line != "yes" { + if opts.IsConfirm && line != "yes" && line != "y" { return line, Canceled } if opts.Validate != nil { diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go index 04f7fbe1a0564..99468dd220b31 100644 --- a/cli/cliui/prompt_test.go +++ b/cli/cliui/prompt_test.go @@ -18,7 +18,7 @@ func TestPrompt(t *testing.T) { ptty := ptytest.New(t) msgChan := make(chan string) go func() { - resp, err := prompt(ptty, cliui.PromptOptions{ + resp, err := newPrompt(ptty, cliui.PromptOptions{ Text: "Example", }) require.NoError(t, err) @@ -34,7 +34,7 @@ func TestPrompt(t *testing.T) { ptty := ptytest.New(t) doneChan := make(chan string) go func() { - resp, err := prompt(ptty, cliui.PromptOptions{ + resp, err := newPrompt(ptty, cliui.PromptOptions{ Text: "Example", IsConfirm: true, }) @@ -47,7 +47,7 @@ func TestPrompt(t *testing.T) { }) } -func prompt(ptty *ptytest.PTY, opts cliui.PromptOptions) (string, error) { +func newPrompt(ptty *ptytest.PTY, opts cliui.PromptOptions) (string, error) { value := "" cmd := &cobra.Command{ RunE: func(cmd *cobra.Command, args []string) error { diff --git a/cli/cliui/select.go b/cli/cliui/select.go new file mode 100644 index 0000000000000..a364e24da31ea --- /dev/null +++ b/cli/cliui/select.go @@ -0,0 +1,68 @@ +package cliui + +import ( + "errors" + "fmt" + "io" + "strings" + "text/template" + + "github.com/manifoldco/promptui" + "github.com/spf13/cobra" +) + +type SelectOptions struct { + Options []string + Size int +} + +// Select displays a list of user options. +func Select(cmd *cobra.Command, opts SelectOptions) (string, error) { + selector := promptui.Select{ + Label: "", + Items: opts.Options, + Size: opts.Size, + Searcher: func(input string, index int) bool { + option := opts.Options[index] + name := strings.Replace(strings.ToLower(option), " ", "", -1) + input = strings.Replace(strings.ToLower(input), " ", "", -1) + + return strings.Contains(name, input) + }, + Stdin: io.NopCloser(cmd.InOrStdin()), + Stdout: &writeCloser{cmd.OutOrStdout()}, + Templates: &promptui.SelectTemplates{ + FuncMap: template.FuncMap{ + "faint": func(value interface{}) string { + return Styles.Placeholder.Render(value.(string)) + }, + "selected": func(value interface{}) string { + return defaultStyles.SelectedMenuItem.Render("▶ " + value.(string)) + }, + }, + Active: "{{ . | selected }}", + Inactive: " {{.}}", + Label: "{{.}}", + Selected: "{{ \"\" }}", + Help: fmt.Sprintf(`{{ "Use" | faint }} {{ .SearchKey | faint }} {{ "to toggle search" | faint }}`), + }, + HideSelected: true, + } + + _, result, err := selector.Run() + if errors.Is(err, promptui.ErrAbort) || errors.Is(err, promptui.ErrInterrupt) { + return result, Canceled + } + if err != nil { + return result, err + } + return result, nil +} + +type writeCloser struct { + io.Writer +} + +func (w *writeCloser) Close() error { + return nil +} diff --git a/cli/cliui/select_test.go b/cli/cliui/select_test.go new file mode 100644 index 0000000000000..91ad89abd9f55 --- /dev/null +++ b/cli/cliui/select_test.go @@ -0,0 +1,47 @@ +package cliui_test + +import ( + "context" + "testing" + + "github.com/manifoldco/promptui" + "github.com/spf13/cobra" + "github.com/stretchr/testify/require" + + "github.com/coder/coder/cli/cliui" + "github.com/coder/coder/pty/ptytest" +) + +func TestSelect(t *testing.T) { + t.Parallel() + t.Run("Select", func(t *testing.T) { + t.Parallel() + ptty := ptytest.New(t) + msgChan := make(chan string) + go func() { + resp, err := newSelect(ptty, cliui.SelectOptions{ + Options: []string{"First", "Second"}, + }) + require.NoError(t, err) + msgChan <- resp + }() + ptty.ExpectMatch("Second") + ptty.Write(promptui.KeyNext) + ptty.WriteLine("") + require.Equal(t, "Second", <-msgChan) + }) +} + +func newSelect(ptty *ptytest.PTY, opts cliui.SelectOptions) (string, error) { + value := "" + cmd := &cobra.Command{ + RunE: func(cmd *cobra.Command, args []string) error { + var err error + value, err = cliui.Select(cmd, opts) + return err + }, + } + cmd.SetOutput(ptty.Output()) + cmd.SetIn(ptty.Input()) + return value, cmd.ExecuteContext(context.Background()) +} diff --git a/cli/projectclone.go b/cli/projectclone.go deleted file mode 100644 index 32d8c96893d7c..0000000000000 --- a/cli/projectclone.go +++ /dev/null @@ -1,6 +0,0 @@ -package cli - -// coder projects inspect -// coder projects update -// coder projects edit -// coder projects clone [dir] diff --git a/cli/projectcreate.go b/cli/projectcreate.go index 604a8788f5c82..80f6eaaa5f170 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -9,28 +9,25 @@ import ( "github.com/briandowns/spinner" "github.com/fatih/color" "github.com/manifoldco/promptui" - "github.com/pion/webrtc/v3" "github.com/spf13/cobra" - "golang.org/x/crypto/ssh" - "golang.org/x/term" "golang.org/x/xerrors" - "github.com/coder/coder/agent" "github.com/coder/coder/cli/cliui" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" - "github.com/coder/coder/peer" - "github.com/coder/coder/peerbroker" "github.com/coder/coder/provisionerd" + "github.com/coder/coder/provisionersdk" ) func projectCreate() *cobra.Command { var ( + yes bool directory string provisioner string ) cmd := &cobra.Command{ Use: "create ", + Args: cobra.ExactArgs(1), Short: "Create a project from the current directory", RunE: func(cmd *cobra.Command, args []string) error { client, err := createClient(cmd) @@ -42,13 +39,13 @@ func projectCreate() *cobra.Command { return err } - templates, err := client.Templates(cmd.Context()) - if err != nil { - return err + projectName := args[0] + _, err = client.ProjectByName(cmd.Context(), organization.ID, projectName) + if err == nil { + return xerrors.Errorf("A project already exists named %q!", projectName) } - selectedTemplate := templates[0] - archive, _, err := client.TemplateArchive(cmd.Context(), selectedTemplate.ID) + archive, err := provisionersdk.Tar(directory) if err != nil { return err } @@ -58,20 +55,22 @@ func projectCreate() *cobra.Command { return err } - _, err = cliui.Prompt(cmd, cliui.PromptOptions{ - Text: "Create project?", - IsConfirm: true, - Default: "yes", - }) - if err != nil { - if errors.Is(err, promptui.ErrAbort) { - return nil + if !yes { + _, err = cliui.Prompt(cmd, cliui.PromptOptions{ + Text: "Create project?", + IsConfirm: true, + Default: "yes", + }) + if err != nil { + if errors.Is(err, promptui.ErrAbort) { + return nil + } + return err } - return err } - project, err := client.CreateProject(cmd.Context(), organization.ID, codersdk.CreateProjectRequest{ - Name: selectedTemplate.ID, + _, err = client.CreateProject(cmd.Context(), organization.ID, codersdk.CreateProjectRequest{ + Name: projectName, VersionID: job.ID, ParameterValues: parameters, }) @@ -79,153 +78,7 @@ func projectCreate() *cobra.Command { return err } - _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s The %s project has been created!\n", caret, color.HiCyanString(project.Name)) - _, err = cliui.Prompt(cmd, cliui.PromptOptions{ - Text: "Create a new workspace?", - IsConfirm: true, - Default: "yes", - }) - if err != nil { - if errors.Is(err, cliui.Canceled) { - return nil - } - return err - } - - workspace, err := client.CreateWorkspace(cmd.Context(), "", codersdk.CreateWorkspaceRequest{ - ProjectID: project.ID, - Name: selectedTemplate.ID, - }) - if err != nil { - return err - } - - spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) - spin.Writer = cmd.OutOrStdout() - spin.Suffix = " Building workspace..." - err = spin.Color("fgHiGreen") - if err != nil { - return err - } - spin.Start() - defer spin.Stop() - logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), workspace.LatestBuild.ID, time.Time{}) - if err != nil { - return err - } - logBuffer := make([]codersdk.ProvisionerJobLog, 0, 64) - for { - log, ok := <-logs - if !ok { - break - } - logBuffer = append(logBuffer, log) - } - build, err := client.WorkspaceBuild(cmd.Context(), workspace.LatestBuild.ID) - if err != nil { - return err - } - if build.Job.Status != codersdk.ProvisionerJobSucceeded { - for _, log := range logBuffer { - _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s %s\n", color.HiGreenString("[tf]"), log.Output) - } - return xerrors.New(build.Job.Error) - } - resources, err := client.WorkspaceResourcesByBuild(cmd.Context(), build.ID) - if err != nil { - return err - } - var workspaceAgent *codersdk.WorkspaceAgent - for _, resource := range resources { - if resource.Agent != nil { - workspaceAgent = resource.Agent - break - } - } - if workspaceAgent == nil { - return xerrors.New("something went wrong.. no agent found") - } - spin.Suffix = " Waiting for agent to connect..." - ticker := time.NewTicker(time.Second) - for { - select { - case <-cmd.Context().Done(): - return nil - case <-ticker.C: - } - resource, err := client.WorkspaceResource(cmd.Context(), workspaceAgent.ResourceID) - if err != nil { - return err - } - if resource.Agent.UpdatedAt.IsZero() { - continue - } - break - } - spin.Stop() - _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s The %s workspace has been created!\n", caret, color.HiCyanString(project.Name)) - _, err = cliui.Prompt(cmd, cliui.PromptOptions{ - Text: "Would you like to SSH?", - IsConfirm: true, - Default: "yes", - }) - if err != nil { - if errors.Is(err, cliui.Canceled) { - return nil - } - return err - } - - dialed, err := client.DialWorkspaceAgent(cmd.Context(), workspaceAgent.ResourceID) - if err != nil { - return err - } - stream, err := dialed.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{}) - if err != nil { - return err - } - sshClient, err := agent.DialSSHClient(conn) - if err != nil { - return err - } - session, err := sshClient.NewSession() - if err != nil { - return err - } - state, err := term.MakeRaw(int(os.Stdin.Fd())) - if err != nil { - return err - } - defer func() { - _ = term.Restore(int(os.Stdin.Fd()), state) - }() - width, height, err := term.GetSize(int(os.Stdin.Fd())) - if err != nil { - return err - } - err = session.RequestPty("xterm-256color", height, width, ssh.TerminalModes{ - ssh.OCRNL: 1, - }) - if err != nil { - return err - } - session.Stdin = os.Stdin - session.Stdout = os.Stdout - session.Stderr = os.Stderr - err = session.Shell() - if err != nil { - return err - } - err = session.Wait() - if err != nil { - return err - } + _, _ = fmt.Fprintln(cmd.OutOrStdout(), fmt.Sprintf("The %s project has been created!", projectName)) return nil }, } @@ -237,6 +90,7 @@ func projectCreate() *cobra.Command { if err != nil { panic(err) } + cmd.Flags().BoolVarP(&yes, "yes", "y", false, "Bypass prompts") return cmd } diff --git a/cli/projectcreate_test.go b/cli/projectcreate_test.go new file mode 100644 index 0000000000000..19a2abbba3cd3 --- /dev/null +++ b/cli/projectcreate_test.go @@ -0,0 +1,47 @@ +package cli_test + +import ( + "testing" + + "github.com/coder/coder/cli/clitest" + "github.com/coder/coder/coderd/coderdtest" + "github.com/coder/coder/database" + "github.com/coder/coder/provisioner/echo" + "github.com/coder/coder/pty/ptytest" + "github.com/stretchr/testify/require" +) + +func TestProjectCreate(t *testing.T) { + t.Parallel() + t.Run("Create", func(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + coderdtest.CreateFirstUser(t, client) + source := clitest.CreateProjectVersionSource(t, &echo.Responses{ + Parse: echo.ParseComplete, + Provision: echo.ProvisionComplete, + }) + cmd, root := clitest.New(t, "projects", "create", "my-project", "--directory", source, "--provisioner", string(database.ProvisionerTypeEcho)) + clitest.SetupConfig(t, client, root) + _ = coderdtest.NewProvisionerDaemon(t, client) + doneChan := make(chan struct{}) + pty := ptytest.New(t) + cmd.SetIn(pty.Input()) + cmd.SetOut(pty.Output()) + go func() { + defer close(doneChan) + err := cmd.Execute() + require.NoError(t, err) + }() + matches := []string{ + "Create project?", "yes", + } + for i := 0; i < len(matches); i += 2 { + match := matches[i] + value := matches[i+1] + pty.ExpectMatch(match) + pty.WriteLine(value) + } + <-doneChan + }) +} diff --git a/cli/projectinit.go b/cli/projectinit.go new file mode 100644 index 0000000000000..cdc8115af0c95 --- /dev/null +++ b/cli/projectinit.go @@ -0,0 +1,81 @@ +package cli + +import ( + "fmt" + "os" + "path/filepath" + + "github.com/coder/coder/cli/cliui" + "github.com/coder/coder/codersdk" + "github.com/coder/coder/provisionersdk" + "github.com/coder/coder/template" + "github.com/spf13/cobra" +) + +func projectInit() *cobra.Command { + return &cobra.Command{ + Use: "init [directory]", + Short: "Get started with an example project.", + RunE: func(cmd *cobra.Command, args []string) error { + templates, err := template.List() + if err != nil { + return err + } + templateNames := []string{} + templateByName := map[string]codersdk.Template{} + for _, template := range templates { + templateNames = append(templateNames, template.Name) + templateByName[template.Name] = template + } + + fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Wrap.Render("Templates contain Infrastructure as Code that works with Coder to provision development workspaces. Get started by selecting one:\n")) + + option, err := cliui.Select(cmd, cliui.SelectOptions{ + Options: templateNames, + }) + if err != nil { + return err + } + selectedTemplate := templateByName[option] + + archive, err := template.Archive(selectedTemplate.ID) + if err != nil { + return err + } + + workingDir, err := os.Getwd() + if err != nil { + return err + } + var directory string + if len(args) > 0 { + directory = args[0] + } else { + directory = filepath.Join(workingDir, selectedTemplate.ID) + } + + relPath, err := filepath.Rel(workingDir, directory) + if err != nil { + relPath = directory + } else { + relPath = "./" + relPath + } + _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%sExtracting %s to %s...\n", cliui.Styles.Prompt, cliui.Styles.Field.Render(selectedTemplate.ID), cliui.Styles.Keyword.Render(relPath)) + + err = os.MkdirAll(directory, 0700) + if err != nil { + return err + } + + err = provisionersdk.Untar(directory, archive) + if err != nil { + return err + } + + fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Prompt.String()+"Inside that directory, get started by running:") + fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render(cliui.Styles.Code.Render("coder projects create"))+"\n") + + return nil + }, + } +} diff --git a/cli/projectinit_test.go b/cli/projectinit_test.go new file mode 100644 index 0000000000000..24a7d743549d0 --- /dev/null +++ b/cli/projectinit_test.go @@ -0,0 +1,34 @@ +package cli_test + +import ( + "os" + "testing" + + "github.com/coder/coder/cli/clitest" + "github.com/coder/coder/pty/ptytest" + "github.com/stretchr/testify/require" +) + +func TestProjectInit(t *testing.T) { + t.Parallel() + t.Run("Extract", func(t *testing.T) { + t.Parallel() + tempDir := t.TempDir() + cmd, _ := clitest.New(t, "projects", "init", tempDir) + doneChan := make(chan struct{}) + pty := ptytest.New(t) + cmd.SetIn(pty.Input()) + cmd.SetOut(pty.Output()) + go func() { + defer close(doneChan) + err := cmd.Execute() + require.NoError(t, err) + }() + pty.ExpectMatch("Develop in Linux") + pty.WriteLine("") + <-doneChan + files, err := os.ReadDir(tempDir) + require.NoError(t, err) + require.Greater(t, len(files), 0) + }) +} diff --git a/cli/projects.go b/cli/projects.go index b422a2aefea50..02b5b31555127 100644 --- a/cli/projects.go +++ b/cli/projects.go @@ -33,6 +33,7 @@ func projects() *cobra.Command { cmd.AddCommand( projectCreate(), projectEdit(), + projectInit(), projectList(), projectPlan(), projectUpdate(), diff --git a/cli/workspacecreate.go b/cli/workspacecreate.go index 2807adeff081c..4dafdca79bcaf 100644 --- a/cli/workspacecreate.go +++ b/cli/workspacecreate.go @@ -5,8 +5,9 @@ import ( "fmt" "time" + "github.com/briandowns/spinner" + "github.com/fatih/color" - "github.com/google/uuid" "github.com/manifoldco/promptui" "github.com/spf13/cobra" "golang.org/x/xerrors" @@ -16,8 +17,12 @@ import ( ) func workspaceCreate() *cobra.Command { + var ( + projectName string + ) cmd := &cobra.Command{ - Use: "create [name]", + Use: "create ", + Args: cobra.ExactArgs(1), Short: "Create a workspace from a project", RunE: func(cmd *cobra.Command, args []string) error { client, err := createClient(cmd) @@ -29,37 +34,19 @@ func workspaceCreate() *cobra.Command { return err } - var name string - if len(args) >= 2 { - name = args[1] - } else { - name, err = cliui.Prompt(cmd, cliui.PromptOptions{ - Text: "What's your workspace's name?", - Validate: func(s string) error { - if s == "" { - return xerrors.Errorf("You must provide a name!") - } - workspace, _ := client.WorkspaceByName(cmd.Context(), "", s) - if workspace.ID.String() != uuid.Nil.String() { - return xerrors.New("A workspace already exists with that name!") - } - return nil - }, - }) - if err != nil { - if errors.Is(err, promptui.ErrAbort) { - return nil - } - return err - } + project, err := client.ProjectByName(cmd.Context(), organization.ID, projectName) + if err != nil { + return err + } + + workspaceName := args[0] + _, err = client.WorkspaceByName(cmd.Context(), "", workspaceName) + if err == nil { + return xerrors.Errorf("A workspace already exists named %q!", workspaceName) } _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s Previewing project create...\n", caret) - project, err := client.ProjectByName(cmd.Context(), organization.ID, args[0]) - if err != nil { - return err - } projectVersion, err := client.ProjectVersion(cmd.Context(), project.ActiveVersionID) if err != nil { return err @@ -82,7 +69,7 @@ func workspaceCreate() *cobra.Command { } _, err = cliui.Prompt(cmd, cliui.PromptOptions{ - Text: fmt.Sprintf("Create workspace %s?", color.HiCyanString(name)), + Text: fmt.Sprintf("Create workspace %s?", color.HiCyanString(workspaceName)), Default: "yes", IsConfirm: true, }) @@ -95,30 +82,49 @@ func workspaceCreate() *cobra.Command { workspace, err := client.CreateWorkspace(cmd.Context(), "", codersdk.CreateWorkspaceRequest{ ProjectID: project.ID, - Name: name, + Name: workspaceName, }) if err != nil { return err } + spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) + spin.Writer = cmd.OutOrStdout() + spin.Suffix = " Building workspace..." + err = spin.Color("fgHiGreen") + if err != nil { + return err + } + spin.Start() + defer spin.Stop() logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), workspace.LatestBuild.ID, time.Time{}) if err != nil { return err } + logBuffer := make([]codersdk.ProvisionerJobLog, 0, 64) for { log, ok := <-logs if !ok { break } - _, _ = fmt.Printf("Terraform: %s\n", log.Output) + logBuffer = append(logBuffer, log) + } + build, err := client.WorkspaceBuild(cmd.Context(), workspace.LatestBuild.ID) + if err != nil { + return err + } + if build.Job.Status != codersdk.ProvisionerJobSucceeded { + for _, log := range logBuffer { + _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s %s\n", color.HiGreenString("[tf]"), log.Output) + } + return xerrors.New(build.Job.Error) } - // This command is WIP, and output will change! - - _, _ = fmt.Printf("Created workspace! %s\n", name) + _, _ = fmt.Printf("Created workspace! %s\n", workspaceName) return nil }, } + cmd.Flags().StringVarP(&projectName, "project", "p", "", "Specify a project name.") return cmd } diff --git a/cmd/cliui/main.go b/cmd/cliui/main.go index 030685ffcc029..351ad7dbf90e7 100644 --- a/cmd/cliui/main.go +++ b/cmd/cliui/main.go @@ -56,6 +56,18 @@ func main() { }, }) + root.AddCommand(&cobra.Command{ + Use: "select", + RunE: func(cmd *cobra.Command, args []string) error { + _, err := cliui.Select(cmd, cliui.SelectOptions{ + Text: "Pick an option!", + Options: []string{"Tomato", "Banana", "Onion", "Grape", "Lemon"}, + Size: 3, + }) + return err + }, + }) + err := root.Execute() if err != nil { _, _ = fmt.Println(err.Error()) diff --git a/cmd/templater/main.go b/cmd/templater/main.go index 06d35a81cb8fe..ea00379e036d4 100644 --- a/cmd/templater/main.go +++ b/cmd/templater/main.go @@ -2,7 +2,6 @@ package main import ( "context" - "encoding/json" "fmt" "io" "io/ioutil" @@ -10,12 +9,9 @@ import ( "net/http/httptest" "net/url" "os" - "path/filepath" - "sort" "strings" "time" - "github.com/google/uuid" "github.com/spf13/cobra" "golang.org/x/xerrors" "google.golang.org/api/idtoken" @@ -31,8 +27,6 @@ import ( "github.com/coder/coder/provisionerd" "github.com/coder/coder/provisionersdk" "github.com/coder/coder/provisionersdk/proto" - - "github.com/gohugoio/hugo/parser/pageparser" ) func main() { @@ -165,77 +159,11 @@ func parse(cmd *cobra.Command, parameters []codersdk.CreateParameterRequest) err return xerrors.Errorf("Job wasn't successful, it was %q. Check the logs!", version.Job.Status) } - schemas, err := client.ProjectVersionSchema(cmd.Context(), version.ID) - if err != nil { - return err - } resources, err := client.ProjectVersionResources(cmd.Context(), version.ID) if err != nil { return err } - readme, err := os.OpenFile(filepath.Base(dir)+".md", os.O_RDONLY, 0600) - if err != nil { - return err - } - defer readme.Close() - frontMatter, err := pageparser.ParseFrontMatterAndContent(readme) - if err != nil { - return err - } - name, exists := frontMatter.FrontMatter["name"] - if !exists { - return xerrors.New("front matter must contain name") - } - description, exists := frontMatter.FrontMatter["description"] - if !exists { - return xerrors.Errorf("front matter must contain description") - } - - for index, resource := range resources { - resource.ID = uuid.UUID{} - resource.JobID = uuid.UUID{} - resource.CreatedAt = time.Time{} - - if resource.Agent != nil { - resource.Agent.ID = uuid.UUID{} - resource.Agent.ResourceID = uuid.UUID{} - resource.Agent.CreatedAt = time.Time{} - resource.Agent.UpdatedAt = time.Time{} - } - resources[index] = resource - } - - for index, schema := range schemas { - schema.ID = uuid.UUID{} - schema.JobID = uuid.UUID{} - schema.CreatedAt = time.Time{} - schemas[index] = schema - } - sort.Slice(resources, func(i, j int) bool { - return resources[i].Name < resources[j].Name - }) - sort.Slice(schemas, func(i, j int) bool { - return schemas[i].Name < schemas[j].Name - }) - - template := codersdk.Template{ - ID: filepath.Base(dir), - Name: name.(string), - Description: description.(string), - ProjectVersionParameterSchema: schemas, - Resources: resources, - } - - data, err := json.MarshalIndent(template, "", "\t") - if err != nil { - return err - } - err = os.WriteFile(filepath.Base(dir)+".json", data, 0600) - if err != nil { - return err - } - project, err := client.CreateProject(cmd.Context(), created.OrganizationID, codersdk.CreateProjectRequest{ Name: "test", VersionID: version.ID, diff --git a/coderd/coderd.go b/coderd/coderd.go index 2dffc055c29c8..79f8d3c48ba1e 100644 --- a/coderd/coderd.go +++ b/coderd/coderd.go @@ -106,10 +106,6 @@ func New(options *Options) (http.Handler, func()) { r.Get("/listen", api.provisionerDaemonsListen) }) }) - r.Route("/templates", func(r chi.Router) { - r.Get("/", api.listTemplates) - r.Get("/{id}", api.templateArchive) - }) r.Route("/users", func(r chi.Router) { r.Get("/first", api.firstUser) r.Post("/first", api.postFirstUser) diff --git a/coderd/templates.go b/coderd/templates.go deleted file mode 100644 index f11f5a98d7418..0000000000000 --- a/coderd/templates.go +++ /dev/null @@ -1,32 +0,0 @@ -package coderd - -import ( - "fmt" - "net/http" - - "github.com/go-chi/chi/v5" - "github.com/go-chi/render" - - "github.com/coder/coder/httpapi" - "github.com/coder/coder/template" -) - -func (*api) listTemplates(rw http.ResponseWriter, r *http.Request) { - render.Status(r, http.StatusOK) - render.JSON(rw, r, template.List()) -} - -func (*api) templateArchive(rw http.ResponseWriter, r *http.Request) { - id := chi.URLParam(r, "id") - archive, exists := template.Archive(id) - if !exists { - httpapi.Write(rw, http.StatusNotFound, httpapi.Response{ - Message: fmt.Sprintf("template does not exists with id %q", id), - }) - return - } - - rw.Header().Set("Content-Type", "application/x-tar") - rw.WriteHeader(http.StatusOK) - _, _ = rw.Write(archive) -} diff --git a/coderd/templates_test.go b/coderd/templates_test.go deleted file mode 100644 index f1cee51f33467..0000000000000 --- a/coderd/templates_test.go +++ /dev/null @@ -1,26 +0,0 @@ -package coderd_test - -import ( - "context" - "testing" - - "github.com/stretchr/testify/require" - - "github.com/coder/coder/coderd/coderdtest" -) - -func TestListTemplates(t *testing.T) { - t.Parallel() - client := coderdtest.New(t, nil) - templates, err := client.Templates(context.Background()) - require.NoError(t, err) - require.Len(t, templates, 0) -} - -func TestTemplateArchive(t *testing.T) { - t.Parallel() - client := coderdtest.New(t, nil) - templates, err := client.Templates(context.Background()) - require.NoError(t, err) - require.Len(t, templates, 0) -} diff --git a/codersdk/templates.go b/codersdk/templates.go index 1b32f82dcbcf8..3a03b8ef35f10 100644 --- a/codersdk/templates.go +++ b/codersdk/templates.go @@ -1,47 +1,8 @@ package codersdk -import ( - "context" - "encoding/json" - "fmt" - "io" - "net/http" -) - type Template struct { ID string `json:"id"` Name string `json:"name"` Description string `json:"description"` - - ProjectVersionParameterSchema []ProjectVersionParameterSchema `json:"schema"` - Resources []WorkspaceResource `json:"resources"` -} - -func (c *Client) Templates(ctx context.Context) ([]Template, error) { - res, err := c.request(ctx, http.MethodGet, "/api/v2/templates", nil) - if err != nil { - return nil, err - } - defer res.Body.Close() - if res.StatusCode != http.StatusOK { - return nil, readBodyAsError(res) - } - var templates []Template - return templates, json.NewDecoder(res.Body).Decode(&templates) -} - -func (c *Client) TemplateArchive(ctx context.Context, id string) ([]byte, string, error) { - res, err := c.request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/templates/%s", id), nil) - if err != nil { - return nil, "", err - } - defer res.Body.Close() - if res.StatusCode != http.StatusOK { - return nil, "", readBodyAsError(res) - } - data, err := io.ReadAll(res.Body) - if err != nil { - return nil, "", err - } - return data, res.Header.Get("Content-Type"), nil + Markdown string `json:"markdown"` } diff --git a/go.mod b/go.mod index f2f4d1023938e..8599eae63d615 100644 --- a/go.mod +++ b/go.mod @@ -77,6 +77,7 @@ require ( go.uber.org/goleak v1.1.12 golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 @@ -216,7 +217,6 @@ require ( go.opencensus.io v0.23.0 // indirect golang.org/x/mod v0.5.1 // indirect golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/tools v0.1.9 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/provisionersdk/archive.go b/provisionersdk/archive.go index 53265584e1ccb..a2c2dc0e7308c 100644 --- a/provisionersdk/archive.go +++ b/provisionersdk/archive.go @@ -7,6 +7,8 @@ import ( "os" "path/filepath" "strings" + + "golang.org/x/xerrors" ) // Tar archives a directory. @@ -54,3 +56,35 @@ func Tar(directory string) ([]byte, error) { } return buffer.Bytes(), nil } + +// Untar extracts the archive to a provided directory. +func Untar(directory string, archive []byte) error { + reader := tar.NewReader(bytes.NewReader(archive)) + for { + header, err := reader.Next() + if xerrors.Is(err, io.EOF) { + return nil + } + if err != nil { + return err + } + target := filepath.Join(directory, header.Name) + switch header.Typeflag { + case tar.TypeDir: + if _, err := os.Stat(target); err != nil { + if err := os.MkdirAll(target, 0755); err != nil { + return err + } + } + case tar.TypeReg: + f, err := os.OpenFile(target, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode)) + if err != nil { + return err + } + if _, err := io.Copy(f, reader); err != nil { + return err + } + _ = f.Close() + } + } +} diff --git a/provisionersdk/archive_test.go b/provisionersdk/archive_test.go index 2a99d306b8be9..966825c4c12e1 100644 --- a/provisionersdk/archive_test.go +++ b/provisionersdk/archive_test.go @@ -2,6 +2,8 @@ package provisionersdk_test import ( "io/ioutil" + "os" + "path/filepath" "testing" "github.com/stretchr/testify/require" @@ -18,3 +20,18 @@ func TestTar(t *testing.T) { _, err = provisionersdk.Tar(dir) require.NoError(t, err) } + +func TestUntar(t *testing.T) { + t.Parallel() + dir := t.TempDir() + file, err := ioutil.TempFile(dir, "") + require.NoError(t, err) + _ = file.Close() + archive, err := provisionersdk.Tar(dir) + require.NoError(t, err) + dir = t.TempDir() + err = provisionersdk.Untar(dir, archive) + require.NoError(t, err) + _, err = os.Stat(filepath.Join(dir, file.Name())) + require.NoError(t, err) +} diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go index c145c885b1ad2..730f2a244efdb 100644 --- a/pty/ptytest/ptytest.go +++ b/pty/ptytest/ptytest.go @@ -92,6 +92,11 @@ func (p *PTY) ExpectMatch(str string) string { return buffer.String() } +func (p *PTY) Write(r rune) { + _, err := p.Input().Write([]byte{byte(r)}) + require.NoError(p.t, err) +} + func (p *PTY) WriteLine(str string) { newline := []byte{'\r'} if runtime.GOOS == "windows" { diff --git a/template/gcp-linux/gcp-linux.md b/template/gcp-linux/README.md similarity index 100% rename from template/gcp-linux/gcp-linux.md rename to template/gcp-linux/README.md diff --git a/template/gcp-linux/gcp-linux.json b/template/gcp-linux/gcp-linux.json deleted file mode 100644 index 623b58285909f..0000000000000 --- a/template/gcp-linux/gcp-linux.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "id": "gcp-linux", - "name": "Develop in Linux on Google Cloud", - "description": "Get started with Linux development on Google Cloud.", - "schema": [ - { - "id": "00000000-0000-0000-0000-000000000000", - "created_at": "0001-01-01T00:00:00Z", - "job_id": "00000000-0000-0000-0000-000000000000", - "name": "gcp_credentials", - "description": "", - "default_source_scheme": "none", - "default_source_value": "", - "allow_override_source": false, - "default_destination_scheme": "provisioner_variable", - "allow_override_destination": false, - "default_refresh": "", - "redisplay_value": false, - "validation_error": "", - "validation_condition": "", - "validation_type_system": "none", - "validation_value_type": "" - }, - { - "id": "00000000-0000-0000-0000-000000000000", - "created_at": "0001-01-01T00:00:00Z", - "job_id": "00000000-0000-0000-0000-000000000000", - "name": "gcp_project", - "description": "The Google Cloud project to manage resources in.", - "default_source_scheme": "none", - "default_source_value": "", - "allow_override_source": false, - "default_destination_scheme": "provisioner_variable", - "allow_override_destination": false, - "default_refresh": "", - "redisplay_value": true, - "validation_error": "", - "validation_condition": "", - "validation_type_system": "none", - "validation_value_type": "" - }, - { - "id": "00000000-0000-0000-0000-000000000000", - "created_at": "0001-01-01T00:00:00Z", - "job_id": "00000000-0000-0000-0000-000000000000", - "name": "gcp_region", - "description": "", - "default_source_scheme": "data", - "default_source_value": "\"us-central1\"", - "allow_override_source": false, - "default_destination_scheme": "provisioner_variable", - "allow_override_destination": false, - "default_refresh": "", - "redisplay_value": true, - "validation_error": "", - "validation_condition": "", - "validation_type_system": "none", - "validation_value_type": "" - } - ], - "resources": [ - { - "id": "00000000-0000-0000-0000-000000000000", - "created_at": "0001-01-01T00:00:00Z", - "job_id": "00000000-0000-0000-0000-000000000000", - "workspace_transition": "start", - "address": "dev", - "type": "google_compute_instance", - "name": "dev", - "agent": { - "id": "00000000-0000-0000-0000-000000000000", - "created_at": "0001-01-01T00:00:00Z", - "updated_at": "0001-01-01T00:00:00Z", - "status": "waiting", - "resource_id": "00000000-0000-0000-0000-000000000000", - "environment_variables": null - } - }, - { - "id": "00000000-0000-0000-0000-000000000000", - "created_at": "0001-01-01T00:00:00Z", - "job_id": "00000000-0000-0000-0000-000000000000", - "workspace_transition": "start", - "address": "random", - "type": "random_string", - "name": "random" - } - ] -} \ No newline at end of file diff --git a/template/gcp-linux/gcp-linux.tf b/template/gcp-linux/main.tf similarity index 100% rename from template/gcp-linux/gcp-linux.tf rename to template/gcp-linux/main.tf diff --git a/template/gcp-windows/gcp-windows.md b/template/gcp-windows/README.md similarity index 100% rename from template/gcp-windows/gcp-windows.md rename to template/gcp-windows/README.md diff --git a/template/gcp-windows/gcp-windows.json b/template/gcp-windows/gcp-windows.json deleted file mode 100644 index bb63a01a048c6..0000000000000 --- a/template/gcp-windows/gcp-windows.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "id": "gcp-windows", - "name": "Develop in Windows on Google Cloud", - "description": "Get started with Windows development on Google Cloud.", - "schema": [ - { - "id": "00000000-0000-0000-0000-000000000000", - "created_at": "0001-01-01T00:00:00Z", - "job_id": "00000000-0000-0000-0000-000000000000", - "name": "gcp_credentials", - "description": "", - "default_source_scheme": "none", - "default_source_value": "", - "allow_override_source": false, - "default_destination_scheme": "provisioner_variable", - "allow_override_destination": false, - "default_refresh": "", - "redisplay_value": false, - "validation_error": "", - "validation_condition": "", - "validation_type_system": "none", - "validation_value_type": "" - }, - { - "id": "00000000-0000-0000-0000-000000000000", - "created_at": "0001-01-01T00:00:00Z", - "job_id": "00000000-0000-0000-0000-000000000000", - "name": "gcp_project", - "description": "The Google Cloud project to manage resources in.", - "default_source_scheme": "none", - "default_source_value": "", - "allow_override_source": false, - "default_destination_scheme": "provisioner_variable", - "allow_override_destination": false, - "default_refresh": "", - "redisplay_value": true, - "validation_error": "", - "validation_condition": "", - "validation_type_system": "none", - "validation_value_type": "" - }, - { - "id": "00000000-0000-0000-0000-000000000000", - "created_at": "0001-01-01T00:00:00Z", - "job_id": "00000000-0000-0000-0000-000000000000", - "name": "gcp_region", - "description": "", - "default_source_scheme": "data", - "default_source_value": "\"us-central1\"", - "allow_override_source": false, - "default_destination_scheme": "provisioner_variable", - "allow_override_destination": false, - "default_refresh": "", - "redisplay_value": true, - "validation_error": "", - "validation_condition": "", - "validation_type_system": "none", - "validation_value_type": "" - } - ], - "resources": [ - { - "id": "00000000-0000-0000-0000-000000000000", - "created_at": "0001-01-01T00:00:00Z", - "job_id": "00000000-0000-0000-0000-000000000000", - "workspace_transition": "start", - "address": "dev", - "type": "google_compute_instance", - "name": "dev", - "agent": { - "id": "00000000-0000-0000-0000-000000000000", - "created_at": "0001-01-01T00:00:00Z", - "updated_at": "0001-01-01T00:00:00Z", - "status": "waiting", - "resource_id": "00000000-0000-0000-0000-000000000000", - "environment_variables": null - } - }, - { - "id": "00000000-0000-0000-0000-000000000000", - "created_at": "0001-01-01T00:00:00Z", - "job_id": "00000000-0000-0000-0000-000000000000", - "workspace_transition": "start", - "address": "random", - "type": "random_string", - "name": "random" - } - ] -} \ No newline at end of file diff --git a/template/gcp-windows/gcp-windows.tf b/template/gcp-windows/main.tf similarity index 100% rename from template/gcp-windows/gcp-windows.tf rename to template/gcp-windows/main.tf diff --git a/template/template.go b/template/template.go index a1abcac53fa15..efca8442bed83 100644 --- a/template/template.go +++ b/template/template.go @@ -1,81 +1,157 @@ -//go:build embed -// +build embed - package template import ( "archive/tar" "bytes" "embed" - "encoding/json" - "fmt" "path" + "sync" + + "github.com/gohugoio/hugo/parser/pageparser" + "golang.org/x/sync/singleflight" + "golang.org/x/xerrors" "github.com/coder/coder/codersdk" ) var ( - //go:embed */*.json + //go:embed */*.md //go:embed */*.tf files embed.FS - list = make([]codersdk.Template, 0) - archives = map[string][]byte{} + templates = make([]codersdk.Template, 0) + parseTemplates sync.Once + archives = singleflight.Group{} ) // Parses templates from the embedded archive and inserts them into the map. func init() { - dirs, err := files.ReadDir(".") - if err != nil { - panic(err) - } - for _, dir := range dirs { - // Each one of these is a template! - templateData, err := files.ReadFile(path.Join(dir.Name(), dir.Name()+".json")) + +} + +// List returns all embedded templates. +func List() ([]codersdk.Template, error) { + var returnError error + parseTemplates.Do(func() { + dirs, err := files.ReadDir(".") if err != nil { - panic(fmt.Sprintf("template %q does not contain compiled json: %s", dir.Name(), err)) + returnError = xerrors.Errorf("read dir: %w", err) + return + } + for _, dir := range dirs { + templateID := dir.Name() + // Each one of these is a template! + readme, err := files.ReadFile(path.Join(dir.Name(), "README.md")) + if err != nil { + returnError = xerrors.Errorf("template %q does not contain README.md", templateID) + return + } + frontMatter, err := pageparser.ParseFrontMatterAndContent(bytes.NewReader(readme)) + if err != nil { + returnError = xerrors.Errorf("parse template %q front matter: %w", templateID, err) + return + } + nameRaw, exists := frontMatter.FrontMatter["name"] + if !exists { + returnError = xerrors.Errorf("template %q front matter does not contain name", templateID) + return + } + name, valid := nameRaw.(string) + if !valid { + returnError = xerrors.Errorf("template %q name isn't a string", templateID) + return + } + descriptionRaw, exists := frontMatter.FrontMatter["description"] + if !exists { + returnError = xerrors.Errorf("template %q front matter does not contain name", templateID) + return + } + description, valid := descriptionRaw.(string) + if !valid { + returnError = xerrors.Errorf("template %q description isn't a string", templateID) + return + } + templates = append(templates, codersdk.Template{ + ID: templateID, + Name: name, + Description: description, + Markdown: string(frontMatter.Content), + }) } - templateSrc, err := files.ReadFile(path.Join(dir.Name(), dir.Name()+".tf")) + }) + return templates, returnError +} + +// Archive returns a tar by template ID. +func Archive(templateID string) ([]byte, error) { + rawData, err, _ := archives.Do(templateID, func() (interface{}, error) { + templates, err := List() if err != nil { - panic(fmt.Sprintf("template %q does not contain terraform source: %s", dir.Name(), err)) + return nil, err + } + var selected codersdk.Template + for _, template := range templates { + if template.ID != templateID { + continue + } + selected = template + break + } + if selected.ID == "" { + return nil, xerrors.Errorf("template with id %q not found", templateID) } - var template codersdk.Template - err = json.Unmarshal(templateData, &template) + entries, err := files.ReadDir(templateID) if err != nil { - panic(fmt.Sprintf("unmarshal template %q: %s", dir.Name(), err)) + return nil, xerrors.Errorf("read dir: %w", err) } var buffer bytes.Buffer tarWriter := tar.NewWriter(&buffer) - err = tarWriter.WriteHeader(&tar.Header{ - Typeflag: tar.TypeReg, - Name: dir.Name() + ".tf", - Size: int64(len(templateSrc)), - }) - if err != nil { - panic(err) - } - _, err = tarWriter.Write(templateSrc) - if err != nil { - panic(err) + + for _, entry := range entries { + file, err := files.Open(path.Join(templateID, entry.Name())) + if err != nil { + return nil, xerrors.Errorf("open file: %w", err) + } + info, err := file.Stat() + if err != nil { + return nil, xerrors.Errorf("stat file: %w", err) + } + if info.IsDir() { + continue + } + data := make([]byte, info.Size()) + _, err = file.Read(data) + if err != nil { + return nil, xerrors.Errorf("read data: %w", err) + } + header, err := tar.FileInfoHeader(info, entry.Name()) + if err != nil { + return nil, xerrors.Errorf("get file header: %w", err) + } + header.Mode = 0644 + err = tarWriter.WriteHeader(header) + if err != nil { + return nil, xerrors.Errorf("write file: %w", err) + } + _, err = tarWriter.Write(data) + if err != nil { + return nil, xerrors.Errorf("write: %w", err) + } } err = tarWriter.Flush() if err != nil { - panic(err) + return nil, xerrors.Errorf("flush archive: %w", err) } - archives[dir.Name()] = buffer.Bytes() - list = append(list, template) + return buffer.Bytes(), nil + }) + if err != nil { + return nil, err } -} - -// List returns all embedded templates. -func List() []codersdk.Template { - return list -} - -// Archive returns a tar by template ID. -func Archive(id string) ([]byte, bool) { - data, exists := archives[id] - return data, exists + data, valid := rawData.([]byte) + if !valid { + panic("dev error: data must be a byte slice") + } + return data, nil } diff --git a/template/template_slim.go b/template/template_slim.go deleted file mode 100644 index f5833d28cab4a..0000000000000 --- a/template/template_slim.go +++ /dev/null @@ -1,16 +0,0 @@ -//go:build !embed -// +build !embed - -package template - -import "github.com/coder/coder/codersdk" - -// List returns all embedded templates. -func List() []codersdk.Template { - return []codersdk.Template{} -} - -// Archive returns a tar by template ID. -func Archive(_ string) ([]byte, bool) { - return nil, false -} diff --git a/template/template_test.go b/template/template_test.go index c86b94c25eaeb..d28e4c7621535 100644 --- a/template/template_test.go +++ b/template/template_test.go @@ -1,6 +1,3 @@ -//go:build embed -// +build embed - package template_test import ( @@ -13,9 +10,10 @@ import ( func TestTemplate(t *testing.T) { t.Parallel() - list := template.List() + list, err := template.List() + require.NoError(t, err) require.Greater(t, len(list), 0) - _, exists := template.Archive(list[0].ID) - require.True(t, exists) + _, err = template.Archive(list[0].ID) + require.NoError(t, err) } From 8146d002e92aff66e25d5e8e3911c8f8ff57b9de Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Thu, 17 Mar 2022 14:11:12 +0000 Subject: [PATCH 31/37] Move templates to examples --- cli/cliui/job.go | 1 + cli/projectcreate.go | 88 ++++++++++++++----- cli/projectinit.go | 37 +++----- cli/root.go | 32 +++---- cli/start.go | 65 +++++++++++--- cli/start_test.go | 39 ++++++-- codersdk/templates.go | 8 -- template/template.go => examples/examples.go | 68 +++++++------- .../examples_test.go | 8 +- {template => examples}/gcp-linux/README.md | 0 {template => examples}/gcp-linux/main.tf | 0 {template => examples}/gcp-windows/README.md | 0 {template => examples}/gcp-windows/main.tf | 0 examples/minimal-project/main.tf | 4 - examples/project-with-parameters/main.tf | 11 --- examples/project-with-resource/main.tf | 17 ---- gcp-linux/README.md | 5 ++ gcp-linux/main.tf | 73 +++++++++++++++ 18 files changed, 296 insertions(+), 160 deletions(-) create mode 100644 cli/cliui/job.go delete mode 100644 codersdk/templates.go rename template/template.go => examples/examples.go (60%) rename template/template_test.go => examples/examples_test.go (61%) rename {template => examples}/gcp-linux/README.md (100%) rename {template => examples}/gcp-linux/main.tf (100%) rename {template => examples}/gcp-windows/README.md (100%) rename {template => examples}/gcp-windows/main.tf (100%) delete mode 100644 examples/minimal-project/main.tf delete mode 100644 examples/project-with-parameters/main.tf delete mode 100644 examples/project-with-resource/main.tf create mode 100644 gcp-linux/README.md create mode 100644 gcp-linux/main.tf diff --git a/cli/cliui/job.go b/cli/cliui/job.go new file mode 100644 index 0000000000000..790e139177e15 --- /dev/null +++ b/cli/cliui/job.go @@ -0,0 +1 @@ +package cliui diff --git a/cli/projectcreate.go b/cli/projectcreate.go index 80f6eaaa5f170..a0c4b301af3cd 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -4,6 +4,8 @@ import ( "errors" "fmt" "os" + "path/filepath" + "sort" "time" "github.com/briandowns/spinner" @@ -26,8 +28,7 @@ func projectCreate() *cobra.Command { provisioner string ) cmd := &cobra.Command{ - Use: "create ", - Args: cobra.ExactArgs(1), + Use: "create [name]", Short: "Create a project from the current directory", RunE: func(cmd *cobra.Command, args []string) error { client, err := createClient(cmd) @@ -39,18 +40,39 @@ func projectCreate() *cobra.Command { return err } - projectName := args[0] + var projectName string + if len(args) == 0 { + projectName = filepath.Base(directory) + } else { + projectName = args[0] + } _, err = client.ProjectByName(cmd.Context(), organization.ID, projectName) if err == nil { return xerrors.Errorf("A project already exists named %q!", projectName) } + start := time.Now() archive, err := provisionersdk.Tar(directory) if err != nil { return err } + spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) + spin.Writer = cmd.OutOrStdout() + spin.Suffix = " Uploading current directory..." + err = spin.Color("fgHiGreen") + if err != nil { + return err + } + spin.Start() + defer spin.Stop() + resp, err := client.Upload(cmd.Context(), codersdk.ContentTypeTar, archive) + if err != nil { + return err + } + spin.FinalMSG = fmt.Sprintf("Uploaded %d byte archive! [%dms]", len(archive), time.Now().Sub(start).Milliseconds()) + "\n" + spin.Stop() - job, parameters, err := createValidProjectVersion(cmd, client, organization, database.ProvisionerType(provisioner), archive) + job, parameters, err := createValidProjectVersion(cmd, client, organization, database.ProvisionerType(provisioner), resp.Hash) if err != nil { return err } @@ -94,33 +116,52 @@ func projectCreate() *cobra.Command { return cmd } -func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, organization codersdk.Organization, provisioner database.ProvisionerType, archive []byte, parameters ...codersdk.CreateParameterRequest) (*codersdk.ProjectVersion, []codersdk.CreateParameterRequest, error) { - spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) - spin.Writer = cmd.OutOrStdout() - spin.Suffix = " Uploading current directory..." - err := spin.Color("fgHiGreen") - if err != nil { - return nil, nil, err - } - spin.Start() - defer spin.Stop() - - resp, err := client.Upload(cmd.Context(), codersdk.ContentTypeTar, archive) - if err != nil { - return nil, nil, err - } - +func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, organization codersdk.Organization, provisioner database.ProvisionerType, hash string, parameters ...codersdk.CreateParameterRequest) (*codersdk.ProjectVersion, []codersdk.CreateParameterRequest, error) { before := time.Now() version, err := client.CreateProjectVersion(cmd.Context(), organization.ID, codersdk.CreateProjectVersionRequest{ StorageMethod: database.ProvisionerStorageMethodFile, - StorageSource: resp.Hash, + StorageSource: hash, Provisioner: provisioner, ParameterValues: parameters, }) if err != nil { return nil, nil, err } + spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) + spin.Writer = cmd.OutOrStdout() spin.Suffix = " Waiting for the import to complete..." + spin.FinalMSG = "Parsed project..." + spin.Start() + + doneChan := make(chan struct{}) + go func() { + defer spin.Stop() + ticker := time.NewTicker(time.Second) + for { + select { + case <-doneChan: + return + case <-ticker.C: + } + version, err := client.ProjectVersion(cmd.Context(), version.ID) + if err != nil { + continue + } + switch version.Job.Status { + case codersdk.ProvisionerJobPending: + spin.Suffix = "Pending..." + case codersdk.ProvisionerJobCanceled: + spin.Suffix = "Canceled..." + case codersdk.ProvisionerJobCanceling: + spin.Suffix = "Canceling..." + case codersdk.ProvisionerJobFailed: + spin.FinalMSG = version.Job.Error + case codersdk.ProvisionerJobRunning: + spin.Suffix = "Running..." + } + } + }() + logs, err := client.ProjectVersionLogsAfter(cmd.Context(), version.ID, before) if err != nil { return nil, nil, err @@ -153,6 +194,9 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga for _, parameterValue := range parameterValues { valuesBySchemaID[parameterValue.SchemaID.String()] = parameterValue } + sort.Slice(parameterSchemas, func(i, j int) bool { + return parameterSchemas[i].Name < parameterSchemas[j].Name + }) for _, parameterSchema := range parameterSchemas { _, ok := valuesBySchemaID[parameterSchema.ID.String()] if ok { @@ -171,7 +215,7 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga DestinationScheme: parameterSchema.DefaultDestinationScheme, }) } - return createValidProjectVersion(cmd, client, organization, provisioner, archive, parameters...) + return createValidProjectVersion(cmd, client, organization, provisioner, hash, parameters...) } if version.Job.Status != codersdk.ProvisionerJobSucceeded { diff --git a/cli/projectinit.go b/cli/projectinit.go index cdc8115af0c95..8300280a59813 100644 --- a/cli/projectinit.go +++ b/cli/projectinit.go @@ -6,43 +6,39 @@ import ( "path/filepath" "github.com/coder/coder/cli/cliui" - "github.com/coder/coder/codersdk" + "github.com/coder/coder/examples" "github.com/coder/coder/provisionersdk" - "github.com/coder/coder/template" "github.com/spf13/cobra" ) func projectInit() *cobra.Command { return &cobra.Command{ Use: "init [directory]", - Short: "Get started with an example project.", + Short: "Get started with a templated project.", RunE: func(cmd *cobra.Command, args []string) error { - templates, err := template.List() + exampleList, err := examples.List() if err != nil { return err } - templateNames := []string{} - templateByName := map[string]codersdk.Template{} - for _, template := range templates { - templateNames = append(templateNames, template.Name) - templateByName[template.Name] = template + exampleNames := []string{} + exampleByName := map[string]examples.Example{} + for _, example := range exampleList { + exampleNames = append(exampleNames, example.Name) + exampleByName[example.Name] = example } - fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Wrap.Render("Templates contain Infrastructure as Code that works with Coder to provision development workspaces. Get started by selecting one:\n")) - + _, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Wrap.Render("Templates contain Infrastructure as Code that works with Coder to provision development workspaces. Get started by selecting one:\n")) option, err := cliui.Select(cmd, cliui.SelectOptions{ - Options: templateNames, + Options: exampleNames, }) if err != nil { return err } - selectedTemplate := templateByName[option] - - archive, err := template.Archive(selectedTemplate.ID) + selectedTemplate := exampleByName[option] + archive, err := examples.Archive(selectedTemplate.ID) if err != nil { return err } - workingDir, err := os.Getwd() if err != nil { return err @@ -53,7 +49,6 @@ func projectInit() *cobra.Command { } else { directory = filepath.Join(workingDir, selectedTemplate.ID) } - relPath, err := filepath.Rel(workingDir, directory) if err != nil { relPath = directory @@ -61,20 +56,16 @@ func projectInit() *cobra.Command { relPath = "./" + relPath } _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%sExtracting %s to %s...\n", cliui.Styles.Prompt, cliui.Styles.Field.Render(selectedTemplate.ID), cliui.Styles.Keyword.Render(relPath)) - err = os.MkdirAll(directory, 0700) if err != nil { return err } - err = provisionersdk.Untar(directory, archive) if err != nil { return err } - - fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Prompt.String()+"Inside that directory, get started by running:") - fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render(cliui.Styles.Code.Render("coder projects create"))+"\n") - + _, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Prompt.String()+"Inside that directory, get started by running:") + _, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render(cliui.Styles.Code.Render("coder projects create"))+"\n") return nil }, } diff --git a/cli/root.go b/cli/root.go index 416cc88c95fdd..2421948759f4d 100644 --- a/cli/root.go +++ b/cli/root.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/fatih/color" + "github.com/charmbracelet/lipgloss" "github.com/kirsle/configdir" "github.com/mattn/go-isatty" "github.com/spf13/cobra" @@ -33,32 +33,26 @@ func Root() *cobra.Command { ▄▄██▀▀█▄▄▄ ██ ██ █▀▀█ ▐█▀▀██ ▄█▀▀█ █▀▀ █▌ ▄▌ ▐█ █▌ ▀█▄▄▄█▌ █ █ ▐█ ██ ██▀▀ █ ██████▀▄█ ▀▀▀▀ ▀▀▀▀ ▀▀▀▀▀ ▀▀▀▀ ▀ - ` + color.New(color.Underline).Sprint("Self-hosted developer workspaces on your infra") + ` + ` + lipgloss.NewStyle().Underline(true).Render("Self-hosted developer workspaces on your infra") + ` `, - Example: ` - - Create a project for developers to create workspaces + Example: cliui.Styles.Paragraph.Render(`Start Coder in "dev" mode. This dev-mode requires no further setup, and your local `+cliui.Styles.Code.Render("coder")+` CLI will be authenticated to talk to it. This makes it easy to experiment with Coder.`) + ` - ` + color.New(color.FgHiMagenta).Sprint("$ coder projects create ") + ` + ` + cliui.Styles.Code.Render("$ coder start --dev") + ` + ` + cliui.Styles.Paragraph.Render("Get started by creating a project from an example.") + ` - - Create a workspace for a specific project - - ` + color.New(color.FgHiMagenta).Sprint("$ coder workspaces create ") + ` - - - Maintain consistency by updating a workspace - - ` + color.New(color.FgHiMagenta).Sprint("$ coder workspaces update "), + ` + cliui.Styles.Code.Render("$ coder projects init"), } // Customizes the color of headings to make subcommands // more visually appealing. - header := color.New(color.FgHiBlack) + header := cliui.Styles.Placeholder cmd.SetUsageTemplate(strings.NewReplacer( - `Usage:`, header.Sprint("Usage:"), - `Examples:`, header.Sprint("Examples:"), - `Available Commands:`, header.Sprint("Commands:"), - `Global Flags:`, header.Sprint("Global Flags:"), - `Flags:`, header.Sprint("Flags:"), - `Additional help topics:`, header.Sprint("Additional help:"), + `Usage:`, header.Render("Usage:"), + `Examples:`, header.Render("Examples:"), + `Available Commands:`, header.Render("Commands:"), + `Global Flags:`, header.Render("Global Flags:"), + `Flags:`, header.Render("Flags:"), + `Additional help topics:`, header.Render("Additional help:"), ).Replace(cmd.UsageTemplate())) cmd.AddCommand( diff --git a/cli/start.go b/cli/start.go index 2076e45b81389..7c4e915f72d35 100644 --- a/cli/start.go +++ b/cli/start.go @@ -32,8 +32,9 @@ import ( func start() *cobra.Command { var ( - address string - dev bool + address string + dev bool + useTunnel bool ) root := &cobra.Command{ Use: "start", @@ -44,22 +45,31 @@ func start() *cobra.Command { return xerrors.Errorf("listen %q: %w", address, err) } defer listener.Close() + tcpAddr, valid := listener.Addr().(*net.TCPAddr) + if !valid { + return xerrors.New("must be listening on tcp") + } + if tcpAddr.IP.IsUnspecified() { + tcpAddr.IP = net.IPv4(127, 0, 0, 1) + } localURL := &url.URL{ Scheme: "http", - Host: address, + Host: tcpAddr.String(), } accessURL := localURL var tunnelErr <-chan error if dev { - var accessURLRaw string - accessURLRaw, tunnelErr, err = tunnel.New(cmd.Context(), localURL.String()) - if err != nil { - return xerrors.Errorf("create tunnel: %w", err) - } - accessURL, err = url.Parse(accessURLRaw) - if err != nil { - return xerrors.Errorf("parse: %w", err) + if useTunnel { + var accessURLRaw string + accessURLRaw, tunnelErr, err = tunnel.New(cmd.Context(), localURL.String()) + if err != nil { + return xerrors.Errorf("create tunnel: %w", err) + } + accessURL, err = url.Parse(accessURLRaw) + if err != nil { + return xerrors.Errorf("parse: %w", err) + } } _, _ = fmt.Fprintf(cmd.OutOrStdout(), ` ▄█▀ ▀█▄ @@ -72,7 +82,7 @@ func start() *cobra.Command { cliui.Styles.Field.Render("dev")+` mode. All data is in-memory! Learn how to setup and manage a production Coder deployment here: `+cliui.Styles.Prompt.Render("https://coder.com/docs/TODO")))+ ` `+ - cliui.Styles.Paragraph.Render(cliui.Styles.Wrap.Render(cliui.Styles.FocusedPrompt.String()+`Run `+cliui.Styles.Code.Render("coder login "+localURL.String())+" in a new terminal to get started.\n"))+` + cliui.Styles.Paragraph.Render(cliui.Styles.Wrap.Render(cliui.Styles.FocusedPrompt.String()+`Run `+cliui.Styles.Code.Render("coder projects init")+" in a new terminal to get started.\n"))+` `) } @@ -80,7 +90,6 @@ func start() *cobra.Command { if err != nil { return err } - logger.Info(cmd.Context(), "opened tunnel", slog.F("url", accessURL.String())) handler, closeCoderd := coderd.New(&coderd.Options{ AccessURL: accessURL, Logger: logger, @@ -89,6 +98,7 @@ func start() *cobra.Command { GoogleTokenValidator: validator, }) client := codersdk.New(localURL) + daemonClose, err := newProvisionerDaemon(cmd.Context(), client, logger) if err != nil { return xerrors.Errorf("create provisioner daemon: %w", err) @@ -101,6 +111,34 @@ func start() *cobra.Command { errCh <- http.Serve(listener, handler) }() + if dev { + config := createConfig(cmd) + _, err = client.CreateFirstUser(cmd.Context(), codersdk.CreateFirstUserRequest{ + Email: "dev@coder.com", + Username: "developer", + Password: "password", + Organization: "coder", + }) + if err != nil { + return xerrors.Errorf("create first user: %w\n", err) + } + token, err := client.LoginWithPassword(cmd.Context(), codersdk.LoginWithPasswordRequest{ + Email: "dev@coder.com", + Password: "password", + }) + if err != nil { + return xerrors.Errorf("login with first user: %w", err) + } + err = config.URL().Write(localURL.String()) + if err != nil { + return xerrors.Errorf("write local url: %w", err) + } + err = config.Session().Write(token.SessionToken) + if err != nil { + return xerrors.Errorf("write session token: %w", err) + } + } + closeCoderd() select { case <-cmd.Context().Done(): @@ -118,6 +156,7 @@ func start() *cobra.Command { } root.Flags().StringVarP(&address, "address", "a", defaultAddress, "The address to serve the API and dashboard.") root.Flags().BoolVarP(&dev, "dev", "", false, "Serve Coder in dev mode for tinkering.") + root.Flags().BoolVarP(&useTunnel, "tunnel", "", true, `Serve "dev" mode through a Cloudflare Tunnel for easy setup.`) return root } diff --git a/cli/start_test.go b/cli/start_test.go index a6d84aa445b5e..a26bcf842a34b 100644 --- a/cli/start_test.go +++ b/cli/start_test.go @@ -2,18 +2,47 @@ package cli_test import ( "context" + "net/url" "testing" + "time" "github.com/stretchr/testify/require" "github.com/coder/coder/cli/clitest" + "github.com/coder/coder/codersdk" ) func TestStart(t *testing.T) { t.Parallel() - ctx, cancelFunc := context.WithCancel(context.Background()) - go cancelFunc() - root, _ := clitest.New(t, "start") - err := root.ExecuteContext(ctx) - require.ErrorIs(t, err, context.Canceled) + t.Run("Production", func(t *testing.T) { + ctx, cancelFunc := context.WithCancel(context.Background()) + go cancelFunc() + root, _ := clitest.New(t, "start", "--address", ":0") + err := root.ExecuteContext(ctx) + require.ErrorIs(t, err, context.Canceled) + }) + t.Run("Development", func(t *testing.T) { + ctx, cancelFunc := context.WithCancel(context.Background()) + defer cancelFunc() + root, cfg := clitest.New(t, "start", "--dev", "--tunnel=false", "--address", ":0") + go func() { + err := root.ExecuteContext(ctx) + require.ErrorIs(t, err, context.Canceled) + }() + var accessURL string + require.Eventually(t, func() bool { + var err error + accessURL, err = cfg.URL().Read() + return err == nil + }, 15*time.Second, 25*time.Millisecond) + // Verify that authentication was properly set in dev-mode. + token, err := cfg.Session().Read() + require.NoError(t, err) + parsed, err := url.Parse(accessURL) + require.NoError(t, err) + client := codersdk.New(parsed) + client.SessionToken = token + _, err = client.User(ctx, "") + require.NoError(t, err) + }) } diff --git a/codersdk/templates.go b/codersdk/templates.go deleted file mode 100644 index 3a03b8ef35f10..0000000000000 --- a/codersdk/templates.go +++ /dev/null @@ -1,8 +0,0 @@ -package codersdk - -type Template struct { - ID string `json:"id"` - Name string `json:"name"` - Description string `json:"description"` - Markdown string `json:"markdown"` -} diff --git a/template/template.go b/examples/examples.go similarity index 60% rename from template/template.go rename to examples/examples.go index efca8442bed83..7b1da9e9eb1cf 100644 --- a/template/template.go +++ b/examples/examples.go @@ -1,4 +1,4 @@ -package template +package examples import ( "archive/tar" @@ -10,8 +10,6 @@ import ( "github.com/gohugoio/hugo/parser/pageparser" "golang.org/x/sync/singleflight" "golang.org/x/xerrors" - - "github.com/coder/coder/codersdk" ) var ( @@ -19,89 +17,91 @@ var ( //go:embed */*.tf files embed.FS - templates = make([]codersdk.Template, 0) - parseTemplates sync.Once - archives = singleflight.Group{} + examples = make([]Example, 0) + parseExamples sync.Once + archives = singleflight.Group{} ) -// Parses templates from the embedded archive and inserts them into the map. -func init() { - +type Example struct { + ID string `json:"id"` + Name string `json:"name"` + Description string `json:"description"` + Markdown string `json:"markdown"` } -// List returns all embedded templates. -func List() ([]codersdk.Template, error) { +// List returns all embedded examples. +func List() ([]Example, error) { var returnError error - parseTemplates.Do(func() { + parseExamples.Do(func() { dirs, err := files.ReadDir(".") if err != nil { returnError = xerrors.Errorf("read dir: %w", err) return } for _, dir := range dirs { - templateID := dir.Name() - // Each one of these is a template! + exampleID := dir.Name() + // Each one of these is a example! readme, err := files.ReadFile(path.Join(dir.Name(), "README.md")) if err != nil { - returnError = xerrors.Errorf("template %q does not contain README.md", templateID) + returnError = xerrors.Errorf("example %q does not contain README.md", exampleID) return } frontMatter, err := pageparser.ParseFrontMatterAndContent(bytes.NewReader(readme)) if err != nil { - returnError = xerrors.Errorf("parse template %q front matter: %w", templateID, err) + returnError = xerrors.Errorf("parse example %q front matter: %w", exampleID, err) return } nameRaw, exists := frontMatter.FrontMatter["name"] if !exists { - returnError = xerrors.Errorf("template %q front matter does not contain name", templateID) + returnError = xerrors.Errorf("example %q front matter does not contain name", exampleID) return } name, valid := nameRaw.(string) if !valid { - returnError = xerrors.Errorf("template %q name isn't a string", templateID) + returnError = xerrors.Errorf("example %q name isn't a string", exampleID) return } descriptionRaw, exists := frontMatter.FrontMatter["description"] if !exists { - returnError = xerrors.Errorf("template %q front matter does not contain name", templateID) + returnError = xerrors.Errorf("example %q front matter does not contain name", exampleID) return } description, valid := descriptionRaw.(string) if !valid { - returnError = xerrors.Errorf("template %q description isn't a string", templateID) + returnError = xerrors.Errorf("example %q description isn't a string", exampleID) return } - templates = append(templates, codersdk.Template{ - ID: templateID, + examples = append(examples, Example{ + ID: exampleID, Name: name, Description: description, Markdown: string(frontMatter.Content), }) } }) - return templates, returnError + return examples, returnError } -// Archive returns a tar by template ID. -func Archive(templateID string) ([]byte, error) { - rawData, err, _ := archives.Do(templateID, func() (interface{}, error) { - templates, err := List() +// Archive returns a tar by example ID. +func Archive(exampleID string) ([]byte, error) { + rawData, err, _ := archives.Do(exampleID, func() (interface{}, error) { + examples, err := List() if err != nil { return nil, err } - var selected codersdk.Template - for _, template := range templates { - if template.ID != templateID { + var selected Example + for _, example := range examples { + if example.ID != exampleID { continue } - selected = template + selected = example break } if selected.ID == "" { - return nil, xerrors.Errorf("template with id %q not found", templateID) + return nil, xerrors.Errorf("example with id %q not found", exampleID) } - entries, err := files.ReadDir(templateID) + entries, err := files.ReadDir(exampleID) if err != nil { return nil, xerrors.Errorf("read dir: %w", err) } @@ -110,7 +110,7 @@ func Archive(templateID string) ([]byte, error) { tarWriter := tar.NewWriter(&buffer) for _, entry := range entries { - file, err := files.Open(path.Join(templateID, entry.Name())) + file, err := files.Open(path.Join(exampleID, entry.Name())) if err != nil { return nil, xerrors.Errorf("open file: %w", err) } diff --git a/template/template_test.go b/examples/examples_test.go similarity index 61% rename from template/template_test.go rename to examples/examples_test.go index d28e4c7621535..b7428dacadb82 100644 --- a/template/template_test.go +++ b/examples/examples_test.go @@ -1,19 +1,19 @@ -package template_test +package examples_test import ( "testing" "github.com/stretchr/testify/require" - "github.com/coder/coder/template" + "github.com/coder/coder/examples" ) func TestTemplate(t *testing.T) { t.Parallel() - list, err := template.List() + list, err := examples.List() require.NoError(t, err) require.Greater(t, len(list), 0) - _, err = template.Archive(list[0].ID) + _, err = examples.Archive(list[0].ID) require.NoError(t, err) } diff --git a/template/gcp-linux/README.md b/examples/gcp-linux/README.md similarity index 100% rename from template/gcp-linux/README.md rename to examples/gcp-linux/README.md diff --git a/template/gcp-linux/main.tf b/examples/gcp-linux/main.tf similarity index 100% rename from template/gcp-linux/main.tf rename to examples/gcp-linux/main.tf diff --git a/template/gcp-windows/README.md b/examples/gcp-windows/README.md similarity index 100% rename from template/gcp-windows/README.md rename to examples/gcp-windows/README.md diff --git a/template/gcp-windows/main.tf b/examples/gcp-windows/main.tf similarity index 100% rename from template/gcp-windows/main.tf rename to examples/gcp-windows/main.tf diff --git a/examples/minimal-project/main.tf b/examples/minimal-project/main.tf deleted file mode 100644 index 0f74afeabe9e9..0000000000000 --- a/examples/minimal-project/main.tf +++ /dev/null @@ -1,4 +0,0 @@ -# The simplest possible Terraform module: it just outputs "Hello, World!" -output "hello_world" { - value = "Hello, World!" -} diff --git a/examples/project-with-parameters/main.tf b/examples/project-with-parameters/main.tf deleted file mode 100644 index aeae497d30a8c..0000000000000 --- a/examples/project-with-parameters/main.tf +++ /dev/null @@ -1,11 +0,0 @@ -# For interesting types of variables, check out the terraform docs: -# https://www.terraform.io/language/values/variables#declaring-an-input-variable -variable "message" { - type = string -} - -# And refer to the docs on using expressions to make use of variables: -# https://www.terraform.io/language/expressions/strings#interpolation -output "hello_provisioner" { - value = "Hello, provisioner: ${var.message}" -} diff --git a/examples/project-with-resource/main.tf b/examples/project-with-resource/main.tf deleted file mode 100644 index bd45f798a191b..0000000000000 --- a/examples/project-with-resource/main.tf +++ /dev/null @@ -1,17 +0,0 @@ -# For interesting types of variables, check out the terraform docs: -# https://www.terraform.io/language/values/variables#declaring-an-input-variable -variable "message" { - type = string -} - -# We can use a "null_resource" to test resources without a cloud provider: -# https://www.terraform.io/language/resources/provisioners/null_resource -resource "null_resource" "minimal_resource" { - - # Note that Terraform's `provisioner` concept is generally an anti-pattern - - # more info here: https://www.terraform.io/language/resources/provisioners/syntax - # But it's helpful here for testing a resource. - provisioner "local-exec" { - command = "echo ${var.message}" - } -} diff --git a/gcp-linux/README.md b/gcp-linux/README.md new file mode 100644 index 0000000000000..7f28a1b63c975 --- /dev/null +++ b/gcp-linux/README.md @@ -0,0 +1,5 @@ +--- +name: Develop in Linux on Google Cloud +description: Get started with Linux development on Google Cloud. +tags: [cloud, google] +--- diff --git a/gcp-linux/main.tf b/gcp-linux/main.tf new file mode 100644 index 0000000000000..c5f55e1c3fe14 --- /dev/null +++ b/gcp-linux/main.tf @@ -0,0 +1,73 @@ +terraform { + required_providers { + coder = { + source = "coder/coder" + } + } +} + +variable "gcp_credentials" { + sensitive = true +} + +variable "gcp_project" { + description = "The Google Cloud project to manage resources in." +} + +variable "gcp_region" { + default = "us-central1" +} + +provider "google" { + project = var.gcp_project + region = var.gcp_region + credentials = var.gcp_credentials +} + +data "coder_workspace" "me" { +} + +data "coder_agent_script" "dev" { + arch = "amd64" + os = "linux" +} + +data "google_compute_default_service_account" "default" { +} + +resource "random_string" "random" { + count = data.coder_workspace.me.transition == "start" ? 1 : 0 + length = 8 + special = false +} + +resource "google_compute_instance" "dev" { + zone = "us-central1-a" + count = data.coder_workspace.me.transition == "start" ? 1 : 0 + name = "coder-${lower(random_string.random[0].result)}" + machine_type = "e2-medium" + network_interface { + network = "default" + access_config { + // Ephemeral public IP + } + } + boot_disk { + initialize_params { + image = "debian-cloud/debian-9" + } + } + service_account { + email = data.google_compute_default_service_account.default.email + scopes = ["cloud-platform"] + } + metadata_startup_script = data.coder_agent_script.dev.value +} + +resource "coder_agent" "dev" { + count = length(google_compute_instance.dev) + auth { + type = "google-instance-identity" + instance_id = google_compute_instance.dev[0].instance_id + } +} From 519043890b045293185bb585a6b90932a7b284d0 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Fri, 18 Mar 2022 07:16:21 +0000 Subject: [PATCH 32/37] Improve workspace create flow --- cli/cliui/cliui.go | 4 + cli/cliui/job.go | 149 ++++++++++++++++++++++++++ cli/cliui/parameter.go | 45 ++++++++ cli/cliui/prompt.go | 8 ++ cli/cliui/prompt_test.go | 18 ++++ cli/cliui/select.go | 18 ++-- cli/projectcreate.go | 93 ++++++---------- cli/projectinit.go | 2 +- cli/projects.go | 60 +++++------ cli/root.go | 3 +- cli/workspacecreate.go | 149 ++++++++++++++++++++------ cli/workspacedelete.go | 28 ++--- cli/workspacelist.go | 7 +- cli/workspaces.go | 3 +- cli/workspacestart.go | 28 ++--- cli/workspacestop.go | 23 ++-- cmd/cliui/main.go | 64 ++++++++++- coderd/organizations.go | 2 +- coderd/organizations_test.go | 11 ++ coderd/users.go | 16 +++ codersdk/users.go | 3 + database/databasefake/databasefake.go | 6 +- examples/gcp-linux/main.tf | 54 +++++++--- gcp-linux/README.md | 5 - gcp-linux/main.tf | 73 ------------- provisioner/terraform/parse.go | 14 ++- provisioner/terraform/provision.go | 2 + provisionersdk/archive.go | 4 + 28 files changed, 618 insertions(+), 274 deletions(-) create mode 100644 cli/cliui/parameter.go delete mode 100644 gcp-linux/README.md delete mode 100644 gcp-linux/main.tf diff --git a/cli/cliui/cliui.go b/cli/cliui/cliui.go index 0ceb7e70000e5..5d324e76cd244 100644 --- a/cli/cliui/cliui.go +++ b/cli/cliui/cliui.go @@ -30,7 +30,9 @@ var Styles = struct { Placeholder, Prompt, FocusedPrompt, + Fuschia, Logo, + Warn, Wrap lipgloss.Style }{ Bold: lipgloss.NewStyle().Bold(true), @@ -41,6 +43,8 @@ var Styles = struct { Placeholder: lipgloss.NewStyle().Foreground(lipgloss.Color("240")), Prompt: defaultStyles.Prompt.Foreground(lipgloss.AdaptiveColor{Light: "#9B9B9B", Dark: "#5C5C5C"}), FocusedPrompt: defaultStyles.FocusedPrompt.Foreground(lipgloss.Color("#651fff")), + Fuschia: defaultStyles.SelectedMenuItem.Copy(), Logo: defaultStyles.Logo.SetString("Coder"), + Warn: lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{Light: "#04B575", Dark: "#ECFD65"}), Wrap: defaultStyles.Wrap, } diff --git a/cli/cliui/job.go b/cli/cliui/job.go index 790e139177e15..44e3940ba004a 100644 --- a/cli/cliui/job.go +++ b/cli/cliui/job.go @@ -1 +1,150 @@ package cliui + +import ( + "fmt" + "os" + "os/signal" + "time" + + "github.com/briandowns/spinner" + "github.com/charmbracelet/lipgloss" + "github.com/spf13/cobra" + + "github.com/coder/coder/codersdk" + "github.com/coder/coder/database" +) + +type JobOptions struct { + Title string + Fetch func() (codersdk.ProvisionerJob, error) + Cancel func() error + Logs func() (<-chan codersdk.ProvisionerJobLog, error) +} + +// Job renders a provisioner job. +func Job(cmd *cobra.Command, opts JobOptions) (codersdk.ProvisionerJob, error) { + var ( + spin = spinner.New(spinner.CharSets[5], 100*time.Millisecond, spinner.WithColor("fgGreen")) + + started = false + completed = false + job codersdk.ProvisionerJob + ) + _, _ = fmt.Fprintln(cmd.OutOrStdout(), fmt.Sprintf("%s%s %s", Styles.FocusedPrompt, opts.Title, Styles.Placeholder.Render("(ctrl+c to cancel)"))) + + spin.Writer = cmd.OutOrStdout() + defer spin.Stop() + + // Refreshes the job state! + refresh := func() { + var err error + job, err = opts.Fetch() + if err != nil { + // If a single fetch fails, it could be a one-off. + return + } + + if !started && job.StartedAt != nil { + spin.Stop() + fmt.Fprintf(cmd.OutOrStdout(), Styles.Prompt.String()+"Started "+Styles.Placeholder.Render("[%dms]")+"\n", job.StartedAt.Sub(job.CreatedAt).Milliseconds()) + spin.Start() + started = true + } + if !completed && job.CompletedAt != nil { + spin.Stop() + msg := "" + switch job.Status { + case codersdk.ProvisionerJobCanceled: + msg = "Canceled" + case codersdk.ProvisionerJobFailed: + msg = "Completed" + case codersdk.ProvisionerJobSucceeded: + msg = "Built" + } + started := job.CreatedAt + if job.StartedAt != nil { + started = *job.StartedAt + } + fmt.Fprintf(cmd.OutOrStderr(), Styles.Prompt.String()+msg+" "+Styles.Placeholder.Render("[%dms]")+"\n", job.CompletedAt.Sub(started).Milliseconds()) + spin.Start() + completed = true + } + + switch job.Status { + case codersdk.ProvisionerJobPending: + spin.Suffix = " Queued" + case codersdk.ProvisionerJobRunning: + spin.Suffix = " Running" + case codersdk.ProvisionerJobCanceling: + spin.Suffix = " Canceling" + } + } + refresh() + spin.Start() + + stopChan := make(chan os.Signal, 1) + defer signal.Stop(stopChan) + go func() { + signal.Notify(stopChan, os.Interrupt) + select { + case <-cmd.Context().Done(): + return + case _, ok := <-stopChan: + if !ok { + return + } + } + spin.Stop() + fmt.Fprintf(cmd.OutOrStdout(), Styles.FocusedPrompt.String()+"Gracefully canceling... wait for exit or data loss may occur!\n") + spin.Start() + err := opts.Cancel() + if err != nil { + fmt.Fprintf(cmd.OutOrStdout(), "Failed to cancel %s...\n", err) + } + refresh() + }() + + logs, err := opts.Logs() + if err != nil { + return job, err + } + + firstLog := false + ticker := time.NewTicker(time.Second) + for { + select { + case <-cmd.Context().Done(): + return job, cmd.Context().Err() + case <-ticker.C: + refresh() + if job.CompletedAt != nil { + return job, nil + } + case log, ok := <-logs: + if !ok { + refresh() + continue + } + if !firstLog { + refresh() + firstLog = true + } + spin.Stop() + var style lipgloss.Style + switch log.Level { + case database.LogLevelTrace: + style = defaultStyles.Error + case database.LogLevelDebug: + style = defaultStyles.Error + case database.LogLevelError: + style = defaultStyles.Error + case database.LogLevelWarn: + style = Styles.Warn + case database.LogLevelInfo: + style = defaultStyles.Note + } + fmt.Fprintln(cmd.OutOrStdout(), fmt.Sprintf("%s %s %s", Styles.Placeholder.Render("|"), style.Render(string(log.Level)), log.Output)) + spin.Start() + } + } +} diff --git a/cli/cliui/parameter.go b/cli/cliui/parameter.go new file mode 100644 index 0000000000000..8ba8a324e4b67 --- /dev/null +++ b/cli/cliui/parameter.go @@ -0,0 +1,45 @@ +package cliui + +import ( + "fmt" + "strings" + + "github.com/spf13/cobra" + + "github.com/coder/coder/coderd/parameter" + "github.com/coder/coder/codersdk" +) + +func ParameterSchema(cmd *cobra.Command, parameterSchema codersdk.ProjectVersionParameterSchema) (string, error) { + _, _ = fmt.Fprintln(cmd.OutOrStdout(), Styles.Bold.Render("var."+parameterSchema.Name)) + if parameterSchema.Description != "" { + _, _ = fmt.Fprintln(cmd.OutOrStdout(), " "+strings.TrimSpace(strings.Join(strings.Split(parameterSchema.Description, "\n"), "\n "))+"\n") + } + + var err error + var options []string + if parameterSchema.ValidationCondition != "" { + options, _, err = parameter.Contains(parameterSchema.ValidationCondition) + if err != nil { + return "", err + } + } + var value string + if len(options) > 0 { + // Move the cursor up a single line for nicer display! + fmt.Fprint(cmd.OutOrStdout(), "\033[1A") + value, err = Select(cmd, SelectOptions{ + Options: options, + HideSearch: true, + }) + if err == nil { + fmt.Fprintln(cmd.OutOrStdout()) + fmt.Fprintln(cmd.OutOrStdout(), " "+Styles.Prompt.String()+Styles.Field.Render(value)) + } + } else { + value, err = Prompt(cmd, PromptOptions{ + Text: Styles.Bold.Render("Enter a value:"), + }) + } + return value, err +} diff --git a/cli/cliui/prompt.go b/cli/cliui/prompt.go index 406e167ed7eba..79824750b96bc 100644 --- a/cli/cliui/prompt.go +++ b/cli/cliui/prompt.go @@ -45,6 +45,14 @@ func Prompt(cmd *cobra.Command, opts PromptOptions) (string, error) { } else { reader := bufio.NewReader(cmd.InOrStdin()) line, err = reader.ReadString('\n') + // Multiline with single quotes! + if err == nil && strings.HasPrefix(line, "'") { + rest, err := reader.ReadString('\'') + if err == nil { + line += rest + line = strings.Trim(line, "'") + } + } } if err != nil { errCh <- err diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go index 99468dd220b31..54c92057674ba 100644 --- a/cli/cliui/prompt_test.go +++ b/cli/cliui/prompt_test.go @@ -45,6 +45,24 @@ func TestPrompt(t *testing.T) { ptty.WriteLine("yes") require.Equal(t, "yes", <-doneChan) }) + + t.Run("Multiline", func(t *testing.T) { + t.Parallel() + ptty := ptytest.New(t) + doneChan := make(chan string) + go func() { + resp, err := newPrompt(ptty, cliui.PromptOptions{ + Text: "Example", + }) + require.NoError(t, err) + doneChan <- resp + }() + ptty.ExpectMatch("Example") + ptty.WriteLine("'this is a") + ptty.WriteLine("test'") + require.Equal(t, `this is a +test`, <-doneChan) + }) } func newPrompt(ptty *ptytest.PTY, opts cliui.PromptOptions) (string, error) { diff --git a/cli/cliui/select.go b/cli/cliui/select.go index a364e24da31ea..e2890dd0e17cf 100644 --- a/cli/cliui/select.go +++ b/cli/cliui/select.go @@ -12,8 +12,9 @@ import ( ) type SelectOptions struct { - Options []string - Size int + Options []string + Size int + HideSearch bool } // Select displays a list of user options. @@ -29,19 +30,24 @@ func Select(cmd *cobra.Command, opts SelectOptions) (string, error) { return strings.Contains(name, input) }, - Stdin: io.NopCloser(cmd.InOrStdin()), - Stdout: &writeCloser{cmd.OutOrStdout()}, + HideHelp: opts.HideSearch, + Stdin: io.NopCloser(cmd.InOrStdin()), + Stdout: &writeCloser{cmd.OutOrStdout()}, Templates: &promptui.SelectTemplates{ FuncMap: template.FuncMap{ "faint": func(value interface{}) string { return Styles.Placeholder.Render(value.(string)) }, + "subtle": func(value interface{}) string { + return defaultStyles.Subtle.Render(value.(string)) + }, "selected": func(value interface{}) string { - return defaultStyles.SelectedMenuItem.Render("▶ " + value.(string)) + return defaultStyles.Keyword.Render("> " + value.(string)) + // return defaultStyles.SelectedMenuItem.Render("> " + value.(string)) }, }, Active: "{{ . | selected }}", - Inactive: " {{.}}", + Inactive: " {{ . }}", Label: "{{.}}", Selected: "{{ \"\" }}", Help: fmt.Sprintf(`{{ "Use" | faint }} {{ .SearchKey | faint }} {{ "to toggle search" | faint }}`), diff --git a/cli/projectcreate.go b/cli/projectcreate.go index a0c4b301af3cd..4816c5fdaa678 100644 --- a/cli/projectcreate.go +++ b/cli/projectcreate.go @@ -51,27 +51,25 @@ func projectCreate() *cobra.Command { return xerrors.Errorf("A project already exists named %q!", projectName) } - start := time.Now() - archive, err := provisionersdk.Tar(directory) - if err != nil { - return err - } spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) spin.Writer = cmd.OutOrStdout() - spin.Suffix = " Uploading current directory..." - err = spin.Color("fgHiGreen") + spin.Suffix = cliui.Styles.Keyword.Render(" Uploading current directory...") + spin.Start() + defer spin.Stop() + archive, err := provisionersdk.Tar(directory) if err != nil { return err } - spin.Start() - defer spin.Stop() + resp, err := client.Upload(cmd.Context(), codersdk.ContentTypeTar, archive) if err != nil { return err } - spin.FinalMSG = fmt.Sprintf("Uploaded %d byte archive! [%dms]", len(archive), time.Now().Sub(start).Milliseconds()) + "\n" spin.Stop() + spin = spinner.New(spinner.CharSets[5], 100*time.Millisecond) + spin.Writer = cmd.OutOrStdout() + spin.Suffix = cliui.Styles.Keyword.Render("Something") job, parameters, err := createValidProjectVersion(cmd, client, organization, database.ProvisionerType(provisioner), resp.Hash) if err != nil { return err @@ -127,54 +125,23 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga if err != nil { return nil, nil, err } - spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) - spin.Writer = cmd.OutOrStdout() - spin.Suffix = " Waiting for the import to complete..." - spin.FinalMSG = "Parsed project..." - spin.Start() - - doneChan := make(chan struct{}) - go func() { - defer spin.Stop() - ticker := time.NewTicker(time.Second) - for { - select { - case <-doneChan: - return - case <-ticker.C: - } - version, err := client.ProjectVersion(cmd.Context(), version.ID) - if err != nil { - continue - } - switch version.Job.Status { - case codersdk.ProvisionerJobPending: - spin.Suffix = "Pending..." - case codersdk.ProvisionerJobCanceled: - spin.Suffix = "Canceled..." - case codersdk.ProvisionerJobCanceling: - spin.Suffix = "Canceling..." - case codersdk.ProvisionerJobFailed: - spin.FinalMSG = version.Job.Error - case codersdk.ProvisionerJobRunning: - spin.Suffix = "Running..." - } - } - }() - logs, err := client.ProjectVersionLogsAfter(cmd.Context(), version.ID, before) + _, err = cliui.Job(cmd, cliui.JobOptions{ + Title: "Building project...", + Fetch: func() (codersdk.ProvisionerJob, error) { + version, err := client.ProjectVersion(cmd.Context(), version.ID) + return version.Job, err + }, + Cancel: func() error { + return client.CancelProjectVersion(cmd.Context(), version.ID) + }, + Logs: func() (<-chan codersdk.ProvisionerJobLog, error) { + return client.ProjectVersionLogsAfter(cmd.Context(), version.ID, before) + }, + }) if err != nil { return nil, nil, err } - logBuffer := make([]codersdk.ProvisionerJobLog, 0, 64) - for { - log, ok := <-logs - if !ok { - break - } - logBuffer = append(logBuffer, log) - } - version, err = client.ProjectVersion(cmd.Context(), version.ID) if err != nil { return nil, nil, err @@ -187,7 +154,6 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga if err != nil { return nil, nil, err } - spin.Stop() if provisionerd.IsMissingParameterError(version.Job.Error) { valuesBySchemaID := map[string]codersdk.ProjectVersionParameter{} @@ -197,14 +163,21 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga sort.Slice(parameterSchemas, func(i, j int) bool { return parameterSchemas[i].Name < parameterSchemas[j].Name }) + missingSchemas := make([]codersdk.ProjectVersionParameterSchema, 0) for _, parameterSchema := range parameterSchemas { _, ok := valuesBySchemaID[parameterSchema.ID.String()] if ok { continue } - value, err := cliui.Prompt(cmd, cliui.PromptOptions{ - Text: fmt.Sprintf("Enter value for %s:", color.HiCyanString(parameterSchema.Name)), - }) + missingSchemas = append(missingSchemas, parameterSchema) + } + _, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render("This project has required variables! They are scoped to the project, and not viewable after being set.")+"\r\n") + for _, parameterSchema := range parameterSchemas { + _, ok := valuesBySchemaID[parameterSchema.ID.String()] + if ok { + continue + } + value, err := cliui.ParameterSchema(cmd, parameterSchema) if err != nil { return nil, nil, err } @@ -214,14 +187,12 @@ func createValidProjectVersion(cmd *cobra.Command, client *codersdk.Client, orga SourceScheme: database.ParameterSourceSchemeData, DestinationScheme: parameterSchema.DefaultDestinationScheme, }) + _, _ = fmt.Fprintln(cmd.OutOrStdout()) } return createValidProjectVersion(cmd, client, organization, provisioner, hash, parameters...) } if version.Job.Status != codersdk.ProvisionerJobSucceeded { - for _, log := range logBuffer { - _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s %s\n", color.HiGreenString("[tf]"), log.Output) - } return nil, nil, xerrors.New(version.Job.Error) } diff --git a/cli/projectinit.go b/cli/projectinit.go index 8300280a59813..eb5412248529d 100644 --- a/cli/projectinit.go +++ b/cli/projectinit.go @@ -27,7 +27,7 @@ func projectInit() *cobra.Command { exampleByName[example.Name] = example } - _, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Wrap.Render("Templates contain Infrastructure as Code that works with Coder to provision development workspaces. Get started by selecting one:\n")) + _, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Wrap.Render("Projects contain Infrastructure as Code that works with Coder to provision development workspaces. Get started by selecting an example:\n")) option, err := cliui.Select(cmd, cliui.SelectOptions{ Options: exampleNames, }) diff --git a/cli/projects.go b/cli/projects.go index 02b5b31555127..432df2bb0c0f4 100644 --- a/cli/projects.go +++ b/cli/projects.go @@ -2,13 +2,12 @@ package cli import ( "fmt" - "strings" + "sort" "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/xlab/treeprint" - "golang.org/x/xerrors" + "github.com/coder/coder/cli/cliui" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" ) @@ -48,40 +47,41 @@ func displayProjectVersionInfo(cmd *cobra.Command, parameterSchemas []codersdk.P for _, schema := range parameterSchemas { schemaByID[schema.ID.String()] = schema } + sort.Slice(resources, func(i, j int) bool { + return fmt.Sprintf("%s.%s", resources[i].Type, resources[i].Name) < fmt.Sprintf("%s.%s", resources[j].Type, resources[j].Name) + }) - _, _ = fmt.Fprintf(cmd.OutOrStdout(), "\n %s\n\n", color.HiBlackString("Parameters")) - for _, value := range parameterValues { - schema, ok := schemaByID[value.SchemaID.String()] - if !ok { - return xerrors.Errorf("schema not found: %s", value.Name) + addressOnStop := map[string]codersdk.WorkspaceResource{} + for _, resource := range resources { + if resource.Transition != database.WorkspaceTransitionStop { + continue } - displayValue := value.SourceValue - if !schema.RedisplayValue { - displayValue = "" + addressOnStop[resource.Address] = resource + } + + displayed := map[string]struct{}{} + for _, resource := range resources { + if resource.Type == "random_string" { + // Hide resources that aren't substantial to a user! + continue } - output := fmt.Sprintf("%s %s %s", color.HiCyanString(value.Name), color.HiBlackString("="), displayValue) - if value.DefaultSourceValue { - output += " (default value)" - } else if value.Scope != database.ParameterScopeImportJob { - output += fmt.Sprintf(" (inherited from %s)", value.Scope) + _, alreadyShown := displayed[resource.Address] + if alreadyShown { + continue } + displayed[resource.Address] = struct{}{} - root := treeprint.NewWithRoot(output) - if schema.Description != "" { - root.AddBranch(fmt.Sprintf("%s\n%s", color.HiBlackString("Description"), schema.Description)) + _, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Bold.Render("resource."+resource.Type+"."+resource.Name)) + _, existsOnStop := addressOnStop[resource.Address] + if existsOnStop { + _, _ = fmt.Fprintln(cmd.OutOrStdout(), " "+cliui.Styles.Warn.Render("~ persistent")) + } else { + _, _ = fmt.Fprintln(cmd.OutOrStdout(), " "+cliui.Styles.Keyword.Render("+ start")+cliui.Styles.Placeholder.Render(" (deletes on stop)")) } - if schema.AllowOverrideSource { - root.AddBranch(fmt.Sprintf("%s Users can customize this value!", color.HiYellowString("+"))) - } - _, _ = fmt.Fprintln(cmd.OutOrStdout(), " "+strings.Join(strings.Split(root.String(), "\n"), "\n ")) - } - _, _ = fmt.Fprintf(cmd.OutOrStdout(), " %s\n\n", color.HiBlackString("Resources")) - for _, resource := range resources { - transition := color.HiGreenString("start") - if resource.Transition == database.WorkspaceTransitionStop { - transition = color.HiRedString("stop") + if resource.Agent != nil { + _, _ = fmt.Fprintln(cmd.OutOrStdout(), " "+cliui.Styles.Fuschia.Render("▲ allows ssh")) } - _, _ = fmt.Fprintf(cmd.OutOrStdout(), " %s %s on %s\n\n", color.HiCyanString(resource.Type), color.HiCyanString(resource.Name), transition) + fmt.Fprintln(cmd.OutOrStdout()) } return nil } diff --git a/cli/root.go b/cli/root.go index 2421948759f4d..5b258ebebc742 100644 --- a/cli/root.go +++ b/cli/root.go @@ -27,7 +27,8 @@ const ( func Root() *cobra.Command { cmd := &cobra.Command{ - Use: "coder", + Use: "coder", + SilenceUsage: true, Long: ` ▄█▀ ▀█▄ ▄▄ ▀▀▀ █▌ ██▀▀█▄ ▐█ ▄▄██▀▀█▄▄▄ ██ ██ █▀▀█ ▐█▀▀██ ▄█▀▀█ █▀▀ diff --git a/cli/workspacecreate.go b/cli/workspacecreate.go index 4dafdca79bcaf..422a419eeda49 100644 --- a/cli/workspacecreate.go +++ b/cli/workspacecreate.go @@ -3,10 +3,10 @@ package cli import ( "errors" "fmt" + "sort" "time" "github.com/briandowns/spinner" - "github.com/fatih/color" "github.com/manifoldco/promptui" "github.com/spf13/cobra" @@ -14,6 +14,7 @@ import ( "github.com/coder/coder/cli/cliui" "github.com/coder/coder/codersdk" + "github.com/coder/coder/database" ) func workspaceCreate() *cobra.Command { @@ -34,19 +35,51 @@ func workspaceCreate() *cobra.Command { return err } - project, err := client.ProjectByName(cmd.Context(), organization.ID, projectName) - if err != nil { - return err + var project codersdk.Project + if projectName == "" { + _, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Wrap.Render("Select a project:")) + + projectNames := []string{} + projectByName := map[string]codersdk.Project{} + projects, err := client.ProjectsByOrganization(cmd.Context(), organization.ID) + if err != nil { + return err + } + for _, project := range projects { + projectNames = append(projectNames, project.Name) + projectByName[project.Name] = project + } + sort.Slice(projectNames, func(i, j int) bool { + return projectByName[projectNames[i]].WorkspaceOwnerCount > projectByName[projectNames[j]].WorkspaceOwnerCount + }) + // Move the cursor up a single line for nicer display! + option, err := cliui.Select(cmd, cliui.SelectOptions{ + Options: projectNames, + HideSearch: true, + }) + if err != nil { + return err + } + project = projectByName[option] + } else { + project, err = client.ProjectByName(cmd.Context(), organization.ID, projectName) + if err != nil { + return xerrors.Errorf("get project by name: %w", err) + } + if err != nil { + return err + } } + fmt.Fprintln(cmd.OutOrStdout()) + fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Prompt.String()+"Creating with the "+cliui.Styles.Field.Render(project.Name)+" project...") + workspaceName := args[0] _, err = client.WorkspaceByName(cmd.Context(), "", workspaceName) if err == nil { return xerrors.Errorf("A workspace already exists named %q!", workspaceName) } - _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s Previewing project create...\n", caret) - projectVersion, err := client.ProjectVersion(cmd.Context(), project.ActiveVersionID) if err != nil { return err @@ -55,6 +88,35 @@ func workspaceCreate() *cobra.Command { if err != nil { return err } + + printed := false + parameters := make([]codersdk.CreateParameterRequest, 0) + for _, parameterSchema := range parameterSchemas { + if !parameterSchema.AllowOverrideSource { + continue + } + if !printed { + fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render("This project has customizable parameters! These can be changed after create, but may have unintended side effects (like data loss).")+"\r\n") + printed = true + } + + value, err := cliui.ParameterSchema(cmd, parameterSchema) + if err != nil { + return err + } + parameters = append(parameters, codersdk.CreateParameterRequest{ + Name: parameterSchema.Name, + SourceValue: value, + SourceScheme: database.ParameterSourceSchemeData, + DestinationScheme: parameterSchema.DefaultDestinationScheme, + }) + } + if printed { + fmt.Fprintln(cmd.OutOrStdout()) + fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.FocusedPrompt.String()+"Previewing resources...") + fmt.Fprintln(cmd.OutOrStdout()) + } + parameterValues, err := client.ProjectVersionParameters(cmd.Context(), projectVersion.ID) if err != nil { return err @@ -80,48 +142,69 @@ func workspaceCreate() *cobra.Command { return err } + before := time.Now() workspace, err := client.CreateWorkspace(cmd.Context(), "", codersdk.CreateWorkspaceRequest{ - ProjectID: project.ID, - Name: workspaceName, + ProjectID: project.ID, + Name: workspaceName, + ParameterValues: parameters, }) if err != nil { return err } - - spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond) - spin.Writer = cmd.OutOrStdout() - spin.Suffix = " Building workspace..." - err = spin.Color("fgHiGreen") + _, err = cliui.Job(cmd, cliui.JobOptions{ + Title: "Building workspace...", + Fetch: func() (codersdk.ProvisionerJob, error) { + build, err := client.WorkspaceBuild(cmd.Context(), workspace.LatestBuild.ID) + return build.Job, err + }, + Cancel: func() error { + return client.CancelWorkspaceBuild(cmd.Context(), workspace.LatestBuild.ID) + }, + Logs: func() (<-chan codersdk.ProvisionerJobLog, error) { + return client.WorkspaceBuildLogsAfter(cmd.Context(), workspace.LatestBuild.ID, before) + }, + }) if err != nil { return err } - spin.Start() - defer spin.Stop() - logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), workspace.LatestBuild.ID, time.Time{}) + resources, err = client.WorkspaceResourcesByBuild(cmd.Context(), workspace.LatestBuild.ID) if err != nil { return err } - logBuffer := make([]codersdk.ProvisionerJobLog, 0, 64) - for { - log, ok := <-logs - if !ok { - break + for _, resource := range resources { + if resource.Agent == nil { + continue } - logBuffer = append(logBuffer, log) - } - build, err := client.WorkspaceBuild(cmd.Context(), workspace.LatestBuild.ID) - if err != nil { - return err - } - if build.Job.Status != codersdk.ProvisionerJobSucceeded { - for _, log := range logBuffer { - _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s %s\n", color.HiGreenString("[tf]"), log.Output) + spin := spinner.New(spinner.CharSets[5], 100*time.Millisecond, spinner.WithColor("fgGreen")) + spin.Writer = cmd.OutOrStdout() + spin.Suffix = " Waiting for agent to connect..." + spin.Start() + defer spin.Stop() + ticker := time.NewTicker(1 * time.Second) + for { + select { + case <-cmd.Context().Done(): + return nil + case <-ticker.C: + } + resource, err := client.WorkspaceResource(cmd.Context(), resource.ID) + if err != nil { + return err + } + if resource.Agent.FirstConnectedAt == nil { + continue + } + spin.Stop() + fmt.Fprintln(cmd.OutOrStdout()) + fmt.Fprintln(cmd.OutOrStdout(), fmt.Sprintf("The %s workspace has been created!", cliui.Styles.Keyword.Render(workspace.Name))) + fmt.Fprintln(cmd.OutOrStdout()) + fmt.Fprintln(cmd.OutOrStdout(), " "+cliui.Styles.Code.Render("coder ssh "+workspace.Name)) + fmt.Fprintln(cmd.OutOrStdout()) + break } - return xerrors.New(build.Job.Error) } - _, _ = fmt.Printf("Created workspace! %s\n", workspaceName) - return nil + return err }, } cmd.Flags().StringVarP(&projectName, "project", "p", "", "Specify a project name.") diff --git a/cli/workspacedelete.go b/cli/workspacedelete.go index 4819d13fdff6e..63b3e18f749c4 100644 --- a/cli/workspacedelete.go +++ b/cli/workspacedelete.go @@ -1,11 +1,11 @@ package cli import ( - "fmt" "time" "github.com/spf13/cobra" + "github.com/coder/coder/cli/cliui" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" ) @@ -32,18 +32,20 @@ func workspaceDelete() *cobra.Command { if err != nil { return err } - logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before) - if err != nil { - return err - } - for { - log, ok := <-logs - if !ok { - break - } - _, _ = fmt.Printf("Output: %s\n", log.Output) - } - return nil + _, err = cliui.Job(cmd, cliui.JobOptions{ + Title: "Deleting workspace...", + Fetch: func() (codersdk.ProvisionerJob, error) { + build, err := client.WorkspaceBuild(cmd.Context(), build.ID) + return build.Job, err + }, + Cancel: func() error { + return client.CancelWorkspaceBuild(cmd.Context(), build.ID) + }, + Logs: func() (<-chan codersdk.ProvisionerJobLog, error) { + return client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before) + }, + }) + return err }, } } diff --git a/cli/workspacelist.go b/cli/workspacelist.go index fec1f6c198f9c..27c6967f8fb4a 100644 --- a/cli/workspacelist.go +++ b/cli/workspacelist.go @@ -5,6 +5,7 @@ import ( "text/tabwriter" "time" + "github.com/coder/coder/cli/cliui" "github.com/fatih/color" "github.com/spf13/cobra" ) @@ -24,8 +25,10 @@ func workspaceList() *cobra.Command { return err } if len(workspaces) == 0 { - _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s No workspaces found! Create one:\n\n", caret) - _, _ = fmt.Fprintln(cmd.OutOrStdout(), color.HiMagentaString(" $ coder workspaces create \n")) + _, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Prompt.String()+"No workspaces found! Create one:") + _, _ = fmt.Fprintln(cmd.OutOrStdout()) + _, _ = fmt.Fprintln(cmd.OutOrStdout(), " "+cliui.Styles.Code.Render("coder workspaces create ")) + _, _ = fmt.Fprintln(cmd.OutOrStdout()) return nil } diff --git a/cli/workspaces.go b/cli/workspaces.go index 69f0ccbde8824..125d81d31b3bf 100644 --- a/cli/workspaces.go +++ b/cli/workspaces.go @@ -8,7 +8,8 @@ import ( func workspaces() *cobra.Command { cmd := &cobra.Command{ - Use: "workspaces", + Use: "workspaces", + Aliases: []string{"ws"}, } cmd.AddCommand(workspaceAgent()) cmd.AddCommand(workspaceCreate()) diff --git a/cli/workspacestart.go b/cli/workspacestart.go index 2ed139543144f..eeed3d81476b0 100644 --- a/cli/workspacestart.go +++ b/cli/workspacestart.go @@ -1,11 +1,11 @@ package cli import ( - "fmt" "time" "github.com/spf13/cobra" + "github.com/coder/coder/cli/cliui" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" ) @@ -31,18 +31,20 @@ func workspaceStart() *cobra.Command { if err != nil { return err } - logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before) - if err != nil { - return err - } - for { - log, ok := <-logs - if !ok { - break - } - _, _ = fmt.Printf("Output: %s\n", log.Output) - } - return nil + _, err = cliui.Job(cmd, cliui.JobOptions{ + Title: "Starting workspace...", + Fetch: func() (codersdk.ProvisionerJob, error) { + build, err := client.WorkspaceBuild(cmd.Context(), build.ID) + return build.Job, err + }, + Cancel: func() error { + return client.CancelWorkspaceBuild(cmd.Context(), build.ID) + }, + Logs: func() (<-chan codersdk.ProvisionerJobLog, error) { + return client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before) + }, + }) + return err }, } } diff --git a/cli/workspacestop.go b/cli/workspacestop.go index 5d82b88e2a0e8..b665bb15b972d 100644 --- a/cli/workspacestop.go +++ b/cli/workspacestop.go @@ -1,11 +1,11 @@ package cli import ( - "fmt" "time" "github.com/spf13/cobra" + "github.com/coder/coder/cli/cliui" "github.com/coder/coder/codersdk" "github.com/coder/coder/database" ) @@ -31,17 +31,22 @@ func workspaceStop() *cobra.Command { if err != nil { return err } - logs, err := client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before) + _, err = cliui.Job(cmd, cliui.JobOptions{ + Title: "Stopping workspace...", + Fetch: func() (codersdk.ProvisionerJob, error) { + build, err := client.WorkspaceBuild(cmd.Context(), build.ID) + return build.Job, err + }, + Cancel: func() error { + return client.CancelWorkspaceBuild(cmd.Context(), build.ID) + }, + Logs: func() (<-chan codersdk.ProvisionerJobLog, error) { + return client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before) + }, + }) if err != nil { return err } - for { - log, ok := <-logs - if !ok { - break - } - _, _ = fmt.Printf("Output: %s\n", log.Output) - } return nil }, } diff --git a/cmd/cliui/main.go b/cmd/cliui/main.go index 351ad7dbf90e7..af4e522e360b8 100644 --- a/cmd/cliui/main.go +++ b/cmd/cliui/main.go @@ -5,11 +5,14 @@ import ( "fmt" "os" "strings" + "time" "github.com/spf13/cobra" "golang.org/x/xerrors" "github.com/coder/coder/cli/cliui" + "github.com/coder/coder/codersdk" + "github.com/coder/coder/database" ) func main() { @@ -60,7 +63,6 @@ func main() { Use: "select", RunE: func(cmd *cobra.Command, args []string) error { _, err := cliui.Select(cmd, cliui.SelectOptions{ - Text: "Pick an option!", Options: []string{"Tomato", "Banana", "Onion", "Grape", "Lemon"}, Size: 3, }) @@ -68,6 +70,66 @@ func main() { }, }) + root.AddCommand(&cobra.Command{ + Use: "job", + RunE: func(cmd *cobra.Command, args []string) error { + job := codersdk.ProvisionerJob{ + Status: codersdk.ProvisionerJobPending, + CreatedAt: database.Now(), + } + go func() { + time.Sleep(time.Second) + if job.Status != codersdk.ProvisionerJobPending { + return + } + started := database.Now() + job.StartedAt = &started + job.Status = codersdk.ProvisionerJobRunning + time.Sleep(3 * time.Second) + if job.Status != codersdk.ProvisionerJobRunning { + return + } + completed := database.Now() + job.CompletedAt = &completed + job.Status = codersdk.ProvisionerJobSucceeded + }() + + _, err := cliui.Job(cmd, cliui.JobOptions{ + Fetch: func() (codersdk.ProvisionerJob, error) { + return job, nil + }, + Logs: func() (<-chan codersdk.ProvisionerJobLog, error) { + logs := make(chan codersdk.ProvisionerJobLog) + go func() { + defer close(logs) + ticker := time.NewTicker(500 * time.Millisecond) + for { + select { + case <-cmd.Context().Done(): + return + case <-ticker.C: + logs <- codersdk.ProvisionerJobLog{ + Output: "Some log", + Level: database.LogLevelInfo, + } + } + } + }() + return logs, nil + }, + Cancel: func() error { + job.Status = codersdk.ProvisionerJobCanceling + time.Sleep(time.Second) + job.Status = codersdk.ProvisionerJobCanceled + completed := database.Now() + job.CompletedAt = &completed + return nil + }, + }) + return err + }, + }) + err := root.Execute() if err != nil { _, _ = fmt.Println(err.Error()) diff --git a/coderd/organizations.go b/coderd/organizations.go index dc1e091f015ae..1bca4d2839173 100644 --- a/coderd/organizations.go +++ b/coderd/organizations.go @@ -229,7 +229,7 @@ func (api *api) postProjectsByOrganization(rw http.ResponseWriter, r *http.Reque CreatedAt: database.Now(), UpdatedAt: database.Now(), Scope: database.ParameterScopeProject, - ScopeID: project.ID.String(), + ScopeID: dbProject.ID.String(), SourceScheme: parameterValue.SourceScheme, SourceValue: parameterValue.SourceValue, DestinationScheme: parameterValue.DestinationScheme, diff --git a/coderd/organizations_test.go b/coderd/organizations_test.go index e8b3061f0d461..5633717306b23 100644 --- a/coderd/organizations_test.go +++ b/coderd/organizations_test.go @@ -152,6 +152,17 @@ func TestProjectsByOrganization(t *testing.T) { require.NoError(t, err) require.Len(t, projects, 1) }) + t.Run("ListMultiple", func(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + user := coderdtest.CreateFirstUser(t, client) + version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, nil) + coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) + coderdtest.CreateProject(t, client, user.OrganizationID, version.ID) + projects, err := client.ProjectsByOrganization(context.Background(), user.OrganizationID) + require.NoError(t, err) + require.Len(t, projects, 2) + }) } func TestProjectByOrganizationAndName(t *testing.T) { diff --git a/coderd/users.go b/coderd/users.go index b5d22d58d640f..13060f9998aeb 100644 --- a/coderd/users.go +++ b/coderd/users.go @@ -603,6 +603,22 @@ func (api *api) postWorkspacesByUser(rw http.ResponseWriter, r *http.Request) { if err != nil { return xerrors.Errorf("insert workspace: %w", err) } + for _, parameterValue := range createWorkspace.ParameterValues { + _, err = db.InsertParameterValue(r.Context(), database.InsertParameterValueParams{ + ID: uuid.New(), + Name: parameterValue.Name, + CreatedAt: database.Now(), + UpdatedAt: database.Now(), + Scope: database.ParameterScopeWorkspace, + ScopeID: workspace.ID.String(), + SourceScheme: parameterValue.SourceScheme, + SourceValue: parameterValue.SourceValue, + DestinationScheme: parameterValue.DestinationScheme, + }) + if err != nil { + return xerrors.Errorf("insert parameter value: %w", err) + } + } input, err := json.Marshal(workspaceProvisionJob{ WorkspaceBuildID: workspaceBuildID, diff --git a/codersdk/users.go b/codersdk/users.go index 94bafe47b1aea..bdee84f5982c3 100644 --- a/codersdk/users.go +++ b/codersdk/users.go @@ -62,6 +62,9 @@ type CreateOrganizationRequest struct { type CreateWorkspaceRequest struct { ProjectID uuid.UUID `json:"project_id" validate:"required"` Name string `json:"name" validate:"username,required"` + // ParameterValues allows for additional parameters to be provided + // during the initial provision. + ParameterValues []CreateParameterRequest `json:"parameter_values"` } // HasFirstUser returns whether the first user has been created. diff --git a/database/databasefake/databasefake.go b/database/databasefake/databasefake.go index 5f9733daeb69a..a6b955a92288b 100644 --- a/database/databasefake/databasefake.go +++ b/database/databasefake/databasefake.go @@ -565,10 +565,10 @@ func (q *fakeQuerier) GetProjectsByOrganization(_ context.Context, arg database. if project.Deleted != arg.Deleted { continue } - if project.OrganizationID == arg.OrganizationID { - projects = append(projects, project) - break + if project.OrganizationID != arg.OrganizationID { + continue } + projects = append(projects, project) } if len(projects) == 0 { return nil, sql.ErrNoRows diff --git a/examples/gcp-linux/main.tf b/examples/gcp-linux/main.tf index c5f55e1c3fe14..06ad46960a2c0 100644 --- a/examples/gcp-linux/main.tf +++ b/examples/gcp-linux/main.tf @@ -1,27 +1,40 @@ terraform { required_providers { coder = { - source = "coder/coder" + source = "coder/coder" } } } -variable "gcp_credentials" { - sensitive = true -} +variable "service_account" { + description = <