From 342549b5460938855d897bb701f4507311fb9313 Mon Sep 17 00:00:00 2001 From: andres-portainer <91705312+andres-portainer@users.noreply.github.com> Date: Mon, 21 Apr 2025 18:59:51 -0300 Subject: [PATCH] fix(validate): remove dead code BE-11824 (#671) --- api/datastore/validate/validate.go | 15 ----- api/datastore/validate/validate_test.go | 61 --------------------- api/datastore/validate/validationMethods.go | 17 ------ go.mod | 4 -- go.sum | 12 ---- 5 files changed, 109 deletions(-) delete mode 100644 api/datastore/validate/validate.go delete mode 100644 api/datastore/validate/validate_test.go delete mode 100644 api/datastore/validate/validationMethods.go diff --git a/api/datastore/validate/validate.go b/api/datastore/validate/validate.go deleted file mode 100644 index 2b37311fe..000000000 --- a/api/datastore/validate/validate.go +++ /dev/null @@ -1,15 +0,0 @@ -package validate - -import ( - "github.com/go-playground/validator/v10" - portainer "github.com/portainer/portainer/api" -) - -var validate *validator.Validate - -func ValidateLDAPSettings(ldp *portainer.LDAPSettings) error { - validate = validator.New() - registerValidationMethods(validate) - - return validate.Struct(ldp) -} diff --git a/api/datastore/validate/validate_test.go b/api/datastore/validate/validate_test.go deleted file mode 100644 index 3fa7bd425..000000000 --- a/api/datastore/validate/validate_test.go +++ /dev/null @@ -1,61 +0,0 @@ -package validate - -import ( - "testing" - - portainer "github.com/portainer/portainer/api" -) - -func TestValidateLDAPSettings(t *testing.T) { - - tests := []struct { - name string - ldap portainer.LDAPSettings - wantErr bool - }{ - { - name: "Empty LDAP Settings", - ldap: portainer.LDAPSettings{}, - wantErr: true, - }, - { - name: "With URL", - ldap: portainer.LDAPSettings{ - AnonymousMode: true, - URL: "192.168.0.1:323", - }, - wantErr: false, - }, - { - name: "Validate URL and URLs", - ldap: portainer.LDAPSettings{ - AnonymousMode: true, - URL: "192.168.0.1:323", - }, - wantErr: false, - }, - { - name: "validate client ldap", - ldap: portainer.LDAPSettings{ - AnonymousMode: false, - ReaderDN: "CN=LDAP API Service Account", - Password: "Qu**dfUUU**", - URL: "aukdc15.pgc.co:389", - TLSConfig: portainer.TLSConfiguration{ - TLS: false, - TLSSkipVerify: false, - }, - }, - wantErr: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - err := ValidateLDAPSettings(&tt.ldap) - if (err == nil) == tt.wantErr { - t.Errorf("No error expected but got %s", err) - } - }) - } -} diff --git a/api/datastore/validate/validationMethods.go b/api/datastore/validate/validationMethods.go deleted file mode 100644 index 36abe3a54..000000000 --- a/api/datastore/validate/validationMethods.go +++ /dev/null @@ -1,17 +0,0 @@ -package validate - -import ( - "github.com/go-playground/validator/v10" -) - -func registerValidationMethods(v *validator.Validate) { - v.RegisterValidation("validate_bool", ValidateBool) -} - -/** - * Validation methods below are being used for custom validation - */ -func ValidateBool(fl validator.FieldLevel) bool { - _, ok := fl.Field().Interface().(bool) - return ok -} diff --git a/go.mod b/go.mod index 22ed99fa2..d5bc8ab27 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,6 @@ require ( github.com/g07cha/defender v0.0.0-20180505193036-5665c627c814 github.com/go-git/go-git/v5 v5.13.0 github.com/go-ldap/ldap/v3 v3.4.1 - github.com/go-playground/validator/v10 v10.12.0 github.com/gofrs/uuid v4.2.0+incompatible github.com/golang-jwt/jwt/v4 v4.5.2 github.com/google/go-cmp v0.6.0 @@ -148,8 +147,6 @@ require ( github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.23.0 // 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.0.0 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gofrs/flock v0.12.1 // indirect @@ -185,7 +182,6 @@ require ( github.com/klauspost/pgzip v1.2.6 // indirect github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect - github.com/leodido/go-urn v1.2.2 // indirect github.com/lib/pq v1.10.9 // indirect github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect github.com/mailru/easyjson v0.7.7 // indirect diff --git a/go.sum b/go.sum index 2ca59e4f6..5fbd993f1 100644 --- a/go.sum +++ b/go.sum @@ -284,14 +284,6 @@ github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= -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.12.0 h1:E4gtWgxWxp8YSxExrQFv5BpCahla0PVF2oTTEYaWQGI= -github.com/go-playground/validator/v10 v10.12.0/go.mod h1:hCAPuzYvKdP33pxWa+2+6AIKXEKqjIUyqsNCtbsSJrA= github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= @@ -446,8 +438,6 @@ github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= -github.com/leodido/go-urn v1.2.2 h1:7z68G0FCGvDk646jz1AelTYNYWrTNm0bEcFAo147wt4= -github.com/leodido/go-urn v1.2.2/go.mod h1:kUaIbLZWttglzwNuG0pgsh5vuV6u2YcGBYz1hIPjtOQ= github.com/lib/pq v0.0.0-20150723085316-0dad96c0b94f/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= @@ -622,7 +612,6 @@ github.com/rubenv/sql-migrate v1.7.1 h1:f/o0WgfO/GqNuVg+6801K/KW3WdDSupzSjDYODmi github.com/rubenv/sql-migrate v1.7.1/go.mod h1:Ob2Psprc0/3ggbM6wCzyYVFFuc6FyZrb2AS+ezLDFb4= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/rwtodd/Go.Sed v0.0.0-20210816025313-55464686f9ef/go.mod h1:8AEUvGVi2uQ5b24BIhcr0GCcpd/RNAFWaN2CJFrWIIQ= github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA= github.com/secure-systems-lab/go-securesystemslib v0.8.0/go.mod h1:UH2VZVuJfCYR8WgMlCU1uFsOUU+KeyrTWcSS73NBOzU= github.com/segmentio/asm v1.1.3 h1:WM03sfUOENvvKexOLp+pCqgb/WDjsi7EK8gIsICtzhc= @@ -678,7 +667,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI=