From cdcf5171cf5c7860673c8bd67822f6d2502edd1c Mon Sep 17 00:00:00 2001 From: Umputun Date: Thu, 31 Oct 2019 22:09:28 -0500 Subject: [PATCH] lint: new warnings from 1.21 golang-lint --- backend/app/cmd/import.go | 5 +++-- backend/app/cmd/server.go | 4 ++-- backend/app/cmd/server_test.go | 1 + backend/app/rest/api/admin_test.go | 6 ++++-- backend/app/rest/api/migrator.go | 24 ++++++++++++------------ backend/app/rest/api/ssl.go | 2 +- 6 files changed, 23 insertions(+), 19 deletions(-) diff --git a/backend/app/cmd/import.go b/backend/app/cmd/import.go index 9275a7df..130c10dc 100644 --- a/backend/app/cmd/import.go +++ b/backend/app/cmd/import.go @@ -17,8 +17,9 @@ import ( // ImportCommand set of flags and command for import type ImportCommand struct { - InputFile string `short:"f" long:"file" description:"input file name" required:"true"` - Provider string `short:"p" long:"provider" default:"disqus" choice:"disqus" choice:"wordpress" description:"import format"` + InputFile string `short:"f" long:"file" description:"input file name" required:"true"` + Provider string `short:"p" long:"provider" default:"disqus" choice:"disqus" choice:"wordpress" description +:"import format"` // nolint Site string `short:"s" long:"site" env:"SITE" default:"remark" description:"site name"` Timeout time.Duration `long:"timeout" default:"15m" description:"import timeout"` AdminPasswd string `long:"admin-passwd" env:"ADMIN_PASSWD" required:"true" description:"admin basic auth password"` diff --git a/backend/app/cmd/server.go b/backend/app/cmd/server.go index 14c25691..e06c92ee 100644 --- a/backend/app/cmd/server.go +++ b/backend/app/cmd/server.go @@ -108,7 +108,7 @@ type AuthGroup struct { // StoreGroup defines options group for store params type StoreGroup struct { - Type string `long:"type" env:"TYPE" description:"type of storage" choice:"bolt" choice:"rpc" default:"bolt"` + Type string `long:"type" env:"TYPE" description:"type of storage" choice:"bolt" choice:"rpc" default:"bolt"` // nolint Bolt struct { Path string `long:"path" env:"PATH" default:"./var" description:"parent dir for bolt files"` Timeout time.Duration `long:"timeout" env:"TIMEOUT" default:"30s" description:"bolt timeout"` @@ -118,7 +118,7 @@ type StoreGroup struct { // ImageGroup defines options group for store pictures type ImageGroup struct { - Type string `long:"type" env:"TYPE" description:"type of storage" choice:"fs" choice:"bolt" default:"fs"` + Type string `long:"type" env:"TYPE" description:"type of storage" choice:"fs" choice:"bolt" default:"fs"` // nolint FS struct { Path string `long:"path" env:"PATH" default:"./var/pictures" description:"images location"` Staging string `long:"staging" env:"STAGING" default:"./var/pictures.staging" description:"staging location"` diff --git a/backend/app/cmd/server_test.go b/backend/app/cmd/server_test.go index 7c53e843..f8dae9df 100644 --- a/backend/app/cmd/server_test.go +++ b/backend/app/cmd/server_test.go @@ -49,6 +49,7 @@ func TestServerApp(t *testing.T) { req.SetBasicAuth("admin", "password") resp, err = client.Do(req) require.Nil(t, err) + defer resp.Body.Close() assert.Equal(t, http.StatusCreated, resp.StatusCode) body, _ = ioutil.ReadAll(resp.Body) t.Log(string(body)) diff --git a/backend/app/rest/api/admin_test.go b/backend/app/rest/api/admin_test.go index 50fe544a..d66cb3ac 100644 --- a/backend/app/rest/api/admin_test.go +++ b/backend/app/rest/api/admin_test.go @@ -47,7 +47,8 @@ func TestAdmin_Delete(t *testing.T) { // check multi count resp, err := post(t, ts.URL+"/api/v1/counts?site=remark42", `["https://radio-t.com/blah","https://radio-t.com/blah2"]`) - assert.Nil(t, err) + require.NoError(t, err) + defer resp.Body.Close() assert.Equal(t, http.StatusOK, resp.StatusCode) bb, err := ioutil.ReadAll(resp.Body) assert.Nil(t, err) @@ -60,7 +61,8 @@ func TestAdmin_Delete(t *testing.T) { // delete a comment req, err := http.NewRequest(http.MethodDelete, fmt.Sprintf("%s/api/v1/admin/comment/%s?site=remark42&url=https://radio-t.com/blah", ts.URL, id1), nil) - assert.Nil(t, err) + require.NoError(t, err) + defer resp.Body.Close() requireAdminOnly(t, req) resp, err = sendReq(t, req, adminUmputunToken) assert.Nil(t, err) diff --git a/backend/app/rest/api/migrator.go b/backend/app/rest/api/migrator.go index 8779bf80..3394ec53 100644 --- a/backend/app/rest/api/migrator.go +++ b/backend/app/rest/api/migrator.go @@ -174,32 +174,32 @@ func (m *Migrator) remapCtrl(w http.ResponseWriter, r *http.Request) { defer m.setBusy(siteID, false) // do export - fh, err := ioutil.TempFile("", "remark42_convert") - if err != nil { - log.Printf("[WARN] failed to make temp file %+v", err) + fh, e := ioutil.TempFile("", "remark42_convert") + if e != nil { + log.Printf("[WARN] failed to make temp file %+v", e) return } defer func() { - if err := os.Remove(fh.Name()); err != nil { - log.Printf("[WARN] failed to remove temp file %+v", err) + if e := os.Remove(fh.Name()); e != nil { + log.Printf("[WARN] failed to remove temp file %+v", e) } }() log.Printf("[DEBUG] start export for site=%s", siteID) - if _, err := m.NativeExporter.Export(fh, siteID); err != nil { - log.Printf("[WARN] export failed with %+v", err) + if _, e := m.NativeExporter.Export(fh, siteID); e != nil { + log.Printf("[WARN] export failed with %+v", e) return } - if _, err = fh.Seek(0, 0); err != nil { - log.Printf("[WARN] failed to seek file %+v", err) + if _, e = fh.Seek(0, 0); e != nil { + log.Printf("[WARN] failed to seek file %+v", e) return } log.Printf("[DEBUG] start import for site=%s", siteID) mappedReader := migrator.WithMapper(fh, mapper) - size, err := m.NativeImporter.Import(mappedReader, siteID) - if err != nil { - log.Printf("[WARN] import failed with %+v", err) + size, e := m.NativeImporter.Import(mappedReader, siteID) + if e != nil { + log.Printf("[WARN] import failed with %+v", e) return } diff --git a/backend/app/rest/api/ssl.go b/backend/app/rest/api/ssl.go index bb0b245b..b005ee02 100644 --- a/backend/app/rest/api/ssl.go +++ b/backend/app/rest/api/ssl.go @@ -119,7 +119,7 @@ func (s *Rest) makeTLSConfig() *tls.Config { // tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305, tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, - tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, + // tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, }, MinVersion: tls.VersionTLS12, CurvePreferences: []tls.CurveID{