[servicecomb-service-center] branch master updated: #1228 replica role use dao

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

robotljw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
     new dcf1e61  #1228 replica role use dao
     new 97b07f3  Merge pull request #1266 from aseTo2016/master
dcf1e61 is described below

commit dcf1e6134faad01f74422b6d067c12fb2dae41b6
Author: aseTo2016 <tys201193111>
AuthorDate: Wed Feb 16 15:33:56 2022 +0800

    #1228 replica role use dao
---
 syncer/service/replicator/resource/role.go      | 16 ++++++++--------
 syncer/service/replicator/resource/role_test.go | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/syncer/service/replicator/resource/role.go b/syncer/service/replicator/resource/role.go
index d2a8df9..ec5a60c 100644
--- a/syncer/service/replicator/resource/role.go
+++ b/syncer/service/replicator/resource/role.go
@@ -2,15 +2,14 @@ package resource
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
+	"github.com/apache/servicecomb-service-center/datasource/rbac"
 	"github.com/apache/servicecomb-service-center/pkg/log"
-	servicerbac "github.com/apache/servicecomb-service-center/server/service/rbac"
 	v1sync "github.com/apache/servicecomb-service-center/syncer/api/v1"
 
-	"github.com/go-chassis/cari/pkg/errsvc"
 	crbac "github.com/go-chassis/cari/rbac"
-	rbacmodel "github.com/go-chassis/cari/rbac"
 )
 
 const (
@@ -76,7 +75,7 @@ func (r *role) LoadCurrentResource(ctx context.Context) *Result {
 
 	cur, err := r.manager.GetRole(ctx, r.roleName)
 	if err != nil {
-		if errsvc.IsErrEqualCode(err, rbacmodel.ErrRoleNotExist) {
+		if errors.Is(err, rbac.ErrRoleNotExist) {
 			return nil
 		}
 		return FailResult(err)
@@ -125,17 +124,18 @@ func (r *role) Operate(ctx context.Context) *Result {
 }
 
 func (r *role) GetRole(ctx context.Context, name string) (*crbac.Role, error) {
-	return servicerbac.GetRole(ctx, name)
+	return rbac.Instance().GetRole(ctx, name)
 }
 
 func (r *role) EditRole(ctx context.Context, name string, role *crbac.Role) error {
-	return servicerbac.EditRole(ctx, name, role)
+	return rbac.Instance().UpdateRole(ctx, name, role)
 }
 
 func (r *role) CreateRole(ctx context.Context, role *crbac.Role) error {
-	return servicerbac.CreateRole(ctx, role)
+	return rbac.Instance().CreateRole(ctx, role)
 }
 
 func (r *role) DeleteRole(ctx context.Context, name string) error {
-	return servicerbac.DeleteRole(ctx, name)
+	_, err := rbac.Instance().DeleteRole(ctx, name)
+	return err
 }
diff --git a/syncer/service/replicator/resource/role_test.go b/syncer/service/replicator/resource/role_test.go
index 8fa8816..9e63475 100644
--- a/syncer/service/replicator/resource/role_test.go
+++ b/syncer/service/replicator/resource/role_test.go
@@ -3,15 +3,15 @@ package resource
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"strconv"
 	"testing"
 	"time"
 
 	v1sync "github.com/apache/servicecomb-service-center/syncer/api/v1"
 
-	"github.com/go-chassis/cari/pkg/errsvc"
+	datasourcerbac "github.com/apache/servicecomb-service-center/datasource/rbac"
 	"github.com/go-chassis/cari/rbac"
-	rbacmodel "github.com/go-chassis/cari/rbac"
 	"github.com/go-chassis/cari/sync"
 	"github.com/stretchr/testify/assert"
 )
@@ -23,7 +23,7 @@ type mockRole struct {
 func (f mockRole) GetRole(_ context.Context, name string) (*rbac.Role, error) {
 	result, ok := f.roles[name]
 	if !ok {
-		return nil, rbacmodel.NewError(rbacmodel.ErrRoleNotExist, "")
+		return nil, datasourcerbac.ErrRoleNotExist
 	}
 	return result, nil
 }
@@ -31,7 +31,7 @@ func (f mockRole) GetRole(_ context.Context, name string) (*rbac.Role, error) {
 func (f mockRole) EditRole(_ context.Context, name string, r *rbac.Role) error {
 	_, ok := f.roles[name]
 	if !ok {
-		return rbacmodel.NewError(rbacmodel.ErrRoleNotExist, "")
+		return datasourcerbac.ErrRoleNotExist
 	}
 	f.roles[name] = r
 	return nil
@@ -40,7 +40,7 @@ func (f mockRole) EditRole(_ context.Context, name string, r *rbac.Role) error {
 func (f mockRole) CreateRole(_ context.Context, r *rbac.Role) error {
 	_, ok := f.roles[r.Name]
 	if ok {
-		return rbacmodel.NewError(rbacmodel.ErrRoleConflict, "role exist")
+		return datasourcerbac.ErrRoleDuplicated
 	}
 
 	f.roles[r.Name] = r
@@ -50,7 +50,7 @@ func (f mockRole) CreateRole(_ context.Context, r *rbac.Role) error {
 func (f mockRole) DeleteRole(_ context.Context, name string) error {
 	_, ok := f.roles[name]
 	if !ok {
-		return rbacmodel.NewError(rbacmodel.ErrRoleNotExist, "")
+		return datasourcerbac.ErrRoleNotExist
 	}
 
 	delete(f.roles, name)
@@ -170,7 +170,7 @@ func TestOperateRole(t *testing.T) {
 			if assert.NotNil(t, result) && assert.Equal(t, Success, result.Status) {
 				_, err := a1.manager.GetRole(ctx, "admin")
 				assert.NotNil(t, err)
-				assert.True(t, errsvc.IsErrEqualCode(err, rbacmodel.ErrRoleNotExist))
+				assert.True(t, errors.Is(err, datasourcerbac.ErrRoleNotExist))
 			}
 		}
 	}