From 5d1b0626a9a9dda677e49c21cbb7ca8e73954b59 Mon Sep 17 00:00:00 2001
From: Aykhan Shahsuvarov <aykhan.shahs@gmail.com>
Date: Sat, 1 Jun 2024 00:24:28 +0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20overrides=20error=20key?=
 =?UTF-8?q?=20in=20errsStr=20map?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_errors/formaters.go | 33 +++++++++++++++------------------
 main.go                    |  7 ++++++-
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/custom_errors/formaters.go b/custom_errors/formaters.go
index df383c5..c877a7c 100644
--- a/custom_errors/formaters.go
+++ b/custom_errors/formaters.go
@@ -6,7 +6,6 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/aykhans/dodo/config"
 	"github.com/go-playground/validator/v10"
 )
 
@@ -24,36 +23,34 @@ func CobraErrorFormater(err error) error {
 	return err
 }
 
+func shortenNamespace(namespace string) string {
+	return namespace[strings.Index(namespace, ".")+1:]
+}
+
 func ValidationErrorsFormater(errs validator.ValidationErrors) error {
 	errsStr := make(map[string]string)
 	for _, err := range errs {
 		switch err.Tag() {
 		case "required":
-			errsStr[err.Field()] = fmt.Sprintf("Field \"%s\" is required", err.Field())
+			errsStr[shortenNamespace(err.Namespace())] = fmt.Sprintf("Field \"%s\" is required", err.Field())
 		case "gte":
-			errsStr[err.Field()] = fmt.Sprintf("Value of \"%s\" must be greater than or equal to \"%s\"", err.Field(), err.Param())
+			errsStr[shortenNamespace(err.Namespace())] = fmt.Sprintf("Value of \"%s\" must be greater than or equal to \"%s\"", err.Field(), err.Param())
 		case "lte":
-			errsStr[err.Field()] = fmt.Sprintf("Value of \"%s\" must be less than or equal to \"%s\"", err.Field(), err.Param())
+			errsStr[shortenNamespace(err.Namespace())] = fmt.Sprintf("Value of \"%s\" must be less than or equal to \"%s\"", err.Field(), err.Param())
 		case "filepath":
-			errsStr[err.Field()] = fmt.Sprintf("Invalid file path for \"%s\" field: \"%s\"", err.Field(), err.Value())
+			errsStr[shortenNamespace(err.Namespace())] = fmt.Sprintf("Invalid file path for \"%s\" field: \"%s\"", err.Field(), err.Value())
 		case "http_url":
-			errsStr[err.Field()] = fmt.Sprintf("Invalid URL for \"%s\" field: \"%s\"", err.Field(), err.Value())
+			errsStr[shortenNamespace(err.Namespace())] =
+				fmt.Sprintf("Invalid url for \"%s\" field: \"%s\"", err.Field(), err.Value())
 		// --------------------------------------| Custom validations |--------------------------------------
 		case "http_method":
-			errsStr[err.Field()] = fmt.Sprintf("Invalid HTTP method for \"%s\" field: \"%s\"", err.Field(), err.Value())
-		case "url_map_slice":
-			values := err.Value().(config.ProxySlice)
-			for i, value := range values {
-				if _, ok := value["url"]; !ok {
-					errsStr[fmt.Sprintf("%s[%d]", err.Field(), i)] = fmt.Sprintf("Field \"url\" is required for \"%s\" field", err.Field())
-				} else {
-					errsStr[fmt.Sprintf("%s[%d]", err.Field(), i)] = fmt.Sprintf("Invalid url for \"%s\" field: \"%s\"", err.Field(), value["url"])
-				}
-			}
+			errsStr[shortenNamespace(err.Namespace())] = fmt.Sprintf("Invalid HTTP method for \"%s\" field: \"%s\"", err.Field(), err.Value())
+		case "proxy_url":
+			errsStr[shortenNamespace(err.Namespace())] = fmt.Sprintf("Invalid proxy url for \"%s\" field: \"%s\" (it must be http, socks5 or socks5h)", err.Field(), err.Value())
 		case "string_bool":
-			errsStr[err.Field()] = fmt.Sprintf("Invalid value for \"%s\" field: \"%s\"", err.Field(), err.Value())
+			errsStr[shortenNamespace(err.Namespace())] = fmt.Sprintf("Invalid value for \"%s\" field: \"%s\"", err.Field(), err.Value())
 		default:
-			errsStr[err.Field()] = fmt.Sprintf("Invalid value for \"%s\" field: \"%s\"", err.Field(), err.Value())
+			errsStr[shortenNamespace(err.Namespace())] = fmt.Sprintf("Invalid value for \"%s\" field: \"%s\"", err.Field(), err.Value())
 		}
 	}
 	return NewValidationErrors(errsStr, errs)
diff --git a/main.go b/main.go
index 5bc9ff5..2dd0ea7 100644
--- a/main.go
+++ b/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"os"
+	"strings"
 	"time"
 
 	"github.com/aykhans/dodo/config"
@@ -35,7 +36,11 @@ func main() {
 		if err != nil {
 			utils.PrintErrAndExit(err)
 		}
-		if err := validator.StructPartial(jsonConfNew, "Proxies"); err != nil {
+		if err := validator.StructFiltered(
+			jsonConfNew,
+			func(ns []byte) bool {
+				return strings.LastIndex(string(ns), "Proxies") == -1
+			}); err != nil {
 			utils.PrintErrAndExit(
 				customerrors.ValidationErrorsFormater(
 					err.(goValidator.ValidationErrors),