diff --git a/entitlements/entitlements.go b/entitlements/entitlements.go index 497714faf20..7b4b196edd8 100644 --- a/entitlements/entitlements.go +++ b/entitlements/entitlements.go @@ -30,6 +30,7 @@ const ( AccessLists EntitlementKind = "AccessLists" AccessMonitoring EntitlementKind = "AccessMonitoring" AccessRequests EntitlementKind = "AccessRequests" + ActivityCenter EntitlementKind = "ActivityCenter" App EntitlementKind = "App" Beams EntitlementKind = "Beams" ClientIPRestrictions EntitlementKind = "ClientIPRestrictions" @@ -51,6 +52,7 @@ const ( Policy EntitlementKind = "Policy" SAML EntitlementKind = "SAML" SessionLocks EntitlementKind = "SessionLocks" + SessionSummaries EntitlementKind = "SessionSummaries" UnrestrictedManagedUpdates EntitlementKind = "UnrestrictedManagedUpdates" UpsellAlert EntitlementKind = "UpsellAlert" UsageReporting EntitlementKind = "UsageReporting" @@ -59,9 +61,9 @@ const ( // AllEntitlements returns all Entitlements; should be 1:1 with the const declared above. var AllEntitlements = []EntitlementKind{ - AccessGraph, AccessGraphDemoMode, AccessLists, AccessMonitoring, AccessRequests, App, Beams, + AccessGraph, AccessGraphDemoMode, AccessLists, AccessMonitoring, AccessRequests, ActivityCenter, App, Beams, ClientIPRestrictions, CloudAuditLogRetention, DB, Desktop, DeviceTrust, ExternalAuditStorage, FeatureHiding, HSM, Identity, JoinActiveSessions, K8s, LicenseAutoUpdate, - MobileDeviceManagement, OIDC, OktaSCIM, OktaUserSync, Policy, SAML, SessionLocks, + MobileDeviceManagement, OIDC, OktaSCIM, OktaUserSync, Policy, SAML, SessionLocks, SessionSummaries, UnrestrictedManagedUpdates, UpsellAlert, UsageReporting, WorkloadClusters, } diff --git a/lib/modules/modules_test.go b/lib/modules/modules_test.go index cf6787cecc4..dcd7c3cb2ee 100644 --- a/lib/modules/modules_test.go +++ b/lib/modules/modules_test.go @@ -143,6 +143,7 @@ func TestFeatures_ToProto(t *testing.T) { string(entitlements.AccessLists): {Enabled: true, Limit: 111}, string(entitlements.AccessMonitoring): {Enabled: true, Limit: 2113}, string(entitlements.AccessRequests): {Enabled: true, Limit: 39}, + string(entitlements.ActivityCenter): {Enabled: true}, string(entitlements.App): {Enabled: false}, string(entitlements.Beams): {Enabled: true}, string(entitlements.CloudAuditLogRetention): {Enabled: true}, @@ -164,6 +165,7 @@ func TestFeatures_ToProto(t *testing.T) { string(entitlements.Policy): {Enabled: true}, string(entitlements.SAML): {Enabled: true}, string(entitlements.SessionLocks): {Enabled: true}, + string(entitlements.SessionSummaries): {Enabled: true}, string(entitlements.UpsellAlert): {Enabled: true}, string(entitlements.UsageReporting): {Enabled: true}, string(entitlements.UnrestrictedManagedUpdates): {Enabled: true}, @@ -203,6 +205,7 @@ func TestFeatures_ToProto(t *testing.T) { entitlements.AccessLists: {Enabled: true, Limit: 111}, entitlements.AccessMonitoring: {Enabled: true, Limit: 2113}, entitlements.AccessRequests: {Enabled: true, Limit: 39}, + entitlements.ActivityCenter: {Enabled: true, Limit: 0}, entitlements.App: {Enabled: false, Limit: 0}, entitlements.Beams: {Enabled: true, Limit: 0}, entitlements.ClientIPRestrictions: {Enabled: true, Limit: 0}, @@ -224,6 +227,7 @@ func TestFeatures_ToProto(t *testing.T) { entitlements.Policy: {Enabled: true, Limit: 0}, entitlements.SAML: {Enabled: true, Limit: 0}, entitlements.SessionLocks: {Enabled: true, Limit: 0}, + entitlements.SessionSummaries: {Enabled: true, Limit: 0}, entitlements.UpsellAlert: {Enabled: true, Limit: 0}, entitlements.UsageReporting: {Enabled: true, Limit: 0}, entitlements.UnrestrictedManagedUpdates: {Enabled: true, Limit: 0}, diff --git a/lib/web/apiserver_test.go b/lib/web/apiserver_test.go index c86368963ef..9088eb7cb08 100644 --- a/lib/web/apiserver_test.go +++ b/lib/web/apiserver_test.go @@ -5095,6 +5095,7 @@ func TestGetWebConfig_WithEntitlements(t *testing.T) { string(entitlements.AccessLists): {Enabled: false}, string(entitlements.AccessMonitoring): {Enabled: false}, string(entitlements.AccessRequests): {Enabled: false}, + string(entitlements.ActivityCenter): {Enabled: false}, string(entitlements.App): {Enabled: true}, string(entitlements.Beams): {Enabled: false}, string(entitlements.ClientIPRestrictions): {Enabled: false}, @@ -5116,6 +5117,7 @@ func TestGetWebConfig_WithEntitlements(t *testing.T) { string(entitlements.Policy): {Enabled: false}, string(entitlements.SAML): {Enabled: false}, string(entitlements.SessionLocks): {Enabled: false}, + string(entitlements.SessionSummaries): {Enabled: false}, string(entitlements.UpsellAlert): {Enabled: false}, string(entitlements.UsageReporting): {Enabled: false}, string(entitlements.UnrestrictedManagedUpdates): {Enabled: false}, diff --git a/web/packages/teleport/src/entitlement.ts b/web/packages/teleport/src/entitlement.ts index 99aa4eefebc..8440bbdc309 100644 --- a/web/packages/teleport/src/entitlement.ts +++ b/web/packages/teleport/src/entitlement.ts @@ -23,6 +23,7 @@ type entitlement = | 'AccessLists' | 'AccessMonitoring' | 'AccessRequests' + | 'ActivityCenter' | 'App' | 'Beams' | 'ClientIPRestrictions' @@ -43,6 +44,7 @@ type entitlement = | 'Policy' | 'SAML' | 'SessionLocks' + | 'SessionSummaries' | 'UnrestrictedManagedUpdates' | 'UpsellAlert' | 'UsageReporting'; @@ -56,6 +58,7 @@ export const defaultEntitlements: Record< AccessLists: { enabled: false, limit: 0 }, AccessMonitoring: { enabled: false, limit: 0 }, AccessRequests: { enabled: false, limit: 0 }, + ActivityCenter: { enabled: false, limit: 0 }, App: { enabled: false, limit: 0 }, Beams: { enabled: false, limit: 0 }, ClientIPRestrictions: { enabled: false, limit: 0 }, @@ -76,6 +79,7 @@ export const defaultEntitlements: Record< Policy: { enabled: false, limit: 0 }, SAML: { enabled: false, limit: 0 }, SessionLocks: { enabled: false, limit: 0 }, + SessionSummaries: { enabled: false, limit: 0 }, UnrestrictedManagedUpdates: { enabled: false, limit: 0 }, UpsellAlert: { enabled: false, limit: 0 }, UsageReporting: { enabled: false, limit: 0 },