premium license has multi-org enabled

Emyrk · Emyrk · commit 96f0b2d1bb02 · 2024-07-24T11:21:48.000-05:00
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -110,8 +110,11 @@ func (n FeatureName) Humanize() string {
 }
 
 // AlwaysEnable returns if the feature is always enabled if entitled.
-// Warning: We don't know if we need this functionality.
-// This method may disappear at any time.
+// This is required because some features are only enabled if they are entitled
+// and not required.
+// E.g: "multiple-organizations" is disabled by default in AGPL and enterprise
+// deployments. This feature should only be enabled for premium deployments
+// when it is entitled.
 func (n FeatureName) AlwaysEnable() bool {
 	return map[FeatureName]bool{
 		FeatureMultipleExternalAuth:       true,
@@ -120,6 +123,7 @@ func (n FeatureName) AlwaysEnable() bool {
 		FeatureWorkspaceBatchActions:      true,
 		FeatureHighAvailability:           true,
 		FeatureCustomRoles:                true,
+		FeatureMultipleOrganizations:      true,
 	}[n]
 }
 
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -582,7 +582,6 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 			codersdk.FeatureUserRoleManagement:         true,
 			codersdk.FeatureAccessControl:              true,
 			codersdk.FeatureControlSharedPorts:         true,
-			codersdk.FeatureMultipleOrganizations:      true,
 		})
 	if err != nil {
 		return err
diff --git a/enterprise/coderd/license/license_test.go b/enterprise/coderd/license/license_test.go
@@ -679,7 +679,18 @@ func TestLicenseEntitlements(t *testing.T) {
 			DeploymentIDs: nil,
 			Trial:         false,
 			FeatureSet:    codersdk.FeatureSetEnterprise,
-			AllFeatures:   false,
+			AllFeatures:   true,
+		}).Valid(time.Now())
+	}
+
+	premiumLicense := func() *coderdenttest.LicenseOptions {
+		return (&coderdenttest.LicenseOptions{
+			AccountType:   "salesforce",
+			AccountID:     "Charlie",
+			DeploymentIDs: nil,
+			Trial:         false,
+			FeatureSet:    codersdk.FeatureSetPremium,
+			AllFeatures:   true,
 		}).Valid(time.Now())
 	}
 
@@ -789,6 +800,30 @@ func TestLicenseEntitlements(t *testing.T) {
 				assert.Equalf(t, int64(50), *userFeature.Actual, "user count")
 			},
 		},
+		{
+			Name: "EnterpriseDisabledMultiOrg",
+			Licenses: []*coderdenttest.LicenseOptions{
+				enterpriseLicense().UserLimit(100),
+			},
+			Enablements:           defaultEnablements,
+			Arguments:             license.FeatureArguments{},
+			ExpectedErrorContains: "",
+			AssertEntitlements: func(t *testing.T, entitlements codersdk.Entitlements) {
+				assert.False(t, entitlements.Features[codersdk.FeatureMultipleOrganizations].Enabled, "multi-org only enabled for premium")
+			},
+		},
+		{
+			Name: "PremiumEnabledMultiOrg",
+			Licenses: []*coderdenttest.LicenseOptions{
+				premiumLicense().UserLimit(100),
+			},
+			Enablements:           defaultEnablements,
+			Arguments:             license.FeatureArguments{},
+			ExpectedErrorContains: "",
+			AssertEntitlements: func(t *testing.T, entitlements codersdk.Entitlements) {
+				assert.True(t, entitlements.Features[codersdk.FeatureMultipleOrganizations].Enabled, "multi-org enabled for premium")
+			},
+		},
 	}
 
 	for _, tc := range testCases {
