Apr 27, 2022 · Apr 27, 2022 · Apr 27, 2022 · Apr 27, 2022 · Apr 27, 2022 · Apr 27, 2022
diff --git a/cli/server.go b/cli/server.go
 "github.com/coder/coder/provisionersdk/proto"
 )

 var defaultDevUser = codersdk.CreateFirstUserRequest{
 Email:            "admin@coder.com",
 Username:         "developer",
 Password:         "password",
 OrganizationName: "acme-corp",
 }

 // nolint:gocyclo
 func server() *cobra.Command {
 var (
 if err != nil {
 return xerrors.Errorf("create first user: %w", err)
 }
 _, _ = fmt.Fprintf(cmd.ErrOrStderr(), "email: %s\n", defaultDevUser.Email)
 _, _ = fmt.Fprintf(cmd.ErrOrStderr(), "password: %s\n", defaultDevUser.Password)
 _, _ = fmt.Fprintln(cmd.ErrOrStderr())

 _, _ = fmt.Fprintf(cmd.ErrOrStderr(), cliui.Styles.Wrap.Render(`Started in dev mode. All data is in-memory! `+cliui.Styles.Bold.Render("Do not use in production")+`. Press `+
 cliui.Styles.Field.Render("ctrl+c")+` to clean up provisioned infrastructure.`)+"\n\n")
 }

 func createFirstUser(cmd *cobra.Command, client *codersdk.Client, cfg config.Root) error {
 _, err := client.CreateFirstUser(cmd.Context(), codersdk.CreateFirstUserRequest{
 Email:            "admin@coder.com",
 Username:         "developer",
 Password:         "password",
 OrganizationName: "acme-corp",
 })
 _, err := client.CreateFirstUser(cmd.Context(), defaultDevUser)
 if err != nil {
 return xerrors.Errorf("create first user: %w", err)
 }
 token, err := client.LoginWithPassword(cmd.Context(), codersdk.LoginWithPasswordRequest{
 Email:"admin@coder.com",
 Password:"password",
 Email:defaultDevUser.Email,
 Password:defaultDevUser.Password,
 })
 if err != nil {
 return xerrors.Errorf("login with first user: %w", err)
diff --git a/cli/server_test.go b/cli/server_test.go
 package cli_test

 import (
 "bytes"
 "context"
 "crypto/ecdsa"
 "crypto/elliptic"
 "testing"
 "time"

 "github.com/stretchr/testify/assert"
 "github.com/stretchr/testify/require"
 "go.uber.org/goleak"

 ctx, cancelFunc := context.WithCancel(context.Background())
 defer cancelFunc()
 root, cfg := clitest.New(t, "server", "--dev", "--skip-tunnel", "--address", ":0")
 var stdoutBuf bytes.Buffer
 root.SetOutput(&stdoutBuf)
 go func() {
 err := root.ExecuteContext(ctx)
 require.ErrorIs(t, err, context.Canceled)

 // Verify that credentials were output to the terminal.
 wantEmail := "email: admin@coder.com"
 wantPassword := "password: password"
 assert.Contains(t, stdoutBuf.String(), wantEmail, "expected output %q; got no match", wantEmail)
 assert.Contains(t, stdoutBuf.String(), wantPassword, "expected output %q; got no match", wantPassword)
 }()
 var token string
 require.Eventually(t, func() bool {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,6 +47,13 @@ import (
		"github.com/coder/coder/provisionersdk/proto"
		)

		var defaultDevUser = codersdk.CreateFirstUserRequest{
		Email: "admin@coder.com",
		Username: "developer",
		Password: "password",
		OrganizationName: "acme-corp",
		}

		// nolint:gocyclo
		func server() *cobra.Command {
		var (
Expand DownExpand Up		@@ -275,6 +282,9 @@ func server() *cobra.Command {
		if err != nil {
		return xerrors.Errorf("create first user: %w", err)
		}
		_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "email: %s\n", defaultDevUser.Email)
		_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "password: %s\n", defaultDevUser.Password)
		_, _ = fmt.Fprintln(cmd.ErrOrStderr())

		_, _ = fmt.Fprintf(cmd.ErrOrStderr(), cliui.Styles.Wrap.Render(`Started in dev mode. All data is in-memory! `+cliui.Styles.Bold.Render("Do not use in production")+`. Press `+
		cliui.Styles.Field.Render("ctrl+c")+` to clean up provisioned infrastructure.`)+"\n\n")
Expand DownExpand Up		@@ -441,18 +451,13 @@ func server() *cobra.Command {
		}

		func createFirstUser(cmd cobra.Command, client codersdk.Client, cfg config.Root) error {
		_, err := client.CreateFirstUser(cmd.Context(), codersdk.CreateFirstUserRequest{
		Email: "admin@coder.com",
		Username: "developer",
		Password: "password",
		OrganizationName: "acme-corp",
		})
		_, err := client.CreateFirstUser(cmd.Context(), defaultDevUser)
		if err != nil {
		return xerrors.Errorf("create first user: %w", err)
		}
		token, err := client.LoginWithPassword(cmd.Context(), codersdk.LoginWithPasswordRequest{
		Email:"admin@coder.com",
		Password:"password",
		Email:defaultDevUser.Email,
		Password:defaultDevUser.Password,
		})
		if err != nil {
		return xerrors.Errorf("login with first user: %w", err)
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,7 @@
		package cli_test

		import (
		"bytes"
		"context"
		"crypto/ecdsa"
		"crypto/elliptic"
Expand All		@@ -18,6 +19,7 @@ import (
		"testing"
		"time"

		"github.com/stretchr/testify/assert"
		"github.com/stretchr/testify/require"
		"go.uber.org/goleak"

Expand DownExpand Up		@@ -73,9 +75,17 @@ func TestServer(t *testing.T) {
		ctx, cancelFunc := context.WithCancel(context.Background())
		defer cancelFunc()
		root, cfg := clitest.New(t, "server", "--dev", "--skip-tunnel", "--address", ":0")
		var stdoutBuf bytes.Buffer
		root.SetOutput(&stdoutBuf)
Comment on lines +78 to +79 Copy link Contributor coadlerApr 27, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. small nit: if you're only ever calling`buffer.String()` you can use`strings.Builder` to avoid a copy on each call to`String()` Copy link MemberAuthor mafredriApr 27, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Good point, I didn't consider`strings.Builder` in this scenario although I did note the multiple calls to`String()` but thought it would be acceptable for a test. Would you like me to do a follow-up PR? Copy link Contributor coadlerApr 27, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Nope! Not important at all, just thought I'd mention. mafredri reacted with thumbs up emoji
		go func() {
		err := root.ExecuteContext(ctx)
		require.ErrorIs(t, err, context.Canceled)

		// Verify that credentials were output to the terminal.
		wantEmail := "email: admin@coder.com"
		wantPassword := "password: password"
Copy link Contributor coadlerApr 27, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Maybe we could export`defaultDevUser` so we could assert the output in tests Copy link MemberAuthor mafredriApr 27, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. That's definitely an option, wediscussed it a bit and I added a commit that this this but ultimately dropped it before the merge. Copy link Contributor coadlerApr 27, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Oops, I should've read back before I commented!
		assert.Contains(t, stdoutBuf.String(), wantEmail, "expected output %q; got no match", wantEmail)
		assert.Contains(t, stdoutBuf.String(), wantPassword, "expected output %q; got no match", wantPassword)
		}()
		var token string
		require.Eventually(t, func() bool {
Expand Down