@@ -36,8 +36,7 @@ func TestOIDCAuthenticationSucceeded(t *testing.T) {
36
36
Audience : "unit-test" ,
37
37
GroupsClaim : "memberships" ,
38
38
}
39
- p , err := newExtension (config , zap .NewNop ())
40
- require .NoError (t , err )
39
+ p := newExtension (config , zap .NewNop ())
41
40
42
41
err = p .Start (context .Background (), componenttest .NewNopHost ())
43
42
require .NoError (t , err )
@@ -195,11 +194,10 @@ func TestOIDCFailedToLoadIssuerCAFromPathInvalidContent(t *testing.T) {
195
194
196
195
func TestOIDCInvalidAuthHeader (t * testing.T ) {
197
196
// prepare
198
- p , err := newExtension (& Config {
197
+ p := newExtension (& Config {
199
198
Audience : "some-audience" ,
200
199
IssuerURL : "http://example.com" ,
201
200
}, zap .NewNop ())
202
- require .NoError (t , err )
203
201
204
202
// test
205
203
ctx , err := p .Authenticate (context .Background (), map [string ][]string {"authorization" : {"some-value" }})
@@ -211,11 +209,10 @@ func TestOIDCInvalidAuthHeader(t *testing.T) {
211
209
212
210
func TestOIDCNotAuthenticated (t * testing.T ) {
213
211
// prepare
214
- p , err := newExtension (& Config {
212
+ p := newExtension (& Config {
215
213
Audience : "some-audience" ,
216
214
IssuerURL : "http://example.com" ,
217
215
}, zap .NewNop ())
218
- require .NoError (t , err )
219
216
220
217
// test
221
218
ctx , err := p .Authenticate (context .Background (), make (map [string ][]string ))
@@ -227,14 +224,13 @@ func TestOIDCNotAuthenticated(t *testing.T) {
227
224
228
225
func TestProviderNotReacheable (t * testing.T ) {
229
226
// prepare
230
- p , err := newExtension (& Config {
227
+ p := newExtension (& Config {
231
228
Audience : "some-audience" ,
232
229
IssuerURL : "http://example.com" ,
233
230
}, zap .NewNop ())
234
- require .NoError (t , err )
235
231
236
232
// test
237
- err = p .Start (context .Background (), componenttest .NewNopHost ())
233
+ err : = p .Start (context .Background (), componenttest .NewNopHost ())
238
234
239
235
// verify
240
236
assert .Error (t , err )
@@ -247,11 +243,10 @@ func TestFailedToVerifyToken(t *testing.T) {
247
243
oidcServer .Start ()
248
244
defer oidcServer .Close ()
249
245
250
- p , err := newExtension (& Config {
246
+ p := newExtension (& Config {
251
247
IssuerURL : oidcServer .URL ,
252
248
Audience : "unit-test" ,
253
249
}, zap .NewNop ())
254
- require .NoError (t , err )
255
250
256
251
err = p .Start (context .Background (), componenttest .NewNopHost ())
257
252
require .NoError (t , err )
@@ -305,8 +300,7 @@ func TestFailedToGetGroupsClaimFromToken(t *testing.T) {
305
300
},
306
301
} {
307
302
t .Run (tt .casename , func (t * testing.T ) {
308
- p , err := newExtension (tt .config , zap .NewNop ())
309
- require .NoError (t , err )
303
+ p := newExtension (tt .config , zap .NewNop ())
310
304
311
305
err = p .Start (context .Background (), componenttest .NewNopHost ())
312
306
require .NoError (t , err )
@@ -414,10 +408,9 @@ func TestMissingClient(t *testing.T) {
414
408
}
415
409
416
410
// test
417
- p , err := newExtension ( config , zap . NewNop () )
411
+ err := config . Validate ( )
418
412
419
413
// verify
420
- assert .Nil (t , p )
421
414
assert .Equal (t , errNoAudienceProvided , err )
422
415
}
423
416
@@ -428,10 +421,9 @@ func TestMissingIssuerURL(t *testing.T) {
428
421
}
429
422
430
423
// test
431
- p , err := newExtension ( config , zap . NewNop () )
424
+ err := config . Validate ( )
432
425
433
426
// verify
434
- assert .Nil (t , p )
435
427
assert .Equal (t , errNoIssuerURL , err )
436
428
}
437
429
@@ -441,12 +433,11 @@ func TestShutdown(t *testing.T) {
441
433
Audience : "some-audience" ,
442
434
IssuerURL : "http://example.com/" ,
443
435
}
444
- p , err := newExtension (config , zap .NewNop ())
445
- require .NoError (t , err )
436
+ p := newExtension (config , zap .NewNop ())
446
437
require .NotNil (t , p )
447
438
448
439
// test
449
- err = p .Shutdown (context .Background ()) // for now, we never fail
440
+ err : = p .Shutdown (context .Background ()) // for now, we never fail
450
441
451
442
// verify
452
443
assert .NoError (t , err )
0 commit comments