changeset 4183:34623265eac1

Made 'golint' happy (again) with the controllers package.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 06 Aug 2019 11:23:27 +0200
parents 49012340336c
children ea36f163db44
files pkg/controllers/srimports.go pkg/controllers/uploadedimports.go
diffstat 2 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/controllers/srimports.go	Tue Aug 06 11:13:28 2019 +0200
+++ b/pkg/controllers/srimports.go	Tue Aug 06 11:23:27 2019 +0200
@@ -214,7 +214,7 @@
 	var once sync.Once
 	closeOnce := func() { zr.Close() }
 
-	var isZIP bool = false
+	var isZIP bool
 	if zr, err = zip.OpenReader(srFile); err != nil {
 		messages = append(messages, fmt.Sprintf("%v - "+
 			"Trying TXT file mode.", err))
--- a/pkg/controllers/uploadedimports.go	Tue Aug 06 11:13:28 2019 +0200
+++ b/pkg/controllers/uploadedimports.go	Tue Aug 06 11:23:27 2019 +0200
@@ -29,7 +29,8 @@
 
 const maxUploadSize = 25 * 1024 * 1024
 
-type BadUploadParameterError string
+// badUploadParameterError is a local type to find bad request parameters.
+type badUploadParameterError string
 
 func importWaterwayProfiles() http.HandlerFunc {
 	return uploadedImport(
@@ -38,12 +39,12 @@
 		func(req *http.Request, dir string) (imports.Job, error) {
 			url := req.FormValue("url")
 			if url == "" {
-				return nil, BadUploadParameterError("missing 'url' parameter")
+				return nil, badUploadParameterError("missing 'url' parameter")
 			}
 
 			featureType := req.FormValue("feature-type")
 			if featureType == "" {
-				return nil, BadUploadParameterError("missing 'feature-type' parameter")
+				return nil, badUploadParameterError("missing 'feature-type' parameter")
 			}
 
 			sortBy := req.FormValue("sort-by")
@@ -52,7 +53,7 @@
 			if p := req.FormValue("precision"); p != "" {
 				v, err := strconv.ParseFloat(p, 64)
 				if err != nil {
-					return nil, BadUploadParameterError(
+					return nil, badUploadParameterError(
 						fmt.Sprintf("Invalid 'precision' parameter: %v", err))
 				}
 				precision = &v
@@ -81,7 +82,7 @@
 		func(req *http.Request, dir string) (imports.Job, error) {
 			originator := req.FormValue("originator")
 			if originator == "" {
-				return nil, BadUploadParameterError("missing 'originator' parameter")
+				return nil, badUploadParameterError("missing 'originator' parameter")
 			}
 
 			return &imports.ApprovedGaugeMeasurements{
@@ -102,7 +103,7 @@
 			if t := req.FormValue("tolerance"); t != "" {
 				v, err := strconv.ParseFloat(t, 64)
 				if err != nil {
-					return nil, BadUploadParameterError(
+					return nil, badUploadParameterError(
 						fmt.Sprintf("Invalid 'tolerance' parameter: %v", err))
 				}
 				tolerance = v
@@ -133,7 +134,7 @@
 	)
 }
 
-func (bup BadUploadParameterError) Error() string {
+func (bup badUploadParameterError) Error() string {
 	return string(bup)
 }
 
@@ -160,7 +161,7 @@
 			if err2 := os.RemoveAll(dir); err2 != nil {
 				log.Printf("warn: %v\n", err2)
 			}
-			if err2, ok := err.(BadUploadParameterError); ok {
+			if err2, ok := err.(badUploadParameterError); ok {
 				http.Error(rw, string(err2), http.StatusBadRequest)
 				return
 			}