Skip to content

Commit 1ebb3a5

Browse files
EmyrkEmyrk
committed
linting
1 parent 649d30f commit 1ebb3a5

File tree

3 files changed

+26
-29
lines changed

3 files changed

+26
-29
lines changed

‎enterprise/coderd/coderd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
569569

570570
entitlements, err := license.Entitlements(
571571
ctx, api.Database,
572-
api.Logger, len(agedReplicas), len(api.ExternalAuthConfigs), api.LicenseKeys, map[codersdk.FeatureName]bool{
572+
len(agedReplicas), len(api.ExternalAuthConfigs), api.LicenseKeys, map[codersdk.FeatureName]bool{
573573
codersdk.FeatureAuditLog: api.AuditLogging,
574574
codersdk.FeatureBrowserOnly: api.BrowserOnly,
575575
codersdk.FeatureSCIM: len(api.SCIMAPIKey) != 0,

‎enterprise/coderd/license/license.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"github.com/golang-jwt/jwt/v4"
1111
"golang.org/x/xerrors"
1212

13-
"cdr.dev/slog"
1413
"github.com/coder/coder/v2/coderd/database"
1514
"github.com/coder/coder/v2/coderd/database/dbauthz"
1615
"github.com/coder/coder/v2/codersdk"
@@ -20,7 +19,6 @@ import (
2019
func Entitlements(
2120
ctx context.Context,
2221
db database.Store,
23-
logger slog.Logger,
2422
replicaCount int,
2523
externalAuthCount int,
2624
keys map[string]ed25519.PublicKey,

‎enterprise/coderd/license/license_test.go

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"github.com/stretchr/testify/require"
1212
"golang.org/x/exp/slices"
1313

14-
"cdr.dev/slog"
1514
"github.com/coder/coder/v2/coderd/database"
1615
"github.com/coder/coder/v2/coderd/database/dbmem"
1716
"github.com/coder/coder/v2/coderd/database/dbtime"
@@ -32,7 +31,7 @@ func TestEntitlements(t *testing.T) {
3231
t.Run("Defaults", func(t *testing.T) {
3332
t.Parallel()
3433
db := dbmem.New()
35-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
34+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
3635
require.NoError(t, err)
3736
require.False(t, entitlements.HasLicense)
3837
require.False(t, entitlements.Trial)
@@ -44,7 +43,7 @@ func TestEntitlements(t *testing.T) {
4443
t.Run("Always return the current user count", func(t *testing.T) {
4544
t.Parallel()
4645
db := dbmem.New()
47-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
46+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
4847
require.NoError(t, err)
4948
require.False(t, entitlements.HasLicense)
5049
require.False(t, entitlements.Trial)
@@ -57,7 +56,7 @@ func TestEntitlements(t *testing.T) {
5756
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{}),
5857
Exp: time.Now().Add(time.Hour),
5958
})
60-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, empty)
59+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, empty)
6160
require.NoError(t, err)
6261
require.True(t, entitlements.HasLicense)
6362
require.False(t, entitlements.Trial)
@@ -81,7 +80,7 @@ func TestEntitlements(t *testing.T) {
8180
}),
8281
Exp: time.Now().Add(time.Hour),
8382
})
84-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, empty)
83+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, empty)
8584
require.NoError(t, err)
8685
require.True(t, entitlements.HasLicense)
8786
require.False(t, entitlements.Trial)
@@ -104,7 +103,7 @@ func TestEntitlements(t *testing.T) {
104103
}),
105104
Exp: time.Now().Add(time.Hour),
106105
})
107-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
106+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
108107
require.NoError(t, err)
109108
require.True(t, entitlements.HasLicense)
110109
require.False(t, entitlements.Trial)
@@ -131,7 +130,7 @@ func TestEntitlements(t *testing.T) {
131130
Exp: time.Now().AddDate(0, 0, 5),
132131
})
133132

134-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
133+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
135134

136135
require.NoError(t, err)
137136
require.True(t, entitlements.HasLicense)
@@ -160,7 +159,7 @@ func TestEntitlements(t *testing.T) {
160159
Exp: time.Now().AddDate(0, 0, 5),
161160
})
162161

163-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
162+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
164163

165164
require.NoError(t, err)
166165
require.True(t, entitlements.HasLicense)
@@ -190,7 +189,7 @@ func TestEntitlements(t *testing.T) {
190189
Exp: time.Now().AddDate(0, 0, 5),
191190
})
192191

193-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
192+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
194193

195194
require.NoError(t, err)
196195
require.True(t, entitlements.HasLicense)
@@ -219,7 +218,7 @@ func TestEntitlements(t *testing.T) {
219218
Exp: time.Now().AddDate(0, 0, 5),
220219
})
221220

222-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
221+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
223222

224223
require.NoError(t, err)
225224
require.True(t, entitlements.HasLicense)
@@ -239,7 +238,7 @@ func TestEntitlements(t *testing.T) {
239238
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{}),
240239
Exp: time.Now().Add(time.Hour),
241240
})
242-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
241+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
243242
require.NoError(t, err)
244243
require.True(t, entitlements.HasLicense)
245244
require.False(t, entitlements.Trial)
@@ -301,7 +300,7 @@ func TestEntitlements(t *testing.T) {
301300
}),
302301
Exp: time.Now().Add(time.Hour),
303302
})
304-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, empty)
303+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, empty)
305304
require.NoError(t, err)
306305
require.True(t, entitlements.HasLicense)
307306
require.Contains(t, entitlements.Warnings, "Your deployment has 2 active users but is only licensed for 1.")
@@ -329,7 +328,7 @@ func TestEntitlements(t *testing.T) {
329328
}),
330329
Exp: time.Now().Add(60 * 24 * time.Hour),
331330
})
332-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, empty)
331+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, empty)
333332
require.NoError(t, err)
334333
require.True(t, entitlements.HasLicense)
335334
require.Empty(t, entitlements.Warnings)
@@ -352,7 +351,7 @@ func TestEntitlements(t *testing.T) {
352351
}),
353352
})
354353

355-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, empty)
354+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, empty)
356355
require.NoError(t, err)
357356
require.True(t, entitlements.HasLicense)
358357
require.False(t, entitlements.Trial)
@@ -368,7 +367,7 @@ func TestEntitlements(t *testing.T) {
368367
}),
369368
})
370369
require.NoError(t, err)
371-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
370+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
372371
require.NoError(t, err)
373372
require.True(t, entitlements.HasLicense)
374373
require.False(t, entitlements.Trial)
@@ -399,7 +398,7 @@ func TestEntitlements(t *testing.T) {
399398
}),
400399
})
401400
require.NoError(t, err)
402-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
401+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
403402
require.NoError(t, err)
404403
require.True(t, entitlements.HasLicense)
405404
require.False(t, entitlements.Trial)
@@ -430,7 +429,7 @@ func TestEntitlements(t *testing.T) {
430429
}),
431430
})
432431
require.NoError(t, err)
433-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
432+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
434433
require.NoError(t, err)
435434
require.True(t, entitlements.HasLicense)
436435
require.False(t, entitlements.Trial)
@@ -451,7 +450,7 @@ func TestEntitlements(t *testing.T) {
451450
AllFeatures: true,
452451
}),
453452
})
454-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
453+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
455454
require.NoError(t, err)
456455
require.True(t, entitlements.HasLicense)
457456
require.False(t, entitlements.Trial)
@@ -481,7 +480,7 @@ func TestEntitlements(t *testing.T) {
481480
AllFeatures: true,
482481
}),
483482
})
484-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, empty)
483+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, empty)
485484
require.NoError(t, err)
486485
require.True(t, entitlements.HasLicense)
487486
require.False(t, entitlements.Trial)
@@ -514,7 +513,7 @@ func TestEntitlements(t *testing.T) {
514513
ExpiresAt: dbtime.Now().Add(time.Hour),
515514
}),
516515
})
517-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
516+
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
518517
require.NoError(t, err)
519518
require.True(t, entitlements.HasLicense)
520519
require.False(t, entitlements.Trial)
@@ -537,7 +536,7 @@ func TestEntitlements(t *testing.T) {
537536
t.Run("MultipleReplicasNoLicense", func(t *testing.T) {
538537
t.Parallel()
539538
db := dbmem.New()
540-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 2, 1, coderdenttest.Keys, all)
539+
entitlements, err := license.Entitlements(context.Background(), db, 2, 1, coderdenttest.Keys, all)
541540
require.NoError(t, err)
542541
require.False(t, entitlements.HasLicense)
543542
require.Len(t, entitlements.Errors, 1)
@@ -555,7 +554,7 @@ func TestEntitlements(t *testing.T) {
555554
},
556555
}),
557556
})
558-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 2, 1, coderdenttest.Keys, map[codersdk.FeatureName]bool{
557+
entitlements, err := license.Entitlements(context.Background(), db, 2, 1, coderdenttest.Keys, map[codersdk.FeatureName]bool{
559558
codersdk.FeatureHighAvailability: true,
560559
})
561560
require.NoError(t, err)
@@ -577,7 +576,7 @@ func TestEntitlements(t *testing.T) {
577576
}),
578577
Exp: time.Now().Add(time.Hour),
579578
})
580-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 2, 1, coderdenttest.Keys, map[codersdk.FeatureName]bool{
579+
entitlements, err := license.Entitlements(context.Background(), db, 2, 1, coderdenttest.Keys, map[codersdk.FeatureName]bool{
581580
codersdk.FeatureHighAvailability: true,
582581
})
583582
require.NoError(t, err)
@@ -589,7 +588,7 @@ func TestEntitlements(t *testing.T) {
589588
t.Run("MultipleGitAuthNoLicense", func(t *testing.T) {
590589
t.Parallel()
591590
db := dbmem.New()
592-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 2, coderdenttest.Keys, all)
591+
entitlements, err := license.Entitlements(context.Background(), db, 1, 2, coderdenttest.Keys, all)
593592
require.NoError(t, err)
594593
require.False(t, entitlements.HasLicense)
595594
require.Len(t, entitlements.Errors, 1)
@@ -607,7 +606,7 @@ func TestEntitlements(t *testing.T) {
607606
},
608607
}),
609608
})
610-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 2, coderdenttest.Keys, map[codersdk.FeatureName]bool{
609+
entitlements, err := license.Entitlements(context.Background(), db, 1, 2, coderdenttest.Keys, map[codersdk.FeatureName]bool{
611610
codersdk.FeatureMultipleExternalAuth: true,
612611
})
613612
require.NoError(t, err)
@@ -629,7 +628,7 @@ func TestEntitlements(t *testing.T) {
629628
}),
630629
Exp: time.Now().Add(time.Hour),
631630
})
632-
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 2, coderdenttest.Keys, map[codersdk.FeatureName]bool{
631+
entitlements, err := license.Entitlements(context.Background(), db, 1, 2, coderdenttest.Keys, map[codersdk.FeatureName]bool{
633632
codersdk.FeatureMultipleExternalAuth: true,
634633
})
635634
require.NoError(t, err)

0 commit comments

Comments
 (0)