Jun 15, 2022 · Jun 14, 2022 · Jun 15, 2022 · Jun 15, 2022 · Jun 15, 2022 · Jun 15, 2022
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
        type: "config|noreplace"
      - src: coder.service
        dst: /usr/lib/systemd/system/coder.service
    scripts:
      preinstall: preinstall.sh

 # Image templates are empty on snapshots to avoid lengthy builds for development.
 dockers:
diff --git a/README.md b/README.md
 curl -fsSL https://coder.com/install.sh | sh
 ```

 Once installed, you canrun atemporary deploymentin dev mode (all data is in-memory and destroyed on exit):
 Once installed, you canstart aproduction deploymentwith a single command:

 ```sh
 coder server --dev
 # Automatically sets up an external access URL on *.try.coder.app
 coder server --tunnel

 # Requires a PostgreSQL instance and external access URL
 coder server --postgres-url <url> --access-url <url>
 ```

 Use `coder --help` to get a complete list of flags and environment variables. Use our [quickstart guide](https://coder.com/docs/coder-oss/latest/quickstart) for a full walkthrough.
diff --git a/cli/config/file.go b/cli/config/file.go
 return File(filepath.Join(string(r), "dotfilesurl"))
 }

 func (r Root) PostgresPath() string {
 return filepath.Join(string(r), "postgres")
 }

 func (r Root) PostgresPassword() File {
 return File(filepath.Join(r.PostgresPath(), "password"))
 }

 func (r Root) PostgresPort() File {
 return File(filepath.Join(r.PostgresPath(), "port"))
 }

 // File provides convenience methods for interacting with *os.File.
 type File string

diff --git a/cli/login.go b/cli/login.go
 "github.com/spf13/cobra"
 "golang.org/x/xerrors"

 "github.com/coder/coder/cli/cliflag"
 "github.com/coder/coder/cli/cliui"
 "github.com/coder/coder/codersdk"
 )
 }

 func login() *cobra.Command {
 return &cobra.Command{
 var (
 email    string
 username string
 password string
 )
 cmd := &cobra.Command{
 Use:   "login <url>",
 Short: "Authenticate with a Coder deployment",
 Args:  cobra.ExactArgs(1),
 return xerrors.Errorf("has initial user: %w", err)
 }
 if !hasInitialUser {
 if !isTTY(cmd) {
 return xerrors.New("the initial user cannot be created in non-interactive mode. use the API")
 }
 _, _ = 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?",
 Default:   "yes",
 IsConfirm: true,
 })
 if errors.Is(err, cliui.Canceled) {
 return nil
 }
 if err != nil {
 return err
 }
 currentUser, err := user.Current()
 if err != nil {
 return xerrors.Errorf("get current user: %w", err)
 }
 username, err := cliui.Prompt(cmd, cliui.PromptOptions{
 Text:    "What " + cliui.Styles.Field.Render("username") + " would you like?",
 Default: currentUser.Username,
 })
 if errors.Is(err, cliui.Canceled) {
 return nil
 }
 if err != nil {
 return xerrors.Errorf("pick username prompt: %w", err)
 }

 email, err := cliui.Prompt(cmd, cliui.PromptOptions{
 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!")
 }
 if username == "" {
 if !isTTY(cmd) {
 return xerrors.New("the initial user cannot be created in non-interactive mode. use the API")
 }
 _, err := cliui.Prompt(cmd, cliui.PromptOptions{
 Text:      "Would you like to create the first user?",
 Default:   "yes",
 IsConfirm: true,
 })
 if errors.Is(err, cliui.Canceled) {
 return nil
 }
 if err != nil {
 return err
 },
 })
 if err != nil {
 return xerrors.Errorf("specify email prompt: %w", err)
 }
 currentUser, err := user.Current()
 if err != nil {
 return xerrors.Errorf("get current user: %w", err)
 }
 username, err = cliui.Prompt(cmd, cliui.PromptOptions{
 Text:    "What " + cliui.Styles.Field.Render("username") + " would you like?",
 Default: currentUser.Username,
 })
 if errors.Is(err, cliui.Canceled) {
 return nil
 }
 if err != nil {
 return xerrors.Errorf("pick username prompt: %w", err)
 }
 }

 password, err := cliui.Prompt(cmd, cliui.PromptOptions{
 Text:     "Enter a " + cliui.Styles.Field.Render("password") + ":",
 Secret:   true,
 Validate: cliui.ValidateNotEmpty,
 })
 if err != nil {
 return xerrors.Errorf("specify password prompt: %w", err)
 if email == "" {
 email, err = cliui.Prompt(cmd, cliui.PromptOptions{
 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 err
 },
 })
 if err != nil {
 return xerrors.Errorf("specify email prompt: %w", err)
 }
 }
 _, err = cliui.Prompt(cmd, cliui.PromptOptions{
 Text:   "Confirm " + cliui.Styles.Field.Render("password") + ":",
 Secret: true,
 Validate: func(s string) error {
 if s != password {
 return xerrors.Errorf("Passwords do not match")
 }
 return nil
 },
 })
 if err != nil {
 return xerrors.Errorf("confirm password prompt: %w", err)

 if password == "" {
 password, err = cliui.Prompt(cmd, cliui.PromptOptions{
 Text:     "Enter a " + cliui.Styles.Field.Render("password") + ":",
 Secret:   true,
 Validate: cliui.ValidateNotEmpty,
 })
 if err != nil {
 return xerrors.Errorf("specify password prompt: %w", err)
 }
 _, err = cliui.Prompt(cmd, cliui.PromptOptions{
 Text:   "Confirm " + cliui.Styles.Field.Render("password") + ":",
 Secret: true,
 Validate: func(s string) error {
 if s != password {
 return xerrors.Errorf("Passwords do not match")
 }
 return nil
 },
 })
 if err != nil {
 return xerrors.Errorf("confirm password prompt: %w", err)
 }
 }

 _, err = client.CreateFirstUser(cmd.Context(), codersdk.CreateFirstUserRequest{
 return nil
 },
 }
 cliflag.StringVarP(cmd.Flags(), &email, "email", "e", "CODER_EMAIL", "", "Specifies an email address to authenticate with.")
 cliflag.StringVarP(cmd.Flags(), &username, "username", "u", "CODER_USERNAME", "", "Specifies a username to authenticate with.")
 cliflag.StringVarP(cmd.Flags(), &password, "password", "p", "CODER_PASSWORD", "", "Specifies a password to authenticate with.")
 return cmd
 }

 // isWSL determines if coder-cli is running within Windows Subsystem for Linux
diff --git a/cli/login_test.go b/cli/login_test.go
 <-doneChan
 })

 t.Run("InitialUserFlags", func(t *testing.T) {
 t.Parallel()
 client := coderdtest.New(t, nil)
 // 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(), "--username", "testuser", "--email", "user@coder.com", "--password", "password")
 pty := ptytest.New(t)
 root.SetIn(pty.Input())
 root.SetOut(pty.Output())
 go func() {
 defer close(doneChan)
 err := root.Execute()
 assert.NoError(t, err)
 }()
 pty.ExpectMatch("Welcome to Coder")
 <-doneChan
 })

 t.Run("InitialUserTTYConfirmPasswordFailAndReprompt", func(t *testing.T) {
 t.Parallel()
 ctx, cancel := context.WithCancel(context.Background())
diff --git a/cli/root.go b/cli/root.go
 SilenceUsage:  true,
 Long: `Coder — A tool for provisioning self-hosted development environments.
 `,
 Example: `  StartCoder 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 withCoder.
  ` + cliui.Styles.Code.Render("$ coder server --dev") + `
 Example: `  StartaCoder server.
  ` + cliui.Styles.Code.Render("$ coder server") + `

  Get started by creating a template from an example.
  ` + cliui.Styles.Code.Render("$ coder templates init"),
Original file line number	Diff line number	Diff line change
Expand Up		@@ -93,6 +93,8 @@ nfpms:
		type: "config\|noreplace"
		- src: coder.service
		dst: /usr/lib/systemd/system/coder.service
		scripts:
		preinstall: preinstall.sh
kylecarbs marked this conversation as resolved. Show resolvedHide resolved

		# Image templates are empty on snapshots to avoid lengthy builds for development.
		dockers:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,6 +25,18 @@ func (r Root) DotfilesURL() File {
		return File(filepath.Join(string(r), "dotfilesurl"))
		}

		func (r Root) PostgresPath() string {
		return filepath.Join(string(r), "postgres")
		}

		func (r Root) PostgresPassword() File {
		return File(filepath.Join(r.PostgresPath(), "password"))
		}

		func (r Root) PostgresPort() File {
		return File(filepath.Join(r.PostgresPath(), "port"))
		}

		// File provides convenience methods for interacting with *os.File.
		type File string

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,6 +17,7 @@ import (
		"github.com/spf13/cobra"
		"golang.org/x/xerrors"

		"github.com/coder/coder/cli/cliflag"
		"github.com/coder/coder/cli/cliui"
		"github.com/coder/coder/codersdk"
		)
Expand All		@@ -37,7 +38,12 @@ func init() {
		}

		func login() *cobra.Command {
		return &cobra.Command{
		var (
		email string
		username string
		password string
		)
		cmd := &cobra.Command{
		Use: "login <url>",
		Short: "Authenticate with a Coder deployment",
		Args: cobra.ExactArgs(1),
Expand DownExpand Up		@@ -66,71 +72,77 @@ func login() *cobra.Command {
		return xerrors.Errorf("has initial user: %w", err)
		}
		if !hasInitialUser {
		if !isTTY(cmd) {
		return xerrors.New("the initial user cannot be created in non-interactive mode. use the API")
		}
		_, _ = 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?",
		Default: "yes",
		IsConfirm: true,
		})
		if errors.Is(err, cliui.Canceled) {
		return nil
		}
		if err != nil {
		return err
		}
		currentUser, err := user.Current()
		if err != nil {
		return xerrors.Errorf("get current user: %w", err)
		}
		username, err := cliui.Prompt(cmd, cliui.PromptOptions{
		Text: "What " + cliui.Styles.Field.Render("username") + " would you like?",
		Default: currentUser.Username,
		})
		if errors.Is(err, cliui.Canceled) {
		return nil
		}
		if err != nil {
		return xerrors.Errorf("pick username prompt: %w", err)
		}

		email, err := cliui.Prompt(cmd, cliui.PromptOptions{
		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!")
		}
		if username == "" {
		if !isTTY(cmd) {
		return xerrors.New("the initial user cannot be created in non-interactive mode. use the API")
		}
		_, err := cliui.Prompt(cmd, cliui.PromptOptions{
		Text: "Would you like to create the first user?",
		Default: "yes",
		IsConfirm: true,
		})
		if errors.Is(err, cliui.Canceled) {
		return nil
		}
		if err != nil {
		return err
		},
		})
		if err != nil {
		return xerrors.Errorf("specify email prompt: %w", err)
		}
		currentUser, err := user.Current()
		if err != nil {
		return xerrors.Errorf("get current user: %w", err)
		}
		username, err = cliui.Prompt(cmd, cliui.PromptOptions{
		Text: "What " + cliui.Styles.Field.Render("username") + " would you like?",
		Default: currentUser.Username,
		})
		if errors.Is(err, cliui.Canceled) {
		return nil
		}
		if err != nil {
		return xerrors.Errorf("pick username prompt: %w", err)
		}
		}

		password, err := cliui.Prompt(cmd, cliui.PromptOptions{
		Text: "Enter a " + cliui.Styles.Field.Render("password") + ":",
		Secret: true,
		Validate: cliui.ValidateNotEmpty,
		})
		if err != nil {
		return xerrors.Errorf("specify password prompt: %w", err)
		if email == "" {
		email, err = cliui.Prompt(cmd, cliui.PromptOptions{
		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 err
		},
		})
		if err != nil {
		return xerrors.Errorf("specify email prompt: %w", err)
		}
		}
		_, err = cliui.Prompt(cmd, cliui.PromptOptions{
		Text: "Confirm " + cliui.Styles.Field.Render("password") + ":",
		Secret: true,
		Validate: func(s string) error {
		if s != password {
		return xerrors.Errorf("Passwords do not match")
		}
		return nil
		},
		})
		if err != nil {
		return xerrors.Errorf("confirm password prompt: %w", err)

		if password == "" {
		password, err = cliui.Prompt(cmd, cliui.PromptOptions{
		Text: "Enter a " + cliui.Styles.Field.Render("password") + ":",
		Secret: true,
		Validate: cliui.ValidateNotEmpty,
		})
		if err != nil {
		return xerrors.Errorf("specify password prompt: %w", err)
		}
		_, err = cliui.Prompt(cmd, cliui.PromptOptions{
		Text: "Confirm " + cliui.Styles.Field.Render("password") + ":",
		Secret: true,
		Validate: func(s string) error {
		if s != password {
		return xerrors.Errorf("Passwords do not match")
		}
		return nil
		},
		})
		if err != nil {
		return xerrors.Errorf("confirm password prompt: %w", err)
		}
		}

		_, err = client.CreateFirstUser(cmd.Context(), codersdk.CreateFirstUserRequest{
Expand DownExpand Up		@@ -219,6 +231,10 @@ func login() *cobra.Command {
		return nil
		},
		}
		cliflag.StringVarP(cmd.Flags(), &email, "email", "e", "CODER_EMAIL", "", "Specifies an email address to authenticate with.")
		cliflag.StringVarP(cmd.Flags(), &username, "username", "u", "CODER_USERNAME", "", "Specifies a username to authenticate with.")
		cliflag.StringVarP(cmd.Flags(), &password, "password", "p", "CODER_PASSWORD", "", "Specifies a password to authenticate with.")
		return cmd
		}

		// isWSL determines if coder-cli is running within Windows Subsystem for Linux
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -56,6 +56,26 @@ func TestLogin(t *testing.T) {
		<-doneChan
		})

		t.Run("InitialUserFlags", func(t *testing.T) {
		t.Parallel()
		client := coderdtest.New(t, nil)
		// 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(), "--username", "testuser", "--email", "user@coder.com", "--password", "password")
		pty := ptytest.New(t)
		root.SetIn(pty.Input())
		root.SetOut(pty.Output())
		go func() {
		defer close(doneChan)
		err := root.Execute()
		assert.NoError(t, err)
		}()
		pty.ExpectMatch("Welcome to Coder")
		<-doneChan
		})

		t.Run("InitialUserTTYConfirmPasswordFailAndReprompt", func(t *testing.T) {
		t.Parallel()
		ctx, cancel := context.WithCancel(context.Background())
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -57,8 +57,8 @@ func Root() *cobra.Command {
		SilenceUsage: true,
		Long: `Coder — A tool for provisioning self-hosted development environments.
		`,
		Example: ` StartCoder 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 withCoder.
		` + cliui.Styles.Code.Render("$ coder server --dev") + `
		Example: ` StartaCoder server.
		` + cliui.Styles.Code.Render("$ coder server") + `

		Get started by creating a template from an example.
		` + cliui.Styles.Code.Render("$ coder templates init"),
Expand Down