chore: update adaptor dependency (#566)

EndlessSeeker · web-flow · commit e0cbf1702da9 · 2024-06-27T16:06:05.000+08:00
* chore: update adaptor dependency

* fix: gin fallback test

* chore: import sort

* chore: import sort
diff --git a/core/fallback/rule_manager.go b/core/fallback/rule_manager.go
@@ -16,10 +16,11 @@ package fallback
 
 import (
 	"encoding/json"
-	"github.com/alibaba/sentinel-golang/logging"
-	"github.com/alibaba/sentinel-golang/util"
 	"reflect"
 	"sync"
+
+	"github.com/alibaba/sentinel-golang/logging"
+	"github.com/alibaba/sentinel-golang/util"
 )
 
 var (
diff --git a/core/fallback/rule_manager_test.go b/core/fallback/rule_manager_test.go
@@ -15,8 +15,9 @@
 package fallback
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestLoadRule(t *testing.T) {
diff --git a/pkg/adapters/echo/go.mod b/pkg/adapters/echo/go.mod
@@ -3,8 +3,7 @@ module github.com/alibaba/sentinel-golang/pkg/adapters/echo
 go 1.13
 
 require (
-	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
-	github.com/alibaba/sentinel-golang v1.0.2
+	github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha
 	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/labstack/echo/v4 v4.1.17
 	github.com/stretchr/testify v1.7.0
diff --git a/pkg/adapters/echo/go.sum b/pkg/adapters/echo/go.sum
diff --git a/pkg/adapters/fiber/go.mod b/pkg/adapters/fiber/go.mod
@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	github.com/StackExchange/wmi v1.2.1 // indirect
-	github.com/alibaba/sentinel-golang v1.0.2
+	github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha
 	github.com/gofiber/fiber/v2 v2.37.1
-	github.com/stretchr/testify v1.5.1
+	github.com/stretchr/testify v1.6.1
 )
diff --git a/pkg/adapters/fiber/go.sum b/pkg/adapters/fiber/go.sum
diff --git a/pkg/adapters/gear/go.mod b/pkg/adapters/gear/go.mod
@@ -3,8 +3,7 @@ module github.com/alibaba/sentinel-golang/pkg/adapters/gear
 go 1.13
 
 require (
-	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
-	github.com/alibaba/sentinel-golang v1.0.2
+	github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha
 	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/teambition/gear v1.24.0
diff --git a/pkg/adapters/gear/go.sum b/pkg/adapters/gear/go.sum
diff --git a/pkg/adapters/gin/go.mod b/pkg/adapters/gin/go.mod
@@ -3,8 +3,7 @@ module github.com/alibaba/sentinel-golang/pkg/adapters/gin
 go 1.13
 
 require (
-	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
-	github.com/alibaba/sentinel-golang v1.0.2
+	github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha
 	github.com/gin-gonic/gin v1.7.0
 	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/stretchr/testify v1.7.0
diff --git a/pkg/adapters/gin/go.sum b/pkg/adapters/gin/go.sum
diff --git a/pkg/adapters/gin/middleware_test.go b/pkg/adapters/gin/middleware_test.go
@@ -27,7 +27,12 @@ func initSentinel(t *testing.T) {
 					fallback.FlowType,
 				},
 			},
-			FallbackBehavior: []byte("{\"webFallbackMode\":0,\"webRespContentType\":1,\"webRespMessage\":\"{\\n  \\\"abc\\\": 123\\n}\",\"webRespStatusCode\":400}"),
+			FallbackBehavior: &fallback.WebBlockFallbackBehavior{
+				WebFallbackMode:    0,
+				WebRespContentType: 1,
+				WebRespStatusCode:  429,
+				WebRespMessage:     "{\n  \"abc\": 123\n}",
+			},
 		},
 	})
 	if err != nil {
@@ -149,7 +154,7 @@ func TestSentinelMiddleware(t *testing.T) {
 					body: nil,
 				},
 				want: want{
-					code: http.StatusBadRequest,
+					code: http.StatusTooManyRequests,
 				},
 			},
 		}
diff --git a/pkg/adapters/go-zero/go.mod b/pkg/adapters/go-zero/go.mod
@@ -3,7 +3,7 @@ module github.com/alibaba/sentinel-golang/pkg/adapters/go-zero
 go 1.17
 
 require (
-	github.com/alibaba/sentinel-golang v1.0.2
+	github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha
 	github.com/stretchr/testify v1.7.0
 	github.com/zeromicro/go-zero v1.3.0
 )
diff --git a/pkg/adapters/go-zero/go.sum b/pkg/adapters/go-zero/go.sum
diff --git a/pkg/adapters/grpc/go.mod b/pkg/adapters/grpc/go.mod
@@ -3,9 +3,8 @@ module github.com/alibaba/sentinel-golang/pkg/adapters/grpc
 go 1.13
 
 require (
-	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
-	github.com/alibaba/sentinel-golang v1.0.2
+	github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha
 	github.com/go-ole/go-ole v1.2.5 // indirect
-	github.com/stretchr/testify v1.5.1
+	github.com/stretchr/testify v1.6.1
 	google.golang.org/grpc v1.34.0
 )
diff --git a/pkg/adapters/grpc/go.sum b/pkg/adapters/grpc/go.sum
diff --git a/pkg/adapters/hertz/go.mod b/pkg/adapters/hertz/go.mod
@@ -3,7 +3,7 @@ module github.com/alibaba/sentinel-golang/pkg/adapters/hertz
 go 1.16
 
 require (
-	github.com/alibaba/sentinel-golang v1.0.4
+	github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha
 	github.com/cloudwego/hertz v0.2.0
 	github.com/stretchr/testify v1.8.0
 )
diff --git a/pkg/adapters/hertz/go.sum b/pkg/adapters/hertz/go.sum
@@ -13,8 +13,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/alibaba/sentinel-golang v1.0.4 h1:i0wtMvNVdy7vM4DdzYrlC4r/Mpk1OKUUBurKKkWhEo8=
-github.com/alibaba/sentinel-golang v1.0.4/go.mod h1:Lag5rIYyJiPOylK8Kku2P+a23gdKMMqzQS7wTnjWEpk=
+github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha h1:8bklTmcFvme7nTps1F7q4Yhx9Sw7Q3GlfrJtVeArG8w=
+github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha/go.mod h1:Beo3qQ/ygtZ/R4w+VtGi9OSVDVyV513YGdzgS6ZWMAY=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
diff --git a/pkg/adapters/iris/go.mod b/pkg/adapters/iris/go.mod
@@ -3,7 +3,7 @@ module github.com/alibaba/sentinel-golang/pkg/adapters/iris/v12
 go 1.20
 
 require (
-	github.com/alibaba/sentinel-golang v1.0.4
+	github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha
 	github.com/kataras/iris/v12 v12.2.0
 )
 
diff --git a/pkg/adapters/iris/go.sum b/pkg/adapters/iris/go.sum
@@ -26,8 +26,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/alibaba/sentinel-golang v1.0.4 h1:i0wtMvNVdy7vM4DdzYrlC4r/Mpk1OKUUBurKKkWhEo8=
-github.com/alibaba/sentinel-golang v1.0.4/go.mod h1:Lag5rIYyJiPOylK8Kku2P+a23gdKMMqzQS7wTnjWEpk=
+github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha h1:8bklTmcFvme7nTps1F7q4Yhx9Sw7Q3GlfrJtVeArG8w=
+github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha/go.mod h1:Beo3qQ/ygtZ/R4w+VtGi9OSVDVyV513YGdzgS6ZWMAY=
 github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
 github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
diff --git a/pkg/adapters/kitex/go.mod b/pkg/adapters/kitex/go.mod
@@ -3,7 +3,7 @@ module github.com/alibaba/sentinel-golang/pkg/adapters/kitex
 go 1.16
 
 require (
-	github.com/alibaba/sentinel-golang v1.0.4
+	github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha
 	github.com/cloudwego/kitex v0.3.4
 	github.com/cloudwego/kitex-examples v0.1.0
 	github.com/stretchr/testify v1.7.0
diff --git a/pkg/adapters/kitex/go.sum b/pkg/adapters/kitex/go.sum
@@ -21,8 +21,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/alibaba/sentinel-golang v1.0.4 h1:i0wtMvNVdy7vM4DdzYrlC4r/Mpk1OKUUBurKKkWhEo8=
-github.com/alibaba/sentinel-golang v1.0.4/go.mod h1:Lag5rIYyJiPOylK8Kku2P+a23gdKMMqzQS7wTnjWEpk=
+github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha h1:8bklTmcFvme7nTps1F7q4Yhx9Sw7Q3GlfrJtVeArG8w=
+github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha/go.mod h1:Beo3qQ/ygtZ/R4w+VtGi9OSVDVyV513YGdzgS6ZWMAY=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0 h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
diff --git a/pkg/adapters/micro/go.mod b/pkg/adapters/micro/go.mod
@@ -3,10 +3,9 @@ module github.com/alibaba/sentinel-golang/pkg/adapters/micro
 go 1.13
 
 require (
-	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
-	github.com/alibaba/sentinel-golang v1.0.2
+	github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha
 	github.com/go-ole/go-ole v1.2.5 // indirect
-	github.com/golang/protobuf v1.4.2
+	github.com/golang/protobuf v1.4.3
 	github.com/micro/go-micro/v2 v2.9.1
-	github.com/stretchr/testify v1.5.1
-)
+	github.com/stretchr/testify v1.6.1
+)
diff --git a/pkg/adapters/micro/go.sum b/pkg/adapters/micro/go.sum

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,9 @@`
`15`	`15`	`package fallback`
`16`	`16`
`17`	`17`	`import (`
`18`		`- "github.com/stretchr/testify/assert"`
`19`	`18`	`"testing"`
	`19`	`+`
	`20`	`+ "github.com/stretchr/testify/assert"`
`20`	`21`	`)`
`21`	`22`
`22`	`23`	`func TestLoadRule(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.13`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/StackExchange/wmi v1.2.1 // indirect`
`7`		`- github.com/alibaba/sentinel-golang v1.0.2`
	`7`	`+ github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha`
`8`	`8`	`github.com/gofiber/fiber/v2 v2.37.1`
`9`		`- github.com/stretchr/testify v1.5.1`
	`9`	`+ github.com/stretchr/testify v1.6.1`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/alibaba/sentinel-golang/pkg/adapters/go-zero`
`3`	`3`	`go 1.17`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/alibaba/sentinel-golang v1.0.2`
	`6`	`+ github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha`
`7`	`7`	`github.com/stretchr/testify v1.7.0`
`8`	`8`	`github.com/zeromicro/go-zero v1.3.0`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/alibaba/sentinel-golang/pkg/adapters/hertz`
`3`	`3`	`go 1.16`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/alibaba/sentinel-golang v1.0.4`
	`6`	`+ github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha`
`7`	`7`	`github.com/cloudwego/hertz v0.2.0`
`8`	`8`	`github.com/stretchr/testify v1.8.0`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/alibaba/sentinel-golang/pkg/adapters/iris/v12`
`3`	`3`	`go 1.20`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/alibaba/sentinel-golang v1.0.4`
	`6`	`+ github.com/alibaba/sentinel-golang v1.0.5-aliyun-alpha`
`7`	`7`	`github.com/kataras/iris/v12 v12.2.0`
`8`	`8`	`)`
`9`	`9`