Skip to content

Commit 96e3225

Browse files
johnstcnjohnstcn
committed
address linter complaints in coderd_test.go
1 parent 440f74f commit 96e3225

File tree

1 file changed

+21
-17
lines changed

1 file changed

+21
-17
lines changed

‎enterprise/coderd/coderd_test.go

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,18 @@ func TestEntitlements(t *testing.T) {
3838
t.Parallel()
3939
t.Run("NoLicense", func(t *testing.T) {
4040
t.Parallel()
41-
client, _ := coderdenttest.New(t, &coderdenttest.Options{
41+
adminClient, adminUser := coderdenttest.New(t, &coderdenttest.Options{
4242
DontAddLicense: true,
4343
})
44-
res, err := client.Entitlements(context.Background())
44+
anotherClient, _ := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
45+
res, err := anotherClient.Entitlements(context.Background())
4546
require.NoError(t, err)
4647
require.False(t, res.HasLicense)
4748
require.Empty(t, res.Warnings)
4849
})
4950
t.Run("FullLicense", func(t *testing.T) {
5051
t.Parallel()
51-
client, _ := coderdenttest.New(t, &coderdenttest.Options{
52+
adminClient, _ := coderdenttest.New(t, &coderdenttest.Options{
5253
AuditLogging: true,
5354
DontAddLicense: true,
5455
})
@@ -58,11 +59,11 @@ func TestEntitlements(t *testing.T) {
5859
features[feature] = 1
5960
}
6061
features[codersdk.FeatureUserLimit] = 100
61-
coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
62+
coderdenttest.AddLicense(t, adminClient, coderdenttest.LicenseOptions{
6263
Features: features,
6364
GraceAt: time.Now().Add(59 * 24 * time.Hour),
6465
})
65-
res, err := client.Entitlements(context.Background())
66+
res, err := adminClient.Entitlements(context.Background()) //nolint:gocritic // adding another user would put us over user limit
6667
require.NoError(t, err)
6768
assert.True(t, res.HasLicense)
6869
ul := res.Features[codersdk.FeatureUserLimit]
@@ -83,27 +84,28 @@ func TestEntitlements(t *testing.T) {
8384
})
8485
t.Run("FullLicenseToNone", func(t *testing.T) {
8586
t.Parallel()
86-
client, _ := coderdenttest.New(t, &coderdenttest.Options{
87+
adminClient, adminUser := coderdenttest.New(t, &coderdenttest.Options{
8788
AuditLogging: true,
8889
DontAddLicense: true,
8990
})
90-
license := coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
91+
anotherClient, _ := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
92+
license := coderdenttest.AddLicense(t, adminClient, coderdenttest.LicenseOptions{
9193
Features: license.Features{
9294
codersdk.FeatureUserLimit: 100,
9395
codersdk.FeatureAuditLog: 1,
9496
},
9597
})
96-
res, err := client.Entitlements(context.Background())
98+
res, err := anotherClient.Entitlements(context.Background())
9799
require.NoError(t, err)
98100
assert.True(t, res.HasLicense)
99101
al := res.Features[codersdk.FeatureAuditLog]
100102
assert.Equal(t, codersdk.EntitlementEntitled, al.Entitlement)
101103
assert.True(t, al.Enabled)
102104

103-
err = client.DeleteLicense(context.Background(), license.ID)
105+
err = adminClient.DeleteLicense(context.Background(), license.ID)
104106
require.NoError(t, err)
105107

106-
res, err = client.Entitlements(context.Background())
108+
res, err = anotherClient.Entitlements(context.Background())
107109
require.NoError(t, err)
108110
assert.False(t, res.HasLicense)
109111
al = res.Features[codersdk.FeatureAuditLog]
@@ -112,8 +114,9 @@ func TestEntitlements(t *testing.T) {
112114
})
113115
t.Run("Pubsub", func(t *testing.T) {
114116
t.Parallel()
115-
client, _, api, _ := coderdenttest.NewWithAPI(t, &coderdenttest.Options{DontAddLicense: true})
116-
entitlements, err := client.Entitlements(context.Background())
117+
adminClient, _, api, adminUser := coderdenttest.NewWithAPI(t, &coderdenttest.Options{DontAddLicense: true})
118+
anotherClient, _ := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
119+
entitlements, err := anotherClient.Entitlements(context.Background())
117120
require.NoError(t, err)
118121
require.False(t, entitlements.HasLicense)
119122
//nolint:gocritic // unit test
@@ -131,18 +134,19 @@ func TestEntitlements(t *testing.T) {
131134
err = api.Pubsub.Publish(coderd.PubsubEventLicenses, []byte{})
132135
require.NoError(t, err)
133136
require.Eventually(t, func() bool {
134-
entitlements, err := client.Entitlements(context.Background())
137+
entitlements, err := anotherClient.Entitlements(context.Background())
135138
assert.NoError(t, err)
136139
return entitlements.HasLicense
137140
}, testutil.WaitShort, testutil.IntervalFast)
138141
})
139142
t.Run("Resync", func(t *testing.T) {
140143
t.Parallel()
141-
client, _, api, _ := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
144+
adminClient, _, api, adminUser := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
142145
EntitlementsUpdateInterval: 25 * time.Millisecond,
143146
DontAddLicense: true,
144147
})
145-
entitlements, err := client.Entitlements(context.Background())
148+
anotherClient, _ := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
149+
entitlements, err := anotherClient.Entitlements(context.Background())
146150
require.NoError(t, err)
147151
require.False(t, entitlements.HasLicense)
148152
// Valid
@@ -177,7 +181,7 @@ func TestEntitlements(t *testing.T) {
177181
})
178182
require.NoError(t, err)
179183
require.Eventually(t, func() bool {
180-
entitlements, err := client.Entitlements(context.Background())
184+
entitlements, err := anotherClient.Entitlements(context.Background())
181185
assert.NoError(t, err)
182186
return entitlements.HasLicense
183187
}, testutil.WaitShort, testutil.IntervalFast)
@@ -224,7 +228,7 @@ func TestAuditLogging(t *testing.T) {
224228
DontAddLicense: true,
225229
})
226230
workspace, agent := setupWorkspaceAgent(t, client, user, 0)
227-
conn, err := client.DialWorkspaceAgent(ctx, agent.ID, nil)
231+
conn, err := client.DialWorkspaceAgent(ctx, agent.ID, nil) //nolint:gocritic // RBAC is not the purpose of this test
228232
require.NoError(t, err)
229233
defer conn.Close()
230234
connected := conn.AwaitReachable(ctx)

0 commit comments

Comments
 (0)