limiter: remove redundant data in headersToAdd

slime-io · Feb 10, 2023 · 70af451 · 70af451
1 parent 160bf3e
commit 70af451
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/staging/src/slime.io/slime/modules/limiter/controllers/envoy_filters.go b/staging/src/slime.io/slime/modules/limiter/controllers/envoy_filters.go
@@ -110,16 +110,20 @@ func (r *SmartLimiterReconciler) GenerateEnvoyConfigs(spec microservicev1alpha2.
  log.Errorf("calculate quota %s err, %+v", des.Action.Quota, err.Error())
  } else {
  // log.Infof("after calculate, the quota %s is %d",des.Action.Quota,rateLimitValue)
- validDescriptor.Descriptor_ = append(validDescriptor.Descriptor_, &microservicev1alpha2.SmartLimitDescriptor{
+ sd := &microservicev1alpha2.SmartLimitDescriptor{
  Action: &microservicev1alpha2.SmartLimitDescriptor_Action{
  Quota: fmt.Sprintf("%d", rateLimitValue),
  FillInterval: des.Action.FillInterval,
  Strategy: des.Action.Strategy,
- HeadersToAdd: generateHeadersToAdd(des),
  },
  Match: des.Match,
  Target: des.Target,
- })
+ }
+ headers := generateHeadersToAdd(des)
+ if len(headers) > 0 {
+ sd.Action.HeadersToAdd = headers
+ }
+ validDescriptor.Descriptor_ = append(validDescriptor.Descriptor_, sd)
  }
  }
  }

diff --git a/staging/src/slime.io/slime/modules/limiter/controllers/envoy_local_limit.go b/staging/src/slime.io/slime/modules/limiter/controllers/envoy_local_limit.go
@@ -283,13 +283,17 @@ func generateLocalRateLimitPerFilterPatch(descriptors []*microservicev1alpha2.Sm
  // build token bucket
  localRateLimitDescriptors := generateLocalRateLimitDescriptors(desc, params.loc)
  localRateLimit := &envoy_extensions_filters_http_local_ratelimit_v3.LocalRateLimit{
- TokenBucket: generateCustomTokenBucket(100000, 100000, 1),
- Descriptors: localRateLimitDescriptors,
- StatPrefix: util.StructEnvoyLocalRateLimitLimiter,
- FilterEnabled: generateEnvoyLocalRateLimitEnabled(),
- FilterEnforced: generateEnvoyLocalRateLimitEnforced(),
- ResponseHeadersToAdd: generateResponseHeaderToAdd(desc),
+ TokenBucket: generateCustomTokenBucket(100000, 100000, 1),
+ Descriptors: localRateLimitDescriptors,
+ StatPrefix: util.StructEnvoyLocalRateLimitLimiter,
+ FilterEnabled: generateEnvoyLocalRateLimitEnabled(),
+ FilterEnforced: generateEnvoyLocalRateLimitEnforced(),
  }
+ headers := generateResponseHeaderToAdd(desc)
+ if len(headers) > 0 {
+ localRateLimit.ResponseHeadersToAdd = headers
+ }
+
  local, err := util.MessageToStruct(localRateLimit)
  if err != nil {
  return nil