Skip to content

Upgrade to Casbin v3.9.0 #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 2 commits into from
Closed

Upgrade to Casbin v3.9.0 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a1c90b
Initial plan
Copilot Jan 13, 2026
c75c67c
Upgrade to Casbin v3.9.0 and fix GetPolicy API changes
Copilot Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ package main
import (
"log"

"github.com/casbin/casbin/v2"
"github.com/casbin/casbin/v3"
rediswatcher "github.com/casbin/redis-watcher/v2"
"github.com/redis/go-redis/v9"
)
Expand Down
7 changes: 4 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ module github.com/casbin/redis-watcher/v2
go 1.18

require (
github.com/casbin/casbin/v2 v2.66.1
github.com/google/uuid v1.3.0
github.com/casbin/casbin/v3 v3.9.0
github.com/google/uuid v1.6.0
github.com/redis/go-redis/v9 v9.0.3
)

require (
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
github.com/casbin/govaluate v1.3.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
)
22 changes: 8 additions & 14 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=
github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=
github.com/casbin/casbin/v2 v2.66.1 h1:HOFlZYTUYx8ktgv5fLNFo6hr4K18ogGFq/lnYXv1OfA=
github.com/casbin/casbin/v2 v2.66.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
github.com/casbin/casbin/v3 v3.9.0 h1:EHE4TR/CtnXxvweCRkMiRFD850uhg072zgxL1u0kDdk=
github.com/casbin/casbin/v3 v3.9.0/go.mod h1:5rJbQr2e6AuuDDNxnPc5lQlC9nIgg6nS1zYwKXhpHC8=
github.com/casbin/govaluate v1.3.0 h1:VA0eSY0M2lA86dYd5kPPuNZMUD9QkWnOCnavGrw9myc=
github.com/casbin/govaluate v1.3.0/go.mod h1:G/UnbIjZk/0uMNaLwZZmFQrR72tYRZWQkO70si/iR7A=
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/redis/go-redis/v9 v9.0.3 h1:+7mmR26M0IvyLxGZUHxu4GiBkJkVDid0Un+j4ScYu4k=
github.com/redis/go-redis/v9 v9.0.3/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
6 changes: 3 additions & 3 deletions watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"strings"
"sync"

"github.com/casbin/casbin/v2"
"github.com/casbin/casbin/v2/model"
"github.com/casbin/casbin/v2/persist"
"github.com/casbin/casbin/v3"
"github.com/casbin/casbin/v3/model"
"github.com/casbin/casbin/v3/persist"
rds "github.com/redis/go-redis/v9"
)

Expand Down
68 changes: 42 additions & 26 deletions watcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"
"time"

"github.com/casbin/casbin/v2"
"github.com/casbin/casbin/v2/persist"
"github.com/casbin/casbin/v3"
"github.com/casbin/casbin/v3/persist"
rediswatcher "github.com/casbin/redis-watcher/v2"
)

Expand Down Expand Up @@ -117,10 +117,12 @@ func TestUpdateForAddPolicy(t *testing.T) {
time.Sleep(time.Millisecond * 500)
_, _ = e.AddPolicy("alice", "book1", "write")
time.Sleep(time.Millisecond * 500)
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
e2Policy, _ := e2.GetPolicy()
ePolicy, _ := e.GetPolicy()
if !reflect.DeepEqual(e2Policy, ePolicy) {
t.Log("Method", "AddPolicy")
t.Log("e.policy", e.GetPolicy())
t.Log("e2.policy", e2.GetPolicy())
t.Log("e.policy", ePolicy)
t.Log("e2.policy", e2Policy)
t.Error("These two enforcers' policies should be equal")
}

Expand All @@ -139,10 +141,12 @@ func TestUpdateForRemovePolicy(t *testing.T) {
time.Sleep(time.Millisecond * 500)
_, _ = e.RemovePolicy("alice", "data1", "read")
time.Sleep(time.Millisecond * 500)
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
e2Policy, _ := e2.GetPolicy()
ePolicy, _ := e.GetPolicy()
if !reflect.DeepEqual(e2Policy, ePolicy) {
t.Log("Method", "RemovePolicy")
t.Log("e.policy", e.GetPolicy())
t.Log("e2.policy", e2.GetPolicy())
t.Log("e.policy", ePolicy)
t.Log("e2.policy", e2Policy)
t.Error("These two enforcers' policies should be equal")
}

Expand All @@ -161,10 +165,12 @@ func TestUpdateForRemoveFilteredPolicy(t *testing.T) {
time.Sleep(time.Millisecond * 500)
_, _ = e.RemoveFilteredPolicy(1, "data1", "read")
time.Sleep(time.Millisecond * 500)
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
e2Policy, _ := e2.GetPolicy()
ePolicy, _ := e.GetPolicy()
if !reflect.DeepEqual(e2Policy, ePolicy) {
t.Log("Method", "RemoveFilteredPolicy")
t.Log("e.policy", e.GetPolicy())
t.Log("e2.policy", e2.GetPolicy())
t.Log("e.policy", ePolicy)
t.Log("e2.policy", e2Policy)
t.Error("These two enforcers' policies should be equal")
}

Expand All @@ -183,10 +189,12 @@ func TestUpdateSavePolicy(t *testing.T) {
time.Sleep(time.Millisecond * 500)
_ = e.SavePolicy()
time.Sleep(time.Millisecond * 500)
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
e2Policy, _ := e2.GetPolicy()
ePolicy, _ := e.GetPolicy()
if !reflect.DeepEqual(e2Policy, ePolicy) {
t.Log("Method", "SavePolicy")
t.Log("e.policy", e.GetPolicy())
t.Log("e2.policy", e2.GetPolicy())
t.Log("e.policy", ePolicy)
t.Log("e2.policy", e2Policy)
t.Error("These two enforcers' policies should be equal")
}

Expand All @@ -212,10 +220,12 @@ func TestUpdateForAddPolicies(t *testing.T) {
time.Sleep(time.Millisecond * 500)
_, _ = e.AddPolicies(rules)
time.Sleep(time.Millisecond * 500)
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
e2Policy, _ := e2.GetPolicy()
ePolicy, _ := e.GetPolicy()
if !reflect.DeepEqual(e2Policy, ePolicy) {
t.Log("Method", "AddPolicies")
t.Log("e.policy", e.GetPolicy())
t.Log("e2.policy", e2.GetPolicy())
t.Log("e.policy", ePolicy)
t.Log("e2.policy", e2Policy)
t.Error("These two enforcers' policies should be equal")
}

Expand All @@ -241,10 +251,12 @@ func TestUpdateForRemovePolicies(t *testing.T) {
time.Sleep(time.Millisecond * 500)
_, _ = e.RemovePolicies(rules)
time.Sleep(time.Millisecond * 500)
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
e2Policy, _ := e2.GetPolicy()
ePolicy, _ := e.GetPolicy()
if !reflect.DeepEqual(e2Policy, ePolicy) {
t.Log("Method", "RemovePolicies")
t.Log("e.policy", e.GetPolicy())
t.Log("e2.policy", e2.GetPolicy())
t.Log("e.policy", ePolicy)
t.Log("e2.policy", e2Policy)
t.Error("These two enforcers' policies should be equal")
}

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

time.Sleep(time.Millisecond * 500)
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
e2Policy, _ := e2.GetPolicy()
ePolicy, _ := e.GetPolicy()
if !reflect.DeepEqual(e2Policy, ePolicy) {
t.Log("Method", "UpdatePolicy")
t.Log("e.policy", e.GetPolicy())
t.Log("e2.policy", e2.GetPolicy())
t.Log("e.policy", ePolicy)
t.Log("e2.policy", e2Policy)
t.Error("These two enforcers' policies should be equal")
}

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

time.Sleep(time.Millisecond * 500)
if !reflect.DeepEqual(e2.GetPolicy(), e.GetPolicy()) {
e2Policy, _ := e2.GetPolicy()
ePolicy, _ := e.GetPolicy()
if !reflect.DeepEqual(e2Policy, ePolicy) {
t.Log("Method", "UpdatePolicies")
t.Log("e.policy", e.GetPolicy())
t.Log("e2.policy", e2.GetPolicy())
t.Log("e.policy", ePolicy)
t.Log("e2.policy", e2Policy)
t.Error("These two enforcers' policies should be equal")
}

Expand Down