make enterprise = All - [multi-org]

Emyrk · Emyrk · commit 41c272615819 · 2024-07-24T11:22:39.000-05:00
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -9,6 +9,7 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -144,26 +145,23 @@ const (
 func (set FeatureSet) Features() []FeatureName {
 	switch FeatureSet(strings.ToLower(string(set))) {
 	case FeatureSetEnterprise:
-		// List all features that should be included in the Enterprise feature set.
-		return []FeatureName{
-			FeatureUserLimit,
-			FeatureAuditLog,
-			FeatureBrowserOnly,
-			FeatureSCIM,
-			FeatureTemplateRBAC,
-			FeatureHighAvailability,
-			FeatureMultipleExternalAuth,
-			FeatureExternalProvisionerDaemons,
-			FeatureAppearance,
-			FeatureAdvancedTemplateScheduling,
-			FeatureWorkspaceProxy,
-			FeatureUserRoleManagement,
-			FeatureExternalTokenEncryption,
-			FeatureWorkspaceBatchActions,
-			FeatureAccessControl,
-			FeatureControlSharedPorts,
-			FeatureCustomRoles,
-		}
+		// Enterprise is the set 'AllFeatures' minus some select features.
+
+		// Copy the list of all features
+		enterpriseFeatures := make([]FeatureName, len(FeatureNames))
+		copy(enterpriseFeatures, FeatureNames)
+		// Remove the selection
+		enterpriseFeatures = slices.DeleteFunc(enterpriseFeatures, func(f FeatureName) bool {
+			switch f {
+			// Add all features that should be excluded in the Enterprise feature set.
+			case FeatureMultipleOrganizations:
+				return true
+			default:
+				return false
+			}
+		})
+
+		return enterpriseFeatures
 	case FeatureSetPremium:
 		// FeatureSetPremium is a superset of Enterprise
 		return append(FeatureSetEnterprise.Features(), FeatureMultipleOrganizations)
diff --git a/codersdk/deployment_test.go b/codersdk/deployment_test.go
@@ -544,5 +544,20 @@ func TestPremiumSuperSet(t *testing.T) {
 
 	enterprise := codersdk.FeatureSetEnterprise
 	premium := codersdk.FeatureSetPremium
+
+	// Premium > Enterprise
+	require.Greater(t, len(premium.Features()), len(enterprise.Features()), "premium should have more features than enterprise")
+
+	// Premium ⊃ Enterprise
 	require.Subset(t, premium.Features(), enterprise.Features(), "premium should be a superset of enterprise. If this fails, update the premium feature set to include all enterprise features.")
+
+	// Premium = All Features
+	// This is currently true. If this assertion changes, update this test
+	// to reflect the change in feature sets.
+	require.ElementsMatch(t, premium.Features(), codersdk.FeatureNames, "premium should contain all features")
+
+	// This check exists because if you misuse the slices.Delete, you can end up
+	// with zero'd values.
+	require.NotContains(t, enterprise.Features(), "", "enterprise should not contain empty string")
+	require.NotContains(t, premium.Features(), "", "premium should not contain empty string")
 }
