Skip to content

fix: suppress license expiry warning if a new license covers the gap #19601

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 2 commits into from
Aug 29, 2025
+361 −8
Merged

fix: suppress license expiry warning if a new license covers the gap #19601

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15b637d
fix: suppress license expiry warning if a new license covers the gap
deansheather Aug 28, 2025
81fe738
fix error checks in tests
deansheather Aug 29, 2025
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
Prev Previous commit
fix error checks in tests
  • Loading branch information
@deansheather
deansheather committed Aug 29, 2025
commit 81fe7380037256fa9690404ba959bf6a4e24e122
26 changes: 19 additions & 7 deletions enterprise/coderd/license/license_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ func TestEntitlements(t *testing.T) {

// Insert the expiring license
graceDate := dbtime.Now().AddDate(0, 0, 1)
db.InsertLicense(context.Background(), database.InsertLicenseParams{
_, err := db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
Features: license.Features{
codersdk.FeatureUserLimit: 100,
Expand All @@ -199,6 +199,9 @@ func TestEntitlements(t *testing.T) {
}),
Exp: time.Now().AddDate(0, 0, 5),
})
require.NoError(t, err)

// Warning should be generated.
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
require.NoError(t, err)
require.True(t, entitlements.HasLicense)
Expand All @@ -207,9 +210,9 @@ func TestEntitlements(t *testing.T) {
require.Len(t, entitlements.Warnings, 1)
require.Contains(t, entitlements.Warnings, "Your license expires in 1 day.")

// Insert the new, not-yet-valid license that starts before the expiring
// Insert the new, not-yet-valid license that starts BEFORE the expiring
// license expires.
db.InsertLicense(context.Background(), database.InsertLicenseParams{
_, err = db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
Features: license.Features{
codersdk.FeatureUserLimit: 100,
Expand All @@ -223,6 +226,9 @@ func TestEntitlements(t *testing.T) {
}),
Exp: dbtime.Now().AddDate(1, 0, 5),
})
require.NoError(t, err)

// Warning should be suppressed.
entitlements, err = license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
require.NoError(t, err)
require.True(t, entitlements.HasLicense)
Expand All @@ -237,7 +243,7 @@ func TestEntitlements(t *testing.T) {

// Insert the expiring license
graceDate := dbtime.Now().AddDate(0, 0, 1)
db.InsertLicense(context.Background(), database.InsertLicenseParams{
_, err := db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
Features: license.Features{
codersdk.FeatureUserLimit: 100,
Expand All @@ -250,6 +256,9 @@ func TestEntitlements(t *testing.T) {
}),
Exp: time.Now().AddDate(0, 0, 5),
})
require.NoError(t, err)

// Should generate a warning.
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
require.NoError(t, err)
require.True(t, entitlements.HasLicense)
Expand All @@ -258,9 +267,9 @@ func TestEntitlements(t *testing.T) {
require.Len(t, entitlements.Warnings, 1)
require.Contains(t, entitlements.Warnings, "Your license expires in 1 day.")

// Insert the new, not-yet-valid license that starts before the expiring
// license expires.
db.InsertLicense(context.Background(), database.InsertLicenseParams{
// Insert the new, not-yet-valid license that starts AFTER the expiring
// license expires (e.g. there's a gap)
_, err = db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
Features: license.Features{
codersdk.FeatureUserLimit: 100,
Expand All @@ -274,6 +283,9 @@ func TestEntitlements(t *testing.T) {
}),
Exp: dbtime.Now().AddDate(1, 0, 5),
})
require.NoError(t, err)

// Warning should still be generated.
entitlements, err = license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
require.NoError(t, err)
require.True(t, entitlements.HasLicense)
Expand Down
Loading