add pipeline name to filter

pkg/filter/apiaggregator/apiaggregator.go

@@ -127,7 +127,7 @@ func (aa *APIAggregator) Results() []string {
 }
 
 // Init initializes APIAggregator.
-func (aa *APIAggregator) Init(filterSpec *httppipeline.FilterSpec) {
+func (aa *APIAggregator) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  aa.filterSpec, aa.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  entity, exists := filterSpec.Super().GetSystemController(rawconfigtrafficcontroller.Kind)
  if !exists {
@@ -143,9 +143,9 @@ func (aa *APIAggregator) Init(filterSpec *httppipeline.FilterSpec) {
 }
 
 // Inherit inherits previous generation of APIAggregator.
-func (aa *APIAggregator) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
+func (aa *APIAggregator) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
  previousGeneration.Close()
- aa.Init(filterSpec)
+ aa.Init(pipeline, filterSpec)
 }
 
 func (aa *APIAggregator) reload() {

pkg/filter/bridge/bridge.go

@@ -91,16 +91,15 @@ func (b *Bridge) Results() []string {
 }
 
 // Init initializes Bridge.
-func (b *Bridge) Init(filterSpec *httppipeline.FilterSpec) {
+func (b *Bridge) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  b.filterSpec, b.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  b.reload()
 }
 
 // Inherit inherits previous generation of Bridge.
-func (b *Bridge) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
-
+func (b *Bridge) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
  previousGeneration.Close()
- b.Init(filterSpec)
+ b.Init(pipeline, filterSpec)
 }
 
 func (b *Bridge) reload() {

pkg/filter/circuitbreaker/circuitbreaker.go

@@ -275,13 +275,13 @@ OuterLoop:
 }
 
 // Init initializes CircuitBreaker.
-func (cb *CircuitBreaker) Init(filterSpec *httppipeline.FilterSpec) {
+func (cb *CircuitBreaker) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  cb.filterSpec, cb.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  cb.reload(nil)
 }
 
 // Inherit inherits previous generation of CircuitBreaker.
-func (cb *CircuitBreaker) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
+func (cb *CircuitBreaker) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
  cb.filterSpec, cb.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  cb.reload(previousGeneration.(*CircuitBreaker))
 }

pkg/filter/circuitbreaker/circuitbreaker_test.go

@@ -66,7 +66,7 @@ urls:
  }
 
  cb := &CircuitBreaker{}
- cb.Init(spec)
+ cb.Init("", spec)
 
  resp := httptest.NewRecorder()
  ctx := &contexttest.MockedHTTPContext{}
@@ -113,7 +113,7 @@ urls:
  }
  newCb := &CircuitBreaker{}
  spec, _ = httppipeline.NewFilterSpec(rawSpec, nil)
- newCb.Inherit(spec, cb)
+ newCb.Inherit("", spec, cb)
  cb.Close()
  result = newCb.Handle(ctx)
  if result != resultShortCircuited {

pkg/filter/corsadaptor/corsadaptor.go

@@ -79,16 +79,16 @@ func (a *CORSAdaptor) Results() []string {
 }
 
 // Init initializes CORSAdaptor.
-func (a *CORSAdaptor) Init(filterSpec *httppipeline.FilterSpec) {
+func (a *CORSAdaptor) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  a.filterSpec, a.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  a.reload()
 }
 
 // Inherit inherits previous generation of CORSAdaptor.
-func (a *CORSAdaptor) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
+func (a *CORSAdaptor) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
 
  previousGeneration.Close()
- a.Init(filterSpec)
+ a.Init(pipeline, filterSpec)
 }
 
 func (a *CORSAdaptor) reload() {

pkg/filter/corsadaptor/corsadaptor_test.go

@@ -41,7 +41,7 @@ name: cors
  }
 
  cors := &CORSAdaptor{}
- cors.Init(spec)
+ cors.Init("", spec)
 
  header := http.Header{}
  ctx := &contexttest.MockedHTTPContext{}
@@ -65,7 +65,7 @@ name: cors
 
  newCors := &CORSAdaptor{}
  spec, _ = httppipeline.NewFilterSpec(rawSpec, nil)
- newCors.Inherit(spec, cors)
+ newCors.Inherit("", spec, cors)
  cors.Close()
  ctx.MockedRequest.MockedMethod = func() string {
  return http.MethodGet

pkg/filter/fallback/fallback.go

@@ -72,16 +72,16 @@ func (f *Fallback) Results() []string {
 }
 
 // Init initializes Fallback.
-func (f *Fallback) Init(filterSpec *httppipeline.FilterSpec) {
+func (f *Fallback) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  f.filterSpec, f.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  f.reload()
 }
 
 // Inherit inherits previous generation of Fallback.
-func (f *Fallback) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
+func (f *Fallback) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
 
  previousGeneration.Close()
- f.Init(filterSpec)
+ f.Init(pipeline, filterSpec)
 }
 
 func (f *Fallback) reload() {

pkg/filter/fallback/fallback_test.go

@@ -47,7 +47,7 @@ mockBody: "mocked body"
  }
 
  fb := &Fallback{}
- fb.Init(spec)
+ fb.Init("", spec)
 
  resp := httptest.NewRecorder()
  ctx := &contexttest.MockedHTTPContext{}
@@ -80,7 +80,7 @@ mockBody: "mocked body"
 
  newFb := &Fallback{}
  spec, _ = httppipeline.NewFilterSpec(rawSpec, nil)
- newFb.Inherit(spec, fb)
+ newFb.Inherit("", spec, fb)
  fb.Close()
  ctx.MockedRequest.MockedMethod = func() string {
  return http.MethodGet

pkg/filter/mock/mock.go

@@ -87,15 +87,15 @@ func (m *Mock) Results() []string {
 }
 
 // Init initializes Mock.
-func (m *Mock) Init(filterSpec *httppipeline.FilterSpec) {
+func (m *Mock) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  m.filterSpec, m.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  m.reload()
 }
 
 // Inherit inherits previous generation of Mock.
-func (m *Mock) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
+func (m *Mock) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
  previousGeneration.Close()
- m.Init(filterSpec)
+ m.Init(pipeline, filterSpec)
 }
 
 func (m *Mock) reload() {

pkg/filter/mock/mock_test.go

@@ -67,7 +67,7 @@ rules:
  }
 
  m := &Mock{}
- m.Init(spec)
+ m.Init("", spec)
 
  ctx := &contexttest.MockedHTTPContext{}
  ctx.MockedRequest.MockedMethod = func() string {
@@ -125,7 +125,7 @@ rules:
  }
  newM := &Mock{}
  spec, _ = httppipeline.NewFilterSpec(rawSpec, nil)
- newM.Inherit(spec, m)
+ newM.Inherit("", spec, m)
  m.Close()
  newM.Handle(ctx)
  if resp.Code != 204 {

pkg/filter/proxy/proxy.go

@@ -183,15 +183,15 @@ func (b *Proxy) Results() []string {
 }
 
 // Init initializes Proxy.
-func (b *Proxy) Init(filterSpec *httppipeline.FilterSpec) {
+func (b *Proxy) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  b.filterSpec, b.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  b.reload()
 }
 
 // Inherit inherits previous generation of Proxy.
-func (b *Proxy) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
+func (b *Proxy) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
  previousGeneration.Close()
- b.Init(filterSpec)
+ b.Init(pipeline, filterSpec)
 }
 
 func (b *Proxy) reload() {

pkg/filter/proxy/proxy_test.go

@@ -85,7 +85,7 @@ failureCodes: [503, 504]
  }
 
  proxy := &Proxy{}
- proxy.Init(spec)
+ proxy.Init("", spec)
 
  if len(proxy.candidatePools) != 1 {
  t.Error("length of candidate pools is incorrect")

pkg/filter/ratelimiter/ratelimiter.go

@@ -225,13 +225,13 @@ OuterLoop:
 }
 
 // Init initializes RateLimiter.
-func (rl *RateLimiter) Init(filterSpec *httppipeline.FilterSpec) {
+func (rl *RateLimiter) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  rl.filterSpec, rl.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  rl.reload(nil)
 }
 
 // Inherit inherits previous generation of RateLimiter.
-func (rl *RateLimiter) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
+func (rl *RateLimiter) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
  rl.filterSpec, rl.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  rl.reload(previousGeneration.(*RateLimiter))
 }

pkg/filter/remotefilter/remotefilter.go

@@ -147,15 +147,15 @@ type (
 )
 
 // Init initializes RemoteFilter.
-func (rf *RemoteFilter) Init(filterSpec *httppipeline.FilterSpec) {
+func (rf *RemoteFilter) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  rf.filterSpec, rf.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  rf.reload()
 }
 
 // Inherit inherits previous generation of RemoteFilter.
-func (rf *RemoteFilter) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
+func (rf *RemoteFilter) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
  previousGeneration.Close()
- rf.Init(filterSpec)
+ rf.Init(pipeline, filterSpec)
 }
 
 func (rf *RemoteFilter) reload() {

pkg/filter/requestadaptor/requestadaptor.go

@@ -79,16 +79,16 @@ func (ra *RequestAdaptor) Results() []string {
 }
 
 // Init initializes RequestAdaptor.
-func (ra *RequestAdaptor) Init(filterSpec *httppipeline.FilterSpec) {
+func (ra *RequestAdaptor) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  ra.filterSpec, ra.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  ra.reload()
 }
 
 // Inherit inherits previous generation of RequestAdaptor.
-func (ra *RequestAdaptor) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
+func (ra *RequestAdaptor) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
 
  previousGeneration.Close()
- ra.Init(filterSpec)
+ ra.Init(pipeline, filterSpec)
 }
 
 func (ra *RequestAdaptor) reload() {

pkg/filter/responseadaptor/responseadaptor.go

@@ -73,15 +73,15 @@ func (ra *ResponseAdaptor) Results() []string {
 }
 
 // Init initializes ResponseAdaptor.
-func (ra *ResponseAdaptor) Init(filterSpec *httppipeline.FilterSpec) {
+func (ra *ResponseAdaptor) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  ra.filterSpec, ra.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  ra.reload()
 }
 
 // Inherit inherits previous generation of ResponseAdaptor.
-func (ra *ResponseAdaptor) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
+func (ra *ResponseAdaptor) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
  previousGeneration.Close()
- ra.Init(filterSpec)
+ ra.Init(pipeline, filterSpec)
 }
 
 func (ra *ResponseAdaptor) reload() {

pkg/filter/responseadaptor/responseadaptor_test.go

@@ -83,9 +83,9 @@ func doTest(t *testing.T, yamlSpec string, prev *ResponseAdaptor) *ResponseAdapt
 
  ra := &ResponseAdaptor{}
  if prev == nil {
- ra.Init(spec)
+ ra.Init("", spec)
  } else {
- ra.Inherit(spec, prev)
+ ra.Inherit("", spec, prev)
  }
 
  ctx := &contexttest.MockedHTTPContext{}

pkg/filter/retryer/retryer.go

@@ -159,7 +159,7 @@ func (r *Retryer) initURL(u *URLRule) {
 }
 
 // Init initializes Retryer.
-func (r *Retryer) Init(filterSpec *httppipeline.FilterSpec) {
+func (r *Retryer) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  r.filterSpec = filterSpec
  r.spec = filterSpec.FilterSpec().(*Spec)
  for _, url := range r.spec.URLs {
@@ -168,8 +168,8 @@ func (r *Retryer) Init(filterSpec *httppipeline.FilterSpec) {
 }
 
 // Inherit inherits previous generation of Retryer.
-func (r *Retryer) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
- r.Init(filterSpec)
+func (r *Retryer) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
+ r.Init(pipeline, filterSpec)
 }
 
 func (r *Retryer) handle(ctx context.HTTPContext, u *URLRule) string {

pkg/filter/timelimiter/timelimiter.go

@@ -86,7 +86,7 @@ func (tl *TimeLimiter) Results() []string {
 }
 
 // Init initializes TimeLimiter.
-func (tl *TimeLimiter) Init(filterSpec *httppipeline.FilterSpec) {
+func (tl *TimeLimiter) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  tl.filterSpec, tl.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
 
  if d := tl.spec.DefaultTimeoutDuration; d != "" {
@@ -106,8 +106,8 @@ func (tl *TimeLimiter) Init(filterSpec *httppipeline.FilterSpec) {
 }
 
 // Inherit inherits previous generation of TimeLimiter.
-func (tl *TimeLimiter) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
- tl.Init(filterSpec)
+func (tl *TimeLimiter) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
+ tl.Init(pipeline, filterSpec)
 }
 
 func (tl *TimeLimiter) handle(ctx context.HTTPContext, u *URLRule) string {

pkg/filter/timelimiter/timelimiter_test.go

@@ -59,7 +59,7 @@ urls:
  }
 
  tl := &TimeLimiter{}
- tl.Init(spec)
+ tl.Init("", spec)
 
  if tl.spec.defaultTimeout != 456*time.Millisecond {
  t.Error("default timeout duration is not the value in spec")
@@ -116,7 +116,7 @@ urls:
 
  newTl := &TimeLimiter{}
  spec, _ = httppipeline.NewFilterSpec(rawSpec, nil)
- newTl.Inherit(spec, tl)
+ newTl.Inherit("", spec, tl)
  tl.Close()
  result = newTl.Handle(ctx)
  if result == resultTimeout {

pkg/filter/validator/validator.go

@@ -82,15 +82,15 @@ func (v *Validator) Results() []string {
 }
 
 // Init initializes Validator.
-func (v *Validator) Init(filterSpec *httppipeline.FilterSpec) {
+func (v *Validator) Init(pipeline string, filterSpec *httppipeline.FilterSpec) {
  v.filterSpec, v.spec = filterSpec, filterSpec.FilterSpec().(*Spec)
  v.reload()
 }
 
 // Inherit inherits previous generation of Validator.
-func (v *Validator) Inherit(filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
+func (v *Validator) Inherit(pipeline string, filterSpec *httppipeline.FilterSpec, previousGeneration httppipeline.Filter) {
  previousGeneration.Close()
- v.Init(filterSpec)
+ v.Init(pipeline, filterSpec)
 }
 
 func (v *Validator) reload() {

pkg/filter/validator/validator_test.go

@@ -44,9 +44,9 @@ func createValidator(yamlSpec string, prev *Validator) *Validator {
  spec, _ := httppipeline.NewFilterSpec(rawSpec, nil)
  v := &Validator{}
  if prev == nil {
- v.Init(spec)
+ v.Init("", spec)
  } else {
- v.Inherit(spec, prev)
+ v.Inherit("", spec, prev)
  }
  return v
 }