Master local

dbm-services/common/db-config/internal/api/apply_config.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"bk-dbconfig/pkg/validate"
+	"dbm-services/common/go-pubpkg/validate"
 )
 
 // ApplyConfigItem TODO

dbm-services/common/db-config/internal/api/config_item.go

@@ -2,7 +2,8 @@ package api
 
 import (
 	"bk-dbconfig/pkg/constvar"
-	"bk-dbconfig/pkg/validate"
+
+	"dbm-services/common/go-pubpkg/validate"
 
 	"github.com/pkg/errors"
 )

dbm-services/common/db-config/internal/api/config_plat.go

@@ -1,7 +1,9 @@
 package api
 
 import (
-	"bk-dbconfig/pkg/validate"
+	"bk-dbconfig/pkg/validatestruct"
+
+	"dbm-services/common/go-pubpkg/validate"
 )
 
 // UpsertConfFilePlatReq TODO
@@ -42,7 +44,7 @@ func (f *UpsertConfFilePlatReq) Validate() error {
 		if err := validate.GoValidateStruct(*c, true); err != nil {
 			return err
 		}
-		valueTypeSub := validate.ValueTypeDef{ValueType: c.ValueType, ValueTypeSub: c.ValueTypeSub}
+		valueTypeSub := validatestruct.ValueTypeDef{ValueType: c.ValueType, ValueTypeSub: c.ValueTypeSub}
 		if err := valueTypeSub.Validate(); err != nil {
 			return err
 		}

dbm-services/common/db-config/internal/api/dbha.go

@@ -1,6 +1,8 @@
 package api
 
-import "bk-dbconfig/pkg/validate"
+import (
+	"dbm-services/common/go-pubpkg/validate"
+)
 
 // BatchGetConfigItemReq TODO
 // 批量获取多个对象的某一配置项

dbm-services/common/db-config/internal/handler/simple/config_file.go

@@ -5,7 +5,8 @@ import (
 	"bk-dbconfig/internal/handler"
 	"bk-dbconfig/internal/service/simpleconfig"
 	"bk-dbconfig/pkg/constvar"
-	"bk-dbconfig/pkg/validate"
+
+	"dbm-services/common/go-pubpkg/validate"
 
 	"github.com/gin-gonic/gin"
 )

dbm-services/common/db-config/internal/handler/simple/config_version.go

@@ -12,7 +12,8 @@ import (
 	"bk-dbconfig/pkg/constvar"
 	"bk-dbconfig/pkg/core/logger"
 	"bk-dbconfig/pkg/util"
-	"bk-dbconfig/pkg/validate"
+
+	"dbm-services/common/go-pubpkg/validate"
 
 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"

dbm-services/common/db-config/internal/service/simpleconfig/config_item_format.go

@@ -9,7 +9,7 @@ import (
 	"bk-dbconfig/pkg/constvar"
 	"bk-dbconfig/pkg/core/logger"
 	"bk-dbconfig/pkg/util"
-	"bk-dbconfig/pkg/validate"
+	"bk-dbconfig/pkg/validatestruct"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cast"
@@ -141,17 +141,17 @@ func CastValueType(confName string, confValue string, f api.BaseConfFileDef, val
 	if valueType == "" {
 		return confValue
 	}
-	if valueType == validate.DTypeInt {
+	if valueType == validatestruct.DTypeInt {
 		return cast.ToInt(confValue)
-	} else if valueType == validate.DTypeFloat || valueType == validate.DTypeNumber {
+	} else if valueType == validatestruct.DTypeFloat || valueType == validatestruct.DTypeNumber {
 		return cast.ToFloat32(confValue)
-	} else if valueType == validate.DTypeBool {
+	} else if valueType == validatestruct.DTypeBool {
 		return cmutil.ToBoolExt(confValue)
-	} else if valueType == validate.DTypeString {
-		if valueSubType == validate.DTypeSubList {
+	} else if valueType == validatestruct.DTypeString {
+		if valueSubType == validatestruct.DTypeSubList {
 			newValue := util.SplitAnyRuneTrim(confValue, ",")
 			return newValue
-		} else if valueSubType == validate.DTypeSubMap {
+		} else if valueSubType == validatestruct.DTypeSubMap {
 			mapI := make(map[string]interface{})
 			err := json.Unmarshal([]byte(confValue), &mapI)
 			if err != nil {

dbm-services/common/db-config/internal/service/simpleconfig/config_meta.go

@@ -7,7 +7,7 @@ import (
 	"bk-dbconfig/internal/pkg/errno"
 	"bk-dbconfig/internal/repository/model"
 	"bk-dbconfig/pkg/util"
-	"bk-dbconfig/pkg/validate"
+	"bk-dbconfig/pkg/validatestruct"
 
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
@@ -59,7 +59,7 @@ func CheckConfNameAndValue(c *model.ConfigModel, checkValue bool, valueType, val
 		}
 		cn.ValueDefault = c.ConfValue
 		// 如果不校验 conf_name， 那么 conf_name 可能在 name_def 里没定义，value_type, value_type_sub, value_allowed 都为空
-		err := validate.ValidateConfValue(cn.ValueDefault, cn.ValueType, cn.ValueTypeSub, cn.ValueAllowed)
+		err := validatestruct.ValidateConfValue(cn.ValueDefault, cn.ValueType, cn.ValueTypeSub, cn.ValueAllowed)
 		if err != nil {
 			errors.WithMessage(err, c.ConfName)
 		}