Merge branch 'main' into buildinfoembed

kylecarbs · kylecarbs · commit 3fcbeb2c94a6 · 2023-03-21T18:54:39.000Z
diff --git a/coderd/workspaceapps_test.go b/coderd/workspaceapps_test.go
@@ -175,11 +175,9 @@ func setupProxyTest(t *testing.T, opts *setupProxyTestOpts) (*codersdk.Client, c
 	deploymentValues.Dangerous.AllowPathAppSiteOwnerAccess = clibase.Bool(opts.DangerousAllowPathAppSiteOwnerAccess)
 
 	client := coderdtest.New(t, &coderdtest.Options{
-		DeploymentValues:            deploymentValues,
-		AppHostname:                 opts.AppHost,
-		IncludeProvisionerDaemon:    true,
-		AgentStatsRefreshInterval:   time.Millisecond * 100,
-		MetricsCacheRefreshInterval: time.Millisecond * 100,
+		DeploymentValues:         deploymentValues,
+		AppHostname:              opts.AppHost,
+		IncludeProvisionerDaemon: true,
 		RealIPConfig: &httpmw.RealIPConfig{
 			TrustedOrigins: []*net.IPNet{{
 				IP:   net.ParseIP("127.0.0.1"),
diff --git a/site/src/xServices/buildInfo/buildInfoXService.ts b/site/src/xServices/buildInfo/buildInfoXService.ts
@@ -53,7 +53,7 @@ export const buildInfoMachine = createMachine(
   },
   {
     services: {
-      getBuildInfo: () => {
+      getBuildInfo: async () => {
         // Build info is injected by the Coder server into the HTML document.
         const buildInfo = document.querySelector("meta[property=build-info]")
         if (buildInfo) {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ export const buildInfoMachine = createMachine(`
`53`	`53`	`},`
`54`	`54`	`{`
`55`	`55`	`services: {`
`56`		`- getBuildInfo: () => {`
	`56`	`+ getBuildInfo: async () => {`
`57`	`57`	`// Build info is injected by the Coder server into the HTML document.`
`58`	`58`	`const buildInfo = document.querySelector("meta[property=build-info]")`
`59`	`59`	`if (buildInfo) {`