Skip to content

fix: label premium features in middleware error #14360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 19, 2024
Merged

fix: label premium features in middleware error #14360

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ed13f76
fix: Report multiple organizations as a premium feature
code-asher Aug 19, 2024
1685f4e
fixup! fix: Report multiple organizations as a premium feature
code-asher Aug 19, 2024
425adcb
fixup! fix: Report multiple organizations as a premium feature
code-asher Aug 19, 2024
01d2673
Flip license check
code-asher Aug 19, 2024
732fefc
Update custom roles test
code-asher Aug 19, 2024
dc1164f
Add org patch test for revoked license
code-asher Aug 19, 2024
bfcad58
Delete extra var and say premium in comments
code-asher Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions codersdk/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,17 @@ func (n FeatureName) AlwaysEnable() bool {
}[n]
}

// Premium returns true if the feature is a premium feature.
func (n FeatureName) Premium() bool {
switch n {
// Add all features that should be excluded in the Enterprise feature set.
case FeatureMultipleOrganizations, FeatureCustomRoles:
return true
default:
return false
}
}

// FeatureSet represents a grouping of features. Rather than manually
// assigning features al-la-carte when making a license, a set can be specified.
// Sets are dynamic in the sense a feature can be added to a set, granting the
Expand All @@ -152,13 +163,7 @@ func (set FeatureSet) Features() []FeatureName {
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, FeatureCustomRoles:
return true
default:
return false
}
return f.Premium()
})

return enterpriseFeatures
Expand Down
6 changes: 5 additions & 1 deletion enterprise/coderd/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,12 @@ func (api *API) RequireFeatureMW(feat codersdk.FeatureName) func(http.Handler) h
enabled := api.entitlements.Features[feat].Enabled
api.entitlementsMu.RUnlock()
if !enabled {
var licenseType = "an Enterprise"
if feat.Premium() {
licenseType = "a Premium"
}
httpapi.Write(r.Context(), rw, http.StatusForbidden, codersdk.Response{
Message: fmt.Sprintf("%s is an Enterprise feature. Contact sales!", feat.Humanize()),
Message: fmt.Sprintf("%s is %s feature. Contact sales!", licenseType, feat.Humanize()),
})
return
}
Expand Down
Loading