Commitc00fa21

authored and

committed

fix: stop reporting future licenses as errors (#14492)

(cherry picked from commit4eac2ac)

1 parent34f86ca commitc00fa21Copy full SHA for c00fa21

File tree

+33

-0

lines changed

+33

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,13 @@ func (opts LicenseOptions) Valid(now time.Time) LicenseOptions {`
`199`	`199`	`returnopts`
`200`	`200`	`}`
`201`	`201`
	`202`	`+func (optsLicenseOptions)FutureTerm(now time.Time)LicenseOptions {`
	`203`	`+opts.NotBefore=now.Add(time.Hour*24)`
	`204`	`+opts.ExpiresAt=now.Add(time.Hour2460)`
	`205`	`+opts.GraceAt=now.Add(time.Hour2453)`
	`206`	`+returnopts`
	`207`	`+}`
	`208`	`+`
`202`	`209`	`func (optsLicenseOptions)UserLimit(limitint64)LicenseOptions {`
`203`	`210`	`returnopts.Feature(codersdk.FeatureUserLimit,limit)`
`204`	`211`	`}`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,13 @@ func LicensesEntitlements(`
`100`	`100`	`// 'Entitlements' group as a whole.`
`101`	`101`	`for_,license:=rangelicenses {`
`102`	`102`	`claims,err:=ParseClaims(license.JWT,keys)`
	`103`	`+varvErr*jwt.ValidationError`
	`104`	`+ifxerrors.As(err,&vErr)&&vErr.Is(jwt.ErrTokenNotValidYet) {`
	`105`	`+// The license isn't valid yet. We don't consider any entitlements contained in it, but`
	`106`	`+// it's also not an error. Just skip it silently. This can happen if an administrator`
	`107`	`+// uploads a license for a new term that hasn't started yet.`
	`108`	`+continue`
	`109`	`+}`
`103`	`110`	`iferr!=nil {`
`104`	`111`	`entitlements.Errors=append(entitlements.Errors,`
`105`	`112`	`fmt.Sprintf("Invalid license (%s) parsing claims: %s",license.UUID.String(),err.Error()))`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -824,6 +824,25 @@ func TestLicenseEntitlements(t *testing.T) {`
`824`	`824`	`assert.True(t,entitlements.Features[codersdk.FeatureMultipleOrganizations].Enabled,"multi-org enabled for premium")`
`825`	`825`	`},`
`826`	`826`	`},`
	`827`	`+{`
	`828`	`+Name:"CurrentAndFuture",`
	`829`	`+Licenses: []*coderdenttest.LicenseOptions{`
	`830`	`+enterpriseLicense().UserLimit(100),`
	`831`	`+premiumLicense().UserLimit(200).FutureTerm(time.Now()),`
	`832`	`+},`
	`833`	`+Enablements:defaultEnablements,`
	`834`	`+AssertEntitlements:func(t*testing.T,entitlements codersdk.Entitlements) {`
	`835`	`+assertEnterpriseFeatures(t,entitlements)`
	`836`	`+assertNoErrors(t,entitlements)`
	`837`	`+assertNoWarnings(t,entitlements)`
	`838`	`+userFeature:=entitlements.Features[codersdk.FeatureUserLimit]`
	`839`	`+assert.Equalf(t,int64(100),*userFeature.Limit,"user limit")`
	`840`	`+assert.Equal(t,codersdk.EntitlementNotEntitled,`
	`841`	`+entitlements.Features[codersdk.FeatureMultipleOrganizations].Entitlement)`
	`842`	`+assert.Equal(t,codersdk.EntitlementNotEntitled,`
	`843`	`+entitlements.Features[codersdk.FeatureCustomRoles].Entitlement)`
	`844`	`+},`
	`845`	`+},`
`827`	`846`	`}`
`828`	`847`
`829`	`848`	`for_,tc:=rangetestCases {`

Comments

(0)