diff --git a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.test.tsx b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.test.tsx index cebff84da793d..45d13caa88496 100644 --- a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.test.tsx +++ b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.test.tsx @@ -1,6 +1,11 @@ import { screen } from "@testing-library/react" import * as API from "../../api/api" -import { MockWorkspaceBuild, MockWorkspaceBuildLogs, renderWithAuth } from "../../testHelpers/renderHelpers" +import { + MockWorkspace, + MockWorkspaceBuild, + MockWorkspaceBuildLogs, + renderWithAuth, +} from "../../testHelpers/renderHelpers" import { WorkspaceBuildPage } from "./WorkspaceBuildPage" describe("WorkspaceBuildPage", () => { @@ -16,7 +21,10 @@ describe("WorkspaceBuildPage", () => { closed: Promise.resolve(undefined), cancel: jest.fn(), }) - renderWithAuth(, { route: `/builds/${MockWorkspaceBuild.id}`, path: "/builds/:buildId" }) + renderWithAuth(, { + route: `/@${MockWorkspace.owner_name}/${MockWorkspace.name}/builds/${MockWorkspace.latest_build.build_number}`, + path: "/@:username/:workspace/builds/:buildNumber", + }) await screen.findByText(MockWorkspaceBuild.workspace_name) await screen.findByText(MockWorkspaceBuildLogs[0].stage) diff --git a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx index 46550ac62225a..9d570db458dfe 100644 --- a/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx +++ b/site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx @@ -6,19 +6,9 @@ import { pageTitle } from "../../util/page" import { workspaceBuildMachine } from "../../xServices/workspaceBuild/workspaceBuildXService" import { WorkspaceBuildPageView } from "./WorkspaceBuildPageView" -const useBuildId = () => { - const { buildId } = useParams() - - if (!buildId) { - throw new Error("buildId param is required.") - } - - return buildId -} - export const WorkspaceBuildPage: FC = () => { - const buildId = useBuildId() - const [buildState] = useMachine(workspaceBuildMachine, { context: { buildId } }) + const { username, workspace: workspaceName, buildNumber } = useParams() + const [buildState] = useMachine(workspaceBuildMachine, { context: { username, workspaceName, buildNumber } }) const { logs, build } = buildState.context const isWaitingForLogs = !buildState.matches("logs.loaded") diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx index c8b06c63c4ac3..7299eea6b2660 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx @@ -24,17 +24,17 @@ import * as TypesGen from "../../api/typesGenerated" import { AvatarData } from "../../components/AvatarData/AvatarData" import { CloseDropdown, OpenDropdown } from "../../components/DropdownArrows/DropdownArrows" import { EmptyState } from "../../components/EmptyState/EmptyState" +import { Margins } from "../../components/Margins/Margins" +import { PageHeader, PageHeaderText, PageHeaderTitle } from "../../components/PageHeader/PageHeader" +import { Stack } from "../../components/Stack/Stack" +import { TableLoader } from "../../components/TableLoader/TableLoader" import { HelpTooltip, HelpTooltipLink, HelpTooltipLinksGroup, HelpTooltipText, HelpTooltipTitle, -} from "../../components/HelpTooltip/HelpTooltip" -import { Margins } from "../../components/Margins/Margins" -import { PageHeader, PageHeaderText, PageHeaderTitle } from "../../components/PageHeader/PageHeader" -import { Stack } from "../../components/Stack/Stack" -import { TableLoader } from "../../components/TableLoader/TableLoader" +} from "../../components/Tooltips/HelpTooltip/HelpTooltip" import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils" import { getDisplayStatus, workspaceFilterQuery } from "../../util/workspace" @@ -214,7 +214,7 @@ export const WorkspacesPageView: FC = ({ loading, works message={Language.emptyCreateWorkspaceMessage} description={Language.emptyCreateWorkspaceDescription} cta={ - + } diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts index 53414283e4cc9..b37e038529dbc 100644 --- a/site/src/testHelpers/entities.ts +++ b/site/src/testHelpers/entities.ts @@ -114,6 +114,8 @@ export const MockTemplate: TypesGen.Template = { description: "This is a test description.", max_ttl_ms: 604800000, min_autostart_interval_ms: 3600000, + created_by_id: "test-creator-id", + created_by_name: "test_creator", } export const MockWorkspaceAutostartDisabled: TypesGen.UpdateWorkspaceAutostartRequest = { diff --git a/site/src/testHelpers/handlers.ts b/site/src/testHelpers/handlers.ts index b77dd09c11aca..bfb8e9be0f4ff 100644 --- a/site/src/testHelpers/handlers.ts +++ b/site/src/testHelpers/handlers.ts @@ -115,7 +115,7 @@ export const handlers = [ rest.get("/api/v2/workspaces/:workspaceId/builds", async (req, res, ctx) => { return res(ctx.status(200), ctx.json(M.MockBuilds)) }), - rest.get("/api/v2/workspacebuilds/:workspaceBuildId", (req, res, ctx) => { + rest.get("/api/v2/users/:username/workspace/:workspaceName/builds/:buildNumber", (req, res, ctx) => { return res(ctx.status(200), ctx.json(M.MockWorkspaceBuild)) }), rest.get("/api/v2/workspacebuilds/:workspaceBuildId/resources", (req, res, ctx) => { diff --git a/site/src/xServices/workspaceBuild/workspaceBuildXService.ts b/site/src/xServices/workspaceBuild/workspaceBuildXService.ts index 88008892fe251..81883b3eaaa08 100644 --- a/site/src/xServices/workspaceBuild/workspaceBuildXService.ts +++ b/site/src/xServices/workspaceBuild/workspaceBuildXService.ts @@ -4,6 +4,9 @@ import { ProvisionerJobLog, WorkspaceBuild } from "../../api/typesGenerated" type LogsContext = { // Build + username: string + workspaceName: string + buildNumber: string buildId: string build?: WorkspaceBuild getBuildError?: Error | unknown @@ -36,28 +39,23 @@ export const workspaceBuildMachine = createMachine( }, }, tsTypes: {} as import("./workspaceBuildXService.typegen").Typegen0, - type: "parallel", + initial: "gettingBuild", states: { - build: { - initial: "gettingBuild", - states: { - gettingBuild: { - entry: "clearGetBuildError", - invoke: { - src: "getWorkspaceBuild", - onDone: { - target: "idle", - actions: "assignBuild", - }, - onError: { - target: "idle", - actions: "assignGetBuildError", - }, - }, + gettingBuild: { + entry: "clearGetBuildError", + invoke: { + src: "getWorkspaceBuild", + onDone: { + target: "logs", + actions: ["assignBuild", "assignBuildId"], + }, + onError: { + target: "idle", + actions: "assignGetBuildError", }, - idle: {}, }, }, + idle: {}, logs: { initial: "gettingExistentLogs", states: { @@ -95,6 +93,10 @@ export const workspaceBuildMachine = createMachine( }, { actions: { + // Build ID + assignBuildId: assign({ + buildId: (_, event) => event.data.id, + }), // Build assignBuild: assign({ build: (_, event) => event.data, @@ -117,7 +119,7 @@ export const workspaceBuildMachine = createMachine( }), }, services: { - getWorkspaceBuild: (ctx) => API.getWorkspaceBuild(ctx.buildId), + getWorkspaceBuild: (ctx) => API.getWorkspaceBuildByNumber(ctx.username, ctx.workspaceName, ctx.buildNumber), getLogs: async (ctx) => API.getWorkspaceBuildLogs(ctx.buildId), streamWorkspaceBuildLogs: (ctx) => async (callback) => { const reader = await API.streamWorkspaceBuildLogs(ctx.buildId) From dd94acab0f48c250f9445557628c9d5d8f445407 Mon Sep 17 00:00:00 2001 From: Katie Horne Date: Tue, 14 Jun 2022 09:41:32 -0500 Subject: [PATCH 06/16] chore: fix issues w/ merge conflict resolution --- site/src/api/typesGenerated.ts | 4 ---- .../TemplateStats/TemplateStats.stories.tsx | 9 -------- .../TemplateStats/TemplateStats.tsx | 8 ------- .../pages/TemplatesPage/TemplatesPageView.tsx | 16 -------------- .../WorkspacesPage/WorkspacesPageView.tsx | 22 ------------------- 5 files changed, 59 deletions(-) diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index 7a58570f3b67c..e220103a3eba0 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -247,11 +247,7 @@ export interface Template { readonly description: string readonly max_ttl_ms: number readonly min_autostart_interval_ms: number -<<<<<<< HEAD - readonly created_by_id?: string -======= readonly created_by_id: string ->>>>>>> main readonly created_by_name: string } diff --git a/site/src/components/TemplateStats/TemplateStats.stories.tsx b/site/src/components/TemplateStats/TemplateStats.stories.tsx index fb7f36d894652..3056187d110d4 100644 --- a/site/src/components/TemplateStats/TemplateStats.stories.tsx +++ b/site/src/components/TemplateStats/TemplateStats.stories.tsx @@ -23,12 +23,3 @@ UsedByMany.args = { }, activeVersion: Mocks.MockTemplateVersion, } - -export const UnknownCreator = Template.bind({}) -UnknownCreator.args = { - template: { - ...Mocks.MockTemplate, - created_by_name: "", - }, - activeVersion: Mocks.MockTemplateVersion, -} diff --git a/site/src/components/TemplateStats/TemplateStats.tsx b/site/src/components/TemplateStats/TemplateStats.tsx index 246064f66c957..3309ab7286764 100644 --- a/site/src/components/TemplateStats/TemplateStats.tsx +++ b/site/src/components/TemplateStats/TemplateStats.tsx @@ -14,10 +14,6 @@ const Language = { userPlural: "users", userSingular: "user", createdByLabel: "Created by", -<<<<<<< HEAD - defaultTemplateCreator: "", -======= ->>>>>>> main } export interface TemplateStatsProps { @@ -53,11 +49,7 @@ export const TemplateStats: FC = ({ template, activeVersion

{Language.createdByLabel} -<<<<<<< HEAD - {template.created_by_name || Language.defaultTemplateCreator} -======= {template.created_by_name} ->>>>>>> main

) diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.tsx index 08a90c60c675c..acd2a43e76bd8 100644 --- a/site/src/pages/TemplatesPage/TemplatesPageView.tsx +++ b/site/src/pages/TemplatesPage/TemplatesPageView.tsx @@ -24,15 +24,7 @@ import { HelpTooltipLinksGroup, HelpTooltipText, HelpTooltipTitle, -<<<<<<< HEAD } from "../../components/Tooltips/HelpTooltip/HelpTooltip" -======= -} from "../../components/HelpTooltip/HelpTooltip" -import { Margins } from "../../components/Margins/Margins" -import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "../../components/PageHeader/PageHeader" -import { Stack } from "../../components/Stack/Stack" -import { TableLoader } from "../../components/TableLoader/TableLoader" ->>>>>>> main dayjs.extend(relativeTime) @@ -58,10 +50,6 @@ export const Language = { templateTooltipText: "With templates you can create a common configuration for your workspaces using Terraform.", templateTooltipLink: "Manage templates", createdByLabel: "Created by", -<<<<<<< HEAD - defaultTemplateCreator: "", -======= ->>>>>>> main } const TemplateHelpTooltip: React.FC = () => { @@ -151,11 +139,7 @@ export const TemplatesPageView: FC = (props) => { {Language.developerCount(template.workspace_owner_count)} {dayjs().to(dayjs(template.updated_at))} -<<<<<<< HEAD - {template.created_by_name || Language.defaultTemplateCreator} -======= {template.created_by_name} ->>>>>>> main

diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx index 50d02b271dafa..3acaf138c526f 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx @@ -34,15 +34,7 @@ import { HelpTooltipLinksGroup, HelpTooltipText, HelpTooltipTitle, -<<<<<<< HEAD } from "../../components/Tooltips/HelpTooltip/HelpTooltip" -======= -} from "../../components/HelpTooltip/HelpTooltip" -import { Margins } from "../../components/Margins/Margins" -import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "../../components/PageHeader/PageHeader" -import { Stack } from "../../components/Stack/Stack" -import { TableLoader } from "../../components/TableLoader/TableLoader" ->>>>>>> main import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils" import { getDisplayStatus, workspaceFilterQuery } from "../../util/workspace" @@ -138,21 +130,7 @@ export const WorkspacesPageView: FC = ({ loading, works return ( -<<<<<<< HEAD - - Create a new workspace from a{" "} - - template - - . - - } - > -======= ->>>>>>> main Workspaces From d2dcdd8e76c702db23125d950d9030636277caf5 Mon Sep 17 00:00:00 2001 From: Kira Pilot Date: Tue, 14 Jun 2022 15:19:51 +0000 Subject: [PATCH 07/16] resolving in flight conflicts --- site/src/pages/TemplatesPage/TemplatesPageView.tsx | 2 +- site/src/pages/WorkspacesPage/WorkspacesPageView.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.tsx index acd2a43e76bd8..bd691e3c7df66 100644 --- a/site/src/pages/TemplatesPage/TemplatesPageView.tsx +++ b/site/src/pages/TemplatesPage/TemplatesPageView.tsx @@ -15,7 +15,7 @@ import { AvatarData } from "../../components/AvatarData/AvatarData" import { CodeExample } from "../../components/CodeExample/CodeExample" import { EmptyState } from "../../components/EmptyState/EmptyState" import { Margins } from "../../components/Margins/Margins" -import { PageHeader, PageHeaderText, PageHeaderTitle } from "../../components/PageHeader/PageHeader" +import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "../../components/PageHeader/PageHeader" import { Stack } from "../../components/Stack/Stack" import { TableLoader } from "../../components/TableLoader/TableLoader" import { diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx index 3acaf138c526f..e6e8a4f7fb936 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx @@ -25,7 +25,7 @@ import { AvatarData } from "../../components/AvatarData/AvatarData" import { CloseDropdown, OpenDropdown } from "../../components/DropdownArrows/DropdownArrows" import { EmptyState } from "../../components/EmptyState/EmptyState" import { Margins } from "../../components/Margins/Margins" -import { PageHeader, PageHeaderText, PageHeaderTitle } from "../../components/PageHeader/PageHeader" +import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "../../components/PageHeader/PageHeader" import { Stack } from "../../components/Stack/Stack" import { TableLoader } from "../../components/TableLoader/TableLoader" import { From 4a2900f9efe1017b2afc84b8b12f5e95342bf9a6 Mon Sep 17 00:00:00 2001 From: Kira Pilot Date: Tue, 14 Jun 2022 15:40:01 +0000 Subject: [PATCH 08/16] formating server.go --- cli/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/server.go b/cli/server.go index b25a0bb7d7de6..3d0af733b19eb 100644 --- a/cli/server.go +++ b/cli/server.go @@ -184,7 +184,7 @@ func server() *cobra.Command { "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 domain, you can provide it "+ - "with the "+ + "with the "+ cliui.Styles.Field.Render("--access-url")+" flag.\n", )) From f5e73a25f04177054d1964d3ba8bd9f85ef6c36a Mon Sep 17 00:00:00 2001 From: Katie Horne Date: Wed, 15 Jun 2022 08:40:24 -0500 Subject: [PATCH 09/16] Apply suggestions from review Co-authored-by: Ammar Bandukwala --- cli/server.go | 2 +- site/src/pages/WorkspacesPage/WorkspacesPageView.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/server.go b/cli/server.go index 3d0af733b19eb..9572d3583393a 100644 --- a/cli/server.go +++ b/cli/server.go @@ -183,7 +183,7 @@ func server() *cobra.Command { "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 domain, you can provide it "+ + "If you'd like to use your own hostname, you can provide it "+ "with the "+ cliui.Styles.Field.Render("--access-url")+" flag.\n", )) diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx index e6e8a4f7fb936..efc49d882aa8e 100644 --- a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx +++ b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx @@ -50,7 +50,7 @@ export const Language = { allWorkspacesButton: "All workspaces", workspaceTooltipTitle: "What is a workspace?", workspaceTooltipText: - "A workspace is your development environment in the cloud. It includes the compute infrastructure and tools you need to work on your project", + "A workspace is your development environment in the cloud. It includes the infrastructure and tools you need to work on your project.", workspaceTooltipLink1: "Create workspaces", workspaceTooltipLink2: "Connect with SSH", workspaceTooltipLink3: "Editors and IDEs", From 4684bd1f834d5305f4c8c19eef7563dc9869eaff Mon Sep 17 00:00:00 2001 From: Katie Horne Date: Wed, 15 Jun 2022 09:15:19 -0500 Subject: [PATCH 10/16] chore: fix typos --- site/src/components/Tooltips/ResourcesHelpTooltip.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/src/components/Tooltips/ResourcesHelpTooltip.tsx b/site/src/components/Tooltips/ResourcesHelpTooltip.tsx index c5728d9faa897..cb1b6894000e7 100644 --- a/site/src/components/Tooltips/ResourcesHelpTooltip.tsx +++ b/site/src/components/Tooltips/ResourcesHelpTooltip.tsx @@ -8,7 +8,7 @@ import { export const Language = { resourceTooltipTitle: "What is a resource?", - resourceTooltipText: "A resource is an infrastructure object that is create when the workspace is provisioned.", + resourceTooltipText: "A resource is an infrastructure object that is created when the workspace is provisioned.", resourceTooltipLink: "Persistent and ephemeral resources", } @@ -18,7 +18,7 @@ export const ResourcesHelpTooltip: React.FC = () => { {Language.resourceTooltipTitle} {Language.resourceTooltipText} - + {Language.resourceTooltipLink} From 6d4afa2cc6c229c23c91a9062a8cc5dbfcc39e22 Mon Sep 17 00:00:00 2001 From: Katie Horne Date: Wed, 15 Jun 2022 09:16:00 -0500 Subject: [PATCH 11/16] chore: update template definition Co-authored-by: Ammar Bandukwala --- .../src/components/Tooltips/HelpTooltip/HelpTooltip.stories.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/components/Tooltips/HelpTooltip/HelpTooltip.stories.tsx b/site/src/components/Tooltips/HelpTooltip/HelpTooltip.stories.tsx index 19542a6ca63a1..d4ee1372293e5 100644 --- a/site/src/components/Tooltips/HelpTooltip/HelpTooltip.stories.tsx +++ b/site/src/components/Tooltips/HelpTooltip/HelpTooltip.stories.tsx @@ -17,7 +17,7 @@ const Template: Story = (args) => ( What is a template? - With templates, you can create a common configuration for your team`'`s workspaces using Terraform so that + A template is a common configuration for your team`'`s workspaces. everyone can use the same environment to deliver great software. From e4a6c0479e1dc0f7c8ff349a86bca58adcafd258 Mon Sep 17 00:00:00 2001 From: Katie Horne Date: Wed, 15 Jun 2022 09:24:15 -0500 Subject: [PATCH 12/16] chore: fix wording; lint --- .../components/Tooltips/HelpTooltip/HelpTooltip.stories.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/site/src/components/Tooltips/HelpTooltip/HelpTooltip.stories.tsx b/site/src/components/Tooltips/HelpTooltip/HelpTooltip.stories.tsx index d4ee1372293e5..8d2d3ad802cd7 100644 --- a/site/src/components/Tooltips/HelpTooltip/HelpTooltip.stories.tsx +++ b/site/src/components/Tooltips/HelpTooltip/HelpTooltip.stories.tsx @@ -16,10 +16,7 @@ export default { const Template: Story = (args) => ( What is a template? - - A template is a common configuration for your team`'`s workspaces. - everyone can use the same environment to deliver great software. - + A template is a common configuration for your team`'`s workspaces. Creating a template Updating a template From 21d87a95de3a070f3c4a670f26f3ef58096e7798 Mon Sep 17 00:00:00 2001 From: Katie Horne Date: Wed, 15 Jun 2022 10:00:54 -0500 Subject: [PATCH 13/16] chore: expand defintion of provisioner-daemons --- cli/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/server.go b/cli/server.go index 9572d3583393a..d617b11b68660 100644 --- a/cli/server.go +++ b/cli/server.go @@ -279,7 +279,7 @@ func server() *cobra.Command { } } - _, _ = fmt.Fprintf(cmd.ErrOrStderr(), "provisioner-daemons: %d\n", provisionerDaemonCount) + _, _ = fmt.Fprintf(cmd.ErrOrStderr(), "The number of provisioner daemons to create on start: %d\n", provisionerDaemonCount) _, _ = fmt.Fprintf(cmd.ErrOrStderr(), "Access your Coder UI in a browser at: %s\n", accessURL) _, _ = fmt.Fprintln(cmd.ErrOrStderr()) From 3cb014cc93a5b791cc066134ec13deb308c9ecdc Mon Sep 17 00:00:00 2001 From: Katie Horne Date: Wed, 15 Jun 2022 10:06:38 -0500 Subject: [PATCH 14/16] chore: update wording --- cli/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/server.go b/cli/server.go index d617b11b68660..fb82eb23626a2 100644 --- a/cli/server.go +++ b/cli/server.go @@ -279,7 +279,7 @@ func server() *cobra.Command { } } - _, _ = fmt.Fprintf(cmd.ErrOrStderr(), "The number of provisioner daemons to create on start: %d\n", provisionerDaemonCount) + _, _ = fmt.Fprintf(cmd.ErrOrStderr(), "Create the following number of provisioner daemons on start: %d\n", provisionerDaemonCount) _, _ = fmt.Fprintf(cmd.ErrOrStderr(), "Access your Coder UI in a browser at: %s\n", accessURL) _, _ = fmt.Fprintln(cmd.ErrOrStderr()) From 43642edaae58a5c1c6bcb674f216af620863bf93 Mon Sep 17 00:00:00 2001 From: Kira Pilot Date: Wed, 15 Jun 2022 15:38:30 +0000 Subject: [PATCH 15/16] fix test --- site/src/components/Tooltips/HelpTooltip/HelpTooltip.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/components/Tooltips/HelpTooltip/HelpTooltip.tsx b/site/src/components/Tooltips/HelpTooltip/HelpTooltip.tsx index 1ed96af999871..66629943c0961 100644 --- a/site/src/components/Tooltips/HelpTooltip/HelpTooltip.tsx +++ b/site/src/components/Tooltips/HelpTooltip/HelpTooltip.tsx @@ -4,7 +4,7 @@ import { makeStyles } from "@material-ui/core/styles" import HelpIcon from "@material-ui/icons/HelpOutline" import OpenInNewIcon from "@material-ui/icons/OpenInNew" import React, { createContext, useContext, useState } from "react" -import { Stack } from "../Stack/Stack" +import { Stack } from "../../Stack/Stack" type Icon = typeof HelpIcon From 4e5067d864ecbe8240f27dbcfa5c2fb3ab72c972 Mon Sep 17 00:00:00 2001 From: Katie Horne Date: Wed, 15 Jun 2022 16:47:58 -0500 Subject: [PATCH 16/16] chore: remove provisioner daemons line --- cli/server.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/server.go b/cli/server.go index fb82eb23626a2..97ceb28146d9f 100644 --- a/cli/server.go +++ b/cli/server.go @@ -279,7 +279,6 @@ func server() *cobra.Command { } } - _, _ = fmt.Fprintf(cmd.ErrOrStderr(), "Create the following number of provisioner daemons on start: %d\n", provisionerDaemonCount) _, _ = fmt.Fprintf(cmd.ErrOrStderr(), "Access your Coder UI in a browser at: %s\n", accessURL) _, _ = fmt.Fprintln(cmd.ErrOrStderr())