fix service merge problem for policy (koderover#1881)

Signed-off-by: Min Min <[email protected]> Signed-off-by: Min Min <[email protected]> Co-authored-by: Min Min <[email protected]>
aw-soyoker · Aug 16, 2022 · 13c2a9c · 13c2a9c
1 parent c8e81f9
commit 13c2a9c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -224,6 +224,10 @@ func MongoDatabase() string {
 	return viper.GetString(setting.ENVAslanDBName)
 }
 
+func PolicyDatabase() string {
+	return MongoDatabase() + "_policy"
+}
+
 func MysqlUser() string {
 	return viper.GetString(setting.ENVMysqlUser)
 }

diff --git a/pkg/microservice/policy/core/repository/mongodb/policy.go b/pkg/microservice/policy/core/repository/mongodb/policy.go
@@ -39,7 +39,7 @@ type PolicyColl struct {
 func NewPolicyColl() *PolicyColl {
 	name := models.Policy{}.TableName()
 	return &PolicyColl{
-		Collection: mongotool.Database(config.MongoDatabase()).Collection(name),
+		Collection: mongotool.Database(config.PolicyDatabase()).Collection(name),
 		coll:       name,
 	}
 }

diff --git a/pkg/microservice/policy/core/repository/mongodb/policy_binding.go b/pkg/microservice/policy/core/repository/mongodb/policy_binding.go
@@ -43,7 +43,7 @@ type PolicyBindingColl struct {
 func NewPolicyBindingColl() *PolicyBindingColl {
 	name := models.PolicyBinding{}.TableName()
 	return &PolicyBindingColl{
-		Collection: mongotool.Database(config.MongoDatabase()).Collection(name),
+		Collection: mongotool.Database(config.PolicyDatabase()).Collection(name),
 		coll:       name,
 	}
 }

diff --git a/pkg/microservice/policy/core/repository/mongodb/policy_meta_registration.go b/pkg/microservice/policy/core/repository/mongodb/policy_meta_registration.go
@@ -38,7 +38,7 @@ type PolicyMetaColl struct {
 func NewPolicyMetaColl() *PolicyMetaColl {
 	name := models.PolicyMeta{}.TableName()
 	return &PolicyMetaColl{
-		Collection: mongotool.Database(config.MongoDatabase()).Collection(name),
+		Collection: mongotool.Database(config.PolicyDatabase()).Collection(name),
 		coll:       name,
 	}
 }

diff --git a/pkg/microservice/policy/core/repository/mongodb/role.go b/pkg/microservice/policy/core/repository/mongodb/role.go
@@ -39,7 +39,7 @@ type RoleColl struct {
 func NewRoleColl() *RoleColl {
 	name := models.Role{}.TableName()
 	return &RoleColl{
-		Collection: mongotool.Database(config.MongoDatabase()).Collection(name),
+		Collection: mongotool.Database(config.PolicyDatabase()).Collection(name),
 		coll:       name,
 	}
 }

diff --git a/pkg/microservice/policy/core/repository/mongodb/role_binding.go b/pkg/microservice/policy/core/repository/mongodb/role_binding.go
@@ -43,7 +43,7 @@ type RoleBindingColl struct {
 func NewRoleBindingColl() *RoleBindingColl {
 	name := models.RoleBinding{}.TableName()
 	return &RoleBindingColl{
-		Collection: mongotool.Database(config.MongoDatabase()).Collection(name),
+		Collection: mongotool.Database(config.PolicyDatabase()).Collection(name),
 		coll:       name,
 	}
 }