Skip to content

Commit

Permalink
fix local limit issue
Browse files Browse the repository at this point in the history
Signed-off-by: huabingzhao <[email protected]>
  • Loading branch information
zhaohuabing committed Dec 20, 2022
1 parent 8330b0f commit 44213b2
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5

//replace github.com/envoyproxy/go-control-plane => /Users/huabingzhao/workspace/go-control-plane

//replace github.com/aeraki-mesh/meta-protocol-control-plane-api => github.com/aeraki-mesh/meta-protocol-control-plane-api v0.0.0-20220325074604-63adf119a7bc
//replace github.com/aeraki-mesh/meta-protocol-control-plane-api =>/Users/huabingzhao/workspace/meta-protocol-control-plane

require (
github.com/aeraki-mesh/meta-protocol-control-plane-api v0.0.0-20221213110004-4eab1878885f
github.com/aeraki-mesh/meta-protocol-control-plane-api v0.0.0-20221220065300-b3acf5666978
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/envoyproxy/go-control-plane v0.10.2-0.20211130161932-f62def555c97
github.com/gogo/protobuf v1.3.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=
github.com/aeraki-mesh/meta-protocol-control-plane-api v0.0.0-20221213110004-4eab1878885f h1:LR/enSBQNFvTJmvccTT4q3C9W016fwgjN+le7URdeyg=
github.com/aeraki-mesh/meta-protocol-control-plane-api v0.0.0-20221213110004-4eab1878885f/go.mod h1:kBlB/k9X2I3yO6mZyS1tcdUfJy3cz4u+z97kmpo8qD4=
github.com/aeraki-mesh/meta-protocol-control-plane-api v0.0.0-20221220065300-b3acf5666978 h1:hQ+6mlTbhy5ysIFwWEfFfxriZ7a+VBgyws0Zjwm50Nw=
github.com/aeraki-mesh/meta-protocol-control-plane-api v0.0.0-20221220065300-b3acf5666978/go.mod h1:kBlB/k9X2I3yO6mZyS1tcdUfJy3cz4u+z97kmpo8qD4=
github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0/go.mod h1:TdjdkYhlOifCQWPs1UdTma97kQQMozf5h26hTuG70u8=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
Expand Down
2 changes: 1 addition & 1 deletion pkg/xds/cache_mgr.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
cachev3 "github.com/envoyproxy/go-control-plane/pkg/cache/v3"
networking "istio.io/api/networking/v1alpha3"

metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/config/route/v1alpha"
metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/aeraki/meta_protocol_proxy/config/route/v1alpha"

"github.com/zhaohuabing/debounce"
istiomodel "istio.io/istio/pilot/pkg/model"
Expand Down
2 changes: 1 addition & 1 deletion pkg/xds/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/envoyproxy/go-control-plane/pkg/cache/types"
"github.com/envoyproxy/go-control-plane/pkg/cache/v3"

metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/config/route/v1alpha"
metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/aeraki/meta_protocol_proxy/config/route/v1alpha"
)

var regexEngine = &matcher.RegexMatcher_GoogleRe2{GoogleRe2: &matcher.RegexMatcher_GoogleRE2{}}
Expand Down
8 changes: 4 additions & 4 deletions plugin/metaprotocol/filters.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"github.com/golang/protobuf/ptypes/wrappers"
"google.golang.org/protobuf/types/known/anypb"

metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/config/route/v1alpha"
grldpl "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/filters/global_ratelimit/v1alpha"
lrldpl "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/filters/local_ratelimit/v1alpha"
mpdataplane "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/v1alpha"
metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/aeraki/meta_protocol_proxy/config/route/v1alpha"
grldpl "github.com/aeraki-mesh/meta-protocol-control-plane-api/aeraki/meta_protocol_proxy/filters/global_ratelimit/v1alpha"
lrldpl "github.com/aeraki-mesh/meta-protocol-control-plane-api/aeraki/meta_protocol_proxy/filters/local_ratelimit/v1alpha"
mpdataplane "github.com/aeraki-mesh/meta-protocol-control-plane-api/aeraki/meta_protocol_proxy/v1alpha"

userapi "github.com/aeraki-mesh/aeraki/api/metaprotocol/v1alpha1"
mpclient "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion plugin/metaprotocol/metaprotocolproxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package metaprotocol
import (
"fmt"

metaprotocol "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/v1alpha"
metaprotocol "github.com/aeraki-mesh/meta-protocol-control-plane-api/aeraki/meta_protocol_proxy/v1alpha"
accesslog "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3"
envoyconfig "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
envoytype "github.com/envoyproxy/go-control-plane/envoy/type/v3"
Expand Down
2 changes: 1 addition & 1 deletion plugin/metaprotocol/route.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package metaprotocol
import (
istionetworking "istio.io/api/networking/v1alpha3"

metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/config/route/v1alpha"
metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/aeraki/meta_protocol_proxy/config/route/v1alpha"

"github.com/aeraki-mesh/aeraki/pkg/model"
)
Expand Down

0 comments on commit 44213b2

Please sign in to comment.