Skip to content

Commit e343748

Browse files
committed
Export cli.DefaultDevUser for use in test
1 parent 3cd7460 commit e343748

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

cli/server.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import (
4747
"github.com/coder/coder/provisionersdk/proto"
4848
)
4949

50-
var defaultDevUser = codersdk.CreateFirstUserRequest{
50+
var DefaultDevUser = codersdk.CreateFirstUserRequest{
5151
Email: "admin@coder.com",
5252
Username: "developer",
5353
Password: "password",
@@ -282,8 +282,8 @@ func server() *cobra.Command {
282282
if err != nil {
283283
return xerrors.Errorf("create first user: %w", err)
284284
}
285-
_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "email: %s\n", defaultDevUser.Email)
286-
_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "password: %s\n", defaultDevUser.Password)
285+
_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "email: %s\n", DefaultDevUser.Email)
286+
_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "password: %s\n", DefaultDevUser.Password)
287287
_, _ = fmt.Fprintln(cmd.ErrOrStderr())
288288

289289
_, _ = 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 `+
@@ -451,13 +451,13 @@ func server() *cobra.Command {
451451
}
452452

453453
func createFirstUser(cmd *cobra.Command, client *codersdk.Client, cfg config.Root) error {
454-
_, err := client.CreateFirstUser(cmd.Context(), defaultDevUser)
454+
_, err := client.CreateFirstUser(cmd.Context(), DefaultDevUser)
455455
if err != nil {
456456
return xerrors.Errorf("create first user: %w", err)
457457
}
458458
token, err := client.LoginWithPassword(cmd.Context(), codersdk.LoginWithPasswordRequest{
459-
Email: defaultDevUser.Email,
460-
Password: defaultDevUser.Password,
459+
Email: DefaultDevUser.Email,
460+
Password: DefaultDevUser.Password,
461461
})
462462
if err != nil {
463463
return xerrors.Errorf("login with first user: %w", err)

cli/server_test.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"crypto/x509"
1111
"crypto/x509/pkix"
1212
"encoding/pem"
13+
"fmt"
1314
"math/big"
1415
"net"
1516
"net/http"
@@ -23,6 +24,7 @@ import (
2324
"github.com/stretchr/testify/require"
2425
"go.uber.org/goleak"
2526

27+
"github.com/coder/coder/cli"
2628
"github.com/coder/coder/cli/clitest"
2729
"github.com/coder/coder/coderd/coderdtest"
2830
"github.com/coder/coder/coderd/database/postgres"
@@ -93,8 +95,8 @@ func TestServer(t *testing.T) {
9395
parsed, err := url.Parse(accessURL)
9496
require.NoError(t, err)
9597
// Verify that credentials were output to the terminal.
96-
wantEmail := "email: admin@coder.com"
97-
wantPassword := "password: password"
98+
wantEmail := fmt.Sprintf("email: %s", cli.DefaultDevUser.Email)
99+
wantPassword := fmt.Sprintf("password: %s", cli.DefaultDevUser.Password)
98100
assert.Contains(t, stdoutBuf.String(), wantEmail, "expected output %q; got no match", wantEmail)
99101
assert.Contains(t, stdoutBuf.String(), wantPassword, "expected output %q; got no match", wantPassword)
100102
client := codersdk.New(parsed)

0 commit comments

Comments
 (0)