v1.3.0

2023-03-24 17:09:30 +03:00
parent 437841c8dd
commit 84b64b7d80
433 changed files with 4246 additions and 6516 deletions
--- a/internal/validators/custom.go
+++ b/internal/validators/custom.go
@@ -2,6 +2,43 @@ package validators

 import "github.com/go-playground/validator/v10"

+// protoValidator is used to validate Proto fields.
+func protoValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return StringInSlice(fieldValue, protoValues)
+}
+
+// accessTypeValidator is used to validate AccessType fields.
+func accessTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return StringInSlice(fieldValue, accessTypeValues)
+}
+
+// resTypesValidator is used to validate ResTypes fields.
+func resTypesValidator(fe validator.FieldLevel) bool {
+	fieldSlice, ok := fe.Field().Interface().([]string)
+	if !ok {
+		return false
+	}
+
+	for _, value := range fieldSlice {
+		if !StringInSlice(value, resTypesValues) {
+			return false
+		}
+	}
+
+	return true
+}
+
+// driverValidator is used to validate Driver fields.
+func driverValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return StringInSlice(fieldValue, driverValues)
+}
+
 // accountCUTypeValidator is used to validate CUType field.
 func accountCUTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -9,20 +46,6 @@ func accountCUTypeValidator(fe validator.FieldLevel) bool {
 	return StringInSlice(fieldValue, accountCUTypeValues)
 }

-// accountAccessTypeValidator is used to validate AccessType field.
-func accountAccessTypeValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return StringInSlice(fieldValue, accountAccessTypeValues)
-}
-
-// bserviceDriverValidator is used to validate Driver field.
-func bserviceDriverValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return StringInSlice(fieldValue, bserviceDriverValues)
-}
-
 // bserviceModeValidator is used to validate Mode field.
 func bserviceModeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -65,11 +88,76 @@ func computeNetTypeValidator(fe validator.FieldLevel) bool {
 	return StringInSlice(fieldValue, computeNetTypeValues)
 }

-// computeProtoValidator is used to validate Proto field.
-func computeProtoValidator(fe validator.FieldLevel) bool {
+// computeOrderValidator is used to validate Order field.
+func computeOrderValidator(fe validator.FieldLevel) bool {
+	fieldSlice, ok := fe.Field().Interface().([]string)
+	if !ok {
+		return false
+	}
+
+	for _, value := range fieldSlice {
+		if !StringInSlice(value, computeOrderValues) {
+			return false
+		}
+	}
+
+	return true
+}
+
+// computeDataDisksValidator is used to validate DataDisks field.
+func computeDataDisksValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()

-	return StringInSlice(fieldValue, computeProtoValues)
+	return StringInSlice(fieldValue, computeDataDisksValues)
+}
+
+// diskTypeValidator is used to validate Type field.
+func diskTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return StringInSlice(fieldValue, diskTypeValues)
+}
+
+// flipgroupClientTypeValidator is used to validate ClientType field.
+func flipgroupClientTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return StringInSlice(fieldValue, flipgroupClientTypeValues)
+}
+
+// kvmNetTypeValidator is used to validate NetType field.
+func kvmNetTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return StringInSlice(fieldValue, kvmNetTypeValues)
+}
+
+// lbAlgorithmValidator is used to validate Algorithm field.
+func lbAlgorithmValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return StringInSlice(fieldValue, lbAlgorithmValues)
+}
+
+// rgDefNetValidator is used to validate DefNet field.
+func rgDefNetValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return StringInSlice(fieldValue, rgDefNetValues)
+}
+
+// rgNetTypeValidator is used to validate NetType field.
+func rgNetTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return StringInSlice(fieldValue, rgNetTypeValues)
+}
+
+// vinsTypeValidator is used to validate Type field.
+func vinsTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return StringInSlice(fieldValue, vinsTypeValues)
 }

 // imageBootTypeValidator is used to validate BootType field.
@@ -108,3 +196,10 @@ func imageArchitectureValidator(fe validator.FieldLevel) bool {

 	return StringInSlice(fieldValue, imageArchitectureValues)
 }
+
+// sepFieldTypeValidator is used to validate FieldType field.
+func sepFieldTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return StringInSlice(fieldValue, sepFieldTypeValues)
+}
--- a/internal/validators/helper.go
+++ b/internal/validators/helper.go
@@ -11,6 +11,11 @@ func ValidateRequest(req interface{}) error {
 	return validate.Struct(req)
 }

+func ValidateConfig(cfg interface{}) error {
+	validate := getDecortValidator()
+	return validate.Struct(cfg)
+}
+
 func ValidationError(fe validator.FieldError) error {
 	return errors.New(errorMessage(fe))
 }
--- a/internal/validators/messages.go
+++ b/internal/validators/messages.go
@@ -12,7 +12,7 @@ func errorMessage(fe validator.FieldError) string {

 	switch fe.Tag() {

-	// Default Validators
+	// Common Validators
 	case "required":
 		return fmt.Sprintf("%s %s is required", prefix, fe.Field())
 	case "gt":
@@ -26,13 +26,31 @@ func errorMessage(fe validator.FieldError) string {
 	case "email":
 		return fmt.Sprintf("%s %s: unexpected E-Mail format", prefix, fe.Field())

-	// Account Validators
-	case "accountAccessType":
-		return fmt.Sprintf("%s %s must be one of the followng: %s",
+	case "driver":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
 			fe.Field(),
-			joinValues(accountAccessTypeValues))
+			joinValues(driverValues))

+	case "accessType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(accessTypeValues))
+
+	case "resTypes":
+		return fmt.Sprintf("%s %s can contain only the following values: %s",
+			prefix,
+			fe.Field(),
+			joinValues(resTypesValues))
+
+	case "proto":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(protoValues))
+
+	// Account Validators
 	case "accountCUType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -40,12 +58,6 @@ func errorMessage(fe validator.FieldError) string {
 			joinValues(accountCUTypeValues))

 	// BService Validators
-	case "bserviceDriver":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(bserviceDriverValues))
-
 	case "bserviceMode":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -83,14 +95,68 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(computeNetTypeValues))

-	case "computeProto":
+	case "computeOrder":
+		return fmt.Sprintf("%s %s can contain only the following values: %s",
+			prefix,
+			fe.Field(),
+			joinValues(computeOrderValues))
+
+	case "computeDataDisks":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
 			fe.Field(),
-			joinValues(computeProtoValues))
+			joinValues(computeDataDisksValues))
+
+	// Disk Validators
+	case "diskType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(diskTypeValues))
+
+	// Flipgroup Validators
+	case "flipgroupClientType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(flipgroupClientTypeValues))
+
+	// KVM_X86/KVM_PPC Validators
+	case "kvmNetType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(kvmNetTypeValues))
+
+	// LB Validators
+	case "lbAlgorithm":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(lbAlgorithmValues))
+
+	// RG Validators
+	case "rgDefNet":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(rgDefNetValues))
+
+	case "rgNetType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(rgNetTypeValues))
+
+	// ViNS Validators
+	case "vinsType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(vinsTypeValues))

 	// Image Validators
-	case "bootType":
+	case "imageBootType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
 			fe.Field(),
@@ -114,6 +180,13 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(imageArchitectureValues))

+	// SEP Validators
+	case "sepFieldType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(sepFieldTypeValues))
+
 	}

 	return fe.Error()
--- a/internal/validators/validator.go
+++ b/internal/validators/validator.go
@@ -34,7 +34,27 @@ func getDecortValidator() *validator.Validate {

 // registerAllValidators registers all custom validators in DecortValidator.
 func registerAllValidators(validate *validator.Validate) error {
-	err := validate.RegisterValidation("bootType", imageBootTypeValidator)
+	err := validate.RegisterValidation("proto", protoValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("accessType", accessTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("resTypes", resTypesValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("driver", driverValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("imageBootType", imageBootTypeValidator)
 	if err != nil {
 		return err
 	}
@@ -54,21 +74,11 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}

-	err = validate.RegisterValidation("accountAccessType", accountAccessTypeValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("accountCUType", accountCUTypeValidator)
 	if err != nil {
 		return err
 	}

-	err = validate.RegisterValidation("bserviceDriver", bserviceDriverValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("bserviceMode", bserviceModeValidator)
 	if err != nil {
 		return err
@@ -99,7 +109,52 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}

-	err = validate.RegisterValidation("computeProto", computeProtoValidator)
+	err = validate.RegisterValidation("computeOrder", computeOrderValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("computeDataDisks", computeDataDisksValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("diskType", diskTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("flipgroupClientType", flipgroupClientTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("kvmNetType", kvmNetTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("lbAlgorithm", lbAlgorithmValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("rgDefNet", rgDefNetValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("rgNetType", rgNetTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("vinsType", vinsTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("sepFieldType", sepFieldTypeValidator)
 	if err != nil {
 		return err
 	}
--- a/internal/validators/values.go
+++ b/internal/validators/values.go
@@ -1,21 +1,40 @@
 package validators

 var (
-	accountAccessTypeValues = []string{"R", "RCX", "ARCXDU"}
-	accountCUTypeValues     = []string{"CU_M", "CU_C", "CU_D", "CU_S", "CU_A", "CU_NO", "CU_I", "CU_NP"}
+	driverValues     = []string{"KVM_X86", "KVM_PPC"}
+	accessTypeValues = []string{"R", "RCX", "ARCXDU"}
+	resTypesValues   = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"}
+	protoValues      = []string{"tcp", "udp"}

-	bserviceDriverValues = []string{"KVM_X86, KVM_PPC"}
-	bserviceModeValues   = []string{"ABSOLUTE", "RELATIVE"}
+	accountCUTypeValues = []string{"CU_M", "CU_C", "CU_D", "CU_S", "CU_A", "CU_NO", "CU_I", "CU_NP"}

-	computeTopologyValues = []string{"compute", "node"}
-	computePolicyValues   = []string{"RECOMMENDED", "REQUIRED"}
-	computeModeValues     = []string{"EQ", "EN", "ANY"}
-	computeDiskTypeValues = []string{"D", "B"}
-	computeNetTypeValues  = []string{"EXTNET", "VINS"}
-	computeProtoValues    = []string{"tcp", "udp"}
+	bserviceModeValues = []string{"ABSOLUTE", "RELATIVE"}
+
+	computeTopologyValues  = []string{"compute", "node"}
+	computePolicyValues    = []string{"RECOMMENDED", "REQUIRED"}
+	computeModeValues      = []string{"EQ", "EN", "ANY"}
+	computeDiskTypeValues  = []string{"D", "B"}
+	computeNetTypeValues   = []string{"EXTNET", "VINS"}
+	computeOrderValues     = []string{"cdrom", "network", "hd"}
+	computeDataDisksValues = []string{"KEEP", "DETACH", "DESTROY"}
+
+	diskTypeValues = []string{"B", "T", "D"}
+
+	flipgroupClientTypeValues = []string{"compute", "vins"}
+
+	kvmNetTypeValues = []string{"EXTNET", "VINS", "NONE"}
+
+	lbAlgorithmValues = []string{"roundrobin", "static-rr", "leastconn"}
+
+	rgDefNetValues  = []string{"PRIVATE", "PUBLIC", "NONE"}
+	rgNetTypeValues = []string{"PUBLIC", "PRIVATE"}
+
+	vinsTypeValues = []string{"DHCP", "VIP", "EXCLUDE"}

 	imageBootTypeValues     = []string{"uefi", "bios"}
 	imageTypeValues         = []string{"windows", "linux", "other"}
 	imageDriversValues      = []string{"KVM_X86"}
 	imageArchitectureValues = []string{"X86_64", "PPC64_LE"}
+
+	sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
 )