rename filter to filters

easegress-io · Mar 4, 2022 · 854072c · 854072c
1 parent 36480f3
commit 854072c
Show file tree

Hide file tree

Showing 75 changed files with 43 additions and 43 deletions.
diff --git a/pkg/filter/apiaggregator/apiaggregator.go → pkg/filters/apiaggregator/apiaggregator.go b/pkg/filter/apiaggregator/apiaggregator.go → pkg/filters/apiaggregator/apiaggregator.go
diff --git a/pkg/filter/bridge/bridge.go → pkg/filters/bridge/bridge.go b/pkg/filter/bridge/bridge.go → pkg/filters/bridge/bridge.go
diff --git a/pkg/filter/canary/matcher.go → pkg/filters/canary/matcher.go b/pkg/filter/canary/matcher.go → pkg/filters/canary/matcher.go
diff --git a/pkg/filter/canary/matcher_test.go → pkg/filters/canary/matcher_test.go b/pkg/filter/canary/matcher_test.go → pkg/filters/canary/matcher_test.go
diff --git a/pkg/filter/canary/rule.go → pkg/filters/canary/rule.go b/pkg/filter/canary/rule.go → pkg/filters/canary/rule.go
diff --git a/pkg/filter/certextractor/certextractor.go → pkg/filters/certextractor/certextractor.go b/pkg/filter/certextractor/certextractor.go → pkg/filters/certextractor/certextractor.go
diff --git a/...ilter/certextractor/certextractor_test.go → ...lters/certextractor/certextractor_test.go b/...ilter/certextractor/certextractor_test.go → ...lters/certextractor/certextractor_test.go
diff --git a/pkg/filter/circuitbreaker/circuitbreaker.go → pkg/filters/circuitbreaker/circuitbreaker.go b/pkg/filter/circuitbreaker/circuitbreaker.go → pkg/filters/circuitbreaker/circuitbreaker.go
diff --git a/...ter/circuitbreaker/circuitbreaker_test.go → ...ers/circuitbreaker/circuitbreaker_test.go b/...ter/circuitbreaker/circuitbreaker_test.go → ...ers/circuitbreaker/circuitbreaker_test.go
diff --git a/pkg/filter/connectcontrol/connectcontrol.go → pkg/filters/connectcontrol/connectcontrol.go b/pkg/filter/connectcontrol/connectcontrol.go → pkg/filters/connectcontrol/connectcontrol.go
diff --git a/...ter/connectcontrol/connectcontrol_test.go → ...ers/connectcontrol/connectcontrol_test.go b/...ter/connectcontrol/connectcontrol_test.go → ...ers/connectcontrol/connectcontrol_test.go
diff --git a/pkg/filter/corsadaptor/corsadaptor.go → pkg/filters/corsadaptor/corsadaptor.go b/pkg/filter/corsadaptor/corsadaptor.go → pkg/filters/corsadaptor/corsadaptor.go
diff --git a/pkg/filter/corsadaptor/corsadaptor_test.go → pkg/filters/corsadaptor/corsadaptor_test.go b/pkg/filter/corsadaptor/corsadaptor_test.go → pkg/filters/corsadaptor/corsadaptor_test.go
diff --git a/pkg/filter/fallback/fallback.go → pkg/filters/fallback/fallback.go b/pkg/filter/fallback/fallback.go → pkg/filters/fallback/fallback.go
diff --git a/pkg/filter/fallback/fallback_test.go → pkg/filters/fallback/fallback_test.go b/pkg/filter/fallback/fallback_test.go → pkg/filters/fallback/fallback_test.go
diff --git a/pkg/filter/headerlookup/headerlookup.go → pkg/filters/headerlookup/headerlookup.go b/pkg/filter/headerlookup/headerlookup.go → pkg/filters/headerlookup/headerlookup.go
diff --git a/pkg/filter/headerlookup/headerlookup_test.go → ...filters/headerlookup/headerlookup_test.go b/pkg/filter/headerlookup/headerlookup_test.go → ...filters/headerlookup/headerlookup_test.go
diff --git a/pkg/filter/headertojson/headertojson.go → pkg/filters/headertojson/headertojson.go b/pkg/filter/headertojson/headertojson.go → pkg/filters/headertojson/headertojson.go
diff --git a/pkg/filter/headertojson/headertojson_test.go → ...filters/headertojson/headertojson_test.go b/pkg/filter/headertojson/headertojson_test.go → ...filters/headertojson/headertojson_test.go
diff --git a/pkg/filter/headertojson/spec.go → pkg/filters/headertojson/spec.go b/pkg/filter/headertojson/spec.go → pkg/filters/headertojson/spec.go
diff --git a/pkg/filter/kafka/kafka.go → pkg/filters/kafka/kafka.go b/pkg/filter/kafka/kafka.go → pkg/filters/kafka/kafka.go
diff --git a/pkg/filter/kafka/kafka_test.go → pkg/filters/kafka/kafka_test.go b/pkg/filter/kafka/kafka_test.go → pkg/filters/kafka/kafka_test.go
diff --git a/pkg/filter/kafka/spec.go → pkg/filters/kafka/spec.go b/pkg/filter/kafka/spec.go → pkg/filters/kafka/spec.go
diff --git a/pkg/filter/kafkabackend/kafka.go → pkg/filters/kafkabackend/kafka.go b/pkg/filter/kafkabackend/kafka.go → pkg/filters/kafkabackend/kafka.go
diff --git a/pkg/filter/kafkabackend/kafka_test.go → pkg/filters/kafkabackend/kafka_test.go b/pkg/filter/kafkabackend/kafka_test.go → pkg/filters/kafkabackend/kafka_test.go
diff --git a/pkg/filter/kafkabackend/spec.go → pkg/filters/kafkabackend/spec.go b/pkg/filter/kafkabackend/spec.go → pkg/filters/kafkabackend/spec.go
diff --git a/pkg/filter/meshadaptor/meshadaptor.go → pkg/filters/meshadaptor/meshadaptor.go b/pkg/filter/meshadaptor/meshadaptor.go → pkg/filters/meshadaptor/meshadaptor.go
diff --git a/pkg/filter/mock/mock.go → pkg/filters/mock/mock.go b/pkg/filter/mock/mock.go → pkg/filters/mock/mock.go
diff --git a/pkg/filter/mock/mock_test.go → pkg/filters/mock/mock_test.go b/pkg/filter/mock/mock_test.go → pkg/filters/mock/mock_test.go
diff --git a/pkg/filter/mqttclientauth/mqttauth.go → pkg/filters/mqttclientauth/mqttauth.go b/pkg/filter/mqttclientauth/mqttauth.go → pkg/filters/mqttclientauth/mqttauth.go
diff --git a/pkg/filter/mqttclientauth/mqttauth_test.go → pkg/filters/mqttclientauth/mqttauth_test.go b/pkg/filter/mqttclientauth/mqttauth_test.go → pkg/filters/mqttclientauth/mqttauth_test.go
diff --git a/pkg/filter/proxy/compression.go → pkg/filters/proxy/compression.go b/pkg/filter/proxy/compression.go → pkg/filters/proxy/compression.go
diff --git a/pkg/filter/proxy/compression_test.go → pkg/filters/proxy/compression_test.go b/pkg/filter/proxy/compression_test.go → pkg/filters/proxy/compression_test.go
diff --git a/pkg/filter/proxy/pool.go → pkg/filters/proxy/pool.go b/pkg/filter/proxy/pool.go → pkg/filters/proxy/pool.go
diff --git a/pkg/filter/proxy/primarysecondaryreader.go → pkg/filters/proxy/primarysecondaryreader.go b/pkg/filter/proxy/primarysecondaryreader.go → pkg/filters/proxy/primarysecondaryreader.go
diff --git a/...lter/proxy/primarysecondaryreader_test.go → ...ters/proxy/primarysecondaryreader_test.go b/...lter/proxy/primarysecondaryreader_test.go → ...ters/proxy/primarysecondaryreader_test.go
diff --git a/pkg/filter/proxy/proxy.go → pkg/filters/proxy/proxy.go b/pkg/filter/proxy/proxy.go → pkg/filters/proxy/proxy.go
diff --git a/pkg/filter/proxy/proxy_test.go → pkg/filters/proxy/proxy_test.go b/pkg/filter/proxy/proxy_test.go → pkg/filters/proxy/proxy_test.go
diff --git a/pkg/filter/proxy/request.go → pkg/filters/proxy/request.go b/pkg/filter/proxy/request.go → pkg/filters/proxy/request.go
diff --git a/pkg/filter/proxy/request_test.go → pkg/filters/proxy/request_test.go b/pkg/filter/proxy/request_test.go → pkg/filters/proxy/request_test.go
diff --git a/pkg/filter/proxy/server.go → pkg/filters/proxy/server.go b/pkg/filter/proxy/server.go → pkg/filters/proxy/server.go
diff --git a/pkg/filter/proxy/server_test.go → pkg/filters/proxy/server_test.go b/pkg/filter/proxy/server_test.go → pkg/filters/proxy/server_test.go
diff --git a/pkg/filter/ratelimiter/ratelimiter.go → pkg/filters/ratelimiter/ratelimiter.go b/pkg/filter/ratelimiter/ratelimiter.go → pkg/filters/ratelimiter/ratelimiter.go
diff --git a/pkg/filter/remotefilter/remotefilter.go → pkg/filters/remotefilter/remotefilter.go b/pkg/filter/remotefilter/remotefilter.go → pkg/filters/remotefilter/remotefilter.go
diff --git a/pkg/filter/requestadaptor/requestadaptor.go → pkg/filters/requestadaptor/requestadaptor.go b/pkg/filter/requestadaptor/requestadaptor.go → pkg/filters/requestadaptor/requestadaptor.go
diff --git a/...ter/requestadaptor/requestadaptor_test.go → ...ers/requestadaptor/requestadaptor_test.go b/...ter/requestadaptor/requestadaptor_test.go → ...ers/requestadaptor/requestadaptor_test.go
diff --git a/...filter/responseadaptor/responseadaptor.go → ...ilters/responseadaptor/responseadaptor.go b/...filter/responseadaptor/responseadaptor.go → ...ilters/responseadaptor/responseadaptor.go
diff --git a/...r/responseadaptor/responseadaptor_test.go → ...s/responseadaptor/responseadaptor_test.go b/...r/responseadaptor/responseadaptor_test.go → ...s/responseadaptor/responseadaptor_test.go
diff --git a/pkg/filter/retryer/retryer.go → pkg/filters/retryer/retryer.go b/pkg/filter/retryer/retryer.go → pkg/filters/retryer/retryer.go
diff --git a/pkg/filter/timelimiter/timelimiter.go → pkg/filters/timelimiter/timelimiter.go b/pkg/filter/timelimiter/timelimiter.go → pkg/filters/timelimiter/timelimiter.go
diff --git a/pkg/filter/timelimiter/timelimiter_test.go → pkg/filters/timelimiter/timelimiter_test.go b/pkg/filter/timelimiter/timelimiter_test.go → pkg/filters/timelimiter/timelimiter_test.go
diff --git a/pkg/filter/topicmapper/spec.go → pkg/filters/topicmapper/spec.go b/pkg/filter/topicmapper/spec.go → pkg/filters/topicmapper/spec.go
diff --git a/pkg/filter/topicmapper/spec_test.go → pkg/filters/topicmapper/spec_test.go b/pkg/filter/topicmapper/spec_test.go → pkg/filters/topicmapper/spec_test.go
diff --git a/pkg/filter/topicmapper/topic.go → pkg/filters/topicmapper/topic.go b/pkg/filter/topicmapper/topic.go → pkg/filters/topicmapper/topic.go
diff --git a/pkg/filter/topicmapper/topic_test.go → pkg/filters/topicmapper/topic_test.go b/pkg/filter/topicmapper/topic_test.go → pkg/filters/topicmapper/topic_test.go
diff --git a/pkg/filter/topicmapper/topicmapper.go → pkg/filters/topicmapper/topicmapper.go b/pkg/filter/topicmapper/topicmapper.go → pkg/filters/topicmapper/topicmapper.go
diff --git a/pkg/filter/topicmapper/topicmapper_test.go → pkg/filters/topicmapper/topicmapper_test.go b/pkg/filter/topicmapper/topicmapper_test.go → pkg/filters/topicmapper/topicmapper_test.go
diff --git a/pkg/filter/validator/basicauth.go → pkg/filters/validator/basicauth.go b/pkg/filter/validator/basicauth.go → pkg/filters/validator/basicauth.go
diff --git a/pkg/filter/validator/jwt.go → pkg/filters/validator/jwt.go b/pkg/filter/validator/jwt.go → pkg/filters/validator/jwt.go
diff --git a/pkg/filter/validator/oauth2.go → pkg/filters/validator/oauth2.go b/pkg/filter/validator/oauth2.go → pkg/filters/validator/oauth2.go
diff --git a/pkg/filter/validator/validator.go → pkg/filters/validator/validator.go b/pkg/filter/validator/validator.go → pkg/filters/validator/validator.go
diff --git a/pkg/filter/validator/validator_test.go → pkg/filters/validator/validator_test.go b/pkg/filter/validator/validator_test.go → pkg/filters/validator/validator_test.go
diff --git a/pkg/filter/wasmhost/doc.go → pkg/filters/wasmhost/doc.go b/pkg/filter/wasmhost/doc.go → pkg/filters/wasmhost/doc.go
diff --git a/pkg/filter/wasmhost/hostfunc.go → pkg/filters/wasmhost/hostfunc.go b/pkg/filter/wasmhost/hostfunc.go → pkg/filters/wasmhost/hostfunc.go
diff --git a/pkg/filter/wasmhost/vm.go → pkg/filters/wasmhost/vm.go b/pkg/filter/wasmhost/vm.go → pkg/filters/wasmhost/vm.go
diff --git a/pkg/filter/wasmhost/wasmhost.go → pkg/filters/wasmhost/wasmhost.go b/pkg/filter/wasmhost/wasmhost.go → pkg/filters/wasmhost/wasmhost.go
diff --git a/pkg/object/easemonitormetrics/easemonitormetrics.go b/pkg/object/easemonitormetrics/easemonitormetrics.go
@@ -27,7 +27,7 @@ import (
  "github.com/Shopify/sarama"
  jsoniter "github.com/json-iterator/go"
 
- "github.com/megaease/easegress/pkg/filter/proxy"
+ "github.com/megaease/easegress/pkg/filters/proxy"
  "github.com/megaease/easegress/pkg/logger"
  "github.com/megaease/easegress/pkg/object/httppipeline"
  "github.com/megaease/easegress/pkg/object/httpserver"

diff --git a/pkg/object/function/spec/function.go b/pkg/object/function/spec/function.go
@@ -22,7 +22,7 @@ import (
 
  k8sresource "k8s.io/apimachinery/pkg/api/resource"
 
- "github.com/megaease/easegress/pkg/filter/requestadaptor"
+ "github.com/megaease/easegress/pkg/filters/requestadaptor"
  "github.com/megaease/easegress/pkg/object/httpserver"
 )
 

diff --git a/pkg/object/function/worker/ingress.go b/pkg/object/function/worker/ingress.go
@@ -23,8 +23,8 @@ import (
 
  "gopkg.in/yaml.v2"
 
- "github.com/megaease/easegress/pkg/filter/proxy"
- "github.com/megaease/easegress/pkg/filter/requestadaptor"
+ "github.com/megaease/easegress/pkg/filters/proxy"
+ "github.com/megaease/easegress/pkg/filters/requestadaptor"
  "github.com/megaease/easegress/pkg/logger"
  "github.com/megaease/easegress/pkg/object/function/spec"
  "github.com/megaease/easegress/pkg/object/httppipeline"

diff --git a/pkg/object/ingresscontroller/translator.go b/pkg/object/ingresscontroller/translator.go
@@ -24,7 +24,7 @@ import (
  "strconv"
  "strings"
 
- "github.com/megaease/easegress/pkg/filter/proxy"
+ "github.com/megaease/easegress/pkg/filters/proxy"
  "github.com/megaease/easegress/pkg/logger"
  "github.com/megaease/easegress/pkg/object/httppipeline"
  "github.com/megaease/easegress/pkg/object/httpserver"

diff --git a/pkg/object/meshcontroller/spec/spec.go b/pkg/object/meshcontroller/spec/spec.go
@@ -25,13 +25,13 @@ import (
  "gopkg.in/yaml.v2"
 
  "github.com/megaease/easegress/pkg/cluster/customdata"
- "github.com/megaease/easegress/pkg/filter/circuitbreaker"
- "github.com/megaease/easegress/pkg/filter/meshadaptor"
- "github.com/megaease/easegress/pkg/filter/mock"
- "github.com/megaease/easegress/pkg/filter/proxy"
- "github.com/megaease/easegress/pkg/filter/ratelimiter"
- "github.com/megaease/easegress/pkg/filter/retryer"
- "github.com/megaease/easegress/pkg/filter/timelimiter"
+ "github.com/megaease/easegress/pkg/filters/circuitbreaker"
+ "github.com/megaease/easegress/pkg/filters/meshadaptor"
+ "github.com/megaease/easegress/pkg/filters/mock"
+ "github.com/megaease/easegress/pkg/filters/proxy"
+ "github.com/megaease/easegress/pkg/filters/ratelimiter"
+ "github.com/megaease/easegress/pkg/filters/retryer"
+ "github.com/megaease/easegress/pkg/filters/timelimiter"
  "github.com/megaease/easegress/pkg/logger"
  "github.com/megaease/easegress/pkg/object/httppipeline"
  "github.com/megaease/easegress/pkg/supervisor"

diff --git a/pkg/object/meshcontroller/spec/spec_test.go b/pkg/object/meshcontroller/spec/spec_test.go
@@ -23,12 +23,12 @@ import (
  "os"
  "testing"
 
- "github.com/megaease/easegress/pkg/filter/circuitbreaker"
- "github.com/megaease/easegress/pkg/filter/mock"
- "github.com/megaease/easegress/pkg/filter/proxy"
- "github.com/megaease/easegress/pkg/filter/ratelimiter"
- "github.com/megaease/easegress/pkg/filter/retryer"
- "github.com/megaease/easegress/pkg/filter/timelimiter"
+ "github.com/megaease/easegress/pkg/filters/circuitbreaker"
+ "github.com/megaease/easegress/pkg/filters/mock"
+ "github.com/megaease/easegress/pkg/filters/proxy"
+ "github.com/megaease/easegress/pkg/filters/ratelimiter"
+ "github.com/megaease/easegress/pkg/filters/retryer"
+ "github.com/megaease/easegress/pkg/filters/timelimiter"
  "github.com/megaease/easegress/pkg/logger"
  _ "github.com/megaease/easegress/pkg/object/httpserver"
  "github.com/megaease/easegress/pkg/util/urlrule"

diff --git a/pkg/object/mqttproxy/mqtt_test.go b/pkg/object/mqttproxy/mqtt_test.go
@@ -35,7 +35,7 @@ import (
 
  paho "github.com/eclipse/paho.mqtt.golang"
  "github.com/eclipse/paho.mqtt.golang/packets"
- _ "github.com/megaease/easegress/pkg/filter/mqttclientauth"
+ _ "github.com/megaease/easegress/pkg/filters/mqttclientauth"
  "github.com/megaease/easegress/pkg/logger"
  "github.com/megaease/easegress/pkg/object/pipeline"
  "github.com/megaease/easegress/pkg/supervisor"

diff --git a/pkg/registry/registry.go b/pkg/registry/registry.go
@@ -20,29 +20,29 @@ package registry
 import (
 
  // Filters
- _ "github.com/megaease/easegress/pkg/filter/apiaggregator"
- _ "github.com/megaease/easegress/pkg/filter/bridge"
- _ "github.com/megaease/easegress/pkg/filter/certextractor"
- _ "github.com/megaease/easegress/pkg/filter/circuitbreaker"
- _ "github.com/megaease/easegress/pkg/filter/connectcontrol"
- _ "github.com/megaease/easegress/pkg/filter/corsadaptor"
- _ "github.com/megaease/easegress/pkg/filter/fallback"
- _ "github.com/megaease/easegress/pkg/filter/headerlookup"
- _ "github.com/megaease/easegress/pkg/filter/headertojson"
- _ "github.com/megaease/easegress/pkg/filter/kafka"
- _ "github.com/megaease/easegress/pkg/filter/kafkabackend"
- _ "github.com/megaease/easegress/pkg/filter/meshadaptor"
- _ "github.com/megaease/easegress/pkg/filter/mock"
- _ "github.com/megaease/easegress/pkg/filter/mqttclientauth"
- _ "github.com/megaease/easegress/pkg/filter/proxy"
- _ "github.com/megaease/easegress/pkg/filter/ratelimiter"
- _ "github.com/megaease/easegress/pkg/filter/remotefilter"
- _ "github.com/megaease/easegress/pkg/filter/requestadaptor"
- _ "github.com/megaease/easegress/pkg/filter/responseadaptor"
- _ "github.com/megaease/easegress/pkg/filter/retryer"
- _ "github.com/megaease/easegress/pkg/filter/timelimiter"
- _ "github.com/megaease/easegress/pkg/filter/validator"
- _ "github.com/megaease/easegress/pkg/filter/wasmhost"
+ _ "github.com/megaease/easegress/pkg/filters/apiaggregator"
+ _ "github.com/megaease/easegress/pkg/filters/bridge"
+ _ "github.com/megaease/easegress/pkg/filters/certextractor"
+ _ "github.com/megaease/easegress/pkg/filters/circuitbreaker"
+ _ "github.com/megaease/easegress/pkg/filters/connectcontrol"
+ _ "github.com/megaease/easegress/pkg/filters/corsadaptor"
+ _ "github.com/megaease/easegress/pkg/filters/fallback"
+ _ "github.com/megaease/easegress/pkg/filters/headerlookup"
+ _ "github.com/megaease/easegress/pkg/filters/headertojson"
+ _ "github.com/megaease/easegress/pkg/filters/kafka"
+ _ "github.com/megaease/easegress/pkg/filters/kafkabackend"
+ _ "github.com/megaease/easegress/pkg/filters/meshadaptor"
+ _ "github.com/megaease/easegress/pkg/filters/mock"
+ _ "github.com/megaease/easegress/pkg/filters/mqttclientauth"
+ _ "github.com/megaease/easegress/pkg/filters/proxy"
+ _ "github.com/megaease/easegress/pkg/filters/ratelimiter"
+ _ "github.com/megaease/easegress/pkg/filters/remotefilter"
+ _ "github.com/megaease/easegress/pkg/filters/requestadaptor"
+ _ "github.com/megaease/easegress/pkg/filters/responseadaptor"
+ _ "github.com/megaease/easegress/pkg/filters/retryer"
+ _ "github.com/megaease/easegress/pkg/filters/timelimiter"
+ _ "github.com/megaease/easegress/pkg/filters/validator"
+ _ "github.com/megaease/easegress/pkg/filters/wasmhost"
 
  // Objects
  _ "github.com/megaease/easegress/pkg/object/autocertmanager"

diff --git a/pkg/util/jmxtool/agent_controller_test.go b/pkg/util/jmxtool/agent_controller_test.go
@@ -25,7 +25,7 @@ import (
  "testing"
  "time"
 
- "github.com/megaease/easegress/pkg/filter/proxy"
+ "github.com/megaease/easegress/pkg/filters/proxy"
  "github.com/megaease/easegress/pkg/logger"
  "github.com/megaease/easegress/pkg/object/meshcontroller/spec"
 )