Commit82534a4

committed

Add all features property

1 parent152f695 commit82534a4Copy full SHA for 82534a4

File tree

+16

-4

lines changed

+16

-4

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ type LicenseOptions struct {`
`88`	`88`	`AccountTypestring`
`89`	`89`	`AccountIDstring`
`90`	`90`	`Trialbool`
	`91`	`+AllFeaturesbool`
`91`	`92`	`GraceAt time.Time`
`92`	`93`	`ExpiresAt time.Time`
`93`	`94`	`UserLimitint64`
`@@ -143,6 +144,7 @@ func GenerateLicense(t *testing.T, options LicenseOptions) string {`
`143`	`144`	`AccountID:options.AccountID,`
`144`	`145`	`Trial:options.Trial,`
`145`	`146`	`Version:license.CurrentVersion,`
	`147`	`+AllFeatures:options.AllFeatures,`
`146`	`148`	`Features: license.Features{`
`147`	`149`	`UserLimit:options.UserLimit,`
`148`	`150`	`AuditLog:auditLog,`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ func Entitlements(ctx context.Context, db database.Store, logger slog.Logger, ke`
`41`	`41`	`returnentitlements,xerrors.Errorf("query active user count: %w",err)`
`42`	`42`	`}`
`43`	`43`
	`44`	`+allFeatures:=false`
	`45`	`+`
`44`	`46`	`// Here we loop through licenses to detect enabled features.`
`45`	`47`	`for_,l:=rangelicenses {`
`46`	`48`	`claims,err:=validateDBLicense(l,keys)`
`@@ -94,9 +96,12 @@ func Entitlements(ctx context.Context, db database.Store, logger slog.Logger, ke`
`94`	`96`	`Enabled:enablements[codersdk.FeatureWorkspaceQuota],`
`95`	`97`	`}`
`96`	`98`	`}`
	`99`	`+ifclaims.AllFeatures {`
	`100`	`+allFeatures=true`
	`101`	`+}`
`97`	`102`	`}`
`98`	`103`
`99`		`-ifentitlements.Trial {`
	`104`	`+ifallFeatures {`
`100`	`105`	`for_,featureName:=rangecodersdk.FeatureNames {`
`101`	`106`	`// No user limit!`
`102`	`107`	`iffeatureName==codersdk.FeatureUserLimit {`
`@@ -171,6 +176,7 @@ type Claims struct {`
`171`	`176`	AccountTypestring`json:"account_type,omitempty"`
`172`	`177`	AccountIDstring`json:"account_id,omitempty"`
`173`	`178`	Trialbool`json:"trial"`
	`179`	+AllFeaturesbool`json:"all_features"`
`174`	`180`	Versionuint64`json:"version"`
`175`	`181`	FeaturesFeatures`json:"features"`
`176`	`182`	`}`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,19 +165,19 @@ func TestEntitlements(t *testing.T) {`
`165`	`165`	`require.False(t,entitlements.Trial)`
`166`	`166`	`})`
`167`	`167`
`168`		`-t.Run("TrialEntitledAll",func(t*testing.T) {`
	`168`	`+t.Run("AllFeatures",func(t*testing.T) {`
`169`	`169`	`t.Parallel()`
`170`	`170`	`db:=databasefake.New()`
`171`	`171`	`db.InsertLicense(context.Background(), database.InsertLicenseParams{`
`172`	`172`	`Exp:time.Now().Add(time.Hour),`
`173`	`173`	`JWT:coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{`
`174`		`-Trial:true,`
	`174`	`+AllFeatures:true,`
`175`	`175`	`}),`
`176`	`176`	`})`
`177`	`177`	`entitlements,err:=license.Entitlements(context.Background(),db, slog.Logger{},coderdenttest.Keys,all)`
`178`	`178`	`require.NoError(t,err)`
`179`	`179`	`require.True(t,entitlements.HasLicense)`
`180`		`-require.True(t,entitlements.Trial)`
	`180`	`+require.False(t,entitlements.Trial)`
`181`	`181`	`for_,featureName:=rangecodersdk.FeatureNames {`
`182`	`182`	`iffeatureName==codersdk.FeatureUserLimit {`
`183`	`183`	`continue`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ export const defaultEntitlements = (): TypesGen.Entitlements => {`
`30`	`30`	`has_license:false,`
`31`	`31`	`warnings:[],`
`32`	`32`	`experimental:false,`
	`33`	`+trial:false,`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -777,12 +777,14 @@ export const MockEntitlements: TypesGen.Entitlements = {`
`777`	`777`	`has_license:false,`
`778`	`778`	`features:{},`
`779`	`779`	`experimental:false,`
	`780`	`+trial:false,`
`780`	`781`	`}`
`781`	`782`
`782`	`783`	`exportconstMockEntitlementsWithWarnings:TypesGen.Entitlements={`
`783`	`784`	`warnings:["You are over your active user limit.","And another thing."],`
`784`	`785`	`has_license:true,`
`785`	`786`	`experimental:false,`
	`787`	`+trial:false,`
`786`	`788`	`features:{`
`787`	`789`	`user_limit:{`
`788`	`790`	`enabled:true,`
`@@ -805,6 +807,7 @@ export const MockEntitlementsWithAuditLog: TypesGen.Entitlements = {`
`805`	`807`	`warnings:[],`
`806`	`808`	`has_license:true,`
`807`	`809`	`experimental:false,`
	`810`	`+trial:false,`
`808`	`811`	`features:{`
`809`	`812`	`audit_log:{`
`810`	`813`	`enabled:true,`

Comments

(0)