Merge branch 'main' into 9754-severity

mtojek · mtojek · commit b373cc2c9ca5 · 2023-11-22T15:41:59.000+01:00
diff --git a/coderd/healthcheck/derphealth/derp.go b/coderd/healthcheck/derphealth/derp.go
@@ -11,6 +11,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"golang.org/x/exp/slices"
 	"golang.org/x/xerrors"
 	"tailscale.com/derp"
 	"tailscale.com/derp/derphttp"
@@ -23,6 +24,7 @@ import (
 
 	"github.com/coder/coder/v2/coderd/healthcheck/health"
 	"github.com/coder/coder/v2/coderd/util/ptr"
+	"github.com/coder/coder/v2/coderd/util/slice"
 )
 
 const (
@@ -188,6 +190,11 @@ func (r *RegionReport) Run(ctx context.Context) {
 	}
 	wg.Wait()
 
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	sortNodeReports(r.NodeReports)
+
 	// Coder allows for 1 unhealthy node in the region, unless there is only 1 node.
 	if len(r.Region.Nodes) == 1 {
 		r.Healthy = healthyNodes == len(r.Region.Nodes)
@@ -498,3 +505,9 @@ func convertError(err error) *string {
 
 	return nil
 }
+
+func sortNodeReports(reports []*NodeReport) {
+	slices.SortFunc(reports, func(a, b *NodeReport) int {
+		return slice.Ascending(a.Node.Name, b.Node.Name)
+	})
+}
diff --git a/coderd/healthcheck/derphealth/derp_test.go b/coderd/healthcheck/derphealth/derp_test.go
@@ -83,7 +83,6 @@ func TestDERP(t *testing.T) {
 
 	t.Run("HealthyWithNodeDegraded", func(t *testing.T) {
 		t.Parallel()
-		t.Skip("https://github.com/coder/coder/issues/10824")
 
 		healthyDerpSrv := derp.NewServer(key.NewNode(), func(format string, args ...any) { t.Logf(format, args...) })
 		defer healthyDerpSrv.Close()
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -95,6 +95,7 @@ func (n FeatureName) AlwaysEnable() bool {
 		FeatureExternalProvisionerDaemons: true,
 		FeatureAppearance:                 true,
 		FeatureWorkspaceBatchActions:      true,
+		FeatureHighAvailability:           true,
 	}[n]
 }
 
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -472,7 +472,6 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 			codersdk.FeatureAuditLog:                   api.AuditLogging,
 			codersdk.FeatureBrowserOnly:                api.BrowserOnly,
 			codersdk.FeatureSCIM:                       len(api.SCIMAPIKey) != 0,
-			codersdk.FeatureHighAvailability:           api.DERPServerRelayAddress != "",
 			codersdk.FeatureMultipleExternalAuth:       len(api.ExternalAuthConfigs) > 1,
 			codersdk.FeatureTemplateRBAC:               api.RBAC,
 			codersdk.FeatureExternalTokenEncryption:    len(api.ExternalTokenEncryption) > 0,
diff --git a/offlinedocs/package.json b/offlinedocs/package.json
@@ -27,7 +27,7 @@
     "next": "14.0.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-icons": "4.11.0",
+    "react-icons": "4.12.0",
     "react-markdown": "8.0.3",
     "rehype-raw": "6.1.1",
     "remark-gfm": "3.0.1"
diff --git a/offlinedocs/pnpm-lock.yaml b/offlinedocs/pnpm-lock.yaml
diff --git a/site/src/components/SyntaxHighlighter/SyntaxHighlighter.tsx b/site/src/components/SyntaxHighlighter/SyntaxHighlighter.tsx
@@ -34,6 +34,7 @@ export const SyntaxHighlighter: FC<{
 
   return (
     <div
+      data-chromatic="ignore"
       css={(theme) => ({
         padding: "8px 0",
         background: theme.palette.background.paper,
diff --git a/site/src/components/Tabs/Tabs.stories.tsx b/site/src/components/Tabs/Tabs.stories.tsx
@@ -0,0 +1,22 @@
+import { Tabs, TabLink } from "./Tabs";
+import type { Meta, StoryObj } from "@storybook/react";
+
+const meta: Meta<typeof Tabs> = {
+  title: "components/Tabs",
+  component: Tabs,
+};
+
+export default meta;
+type Story = StoryObj<typeof Tabs>;
+
+export const Default: Story = {
+  args: {
+    children: (
+      <>
+        <TabLink to="">Tab 1</TabLink>
+        <TabLink to="tab-3">Tab 2</TabLink>
+        <TabLink to="tab-4">Tab 3</TabLink>
+      </>
+    ),
+  },
+};
diff --git a/site/src/components/Tabs/Tabs.tsx b/site/src/components/Tabs/Tabs.tsx
@@ -29,11 +29,7 @@ interface TabLinkProps extends NavLinkProps {
   className?: string;
 }
 
-export const TabLink: FC<TabLinkProps> = ({
-  className,
-  children,
-  ...linkProps
-}) => {
+export const TabLink: FC<TabLinkProps> = ({ className, ...linkProps }) => {
   const tabLink = useClassName(classNames.tabLink, []);
   const activeTabLink = useClassName(classNames.activeTabLink, []);
 
diff --git a/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx b/site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
@@ -25,7 +25,14 @@ import {
   useId,
 } from "react";
 import chroma from "chroma-js";
-import { subDays, addWeeks, format } from "date-fns";
+import {
+  subDays,
+  addWeeks,
+  format,
+  startOfDay,
+  startOfHour,
+  addHours,
+} from "date-fns";
 import { useSearchParams } from "react-router-dom";
 import "react-date-range/dist/styles.css";
 import "react-date-range/dist/theme/default.css";
@@ -146,9 +153,14 @@ const getDateRange = (
   }
 
   if (interval === "day") {
+    // Only instantiate new Date once so that we don't get the wrong interval if
+    // start is 23:59:59.999 and the clock shifts to 00:00:00 before the second
+    // instantiation.
+    const today = new Date();
     return {
-      startDate: subDays(new Date(), 6),
-      endDate: new Date(),
+      startDate: startOfDay(subDays(today, 6)),
+      // Add one hour to endDate to include real-time data for today.
+      endDate: addHours(startOfHour(today), 1),
     };
   }
 

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ func (n FeatureName) AlwaysEnable() bool {`
`95`	`95`	`FeatureExternalProvisionerDaemons: true,`
`96`	`96`	`FeatureAppearance: true,`
`97`	`97`	`FeatureWorkspaceBatchActions: true,`
	`98`	`+ FeatureHighAvailability: true,`
`98`	`99`	`}[n]`
`99`	`100`	`}`
`100`	`101`