Skip to content

Commit b991aac

Browse files
sreyasreya
committed
fix tests
1 parent a26df46 commit b991aac

File tree

3 files changed

+28
-32
lines changed

3 files changed

+28
-32
lines changed

‎coderd/cryptokeys/cache.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"cdr.dev/slog"
1414
"github.com/coder/coder/v2/coderd/database"
1515
"github.com/coder/coder/v2/coderd/database/db2sdk"
16-
"github.com/coder/coder/v2/coderd/jwtutils"
1716
"github.com/coder/coder/v2/codersdk"
1817
"github.com/coder/quartz"
1918
)
@@ -25,8 +24,6 @@ var (
2524
ErrInvalidFeature = xerrors.New("invalid feature for this operation")
2625
)
2726

28-
var _ jwtutils.SigningKeyProvider = &cache{}
29-
3027
type Fetcher interface {
3128
Fetch(ctx context.Context) ([]codersdk.CryptoKey, error)
3229
}

‎coderd/cryptokeys/cache_internal_test.go

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎coderd/cryptokeys/cache_test.go

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestCryptoKeyCache(t *testing.T) {
3939

4040
now := clock.Now().UTC()
4141
expected := codersdk.CryptoKey{
42-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
42+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
4343
Secret: generateKey(t, 64),
4444
Sequence: 2,
4545
StartsAt: now,
@@ -49,7 +49,7 @@ func TestCryptoKeyCache(t *testing.T) {
4949
keys: []codersdk.CryptoKey{expected},
5050
}
5151

52-
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureWorkspaceApp, cryptokeys.WithCacheClock(clock))
52+
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureTailnetResume, cryptokeys.WithCacheClock(clock))
5353
require.NoError(t, err)
5454

5555
id, got, err := cache.SigningKey(ctx)
@@ -71,11 +71,11 @@ func TestCryptoKeyCache(t *testing.T) {
7171
keys: []codersdk.CryptoKey{},
7272
}
7373

74-
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureWorkspaceApp, cryptokeys.WithCacheClock(clock))
74+
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureTailnetResume, cryptokeys.WithCacheClock(clock))
7575
require.NoError(t, err)
7676

7777
expected := codersdk.CryptoKey{
78-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
78+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
7979
Secret: generateKey(t, 64),
8080
Sequence: 12,
8181
StartsAt: clock.Now().UTC(),
@@ -109,7 +109,7 @@ func TestCryptoKeyCache(t *testing.T) {
109109
now := clock.Now().UTC()
110110

111111
expected := codersdk.CryptoKey{
112-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
112+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
113113
Secret: generateKey(t, 64),
114114
Sequence: 1,
115115
StartsAt: clock.Now().UTC(),
@@ -119,7 +119,7 @@ func TestCryptoKeyCache(t *testing.T) {
119119
keys: []codersdk.CryptoKey{
120120
expected,
121121
{
122-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
122+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
123123
Secret: generateKey(t, 64),
124124
Sequence: 2,
125125
StartsAt: now.Add(-time.Second),
@@ -128,7 +128,7 @@ func TestCryptoKeyCache(t *testing.T) {
128128
},
129129
}
130130

131-
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureWorkspaceApp, cryptokeys.WithCacheClock(clock))
131+
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureTailnetResume, cryptokeys.WithCacheClock(clock))
132132
require.NoError(t, err)
133133

134134
id, got, err := cache.SigningKey(ctx)
@@ -150,7 +150,7 @@ func TestCryptoKeyCache(t *testing.T) {
150150
keys: []codersdk.CryptoKey{},
151151
}
152152

153-
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureWorkspaceApp)
153+
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureTailnetResume)
154154
require.NoError(t, err)
155155

156156
_, _, err = cache.SigningKey(ctx)
@@ -172,7 +172,7 @@ func TestCryptoKeyCache(t *testing.T) {
172172

173173
now := clock.Now().UTC()
174174
expected := codersdk.CryptoKey{
175-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
175+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
176176
Secret: generateKey(t, 64),
177177
Sequence: 12,
178178
StartsAt: now,
@@ -181,15 +181,15 @@ func TestCryptoKeyCache(t *testing.T) {
181181
keys: []codersdk.CryptoKey{
182182
expected,
183183
{
184-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
184+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
185185
Secret: generateKey(t, 64),
186186
Sequence: 13,
187187
StartsAt: now,
188188
},
189189
},
190190
}
191191

192-
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureWorkspaceApp, cryptokeys.WithCacheClock(clock))
192+
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureTailnetResume, cryptokeys.WithCacheClock(clock))
193193
require.NoError(t, err)
194194

195195
got, err := cache.VerifyingKey(ctx, keyID(expected))
@@ -210,11 +210,11 @@ func TestCryptoKeyCache(t *testing.T) {
210210
keys: []codersdk.CryptoKey{},
211211
}
212212

213-
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureWorkspaceApp, cryptokeys.WithCacheClock(clock))
213+
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureTailnetResume, cryptokeys.WithCacheClock(clock))
214214
require.NoError(t, err)
215215

216216
expected := codersdk.CryptoKey{
217-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
217+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
218218
Secret: generateKey(t, 64),
219219
Sequence: 12,
220220
StartsAt: clock.Now().UTC(),
@@ -244,7 +244,7 @@ func TestCryptoKeyCache(t *testing.T) {
244244

245245
now := clock.Now().UTC()
246246
expected := codersdk.CryptoKey{
247-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
247+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
248248
Secret: generateKey(t, 64),
249249
Sequence: 12,
250250
StartsAt: now.Add(-time.Second),
@@ -256,7 +256,7 @@ func TestCryptoKeyCache(t *testing.T) {
256256
},
257257
}
258258

259-
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureWorkspaceApp, cryptokeys.WithCacheClock(clock))
259+
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureTailnetResume, cryptokeys.WithCacheClock(clock))
260260
require.NoError(t, err)
261261

262262
got, err := cache.VerifyingKey(ctx, keyID(expected))
@@ -276,7 +276,7 @@ func TestCryptoKeyCache(t *testing.T) {
276276

277277
now := clock.Now().UTC()
278278
expected := codersdk.CryptoKey{
279-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
279+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
280280
Secret: generateKey(t, 64),
281281
Sequence: 12,
282282
StartsAt: now.Add(-time.Second),
@@ -289,7 +289,7 @@ func TestCryptoKeyCache(t *testing.T) {
289289
},
290290
}
291291

292-
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureWorkspaceApp, cryptokeys.WithCacheClock(clock))
292+
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureTailnetResume, cryptokeys.WithCacheClock(clock))
293293
require.NoError(t, err)
294294

295295
_, err = cache.VerifyingKey(ctx, keyID(expected))
@@ -310,7 +310,7 @@ func TestCryptoKeyCache(t *testing.T) {
310310
keys: []codersdk.CryptoKey{},
311311
}
312312

313-
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureWorkspaceApp, cryptokeys.WithCacheClock(clock))
313+
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureTailnetResume, cryptokeys.WithCacheClock(clock))
314314
require.NoError(t, err)
315315

316316
_, err = cache.VerifyingKey(ctx, "1")
@@ -329,7 +329,7 @@ func TestCryptoKeyCache(t *testing.T) {
329329

330330
now := clock.Now().UTC()
331331
expected := codersdk.CryptoKey{
332-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
332+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
333333
Secret: generateKey(t, 64),
334334
Sequence: 12,
335335
StartsAt: now,
@@ -341,7 +341,7 @@ func TestCryptoKeyCache(t *testing.T) {
341341
},
342342
}
343343

344-
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureWorkspaceApp, cryptokeys.WithCacheClock(clock))
344+
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureTailnetResume, cryptokeys.WithCacheClock(clock))
345345
require.NoError(t, err)
346346

347347
id, got, err := cache.SigningKey(ctx)
@@ -351,7 +351,7 @@ func TestCryptoKeyCache(t *testing.T) {
351351
require.Equal(t, 1, ff.called)
352352

353353
newKey := codersdk.CryptoKey{
354-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
354+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
355355
Secret: generateKey(t, 64),
356356
Sequence: 13,
357357
StartsAt: now,
@@ -392,7 +392,7 @@ func TestCryptoKeyCache(t *testing.T) {
392392

393393
now := clock.Now().UTC()
394394
expected := codersdk.CryptoKey{
395-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
395+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
396396
Secret: generateKey(t, 64),
397397
Sequence: 12,
398398
StartsAt: now,
@@ -406,15 +406,15 @@ func TestCryptoKeyCache(t *testing.T) {
406406

407407
// Create a trap that blocks when the refresh timer fires.
408408
trap := clock.Trap().Now("refresh")
409-
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureWorkspaceApp, cryptokeys.WithCacheClock(clock))
409+
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureTailnetResume, cryptokeys.WithCacheClock(clock))
410410
require.NoError(t, err)
411411

412412
_, wait := clock.AdvanceNext()
413413
trapped := trap.MustWait(ctx)
414414

415415
newKey := codersdk.CryptoKey{
416-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
417-
Secret: "key2",
416+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
417+
Secret: generateKey(t, 64),
418418
Sequence: 13,
419419
StartsAt: now,
420420
}
@@ -448,8 +448,8 @@ func TestCryptoKeyCache(t *testing.T) {
448448

449449
now := clock.Now()
450450
expected := codersdk.CryptoKey{
451-
Feature: codersdk.CryptoKeyFeatureWorkspaceApp,
452-
Secret: "key1",
451+
Feature: codersdk.CryptoKeyFeatureTailnetResume,
452+
Secret: generateKey(t, 64),
453453
Sequence: 12,
454454
StartsAt: now,
455455
}
@@ -459,7 +459,7 @@ func TestCryptoKeyCache(t *testing.T) {
459459
},
460460
}
461461

462-
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureWorkspaceApp, cryptokeys.WithCacheClock(clock))
462+
cache, err := cryptokeys.NewSigningCache(ctx, logger, ff, codersdk.CryptoKeyFeatureTailnetResume, cryptokeys.WithCacheClock(clock))
463463
require.NoError(t, err)
464464

465465
id, got, err := cache.SigningKey(ctx)

0 commit comments

Comments
 (0)