Skip to content

Commit ead01f9

Browse files
hsluoyzhsluoyz
committed
feat: upgrade to Casbin v3.9.0 (#58)
1 parent 6c8eb80 commit ead01f9

File tree

5 files changed

+58
-47
lines changed

5 files changed

+58
-47
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"fmt"
2727
"log"
2828

29-
"github.com/casbin/casbin/v2"
29+
"github.com/casbin/casbin/v3"
3030
rediswatcher "github.com/casbin/redis-watcher/v2"
3131
"github.com/redis/go-redis/v9"
3232
)

‎go.mod‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ module github.com/casbin/redis-watcher/v2
33
go 1.23
44

55
require (
6-
github.com/casbin/casbin/v2 v2.66.1
7-
github.com/google/uuid v1.3.0
6+
github.com/casbin/casbin/v3 v3.9.0
7+
github.com/google/uuid v1.6.0
88
github.com/redis/go-redis/v9 v9.0.3
99
)
1010

1111
require (
12-
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
12+
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
13+
github.com/casbin/govaluate v1.3.0 // indirect
1314
github.com/cespare/xxhash/v2 v2.2.0 // indirect
1415
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
1516
)

‎go.sum‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
1-
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
2-
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
1+
github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=
2+
github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
33
github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
44
github.com/bsm/ginkgo/v2 v2.7.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w=
55
github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=
66
github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
7-
github.com/casbin/casbin/v2 v2.66.1 h1:HOFlZYTUYx8ktgv5fLNFo6hr4K18ogGFq/lnYXv1OfA=
8-
github.com/casbin/casbin/v2 v2.66.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
7+
github.com/casbin/casbin/v3 v3.9.0 h1:EHE4TR/CtnXxvweCRkMiRFD850uhg072zgxL1u0kDdk=
8+
github.com/casbin/casbin/v3 v3.9.0/go.mod h1:5rJbQr2e6AuuDDNxnPc5lQlC9nIgg6nS1zYwKXhpHC8=
9+
github.com/casbin/govaluate v1.3.0 h1:VA0eSY0M2lA86dYd5kPPuNZMUD9QkWnOCnavGrw9myc=
10+
github.com/casbin/govaluate v1.3.0/go.mod h1:G/UnbIjZk/0uMNaLwZZmFQrR72tYRZWQkO70si/iR7A=
911
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
1012
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
1113
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
1214
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
13-
github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
14-
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
15-
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
16-
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
15+
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
16+
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
1717
github.com/redis/go-redis/v9 v9.0.3 h1:+7mmR26M0IvyLxGZUHxu4GiBkJkVDid0Un+j4ScYu4k=
1818
github.com/redis/go-redis/v9 v9.0.3/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
19-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
20-
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
21-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
22-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
23-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
24-
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=

‎watcher.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"strings"
1010
"sync"
1111

12-
"github.com/casbin/casbin/v2"
13-
"github.com/casbin/casbin/v2/model"
14-
"github.com/casbin/casbin/v2/persist"
12+
"github.com/casbin/casbin/v3"
13+
"github.com/casbin/casbin/v3/model"
14+
"github.com/casbin/casbin/v3/persist"
1515
rds "github.com/redis/go-redis/v9"
1616
)
1717

‎watcher_test.go‎

Lines changed: 42 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/casbin/casbin/v2"
12-
"github.com/casbin/casbin/v2/persist"
11+
"github.com/casbin/casbin/v3"
12+
"github.com/casbin/casbin/v3/persist"
1313
rediswatcher "github.com/casbin/redis-watcher/v2"
1414
)
1515

@@ -117,10 +117,12 @@ func TestUpdateForAddPolicy(t *testing.T) {
117117
time.Sleep(time.Millisecond * 500)
118118
_, _ = e.AddPolicy("alice", "book1", "write")
119119
time.Sleep(time.Millisecond * 500)
120-
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
120+
ePolicy, _ := e.GetPolicy()
121+
e2Policy, _ := e2.GetPolicy()
122+
if !reflect.DeepEqual(e2Policy, ePolicy) {
121123
t.Log("Method", "AddPolicy")
122-
t.Log("e.policy", e.GetPolicy())
123-
t.Log("e2.policy", e2.GetPolicy())
124+
t.Log("e.policy", ePolicy)
125+
t.Log("e2.policy", e2Policy)
124126
t.Error("These two enforcers' policies should be equal")
125127
}
126128

@@ -139,10 +141,12 @@ func TestUpdateForRemovePolicy(t *testing.T) {
139141
time.Sleep(time.Millisecond * 500)
140142
_, _ = e.RemovePolicy("alice", "data1", "read")
141143
time.Sleep(time.Millisecond * 500)
142-
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
144+
ePolicy, _ := e.GetPolicy()
145+
e2Policy, _ := e2.GetPolicy()
146+
if !reflect.DeepEqual(e2Policy, ePolicy) {
143147
t.Log("Method", "RemovePolicy")
144-
t.Log("e.policy", e.GetPolicy())
145-
t.Log("e2.policy", e2.GetPolicy())
148+
t.Log("e.policy", ePolicy)
149+
t.Log("e2.policy", e2Policy)
146150
t.Error("These two enforcers' policies should be equal")
147151
}
148152

@@ -161,10 +165,12 @@ func TestUpdateForRemoveFilteredPolicy(t *testing.T) {
161165
time.Sleep(time.Millisecond * 500)
162166
_, _ = e.RemoveFilteredPolicy(1, "data1", "read")
163167
time.Sleep(time.Millisecond * 500)
164-
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
168+
ePolicy, _ := e.GetPolicy()
169+
e2Policy, _ := e2.GetPolicy()
170+
if !reflect.DeepEqual(e2Policy, ePolicy) {
165171
t.Log("Method", "RemoveFilteredPolicy")
166-
t.Log("e.policy", e.GetPolicy())
167-
t.Log("e2.policy", e2.GetPolicy())
172+
t.Log("e.policy", ePolicy)
173+
t.Log("e2.policy", e2Policy)
168174
t.Error("These two enforcers' policies should be equal")
169175
}
170176

@@ -183,10 +189,12 @@ func TestUpdateSavePolicy(t *testing.T) {
183189
time.Sleep(time.Millisecond * 500)
184190
_ = e.SavePolicy()
185191
time.Sleep(time.Millisecond * 500)
186-
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
192+
ePolicy, _ := e.GetPolicy()
193+
e2Policy, _ := e2.GetPolicy()
194+
if !reflect.DeepEqual(e2Policy, ePolicy) {
187195
t.Log("Method", "SavePolicy")
188-
t.Log("e.policy", e.GetPolicy())
189-
t.Log("e2.policy", e2.GetPolicy())
196+
t.Log("e.policy", ePolicy)
197+
t.Log("e2.policy", e2Policy)
190198
t.Error("These two enforcers' policies should be equal")
191199
}
192200

@@ -212,10 +220,12 @@ func TestUpdateForAddPolicies(t *testing.T) {
212220
time.Sleep(time.Millisecond * 500)
213221
_, _ = e.AddPolicies(rules)
214222
time.Sleep(time.Millisecond * 500)
215-
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
223+
ePolicy, _ := e.GetPolicy()
224+
e2Policy, _ := e2.GetPolicy()
225+
if !reflect.DeepEqual(e2Policy, ePolicy) {
216226
t.Log("Method", "AddPolicies")
217-
t.Log("e.policy", e.GetPolicy())
218-
t.Log("e2.policy", e2.GetPolicy())
227+
t.Log("e.policy", ePolicy)
228+
t.Log("e2.policy", e2Policy)
219229
t.Error("These two enforcers' policies should be equal")
220230
}
221231

@@ -241,10 +251,12 @@ func TestUpdateForRemovePolicies(t *testing.T) {
241251
time.Sleep(time.Millisecond * 500)
242252
_, _ = e.RemovePolicies(rules)
243253
time.Sleep(time.Millisecond * 500)
244-
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
254+
ePolicy, _ := e.GetPolicy()
255+
e2Policy, _ := e2.GetPolicy()
256+
if !reflect.DeepEqual(e2Policy, ePolicy) {
245257
t.Log("Method", "RemovePolicies")
246-
t.Log("e.policy", e.GetPolicy())
247-
t.Log("e2.policy", e2.GetPolicy())
258+
t.Log("e.policy", ePolicy)
259+
t.Log("e2.policy", e2Policy)
248260
t.Error("These two enforcers' policies should be equal")
249261
}
250262

@@ -264,10 +276,12 @@ func TestUpdateForUpdatePolicy(t *testing.T) {
264276
_, _ = e.UpdatePolicy([]string{"alice", "data1", "read"}, []string{"alice", "data1", "write"})
265277

266278
time.Sleep(time.Millisecond * 500)
267-
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
279+
ePolicy, _ := e.GetPolicy()
280+
e2Policy, _ := e2.GetPolicy()
281+
if !reflect.DeepEqual(e2Policy, ePolicy) {
268282
t.Log("Method", "UpdatePolicy")
269-
t.Log("e.policy", e.GetPolicy())
270-
t.Log("e2.policy", e2.GetPolicy())
283+
t.Log("e.policy", ePolicy)
284+
t.Log("e2.policy", e2Policy)
271285
t.Error("These two enforcers' policies should be equal")
272286
}
273287

@@ -287,10 +301,12 @@ func TestUpdateForUpdatePolicies(t *testing.T) {
287301
_, _ = e.UpdatePolicies([][]string{{"alice", "data1", "read"}}, [][]string{{"alice", "data1", "write"}})
288302

289303
time.Sleep(time.Millisecond * 500)
290-
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
304+
ePolicy, _ := e.GetPolicy()
305+
e2Policy, _ := e2.GetPolicy()
306+
if !reflect.DeepEqual(e2Policy, ePolicy) {
291307
t.Log("Method", "UpdatePolicies")
292-
t.Log("e.policy", e.GetPolicy())
293-
t.Log("e2.policy", e2.GetPolicy())
308+
t.Log("e.policy", ePolicy)
309+
t.Log("e2.policy", e2Policy)
294310
t.Error("These two enforcers' policies should be equal")
295311
}
296312

0 commit comments

Comments
 (0)