Merge branch 'main' into cli-ui-copyedits

coder · khorne3 · Jun 16, 2022 · Jun 10, 2022 · Jun 10, 2022 · Jun 10, 2022
commit 9400b2f8807225000bcf6fddab7279f7dc3da4b3
diff --git a/cli/server.go b/cli/server.go
@@ -190,25 +190,11 @@ func server() *cobra.Command {
 
 			// If we're attempting to tunnel in dev-mode, the access URL
 			// needs to be changed to use the tunnel.
-			if dev && tunnel {
-				_, _ = fmt.Fprintln(cmd.ErrOrStderr(), cliui.Styles.Wrap.Render(
-					"Coder requires a URL accessible by workspaces you provision. "+
-						"A free tunnel can be created for simple setup. This will "+
-						"expose your Coder deployment to a publicly accessible URL. "+
-						"If you'd like to use your own hostname, you can provide it "+
-						"with the "+
-						cliui.Styles.Field.Render("--access-url")+" flag.\n",
-				))
-
-				// This skips the prompt if the flag is explicitly specified.
-				if !cmd.Flags().Changed("tunnel") {
-					_, err = cliui.Prompt(cmd, cliui.PromptOptions{
-						Text:      "Would you like to start a tunnel for simple setup?",
-						IsConfirm: true,
-					})
-					if errors.Is(err, cliui.Canceled) {
-						return err
-					}
+			if tunnel {
+				cmd.Printf("Opening tunnel so workspaces can connect to your deployment\n")
+				devTunnel, devTunnelErrChan, err = devtunnel.New(ctxTunnel, logger.Named("devtunnel"))
+				if err != nil {
+					return xerrors.Errorf("create tunnel: %w", err)
 				}
 				accessURL = devTunnel.URL
 			}
@@ -275,10 +261,10 @@ func server() *cobra.Command {
 				}
 			}
 
-			_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "Access your Coder UI in a browser at: %s\n", accessURL)
-			_, _ = fmt.Fprintln(cmd.ErrOrStderr())
-
-			if !dev {
+			if inMemoryDatabase {
+				options.Database = databasefake.New()
+				options.Pubsub = database.NewPubsubInMemory()
+			} else {
 				sqlDB, err := sql.Open(sqlDriver, postgresURL)
 				if err != nil {
 					return xerrors.Errorf("dial postgres: %w", err)