PCSM-219: Undoing using the validator

Author: chupe

config/config.go

@@ -10,7 +10,6 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/percona/percona-clustersync-mongodb/errors"
-	"github.com/percona/percona-clustersync-mongodb/validate"
 )
 
 // Load initializes Viper and returns a validated Config.
@@ -35,11 +34,6 @@ func Load(cmd *cobra.Command) (*Config, error) {
 		return nil, errors.Wrap(err, "unmarshal config")
 	}
 
-	err = validate.Struct(&cfg)
-	if err != nil {
-		return nil, errors.Wrap(err, "validate config")
-	}
-
 	return &cfg, nil
 }
 

config/schema.go

@@ -10,7 +10,7 @@ import (
 // Config holds all PCSM configuration.
 type Config struct {
 	// Connection
-	Port   int    `mapstructure:"port"   validate:"omitempty,gte=1024,lte=65535"`
+	Port   int    `mapstructure:"port"`
 	Source string `mapstructure:"source"`
 	Target string `mapstructure:"target"`
 
@@ -34,14 +34,14 @@ type Config struct {
 
 // LogConfig holds logging configuration.
 type LogConfig struct {
-	Level   string `mapstructure:"log-level" validate:"omitempty,oneof=trace debug info warn error fatal panic"`
+	Level   string `mapstructure:"log-level"`
 	JSON    bool   `mapstructure:"log-json"`
 	NoColor bool   `mapstructure:"no-color"`
 }
 
 // MongoDBConfig holds MongoDB client configuration.
 type MongoDBConfig struct {
-	OperationTimeout string `mapstructure:"mongodb-cli-operation-timeout" validate:"omitempty,duration"`
+	OperationTimeout string `mapstructure:"mongodb-cli-operation-timeout"`
 }
 
 // OperationTimeoutDuration returns the parsed timeout or default.
@@ -58,11 +58,11 @@ func (m *MongoDBConfig) OperationTimeoutDuration() time.Duration {
 
 // CloneConfig holds clone tuning configuration.
 type CloneConfig struct {
-	NumParallelCollections int    `mapstructure:"clone-num-parallel-collections" validate:"omitempty,gte=0,lte=100"`
-	NumReadWorkers         int    `mapstructure:"clone-num-read-workers"         validate:"omitempty,gte=0,lte=1000"`
-	NumInsertWorkers       int    `mapstructure:"clone-num-insert-workers"       validate:"omitempty,gte=0,lte=1000"`
-	SegmentSize            string `mapstructure:"clone-segment-size"             validate:"omitempty,bytesize"`
-	ReadBatchSize          string `mapstructure:"clone-read-batch-size"          validate:"omitempty,bytesize"`
+	NumParallelCollections int    `mapstructure:"clone-num-parallel-collections"`
+	NumReadWorkers         int    `mapstructure:"clone-num-read-workers"`
+	NumInsertWorkers       int    `mapstructure:"clone-num-insert-workers"`
+	SegmentSize            string `mapstructure:"clone-segment-size"`
+	ReadBatchSize          string `mapstructure:"clone-read-batch-size"`
 }
 
 // SegmentSizeBytes parses and returns the segment size in bytes.

go.mod

@@ -4,11 +4,9 @@ go 1.25.0
 
 require (
 	github.com/dustin/go-humanize v1.0.1
-	github.com/go-playground/validator/v10 v10.30.0
 	github.com/prometheus/client_golang v1.22.0
 	github.com/rs/zerolog v1.34.0
 	github.com/spf13/cobra v1.9.1
-	github.com/spf13/pflag v1.0.10
 	github.com/spf13/viper v1.21.0
 	github.com/stretchr/testify v1.11.1
 	go.mongodb.org/mongo-driver/v2 v2.2.1
@@ -20,14 +18,10 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.12 // indirect
-	github.com/go-playground/locales v0.14.1 // indirect
-	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/golang/snappy v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect
-	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -40,6 +34,7 @@ require (
 	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
 	github.com/spf13/afero v1.15.0 // indirect
 	github.com/spf13/cast v1.10.0 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect

go.sum

@@ -12,16 +12,6 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw=
-github.com/gabriel-vasile/mimetype v1.4.12/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
-github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
-github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
-github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
-github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
-github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.30.0 h1:5YBPNs273uzsZJD1I8uiB4Aqg9sN6sMDVX3s6LxmhWU=
-github.com/go-playground/validator/v10 v10.30.0/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM=
 github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
 github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -39,8 +29,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
-github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=

main.go

@@ -30,7 +30,6 @@ import (
 	"github.com/percona/percona-clustersync-mongodb/pcsm"
 	"github.com/percona/percona-clustersync-mongodb/topo"
 	"github.com/percona/percona-clustersync-mongodb/util"
-	"github.com/percona/percona-clustersync-mongodb/validate"
 )
 
 // Constants for server configuration.
@@ -851,13 +850,6 @@ func (s *server) handleStart(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	// Validate request
-	if err := params.Validate(); err != nil {
-		writeResponse(w, startResponse{Err: err.Error()})
-
-		return
-	}
-
 	options, err := resolveStartOptions(s.cfg, params)
 	if err != nil {
 		writeResponse(w, startResponse{Err: err.Error()})
@@ -1046,24 +1038,19 @@ type startRequest struct {
 
 	// Clone tuning options (pointer types to distinguish "not set" from zero value)
 	// CloneNumParallelCollections is the number of collections to clone in parallel.
-	CloneNumParallelCollections *int `json:"cloneNumParallelCollections,omitempty" validate:"omitempty,gte=0,lte=100"`
+	CloneNumParallelCollections *int `json:"cloneNumParallelCollections,omitempty"`
 	// CloneNumReadWorkers is the number of read workers during clone.
-	CloneNumReadWorkers *int `json:"cloneNumReadWorkers,omitempty" validate:"omitempty,gte=0,lte=1000"`
+	CloneNumReadWorkers *int `json:"cloneNumReadWorkers,omitempty"`
 	// CloneNumInsertWorkers is the number of insert workers during clone.
-	CloneNumInsertWorkers *int `json:"cloneNumInsertWorkers,omitempty" validate:"omitempty,gte=0,lte=1000"`
+	CloneNumInsertWorkers *int `json:"cloneNumInsertWorkers,omitempty"`
 	// CloneSegmentSize is the segment size for clone operations (e.g., "100MB", "1GiB").
-	CloneSegmentSize *string `json:"cloneSegmentSize,omitempty" validate:"omitempty,bytesize"`
+	CloneSegmentSize *string `json:"cloneSegmentSize,omitempty"`
 	// CloneReadBatchSize is the read batch size during clone (e.g., "16MiB").
-	CloneReadBatchSize *string `json:"cloneReadBatchSize,omitempty" validate:"omitempty,bytesize"`
+	CloneReadBatchSize *string `json:"cloneReadBatchSize,omitempty"`
 
 	// NOTE: UseCollectionBulkWrite intentionally NOT exposed via HTTP (internal only)
 }
 
-// Validate validates the startRequest.
-func (r *startRequest) Validate() error {
-	return validate.Struct(r)
-}
-
 // startResponse represents the response body for the /start endpoint.
 type startResponse struct {
 	// Ok indicates if the operation was successful.