Skip to content

Commit 87539c9

Browse files
committed
feat: upgrade casbin dependency to v2.100.0
1 parent 16aa502 commit 87539c9

File tree

3 files changed

+25
-18
lines changed

3 files changed

+25
-18
lines changed

adapter_test.go

+16-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ import (
3737
)
3838

3939
func testGetPolicy(t *testing.T, e *casbin.Enforcer, res [][]string) {
40-
myRes := e.GetPolicy()
40+
myRes, err := e.GetPolicy()
41+
if err != nil {
42+
panic(err)
43+
}
44+
4145
log.Print("Policy: ", myRes)
4246

4347
if !util.Array2DEquals(res, myRes) {
@@ -46,7 +50,11 @@ func testGetPolicy(t *testing.T, e *casbin.Enforcer, res [][]string) {
4650
}
4751

4852
func testGetPolicyWithoutOrder(t *testing.T, e *casbin.Enforcer, res [][]string) {
49-
myRes := e.GetPolicy()
53+
myRes, err := e.GetPolicy()
54+
if err != nil {
55+
panic(err)
56+
}
57+
5058
log.Print("Policy: ", myRes)
5159

5260
if !arrayEqualsWithoutOrder(myRes, res) {
@@ -763,7 +771,12 @@ func TestTransactionRace(t *testing.T) {
763771
require.NoError(t, g.Wait())
764772

765773
for i := 0; i < concurrency; i++ {
766-
require.True(t, e.HasPolicy("jack", fmt.Sprintf("data%d", i), "write"))
774+
hasPolicy, err := e.HasPolicy("jack", fmt.Sprintf("data%d", i), "write")
775+
if err != nil {
776+
panic(err)
777+
}
778+
779+
require.True(t, hasPolicy)
767780
}
768781
}
769782

go.mod

+3-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/casbin/gorm-adapter/v3
33
go 1.20
44

55
require (
6-
github.com/casbin/casbin/v2 v2.77.1
6+
github.com/casbin/casbin/v2 v2.100.0
77
github.com/glebarez/sqlite v1.7.0
88
github.com/go-sql-driver/mysql v1.7.0
99
github.com/lib/pq v1.10.2
@@ -17,7 +17,8 @@ require (
1717
)
1818

1919
require (
20-
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
20+
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
21+
github.com/casbin/govaluate v1.2.0 // indirect
2122
github.com/davecgh/go-spew v1.1.1 // indirect
2223
github.com/dustin/go-humanize v1.0.1 // indirect
2324
github.com/glebarez/go-sqlite v1.20.3 // indirect
@@ -36,9 +37,6 @@ require (
3637
github.com/pmezard/go-difflib v1.0.0 // indirect
3738
github.com/remyoudompheng/bigfft v0.0.0-20230126093431-47fa9a501578 // indirect
3839
github.com/rogpeppe/go-internal v1.12.0 // indirect
39-
github.com/tidwall/gjson v1.14.4 // indirect
40-
github.com/tidwall/match v1.1.1 // indirect
41-
github.com/tidwall/pretty v1.2.0 // indirect
4240
golang.org/x/crypto v0.17.0 // indirect
4341
golang.org/x/sys v0.15.0 // indirect
4442
golang.org/x/text v0.14.0 // indirect

go.sum

+6-10
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v0.8.0/go.mod h
1616
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o=
1717
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.0 h1:HCc0+LpPfpCKs6LGGLAhwBARt9632unrVcI6i8s/8os=
1818
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.0/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
19-
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
20-
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
21-
github.com/casbin/casbin/v2 v2.77.1 h1:+H46VamJCTlmCPcb0N99Zaj4tSorfuvBh3v5lyGopeU=
22-
github.com/casbin/casbin/v2 v2.77.1/go.mod h1:mzGx0hYW9/ksOSpw3wNjk3NRAroq5VMFYUQ6G43iGPk=
19+
github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=
20+
github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
21+
github.com/casbin/casbin/v2 v2.100.0 h1:aeugSNjjHfCrgA22nHkVvw2xsscboHv5r0a13ljQKGQ=
22+
github.com/casbin/casbin/v2 v2.100.0/go.mod h1:LO7YPez4dX3LgoTCqSQAleQDo0S0BeZBDxYnPUl95Ng=
23+
github.com/casbin/govaluate v1.2.0 h1:wXCXFmqyY+1RwiKfYo3jMKyrtZmOL3kHwaqDyCPOYak=
24+
github.com/casbin/govaluate v1.2.0/go.mod h1:G/UnbIjZk/0uMNaLwZZmFQrR72tYRZWQkO70si/iR7A=
2325
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2426
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2527
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -103,12 +105,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
103105
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
104106
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
105107
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
106-
github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
107-
github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
108-
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
109-
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
110-
github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
111-
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
112108
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
113109
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
114110
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

0 commit comments

Comments
 (0)