v1.12.2

internal/validators/custom.go

@@ -14,13 +14,6 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/multierror"
 )
 
-// computeDriverValidator is used to validate Driver field in kvmx86 create.
-func computeDriverValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, computeDriverValues)
-}
-
 // protoValidator is used to validate Proto fields.
 func protoValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -58,13 +51,6 @@ func resTypesValidator(fe validator.FieldLevel) bool {
 	return true
 }
 
-// driverValidator is used to validate Driver fields.
-func driverValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, driverValues)
-}
-
 // accountCUTypeValidator is used to validate CUType field.
 func accountCUTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -121,6 +107,27 @@ func computex86NetTypeValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, computex86NetTypeValues)
 }
 
+// securityGroupDirectionValidator is used to validate Direction field
+func securityGroupDirectionValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, securityGroupDirectionValues)
+}
+
+// securityGroupEthertypeValidator is used to validate Ethertype field
+func securityGroupEthertypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, securityGroupEthertypeValues)
+}
+
+// securityGroupProtocolValidator is used to validate Protocol field
+func securityGroupProtocolValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, securityGroupProtocolValues)
+}
+
 // computeOrderValidator is used to validate Order field.
 func computeOrderValidator(fe validator.FieldLevel) bool {
 	fieldSlice, ok := fe.Field().Interface().([]string)
@@ -207,22 +214,6 @@ func imageTypeValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, imageTypeValues)
 }
 
-// imageDriversValidator is used to validate Drivers field.
-func imageDriversValidator(fe validator.FieldLevel) bool {
-	fieldSlice, ok := fe.Field().Interface().([]string)
-	if !ok {
-		return false
-	}
-
-	for _, item := range fieldSlice {
-		if !IsInSlice(item, imageDriversValues) {
-			return false
-		}
-	}
-
-	return true
-}
-
 // imageArchitectureValidator is used to validate Architecture field.
 func imageArchitectureValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()

internal/validators/messages.go

@@ -28,12 +28,6 @@ func errorMessage(fe validator.FieldError) string {
 	case "isBool":
 		return fmt.Sprintf("%s %s: must be bool type", prefix, fe.Field())
 
-	case "driver":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(driverValues))
-
 	case "accessType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -128,12 +122,6 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(computeDataDisksValues))
 
-	case "computeDriver":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(computeDriverValues))
-
 	// Disk Validators
 	case "diskType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
@@ -201,12 +189,6 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(imageTypeValues))
 
-	case "imageDrivers":
-		return fmt.Sprintf("%s %s must contain only the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(imageDriversValues))
-
 	case "imageArchitecture":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -341,6 +323,25 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(userProviders))
 
+	// security group validators
+	case "securityGroupDirection":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(securityGroupDirectionValues))
+
+	case "securityGroupEthertype":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(securityGroupEthertypeValues))
+
+	case "securityGroupProtocol":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(securityGroupProtocolValues))
+
 	// trunk tags validator
 	case "trunkTags":
 		return fmt.Sprintf("%s %s must be in range from 1 to 4095",

internal/validators/validator.go

@@ -31,11 +31,6 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("computeDriver", computeDriverValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("apiGroup", apiGroupValidator)
 	if err != nil {
 		return err
@@ -51,11 +46,6 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("driver", driverValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("imageBootType", imageBootTypeValidator)
 	if err != nil {
 		return err
@@ -66,11 +56,6 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("imageDrivers", imageDriversValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("imageArchitecture", imageArchitectureValidator)
 	if err != nil {
 		return err
@@ -301,5 +286,20 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("securityGroupDirection", securityGroupDirectionValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("securityGroupEthertype", securityGroupEthertypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("securityGroupProtocol", securityGroupProtocolValidator)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }

internal/validators/values.go

@@ -3,7 +3,6 @@ package validators
 var (
 	apiGroupValues = []string{"cloudapi", "cloudbroker", "system"}
 
-	driverValues     = []string{"KVM_X86"}
 	accessTypeValues = []string{"R", "RCX", "ARCXDU"}
 	resTypesValues   = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"}
 	protoValues      = []string{"tcp", "udp"}
@@ -20,7 +19,6 @@ var (
 	computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC", "DPDK", "SDN", "EMPTY", "TRUNK"}
 	computeOrderValues      = []string{"cdrom", "network", "hd"}
 	computeDataDisksValues  = []string{"KEEP", "DETACH", "DESTROY"}
-	computeDriverValues     = []string{"KVM_X86"}
 
 	diskTypeValues = []string{"B", "T", "D"}
 
@@ -38,7 +36,6 @@ var (
 
 	imageBootTypeValues     = []string{"uefi", "bios"}
 	imageTypeValues         = []string{"windows", "linux", "unknown"}
-	imageDriversValues      = []string{"KVM_X86"}
 	imageArchitectureValues = []string{"X86_64"}
 
 	sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
@@ -76,6 +73,10 @@ var (
 	userProviders = []string{"bvs", "decs3o"}
 
 	deviceValues = []string{"primary", "secondary"}
+
+	securityGroupDirectionValues = []string{"inbound", "outbound"}
+	securityGroupEthertypeValues = []string{"IPv4", "IPv6"}
+	securityGroupProtocolValues  = []string{"icmp", "tcp", "udp"}
 )
 
 const (