backend changes

hugodutka · hugodutka · commit f719a499a8ec · 2025-02-24T11:48:46.000Z
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 {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ import (`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`const (`
`15`		`- LicenseExpiryClaim = "license_expires"`
	`15`	`+ LicenseExpiryClaim = "license_expires"`
	`16`	`+ LicenseTelemetryRequiredErrorText = "License requires telemetry but telemetry is disabled"`
`16`	`17`	`)`
`17`	`18`
`18`	`19`	`type AddLicenseRequest struct {`