Skip to content

Commit

Permalink
Merge 218f01c into bcf37da
Browse files Browse the repository at this point in the history
  • Loading branch information
@nodece
nodece committed Jul 15, 2020
2 parents bcf37da + 218f01c commit 1378119
Show file tree
Hide file tree
Showing 29 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -4,7 +4,7 @@ Casbin
[![Go Report Card](https://goreportcard.com/badge/github.com/casbin/casbin)](https://goreportcard.com/report/github.com/casbin/casbin)
[![Build Status](https://travis-ci.org/casbin/casbin.svg?branch=master)](https://travis-ci.org/casbin/casbin)
[![Coverage Status](https://coveralls.io/repos/github/casbin/casbin/badge.svg?branch=master)](https://coveralls.io/github/casbin/casbin?branch=master)
[![Godoc](https://godoc.org/github.com/casbin/casbin?status.svg)](https://pkg.go.dev/github.com/casbin/casbin/v2)
[![Godoc](https://godoc.org/github.com/casbin/casbin?status.svg)](https://pkg.go.dev/github.com/casbin/casbin/v3)
[![Release](https://img.shields.io/github/release/casbin/casbin.svg)](https://github.com/casbin/casbin/releases/latest)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/casbin/lobby)
[![Sourcegraph](https://sourcegraph.com/github.com/casbin/casbin/-/badge.svg)](https://sourcegraph.com/github.com/casbin/casbin?badge)
Expand Down
16 changes: 8 additions & 8 deletions enforcer.go
View file
Expand Up @@ -20,14 +20,14 @@ import (
"strings"

"github.com/Knetic/govaluate"
"github.com/casbin/casbin/v2/effect"
"github.com/casbin/casbin/v2/log"
"github.com/casbin/casbin/v2/model"
"github.com/casbin/casbin/v2/persist"
fileadapter "github.com/casbin/casbin/v2/persist/file-adapter"
"github.com/casbin/casbin/v2/rbac"
defaultrolemanager "github.com/casbin/casbin/v2/rbac/default-role-manager"
"github.com/casbin/casbin/v2/util"
"github.com/casbin/casbin/v3/effect"
"github.com/casbin/casbin/v3/log"
"github.com/casbin/casbin/v3/model"
"github.com/casbin/casbin/v3/persist"
fileadapter "github.com/casbin/casbin/v3/persist/file-adapter"
"github.com/casbin/casbin/v3/rbac"
defaultrolemanager "github.com/casbin/casbin/v3/rbac/default-role-manager"
"github.com/casbin/casbin/v3/util"
)

// Enforcer is the main interface for authorization enforcement and policy management.
Expand Down
8 changes: 4 additions & 4 deletions enforcer_interface.go
View file
Expand Up @@ -16,10 +16,10 @@ package casbin

import (
"github.com/Knetic/govaluate"
"github.com/casbin/casbin/v2/effect"
"github.com/casbin/casbin/v2/model"
"github.com/casbin/casbin/v2/persist"
"github.com/casbin/casbin/v2/rbac"
"github.com/casbin/casbin/v3/effect"
"github.com/casbin/casbin/v3/model"
"github.com/casbin/casbin/v3/persist"
"github.com/casbin/casbin/v3/rbac"
)

var _ IEnforcer = &Enforcer{}
Expand Down
4 changes: 2 additions & 2 deletions enforcer_synced.go
View file
Expand Up @@ -20,8 +20,8 @@ import (
"time"

"github.com/Knetic/govaluate"
"github.com/casbin/casbin/v2/log"
"github.com/casbin/casbin/v2/persist"
"github.com/casbin/casbin/v3/log"
"github.com/casbin/casbin/v3/persist"
)

// SyncedEnforcer wraps Enforcer and provides synchronized access
Expand Down
6 changes: 3 additions & 3 deletions enforcer_test.go
View file
Expand Up @@ -18,9 +18,9 @@ import (
"sync"
"testing"

"github.com/casbin/casbin/v2/model"
fileadapter "github.com/casbin/casbin/v2/persist/file-adapter"
"github.com/casbin/casbin/v2/util"
"github.com/casbin/casbin/v3/model"
fileadapter "github.com/casbin/casbin/v3/persist/file-adapter"
"github.com/casbin/casbin/v3/util"
)

func TestKeyMatchModelInMemory(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion error_test.go
View file
Expand Up @@ -17,7 +17,7 @@ package casbin
import (
"testing"

"github.com/casbin/casbin/v2/persist/file-adapter"
"github.com/casbin/casbin/v3/persist/file-adapter"
)

func TestPathError(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion filter_test.go
View file
Expand Up @@ -17,7 +17,7 @@ package casbin
import (
"testing"

"github.com/casbin/casbin/v2/persist/file-adapter"
"github.com/casbin/casbin/v3/persist/file-adapter"
)

func TestInitFilteredAdapter(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
@@ -1,4 +1,4 @@
module github.com/casbin/casbin/v2
module github.com/casbin/casbin/v3

require github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible

Expand Down
4 changes: 2 additions & 2 deletions internal_api.go
View file
Expand Up @@ -15,8 +15,8 @@
package casbin

import (
"github.com/casbin/casbin/v2/model"
"github.com/casbin/casbin/v2/persist"
"github.com/casbin/casbin/v3/model"
"github.com/casbin/casbin/v3/persist"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion management_api_test.go
View file
Expand Up @@ -17,7 +17,7 @@ package casbin
import (
"testing"

"github.com/casbin/casbin/v2/util"
"github.com/casbin/casbin/v3/util"
)

func testStringList(t *testing.T, title string, f func() []string, res []string) {
Expand Down
4 changes: 2 additions & 2 deletions model/assertion.go
View file
Expand Up @@ -18,8 +18,8 @@ import (
"errors"
"strings"

"github.com/casbin/casbin/v2/log"
"github.com/casbin/casbin/v2/rbac"
"github.com/casbin/casbin/v3/log"
"github.com/casbin/casbin/v3/rbac"
)

// Assertion represents an expression in a section of the model.
Expand Down
2 changes: 1 addition & 1 deletion model/function.go
View file
Expand Up @@ -18,7 +18,7 @@ import (
"sync"

"github.com/Knetic/govaluate"
"github.com/casbin/casbin/v2/util"
"github.com/casbin/casbin/v3/util"
)

// FunctionMap represents the collection of Function.
Expand Down
6 changes: 3 additions & 3 deletions model/model.go
View file
Expand Up @@ -19,9 +19,9 @@ import (
"strconv"
"strings"

"github.com/casbin/casbin/v2/config"
"github.com/casbin/casbin/v2/log"
"github.com/casbin/casbin/v2/util"
"github.com/casbin/casbin/v3/config"
"github.com/casbin/casbin/v3/log"
"github.com/casbin/casbin/v3/util"
)

// Model represents the whole access control model.
Expand Down
2 changes: 1 addition & 1 deletion model/model_test.go
View file
Expand Up @@ -15,7 +15,7 @@
package model

import (
"github.com/casbin/casbin/v2/config"
"github.com/casbin/casbin/v3/config"
"io/ioutil"
"path/filepath"
"strings"
Expand Down
6 changes: 3 additions & 3 deletions model/policy.go
View file
Expand Up @@ -17,9 +17,9 @@ package model
import (
"strings"

"github.com/casbin/casbin/v2/log"
"github.com/casbin/casbin/v2/rbac"
"github.com/casbin/casbin/v2/util"
"github.com/casbin/casbin/v3/log"
"github.com/casbin/casbin/v3/rbac"
"github.com/casbin/casbin/v3/util"
)

type (
Expand Down
8 changes: 4 additions & 4 deletions model_test.go
View file
Expand Up @@ -17,10 +17,10 @@ package casbin
import (
"testing"

fileadapter "github.com/casbin/casbin/v2/persist/file-adapter"
"github.com/casbin/casbin/v2/rbac"
defaultrolemanager "github.com/casbin/casbin/v2/rbac/default-role-manager"
"github.com/casbin/casbin/v2/util"
fileadapter "github.com/casbin/casbin/v3/persist/file-adapter"
"github.com/casbin/casbin/v3/rbac"
defaultrolemanager "github.com/casbin/casbin/v3/rbac/default-role-manager"
"github.com/casbin/casbin/v3/util"
)

func testEnforce(t *testing.T, e *Enforcer, sub interface{}, obj interface{}, act string, res bool) {
Expand Down
2 changes: 1 addition & 1 deletion persist/adapter.go
View file
Expand Up @@ -18,7 +18,7 @@ import (
"encoding/csv"
"strings"

"github.com/casbin/casbin/v2/model"
"github.com/casbin/casbin/v3/model"
)

// LoadPolicyLine loads a text line as a policy rule to model.
Expand Down
2 changes: 1 addition & 1 deletion persist/adapter_filtered.go
View file
Expand Up @@ -15,7 +15,7 @@
package persist

import (
"github.com/casbin/casbin/v2/model"
"github.com/casbin/casbin/v3/model"
)

// FilteredAdapter is the interface for Casbin adapters supporting filtered policies.
Expand Down
6 changes: 3 additions & 3 deletions persist/file-adapter/adapter.go
View file
Expand Up @@ -21,9 +21,9 @@ import (
"os"
"strings"

"github.com/casbin/casbin/v2/model"
"github.com/casbin/casbin/v2/persist"
"github.com/casbin/casbin/v2/util"
"github.com/casbin/casbin/v3/model"
"github.com/casbin/casbin/v3/persist"
"github.com/casbin/casbin/v3/util"
)

// Adapter is the file adapter for Casbin.
Expand Down
4 changes: 2 additions & 2 deletions persist/file-adapter/adapter_filtered.go
View file
Expand Up @@ -20,8 +20,8 @@ import (
"os"
"strings"

"github.com/casbin/casbin/v2/model"
"github.com/casbin/casbin/v2/persist"
"github.com/casbin/casbin/v3/model"
"github.com/casbin/casbin/v3/persist"
)

// FilteredAdapter is the filtered file adapter for Casbin. It can load policy
Expand Down
4 changes: 2 additions & 2 deletions persist/file-adapter/adapter_mock.go
View file
Expand Up @@ -21,8 +21,8 @@ import (
"os"
"strings"

"github.com/casbin/casbin/v2/model"
"github.com/casbin/casbin/v2/persist"
"github.com/casbin/casbin/v3/model"
"github.com/casbin/casbin/v3/persist"
)

// AdapterMock is the file adapter for Casbin.
Expand Down
2 changes: 1 addition & 1 deletion persist/watcher_ex.go
View file
Expand Up @@ -14,7 +14,7 @@

package persist

import "github.com/casbin/casbin/v2/model"
import "github.com/casbin/casbin/v3/model"

// WatcherEx is the strengthen for Casbin watchers.
type WatcherEx interface {
Expand Down
6 changes: 3 additions & 3 deletions rbac/default-role-manager/role_manager.go
View file
Expand Up @@ -18,9 +18,9 @@ import (
"strings"
"sync"

"github.com/casbin/casbin/v2/errors"
"github.com/casbin/casbin/v2/log"
"github.com/casbin/casbin/v2/rbac"
"github.com/casbin/casbin/v3/errors"
"github.com/casbin/casbin/v3/log"
"github.com/casbin/casbin/v3/rbac"
)

const defaultDomain string = "casbin::default"
Expand Down
4 changes: 2 additions & 2 deletions rbac/default-role-manager/role_manager_test.go
View file
Expand Up @@ -17,8 +17,8 @@ package defaultrolemanager
import (
"testing"

"github.com/casbin/casbin/v2/rbac"
"github.com/casbin/casbin/v2/util"
"github.com/casbin/casbin/v3/rbac"
"github.com/casbin/casbin/v3/util"
)

func testRole(t *testing.T, rm rbac.RoleManager, name1 string, name2 string, res bool) {
Expand Down
2 changes: 1 addition & 1 deletion rbac_api.go
View file
Expand Up @@ -17,7 +17,7 @@ package casbin
import (
"errors"

"github.com/casbin/casbin/v2/util"
"github.com/casbin/casbin/v3/util"
)

// GetRolesForUser gets the roles that a user has.
Expand Down
6 changes: 3 additions & 3 deletions rbac_api_test.go
View file
Expand Up @@ -18,10 +18,10 @@ import (
"sort"
"testing"

defaultrolemanager "github.com/casbin/casbin/v2/rbac/default-role-manager"
defaultrolemanager "github.com/casbin/casbin/v3/rbac/default-role-manager"

"github.com/casbin/casbin/v2/errors"
"github.com/casbin/casbin/v2/util"
"github.com/casbin/casbin/v3/errors"
"github.com/casbin/casbin/v3/util"
)

func testGetRoles(t *testing.T, e *Enforcer, res []string, name string, domain ...string) {
Expand Down
2 changes: 1 addition & 1 deletion rbac_api_with_domains_test.go
View file
Expand Up @@ -17,7 +17,7 @@ package casbin
import (
"testing"

"github.com/casbin/casbin/v2/util"
"github.com/casbin/casbin/v3/util"
)

// testGetUsersInDomain: Add by Gordon
Expand Down
2 changes: 1 addition & 1 deletion util/builtin_operators.go
View file
Expand Up @@ -23,7 +23,7 @@ import (
"strings"

"github.com/Knetic/govaluate"
"github.com/casbin/casbin/v2/rbac"
"github.com/casbin/casbin/v3/rbac"
)

// validate the variadic parameter size and type as string
Expand Down
2 changes: 1 addition & 1 deletion watcher_ex_test.go
View file
Expand Up @@ -17,7 +17,7 @@ package casbin
import (
"testing"

"github.com/casbin/casbin/v2/model"
"github.com/casbin/casbin/v3/model"
)

type SampleWatcherEx struct {
Expand Down

0 comments on commit 1378119

Please sign in to comment.