Skip to content

Commit e7b5535

Browse files
O-suraO-sura
committed
Fix unit test bugs
1 parent c855d29 commit e7b5535

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎gateway/gateway-controller/pkg/utils/api_key_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ func TestHashAPIKeyWithArgon2ID_EmptyKey(t *testing.T) {
728728

729729
// Additional tests for uncovered lines
730730

731-
// Tests for expiration handling in generateAPIKeyFromRequest
731+
// Tests for expiration handling in createAPIKeyFromRequest
732732
func TestGenerateAPIKeyFromRequest_Expiration_AllUnits(t *testing.T) {
733733
service := &APIKeyService{
734734
apiKeyConfig: &config.APIKeyConfig{
@@ -748,29 +748,29 @@ func TestGenerateAPIKeyFromRequest_Expiration_AllUnits(t *testing.T) {
748748

749749
t.Run("seconds unit", func(t *testing.T) {
750750
name := "key1"
751-
req := &api.APIKeyGenerationRequest{
751+
req := &api.APIKeyCreationRequest{
752752
Name: &name,
753753
ExpiresIn: &struct {
754-
Duration int `json:"duration" yaml:"duration"`
755-
Unit api.APIKeyGenerationRequestExpiresInUnit `json:"unit" yaml:"unit"`
754+
Duration int `json:"duration" yaml:"duration"`
755+
Unit api.APIKeyCreationRequestExpiresInUnit `json:"unit" yaml:"unit"`
756756
}{
757757
Duration: 3600,
758-
Unit: api.APIKeyGenerationRequestExpiresInUnitSeconds,
758+
Unit: api.APIKeyCreationRequestExpiresInUnitSeconds,
759759
},
760760
}
761-
key, err := service.generateAPIKeyFromRequest("h1", req, "u1", apiConfig)
761+
key, err := service.createAPIKeyFromRequest("h1", req, "u1", apiConfig)
762762
assert.NoError(t, err)
763763
assert.NotNil(t, key.ExpiresAt)
764764
})
765765

766766
t.Run("past expiration fails", func(t *testing.T) {
767767
name := "key2"
768768
past := time.Now().Add(-1 * time.Hour)
769-
req := &api.APIKeyGenerationRequest{
769+
req := &api.APIKeyCreationRequest{
770770
Name: &name,
771771
ExpiresAt: &past,
772772
}
773-
_, err := service.generateAPIKeyFromRequest("h1", req, "u1", apiConfig)
773+
_, err := service.createAPIKeyFromRequest("h1", req, "u1", apiConfig)
774774
assert.Error(t, err)
775775
assert.Contains(t, err.Error(), "must be in the future")
776776
})

‎gateway/policy-engine/internal/executor/chain_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ func TestExecuteRequestPolicies_EmptyPolicyList(t *testing.T) {
195195
ctx := context.Background()
196196
reqCtx := newTestRequestContext()
197197

198-
result, err := executor.ExecuteRequestPolicies(ctx, []policy.Policy{}, reqCtx, []policy.PolicySpec{}, "api", "route")
198+
result, err := executor.ExecuteRequestPolicies(ctx, []policy.Policy{}, reqCtx, []policy.PolicySpec{}, "api", "route", false)
199199

200200
require.NoError(t, err)
201201
assert.NotNil(t, result)
@@ -212,7 +212,7 @@ func TestExecuteRequestPolicies_SinglePolicy_NoAction(t *testing.T) {
212212
policies := []policy.Policy{&noopPolicy{}}
213213
specs := []policy.PolicySpec{newPolicySpec("noop", "v1.0.0", true, nil)}
214214

215-
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route")
215+
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route", false)
216216

217217
require.NoError(t, err)
218218
assert.Len(t, result.Results, 1)
@@ -230,7 +230,7 @@ func TestExecuteRequestPolicies_DisabledPolicy_Skipped(t *testing.T) {
230230
policies := []policy.Policy{&noopPolicy{}}
231231
specs := []policy.PolicySpec{newPolicySpec("noop", "v1.0.0", false, nil)}
232232

233-
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route")
233+
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route", false)
234234

235235
require.NoError(t, err)
236236
assert.Len(t, result.Results, 1)
@@ -247,7 +247,7 @@ func TestExecuteRequestPolicies_ConditionFalse_Skipped(t *testing.T) {
247247
policies := []policy.Policy{&noopPolicy{}}
248248
specs := []policy.PolicySpec{newPolicySpec("noop", "v1.0.0", true, ptrStr("request.method == 'POST'"))}
249249

250-
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route")
250+
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route", true)
251251

252252
require.NoError(t, err)
253253
assert.Len(t, result.Results, 1)
@@ -264,7 +264,7 @@ func TestExecuteRequestPolicies_ConditionTrue_Executed(t *testing.T) {
264264
policies := []policy.Policy{&noopPolicy{}}
265265
specs := []policy.PolicySpec{newPolicySpec("noop", "v1.0.0", true, ptrStr("request.method == 'GET'"))}
266266

267-
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route")
267+
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route", true)
268268

269269
require.NoError(t, err)
270270
assert.Len(t, result.Results, 1)
@@ -281,7 +281,7 @@ func TestExecuteRequestPolicies_ConditionEvaluationError(t *testing.T) {
281281
policies := []policy.Policy{&noopPolicy{}}
282282
specs := []policy.PolicySpec{newPolicySpec("noop", "v1.0.0", true, ptrStr("invalid.expression"))}
283283

284-
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route")
284+
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route", true)
285285

286286
assert.Error(t, err)
287287
assert.Nil(t, result)
@@ -303,7 +303,7 @@ func TestExecuteRequestPolicies_ShortCircuit(t *testing.T) {
303303
newPolicySpec("noop", "v1.0.0", true, nil),
304304
}
305305

306-
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route")
306+
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route", false)
307307

308308
require.NoError(t, err)
309309
assert.True(t, result.ShortCircuited)
@@ -322,7 +322,7 @@ func TestExecuteRequestPolicies_HeaderModification(t *testing.T) {
322322
}
323323
specs := []policy.PolicySpec{newPolicySpec("header-mod", "v1.0.0", true, nil)}
324324

325-
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route")
325+
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route", false)
326326

327327
require.NoError(t, err)
328328
assert.Len(t, result.Results, 1)
@@ -351,7 +351,7 @@ func TestExecuteRequestPolicies_MultiplePolicies(t *testing.T) {
351351
newPolicySpec("noop", "v1.0.0", true, nil),
352352
}
353353

354-
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route")
354+
result, err := executor.ExecuteRequestPolicies(ctx, policies, reqCtx, specs, "api", "route", false)
355355

356356
require.NoError(t, err)
357357
assert.Len(t, result.Results, 3)
@@ -377,7 +377,7 @@ func TestExecuteResponsePolicies_EmptyPolicyList(t *testing.T) {
377377
ctx := context.Background()
378378
respCtx := newTestResponseContext()
379379

380-
result, err := executor.ExecuteResponsePolicies(ctx, []policy.Policy{}, respCtx, []policy.PolicySpec{}, "api", "route")
380+
result, err := executor.ExecuteResponsePolicies(ctx, []policy.Policy{}, respCtx, []policy.PolicySpec{}, "api", "route", false)
381381

382382
require.NoError(t, err)
383383
assert.NotNil(t, result)
@@ -393,7 +393,7 @@ func TestExecuteResponsePolicies_SinglePolicy(t *testing.T) {
393393
policies := []policy.Policy{&noopPolicy{}}
394394
specs := []policy.PolicySpec{newPolicySpec("noop", "v1.0.0", true, nil)}
395395

396-
result, err := executor.ExecuteResponsePolicies(ctx, policies, respCtx, specs, "api", "route")
396+
result, err := executor.ExecuteResponsePolicies(ctx, policies, respCtx, specs, "api", "route", false)
397397

398398
require.NoError(t, err)
399399
assert.Len(t, result.Results, 1)
@@ -410,7 +410,7 @@ func TestExecuteResponsePolicies_DisabledPolicy(t *testing.T) {
410410
policies := []policy.Policy{&noopPolicy{}}
411411
specs := []policy.PolicySpec{newPolicySpec("noop", "v1.0.0", false, nil)}
412412

413-
result, err := executor.ExecuteResponsePolicies(ctx, policies, respCtx, specs, "api", "route")
413+
result, err := executor.ExecuteResponsePolicies(ctx, policies, respCtx, specs, "api", "route", false)
414414

415415
require.NoError(t, err)
416416
assert.Len(t, result.Results, 1)
@@ -427,7 +427,7 @@ func TestExecuteResponsePolicies_ConditionFalse(t *testing.T) {
427427
policies := []policy.Policy{&noopPolicy{}}
428428
specs := []policy.PolicySpec{newPolicySpec("noop", "v1.0.0", true, ptrStr("response.status == 404"))}
429429

430-
result, err := executor.ExecuteResponsePolicies(ctx, policies, respCtx, specs, "api", "route")
430+
result, err := executor.ExecuteResponsePolicies(ctx, policies, respCtx, specs, "api", "route", true)
431431

432432
require.NoError(t, err)
433433
assert.Len(t, result.Results, 1)
@@ -444,7 +444,7 @@ func TestExecuteResponsePolicies_ConditionError(t *testing.T) {
444444
policies := []policy.Policy{&noopPolicy{}}
445445
specs := []policy.PolicySpec{newPolicySpec("noop", "v1.0.0", true, ptrStr("invalid"))}
446446

447-
result, err := executor.ExecuteResponsePolicies(ctx, policies, respCtx, specs, "api", "route")
447+
result, err := executor.ExecuteResponsePolicies(ctx, policies, respCtx, specs, "api", "route", true)
448448

449449
assert.Error(t, err)
450450
assert.Nil(t, result)
@@ -462,7 +462,7 @@ func TestExecuteResponsePolicies_HeaderModification(t *testing.T) {
462462
}
463463
specs := []policy.PolicySpec{newPolicySpec("header-mod", "v1.0.0", true, nil)}
464464

465-
result, err := executor.ExecuteResponsePolicies(ctx, policies, respCtx, specs, "api", "route")
465+
result, err := executor.ExecuteResponsePolicies(ctx, policies, respCtx, specs, "api", "route", false)
466466

467467
require.NoError(t, err)
468468
assert.Len(t, result.Results, 1)
@@ -497,7 +497,7 @@ func TestExecuteResponsePolicies_ReverseOrder(t *testing.T) {
497497
newPolicySpec("third", "v1.0.0", true, nil),
498498
}
499499

500-
result, err := executor.ExecuteResponsePolicies(ctx, policies, respCtx, specs, "api", "route")
500+
result, err := executor.ExecuteResponsePolicies(ctx, policies, respCtx, specs, "api", "route", false)
501501

502502
require.NoError(t, err)
503503
assert.Len(t, result.Results, 3)

0 commit comments

Comments
 (0)