coder · hugodutka · Feb 24, 2025 · Feb 23, 2025 · Feb 23, 2025 · Feb 23, 2025
diff --git a/coderd/entitlements/entitlements.go b/coderd/entitlements/entitlements.go
@@ -30,22 +30,30 @@ func New() *Set {
 		// These will be updated when coderd is initialized.
 		entitlements: codersdk.Entitlements{
 			Features:         map[codersdk.FeatureName]codersdk.Feature{},
-			Warnings:         nil,
-			Errors:           nil,
+			Warnings:         []string{},
+			Errors:           []string{},
 			HasLicense:       false,
 			Trial:            false,
 			RequireTelemetry: false,
 			RefreshedAt:      time.Time{},
 		},
 		right2Update: make(chan struct{}, 1),
 	}
+	// Ensure all features are present in the entitlements. Our frontend
+	// expects this.
+	for _, featureName := range codersdk.FeatureNames {
+		s.entitlements.AddFeature(featureName, codersdk.Feature{
+			Entitlement: codersdk.EntitlementNotEntitled,
+			Enabled:     false,
+		})
+	}
 	s.right2Update <- struct{}{} // one token, serialized updates
 	return s
 }
 
 // ErrLicenseRequiresTelemetry is an error returned by a fetch passed to Update to indicate that the
 // fetched license cannot be used because it requires telemetry.
-var ErrLicenseRequiresTelemetry = xerrors.New("License requires telemetry but telemetry is disabled")
+var ErrLicenseRequiresTelemetry = xerrors.New(codersdk.LicenseTelemetryRequiredErrorText)
 
 func (l *Set) Update(ctx context.Context, fetch func(context.Context) (codersdk.Entitlements, error)) error {
 	select {

diff --git a/codersdk/licenses.go b/codersdk/licenses.go
@@ -12,7 +12,8 @@ import (
 )
 
 const (
-	LicenseExpiryClaim = "license_expires"
+	LicenseExpiryClaim                = "license_expires"
+	LicenseTelemetryRequiredErrorText = "License requires telemetry but telemetry is disabled"
 )
 
 type AddLicenseRequest struct {

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
diff --git a/site/src/modules/dashboard/LicenseBanner/LicenseBannerView.tsx b/site/src/modules/dashboard/LicenseBanner/LicenseBannerView.tsx
@@ -6,6 +6,7 @@ import {
 	useTheme,
 } from "@emotion/react";
 import Link from "@mui/material/Link";
+import { LicenseTelemetryRequiredErrorText } from "api/typesGenerated";
 import { Expander } from "components/Expander/Expander";
 import { Pill } from "components/Pill/Pill";
 import { type FC, useState } from "react";
@@ -14,6 +15,7 @@ export const Language = {
 	licenseIssue: "License Issue",
 	licenseIssues: (num: number): string => `${num} License Issues`,
 	upgrade: "Contact sales@coder.com.",
+	exception: "Contact sales@coder.com if you need an exception.",
 	exceeded: "It looks like you've exceeded some limits of your license.",
 	lessDetails: "Less",
 	moreDetails: "More",
@@ -26,6 +28,14 @@ const styles = {
 	},
 } satisfies Record<string, Interpolation<Theme>>;
 
+const formatMessage = (message: string) => {
+	// If the message ends with an alphanumeric character, add a period.
+	if (/[a-z0-9]$/i.test(message)) {
+		return `${message}.`;
+	}
+	return message;
+};
+
 export interface LicenseBannerViewProps {
 	errors: readonly string[];
 	warnings: readonly string[];
@@ -57,14 +67,16 @@ export const LicenseBannerView: FC<LicenseBannerViewProps> = ({
 			<div css={containerStyles}>
 				<Pill type={type}>{Language.licenseIssue}</Pill>
 				<div css={styles.leftContent}>
-					<span>{messages[0]}</span>
+					<span>{formatMessage(messages[0])}</span>
 					&nbsp;
 					<Link
 						color={textColor}
 						fontWeight="medium"
 						href="mailto:sales@coder.com"
 					>
-						{Language.upgrade}
+						{messages[0] === LicenseTelemetryRequiredErrorText
+							? Language.exception
+							: Language.upgrade}
 					</Link>
 				</div>
 			</div>
@@ -90,7 +102,7 @@ export const LicenseBannerView: FC<LicenseBannerViewProps> = ({
 					<ul css={{ padding: 8, margin: 0 }}>
 						{messages.map((message) => (
 							<li css={{ margin: 4 }} key={message}>
-								{message}
+								{formatMessage(message)}
 							</li>
 						))}
 					</ul>