Skip to content

Commit 81d593a

Browse files
AmaliMatharaarachchiAmaliMatharaarachchi
committed
temp
1 parent 94cc131 commit 81d593a

File tree

1 file changed

+88
-89
lines changed

1 file changed

+88
-89
lines changed

‎adapter/internal/oasparser/envoyconf/listener.go

+88-89
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func CreateListenerByGateway(gateway *gwapiv1.Gateway, resolvedListenerCerts map
9999
var filterChains []*listenerv3.FilterChain
100100

101101
for _, listenerObj := range listeners {
102-
if listenerObj.Name == "httpslistener" {
102+
if listenerObj.Name == "gatewaylistener" {
103103
httpFilters = getHTTPFilters(gwLuaScript)
104104
} else {
105105
httpFilters = getHTTPFilters(`
@@ -398,137 +398,136 @@ func CreateVirtualHosts(vhostToRouteArrayMap map[string][]*routev3.Route, custom
398398
return virtualHosts
399399
}
400400

401-
402401
func generateSubscriptionBasedRatelimits() []*routev3.RateLimit {
403402
return []*routev3.RateLimit{&routev3.RateLimit{
404-
Actions: []*routev3.RateLimit_Action{
405-
{
406-
ActionSpecifier: &routev3.RateLimit_Action_Metadata{
407-
Metadata: &routev3.RateLimit_Action_MetaData{
408-
DescriptorKey: DescriptorKeyForOrganization,
409-
MetadataKey: &metadatav3.MetadataKey{
410-
Key: extAuthzFilterName,
411-
Path: []*metadatav3.MetadataKey_PathSegment{
412-
{
413-
Segment: &metadatav3.MetadataKey_PathSegment_Key{
414-
Key: descriptorMetadataKeyForOrganization,
415-
},
403+
Actions: []*routev3.RateLimit_Action{
404+
{
405+
ActionSpecifier: &routev3.RateLimit_Action_Metadata{
406+
Metadata: &routev3.RateLimit_Action_MetaData{
407+
DescriptorKey: DescriptorKeyForOrganization,
408+
MetadataKey: &metadatav3.MetadataKey{
409+
Key: extAuthzFilterName,
410+
Path: []*metadatav3.MetadataKey_PathSegment{
411+
{
412+
Segment: &metadatav3.MetadataKey_PathSegment_Key{
413+
Key: descriptorMetadataKeyForOrganization,
416414
},
417415
},
418416
},
419-
Source: routev3.RateLimit_Action_MetaData_DYNAMIC,
420-
SkipIfAbsent: true,
421417
},
418+
Source: routev3.RateLimit_Action_MetaData_DYNAMIC,
419+
SkipIfAbsent: true,
422420
},
423421
},
424-
{
425-
ActionSpecifier: &routev3.RateLimit_Action_Metadata{
426-
Metadata: &routev3.RateLimit_Action_MetaData{
427-
DescriptorKey: DescriptorKeyForSubscription,
428-
MetadataKey: &metadatav3.MetadataKey{
429-
Key: extAuthzFilterName,
430-
Path: []*metadatav3.MetadataKey_PathSegment{
431-
{
432-
Segment: &metadatav3.MetadataKey_PathSegment_Key{
433-
Key: descriptorMetadataKeyForSubscription,
434-
},
422+
},
423+
{
424+
ActionSpecifier: &routev3.RateLimit_Action_Metadata{
425+
Metadata: &routev3.RateLimit_Action_MetaData{
426+
DescriptorKey: DescriptorKeyForSubscription,
427+
MetadataKey: &metadatav3.MetadataKey{
428+
Key: extAuthzFilterName,
429+
Path: []*metadatav3.MetadataKey_PathSegment{
430+
{
431+
Segment: &metadatav3.MetadataKey_PathSegment_Key{
432+
Key: descriptorMetadataKeyForSubscription,
435433
},
436434
},
437435
},
438-
Source: routev3.RateLimit_Action_MetaData_DYNAMIC,
439-
SkipIfAbsent: true,
440436
},
437+
Source: routev3.RateLimit_Action_MetaData_DYNAMIC,
438+
SkipIfAbsent: true,
441439
},
442440
},
443-
{
444-
ActionSpecifier: &routev3.RateLimit_Action_Metadata{
445-
Metadata: &routev3.RateLimit_Action_MetaData{
446-
DescriptorKey: DescriptorKeyForPolicy,
447-
MetadataKey: &metadatav3.MetadataKey{
448-
Key: extAuthzFilterName,
449-
Path: []*metadatav3.MetadataKey_PathSegment{
450-
{
451-
Segment: &metadatav3.MetadataKey_PathSegment_Key{
452-
Key: descriptorMetadataKeyForUsagePolicy,
453-
},
441+
},
442+
{
443+
ActionSpecifier: &routev3.RateLimit_Action_Metadata{
444+
Metadata: &routev3.RateLimit_Action_MetaData{
445+
DescriptorKey: DescriptorKeyForPolicy,
446+
MetadataKey: &metadatav3.MetadataKey{
447+
Key: extAuthzFilterName,
448+
Path: []*metadatav3.MetadataKey_PathSegment{
449+
{
450+
Segment: &metadatav3.MetadataKey_PathSegment_Key{
451+
Key: descriptorMetadataKeyForUsagePolicy,
454452
},
455453
},
456454
},
457-
Source: routev3.RateLimit_Action_MetaData_DYNAMIC,
458-
SkipIfAbsent: true,
459455
},
456+
Source: routev3.RateLimit_Action_MetaData_DYNAMIC,
457+
SkipIfAbsent: true,
460458
},
461459
},
462460
},
463-
}, &routev3.RateLimit{
464-
Actions: []*routev3.RateLimit_Action{
465-
{
466-
ActionSpecifier: &routev3.RateLimit_Action_Metadata{
467-
Metadata: &routev3.RateLimit_Action_MetaData{
468-
DescriptorKey: DescriptorKeyForOrganization,
469-
MetadataKey: &metadatav3.MetadataKey{
470-
Key: extAuthzFilterName,
471-
Path: []*metadatav3.MetadataKey_PathSegment{
472-
{
473-
Segment: &metadatav3.MetadataKey_PathSegment_Key{
474-
Key: descriptorMetadataKeyForOrganization,
475-
},
461+
},
462+
}, &routev3.RateLimit{
463+
Actions: []*routev3.RateLimit_Action{
464+
{
465+
ActionSpecifier: &routev3.RateLimit_Action_Metadata{
466+
Metadata: &routev3.RateLimit_Action_MetaData{
467+
DescriptorKey: DescriptorKeyForOrganization,
468+
MetadataKey: &metadatav3.MetadataKey{
469+
Key: extAuthzFilterName,
470+
Path: []*metadatav3.MetadataKey_PathSegment{
471+
{
472+
Segment: &metadatav3.MetadataKey_PathSegment_Key{
473+
Key: descriptorMetadataKeyForOrganization,
476474
},
477475
},
478476
},
479-
Source: routev3.RateLimit_Action_MetaData_DYNAMIC,
480-
SkipIfAbsent: true,
481477
},
478+
Source: routev3.RateLimit_Action_MetaData_DYNAMIC,
479+
SkipIfAbsent: true,
482480
},
483481
},
484-
{
485-
ActionSpecifier: &routev3.RateLimit_Action_Metadata{
486-
Metadata: &routev3.RateLimit_Action_MetaData{
487-
DescriptorKey: DescriptorKeyForSubscription,
488-
MetadataKey: &metadatav3.MetadataKey{
489-
Key: extAuthzFilterName,
490-
Path: []*metadatav3.MetadataKey_PathSegment{
491-
{
492-
Segment: &metadatav3.MetadataKey_PathSegment_Key{
493-
Key: descriptorMetadataKeyForSubscription,
494-
},
482+
},
483+
{
484+
ActionSpecifier: &routev3.RateLimit_Action_Metadata{
485+
Metadata: &routev3.RateLimit_Action_MetaData{
486+
DescriptorKey: DescriptorKeyForSubscription,
487+
MetadataKey: &metadatav3.MetadataKey{
488+
Key: extAuthzFilterName,
489+
Path: []*metadatav3.MetadataKey_PathSegment{
490+
{
491+
Segment: &metadatav3.MetadataKey_PathSegment_Key{
492+
Key: descriptorMetadataKeyForSubscription,
495493
},
496494
},
497495
},
498-
Source: routev3.RateLimit_Action_MetaData_DYNAMIC,
499-
SkipIfAbsent: true,
500496
},
497+
Source: routev3.RateLimit_Action_MetaData_DYNAMIC,
498+
SkipIfAbsent: true,
501499
},
502500
},
503-
{
504-
ActionSpecifier: &routev3.RateLimit_Action_Metadata{
505-
Metadata: &routev3.RateLimit_Action_MetaData{
506-
DescriptorKey: DescriptorKeyForPolicy,
507-
MetadataKey: &metadatav3.MetadataKey{
508-
Key: extAuthzFilterName,
509-
Path: []*metadatav3.MetadataKey_PathSegment{
510-
{
511-
Segment: &metadatav3.MetadataKey_PathSegment_Key{
512-
Key: descriptorMetadataKeyForUsagePolicy,
513-
},
501+
},
502+
{
503+
ActionSpecifier: &routev3.RateLimit_Action_Metadata{
504+
Metadata: &routev3.RateLimit_Action_MetaData{
505+
DescriptorKey: DescriptorKeyForPolicy,
506+
MetadataKey: &metadatav3.MetadataKey{
507+
Key: extAuthzFilterName,
508+
Path: []*metadatav3.MetadataKey_PathSegment{
509+
{
510+
Segment: &metadatav3.MetadataKey_PathSegment_Key{
511+
Key: descriptorMetadataKeyForUsagePolicy,
514512
},
515513
},
516514
},
517-
Source: routev3.RateLimit_Action_MetaData_DYNAMIC,
518-
SkipIfAbsent: true,
519515
},
516+
Source: routev3.RateLimit_Action_MetaData_DYNAMIC,
517+
SkipIfAbsent: true,
520518
},
521519
},
522-
{
523-
ActionSpecifier: &routev3.RateLimit_Action_GenericKey_{
524-
GenericKey: &routev3.RateLimit_Action_GenericKey{
525-
DescriptorKey: "burst",
526-
DescriptorValue: "enabled",
527-
},
520+
},
521+
{
522+
ActionSpecifier: &routev3.RateLimit_Action_GenericKey_{
523+
GenericKey: &routev3.RateLimit_Action_GenericKey{
524+
DescriptorKey: "burst",
525+
DescriptorValue: "enabled",
528526
},
529527
},
530528
},
531529
},
530+
},
532531
}
533532
}
534533

0 commit comments

Comments
 (0)