DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sets.String is deprecated: use generic Set instead. new ways: s1 := Set[string]{} s2 := New[string]() (#9589)

Browse source 
Signed-off-by: Fish-pro <zechun.chen@daocloud.io>
This commit is contained in:
Fish-pro 2023-02-16 22:05:48 +08:00 • committed by GitHub
parent 1cdd61fb94
commit ac8dd3dd53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/ingress/controller/template/template.go
View file

@ -792,7 +792,7 @@ rewrite "(?i)%s" %s break;
func filterRateLimits(input interface{}) []ratelimit.Config {
ratelimits := []ratelimit.Config{}
found := sets.String{}
found := sets.Set[string]{}
servers, ok := input.([]*ingress.Server)
if !ok {
@ -815,12 +815,12 @@ func filterRateLimits(input interface{}) []ratelimit.Config {
// for connection limit by IP address, one for limiting requests per minute, and
// one for limiting requests per second.
func buildRateLimitZones(input interface{}) []string {
zones := sets.String{}
zones := sets.Set[string]{}
servers, ok := input.([]*ingress.Server)
if !ok {
klog.Errorf("expected a '[]*ingress.Server' type but %T was returned", input)
return zones.List()
return zones.UnsortedList()
}
for _, server := range servers {
@ -859,7 +859,7 @@ func buildRateLimitZones(input interface{}) []string {
}
}
return zones.List()
return zones.UnsortedList()
}
// buildRateLimit produces an array of limit_req to be used inside the Path of
@ -1654,7 +1654,7 @@ func buildModSecurityForLocation(cfg config.Configuration, location *ingress.Loc
func buildMirrorLocations(locs []*ingress.Location) string {
var buffer bytes.Buffer
mapped := sets.String{}
mapped := sets.Set[string]{}
for _, loc := range locs {
if loc.Mirror.Source == "" || loc.Mirror.Target == "" {