From 7dd4d4859b6d56833bc41024b115b4c3d30f7fad Mon Sep 17 00:00:00 2001
From: Mahmudul Haque <mahmudulhaque@protonmail.com>
Date: Tue, 9 Feb 2021 23:52:27 +0600
Subject: [PATCH] unparam lint (#16865)

Automatic Merge
---
 .golangci.yml                      |   5 ++
 api4/cloud.go                      |   6 +-
 api4/file.go                       |  28 ++-----
 api4/job.go                        |   6 +-
 api4/system.go                     |   6 +-
 config/database_test.go            | 118 +++++++++++++++--------------
 go.tools.mod                       |   2 +-
 go.tools.sum                       |   2 +
 i18n/en.json                       |   4 -
 mlog/logr.go                       |   9 +--
 plugin/interface_generator/main.go |   1 +
 11 files changed, 81 insertions(+), 106 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index c167fe4eb4..0d3025dcf1 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -59,3 +59,8 @@ issues:
     - linters:
       - misspell
       path: "utils/markdown/html_entities.go"
+
+    - linters:
+      - unparam
+      path: "app/plugin_api_tests"
+      text: "is always nil"
diff --git a/api4/cloud.go b/api4/cloud.go
index 77358cf1a4..eeffd43100 100644
--- a/api4/cloud.go
+++ b/api4/cloud.go
@@ -342,7 +342,7 @@ func getSubscriptionInvoicePDF(c *Context, w http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	err := writeFileResponse(
+	writeFileResponse(
 		filename,
 		"application/pdf",
 		int64(binary.Size(pdfData)),
@@ -353,10 +353,6 @@ func getSubscriptionInvoicePDF(c *Context, w http.ResponseWriter, r *http.Reques
 		w,
 		r,
 	)
-	if err != nil {
-		c.Err = err
-		return
-	}
 }
 
 func handleCWSWebhook(c *Context, w http.ResponseWriter, r *http.Request) {
diff --git a/api4/file.go b/api4/file.go
index eb68d8b26b..e1c736a9e3 100644
--- a/api4/file.go
+++ b/api4/file.go
@@ -494,11 +494,7 @@ func getFile(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	auditRec.Success()
 
-	err = writeFileResponse(info.Name, info.MimeType, info.Size, time.Unix(0, info.UpdateAt*int64(1000*1000)), *c.App.Config().ServiceSettings.WebserverMode, fileReader, forceDownload, w, r)
-	if err != nil {
-		c.Err = err
-		return
-	}
+	writeFileResponse(info.Name, info.MimeType, info.Size, time.Unix(0, info.UpdateAt*int64(1000*1000)), *c.App.Config().ServiceSettings.WebserverMode, fileReader, forceDownload, w, r)
 }
 
 func getFileThumbnail(c *Context, w http.ResponseWriter, r *http.Request) {
@@ -532,11 +528,7 @@ func getFileThumbnail(c *Context, w http.ResponseWriter, r *http.Request) {
 	}
 	defer fileReader.Close()
 
-	err = writeFileResponse(info.Name, ThumbnailImageType, 0, time.Unix(0, info.UpdateAt*int64(1000*1000)), *c.App.Config().ServiceSettings.WebserverMode, fileReader, forceDownload, w, r)
-	if err != nil {
-		c.Err = err
-		return
-	}
+	writeFileResponse(info.Name, ThumbnailImageType, 0, time.Unix(0, info.UpdateAt*int64(1000*1000)), *c.App.Config().ServiceSettings.WebserverMode, fileReader, forceDownload, w, r)
 }
 
 func getFileLink(c *Context, w http.ResponseWriter, r *http.Request) {
@@ -611,11 +603,7 @@ func getFilePreview(c *Context, w http.ResponseWriter, r *http.Request) {
 	}
 	defer fileReader.Close()
 
-	err = writeFileResponse(info.Name, PreviewImageType, 0, time.Unix(0, info.UpdateAt*int64(1000*1000)), *c.App.Config().ServiceSettings.WebserverMode, fileReader, forceDownload, w, r)
-	if err != nil {
-		c.Err = err
-		return
-	}
+	writeFileResponse(info.Name, PreviewImageType, 0, time.Unix(0, info.UpdateAt*int64(1000*1000)), *c.App.Config().ServiceSettings.WebserverMode, fileReader, forceDownload, w, r)
 }
 
 func getFileInfo(c *Context, w http.ResponseWriter, r *http.Request) {
@@ -678,14 +666,10 @@ func getPublicFile(c *Context, w http.ResponseWriter, r *http.Request) {
 	}
 	defer fileReader.Close()
 
-	err = writeFileResponse(info.Name, info.MimeType, info.Size, time.Unix(0, info.UpdateAt*int64(1000*1000)), *c.App.Config().ServiceSettings.WebserverMode, fileReader, false, w, r)
-	if err != nil {
-		c.Err = err
-		return
-	}
+	writeFileResponse(info.Name, info.MimeType, info.Size, time.Unix(0, info.UpdateAt*int64(1000*1000)), *c.App.Config().ServiceSettings.WebserverMode, fileReader, false, w, r)
 }
 
-func writeFileResponse(filename string, contentType string, contentSize int64, lastModification time.Time, webserverMode string, fileReader io.ReadSeeker, forceDownload bool, w http.ResponseWriter, r *http.Request) *model.AppError {
+func writeFileResponse(filename string, contentType string, contentSize int64, lastModification time.Time, webserverMode string, fileReader io.ReadSeeker, forceDownload bool, w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Cache-Control", "private, no-cache")
 	w.Header().Set("X-Content-Type-Options", "nosniff")
 
@@ -740,6 +724,4 @@ func writeFileResponse(filename string, contentType string, contentSize int64, l
 	w.Header().Set("Content-Security-Policy", "Frame-ancestors 'none'")
 
 	http.ServeContent(w, r, filename, lastModification, fileReader)
-
-	return nil
 }
diff --git a/api4/job.go b/api4/job.go
index 576c101258..fb849cf311 100644
--- a/api4/job.go
+++ b/api4/job.go
@@ -91,11 +91,7 @@ func downloadJob(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	// We are able to pass 0 for content size due to the fact that Golang's serveContent (https://golang.org/src/net/http/fs.go)
 	// already sets that for us
-	err = writeFileResponse(fileName, FileMime, 0, time.Unix(0, job.LastActivityAt*int64(1000*1000)), *c.App.Config().ServiceSettings.WebserverMode, fileReader, true, w, r)
-	if err != nil {
-		c.Err = err
-		return
-	}
+	writeFileResponse(fileName, FileMime, 0, time.Unix(0, job.LastActivityAt*int64(1000*1000)), *c.App.Config().ServiceSettings.WebserverMode, fileReader, true, w, r)
 }
 
 func createJob(c *Context, w http.ResponseWriter, r *http.Request) {
diff --git a/api4/system.go b/api4/system.go
index 708b3f186c..8541a8c206 100644
--- a/api4/system.go
+++ b/api4/system.go
@@ -119,11 +119,7 @@ func generateSupportPacket(c *Context, w http.ResponseWriter, r *http.Request) {
 	// Send the zip file back to client
 	// We are able to pass 0 for content size due to the fact that Golang's serveContent (https://golang.org/src/net/http/fs.go)
 	// already sets that for us
-	writeFileResponseErr := writeFileResponse(outputZipFilename, FileMime, 0, now, *c.App.Config().ServiceSettings.WebserverMode, fileBytesReader, true, w, r)
-	if writeFileResponseErr != nil {
-		c.Err = model.NewAppError("generateSupportPacket", "api.unable_write_file_response", nil, writeFileResponseErr.Error(), http.StatusForbidden)
-		return
-	}
+	writeFileResponse(outputZipFilename, FileMime, 0, now, *c.App.Config().ServiceSettings.WebserverMode, fileBytesReader, true, w, r)
 }
 
 func getSystemPing(c *Context, w http.ResponseWriter, r *http.Request) {
diff --git a/config/database_test.go b/config/database_test.go
index 4d6e5f4298..51d8edb228 100644
--- a/config/database_test.go
+++ b/config/database_test.go
@@ -115,13 +115,17 @@ func assertDatabaseNotEqualsConfig(t *testing.T, expectedCfg *model.Config) {
 	assert.NotEqual(t, expectedCfg, actualCfg)
 }
 
-func newTestDatabaseStore(t *testing.T, customDefaults *model.Config) (*config.Store, error) {
+func newTestDatabaseStore(customDefaults *model.Config) (*config.Store, error) {
 	sqlSettings := mainHelper.GetSQLSettings()
 	dss, err := config.NewDatabaseStore(getDsn(*sqlSettings.DriverName, *sqlSettings.DataSource))
-	require.NoError(t, err)
+	if err != nil {
+		return nil, err
+	}
 
 	cStore, err := config.NewStoreFromBacking(dss, customDefaults, false)
-	require.NoError(t, err)
+	if err != nil {
+		return nil, err
+	}
 
 	return cStore, nil
 }
@@ -133,7 +137,7 @@ func TestDatabaseStoreNew(t *testing.T) {
 	sqlSettings := mainHelper.GetSQLSettings()
 
 	t.Run("no existing configuration - initialization required", func(t *testing.T) {
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -142,7 +146,7 @@ func TestDatabaseStoreNew(t *testing.T) {
 
 	t.Run("no existing configuration with custom defaults", func(t *testing.T) {
 		truncateTables(t)
-		ds, err := newTestDatabaseStore(t, customConfigDefaults)
+		ds, err := newTestDatabaseStore(customConfigDefaults)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -154,7 +158,7 @@ func TestDatabaseStoreNew(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, testConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -166,7 +170,7 @@ func TestDatabaseStoreNew(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, testConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, customConfigDefaults)
+		ds, err := newTestDatabaseStore(customConfigDefaults)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -183,7 +187,7 @@ func TestDatabaseStoreNew(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, minimalConfigNoFF, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -195,7 +199,7 @@ func TestDatabaseStoreNew(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, minimalConfigNoFF, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, customConfigDefaults)
+		ds, err := newTestDatabaseStore(customConfigDefaults)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -229,7 +233,7 @@ func TestDatabaseStoreGet(t *testing.T) {
 	_, tearDown := setupConfigDatabase(t, testConfig, nil)
 	defer tearDown()
 
-	ds, err := newTestDatabaseStore(t, nil)
+	ds, err := newTestDatabaseStore(nil)
 	require.NoError(t, err)
 	defer ds.Close()
 
@@ -247,7 +251,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, testConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -257,7 +261,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		os.Setenv("MM_SERVICESETTINGS_SITEURL", "http://override")
 		defer os.Unsetenv("MM_SERVICESETTINGS_SITEURL")
 
-		ds, err = newTestDatabaseStore(t, nil)
+		ds, err = newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -269,7 +273,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, testConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, customConfigDefaults)
+		ds, err := newTestDatabaseStore(customConfigDefaults)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -279,7 +283,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		os.Setenv("MM_SERVICESETTINGS_SITEURL", "http://override")
 		defer os.Unsetenv("MM_SERVICESETTINGS_SITEURL")
 
-		ds, err = newTestDatabaseStore(t, customConfigDefaults)
+		ds, err = newTestDatabaseStore(customConfigDefaults)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -292,7 +296,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, testConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -302,7 +306,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		os.Setenv("MM_PLUGINSETTINGS_ENABLEUPLOADS", "true")
 		defer os.Unsetenv("MM_PLUGINSETTINGS_ENABLEUPLOADS")
 
-		ds, err = newTestDatabaseStore(t, nil)
+		ds, err = newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -314,7 +318,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, testConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -324,7 +328,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		os.Setenv("MM_TEAMSETTINGS_MAXUSERSPERTEAM", "3000")
 		defer os.Unsetenv("MM_TEAMSETTINGS_MAXUSERSPERTEAM")
 
-		ds, err = newTestDatabaseStore(t, nil)
+		ds, err = newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -336,7 +340,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, testConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -346,7 +350,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		os.Setenv("MM_SERVICESETTINGS_TLSSTRICTTRANSPORTMAXAGE", "123456")
 		defer os.Unsetenv("MM_SERVICESETTINGS_TLSSTRICTTRANSPORTMAXAGE")
 
-		ds, err = newTestDatabaseStore(t, nil)
+		ds, err = newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -358,7 +362,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, testConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -368,7 +372,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		os.Setenv("MM_SQLSETTINGS_DATASOURCEREPLICAS", "user:pwd@db:5432/test-db")
 		defer os.Unsetenv("MM_SQLSETTINGS_DATASOURCEREPLICAS")
 
-		ds, err = newTestDatabaseStore(t, nil)
+		ds, err = newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -383,7 +387,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, testConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -393,7 +397,7 @@ func TestDatabaseStoreGetEnivironmentOverrides(t *testing.T) {
 		os.Setenv("MM_SQLSETTINGS_DATASOURCEREPLICAS", "user:pwd@db:5432/test-db user:pwd@db2:5433/test-db2 user:pwd@db3:5434/test-db3")
 		defer os.Unsetenv("MM_SQLSETTINGS_DATASOURCEREPLICAS")
 
-		ds, err = newTestDatabaseStore(t, nil)
+		ds, err = newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -413,7 +417,7 @@ func TestDatabaseStoreSet(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, emptyConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -427,7 +431,7 @@ func TestDatabaseStoreSet(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, minimalConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -443,7 +447,7 @@ func TestDatabaseStoreSet(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, ldapConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -460,7 +464,7 @@ func TestDatabaseStoreSet(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, emptyConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -479,7 +483,7 @@ func TestDatabaseStoreSet(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, minimalConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -498,7 +502,7 @@ func TestDatabaseStoreSet(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, readOnlyConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -518,7 +522,7 @@ func TestDatabaseStoreSet(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, minimalConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -541,7 +545,7 @@ func TestDatabaseStoreSet(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, emptyConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -566,7 +570,7 @@ func TestDatabaseStoreSet(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, emptyConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -583,7 +587,7 @@ func TestDatabaseStoreSet(t *testing.T) {
 		activeID, tearDown := setupConfigDatabase(t, emptyConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -608,7 +612,7 @@ func TestDatabaseStoreSet(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, minimalConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -624,7 +628,7 @@ func TestDatabaseStoreSet(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, minimalConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -648,7 +652,7 @@ func TestDatabaseStoreLoad(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, emptyConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -663,7 +667,7 @@ func TestDatabaseStoreLoad(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, minimalConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -685,7 +689,7 @@ func TestDatabaseStoreLoad(t *testing.T) {
 		os.Setenv("MM_SERVICESETTINGS_SITEURL", "http://overridePersistEnvVariables")
 		defer os.Unsetenv("MM_SERVICESETTINGS_SITEURL")
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -706,7 +710,7 @@ func TestDatabaseStoreLoad(t *testing.T) {
 		os.Setenv("MM_PLUGINSETTINGS_ENABLEUPLOADS", "true")
 		defer os.Unsetenv("MM_PLUGINSETTINGS_ENABLEUPLOADS")
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -729,7 +733,7 @@ func TestDatabaseStoreLoad(t *testing.T) {
 		os.Setenv("MM_TEAMSETTINGS_MAXUSERSPERTEAM", "3000")
 		defer os.Unsetenv("MM_TEAMSETTINGS_MAXUSERSPERTEAM")
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -752,7 +756,7 @@ func TestDatabaseStoreLoad(t *testing.T) {
 		os.Setenv("MM_SERVICESETTINGS_TLSSTRICTTRANSPORTMAXAGE", "123456")
 		defer os.Unsetenv("MM_SERVICESETTINGS_TLSSTRICTTRANSPORTMAXAGE")
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -775,7 +779,7 @@ func TestDatabaseStoreLoad(t *testing.T) {
 		os.Setenv("MM_SQLSETTINGS_DATASOURCEREPLICAS", "user:pwd@db:5432/test-db")
 		defer os.Unsetenv("MM_SQLSETTINGS_DATASOURCEREPLICAS")
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -800,7 +804,7 @@ func TestDatabaseStoreLoad(t *testing.T) {
 		os.Setenv("MM_SQLSETTINGS_DATASOURCEREPLICAS", "user:pwd@db:5432/test-db")
 		defer os.Unsetenv("MM_SQLSETTINGS_DATASOURCEREPLICAS")
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -820,7 +824,7 @@ func TestDatabaseStoreLoad(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, emptyConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -848,7 +852,7 @@ func TestDatabaseStoreLoad(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, fixesRequiredConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -862,7 +866,7 @@ func TestDatabaseStoreLoad(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, emptyConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -886,7 +890,7 @@ func TestDatabaseGetFile(t *testing.T) {
 	})
 	defer tearDown()
 
-	ds, err := newTestDatabaseStore(t, nil)
+	ds, err := newTestDatabaseStore(nil)
 	require.NoError(t, err)
 	defer ds.Close()
 
@@ -917,7 +921,7 @@ func TestDatabaseSetFile(t *testing.T) {
 	_, tearDown := setupConfigDatabase(t, minimalConfig, nil)
 	defer tearDown()
 
-	ds, err := newTestDatabaseStore(t, nil)
+	ds, err := newTestDatabaseStore(nil)
 	require.NoError(t, err)
 	defer ds.Close()
 
@@ -970,7 +974,7 @@ func TestDatabaseHasFile(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, minimalConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -983,7 +987,7 @@ func TestDatabaseHasFile(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, minimalConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -1001,7 +1005,7 @@ func TestDatabaseHasFile(t *testing.T) {
 		})
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -1014,7 +1018,7 @@ func TestDatabaseHasFile(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, minimalConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -1029,7 +1033,7 @@ func TestDatabaseRemoveFile(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, minimalConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -1041,7 +1045,7 @@ func TestDatabaseRemoveFile(t *testing.T) {
 		_, tearDown := setupConfigDatabase(t, minimalConfig, nil)
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -1065,7 +1069,7 @@ func TestDatabaseRemoveFile(t *testing.T) {
 		})
 		defer tearDown()
 
-		ds, err := newTestDatabaseStore(t, nil)
+		ds, err := newTestDatabaseStore(nil)
 		require.NoError(t, err)
 		defer ds.Close()
 
@@ -1088,7 +1092,7 @@ func TestDatabaseStoreString(t *testing.T) {
 	_, tearDown := setupConfigDatabase(t, emptyConfig, nil)
 	defer tearDown()
 
-	ds, err := newTestDatabaseStore(t, nil)
+	ds, err := newTestDatabaseStore(nil)
 	require.NoError(t, err)
 	require.NotNil(t, ds)
 	defer ds.Close()
diff --git a/go.tools.mod b/go.tools.mod
index 28bd9e6891..f6e5871a0d 100644
--- a/go.tools.mod
+++ b/go.tools.mod
@@ -4,7 +4,7 @@ go 1.14
 
 require (
 	github.com/jstemmer/go-junit-report v0.9.1 // indirect
-	github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210122154757-d807da7d142a // indirect
+	github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210205183519-d9e542a75ab2 // indirect
 	github.com/philhofer/fwd v1.0.0 // indirect
 	github.com/reflog/struct2interface v0.6.1 // indirect
 	github.com/tinylib/msgp v1.1.2 // indirect
diff --git a/go.tools.sum b/go.tools.sum
index 006022fc17..33730329d1 100644
--- a/go.tools.sum
+++ b/go.tools.sum
@@ -79,6 +79,8 @@ github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210103185547-4c12aa
 github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210103185547-4c12aa739237/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM=
 github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210122154757-d807da7d142a h1:H8g7UkbNEpYE6UD7ej8UWp2W9q0eW+7BtvUl1v+bGMc=
 github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210122154757-d807da7d142a/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM=
+github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210205183519-d9e542a75ab2 h1:HMz7yZQBfrnek35I5OOxdNdIt0rYoTnhFVn+Uq3TGi8=
+github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210205183519-d9e542a75ab2/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
diff --git a/i18n/en.json b/i18n/en.json
index dcd701f6f1..b3706b19fd 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3066,10 +3066,6 @@
     "id": "api.unable_to_read_file_from_backend",
     "translation": "Error reading file from backend"
   },
-  {
-    "id": "api.unable_write_file_response",
-    "translation": "Error downloading support packet file."
-  },
   {
     "id": "api.upgrade_to_enterprise.already-done.app_error",
     "translation": "You have already upgraded to Mattermost Enterprise Edition. Please restart the server to finish the upgrade."
diff --git a/mlog/logr.go b/mlog/logr.go
index 4464080f27..c44fafa0cd 100644
--- a/mlog/logr.go
+++ b/mlog/logr.go
@@ -75,10 +75,7 @@ func NewLogrTarget(name string, t *LogTarget) (logr.Target, error) {
 	if err != nil {
 		return nil, err
 	}
-	filter, err := newFilter(t.Levels)
-	if err != nil {
-		return nil, err
-	}
+	filter := newFilter(t.Levels)
 
 	if t.MaxQueueSize == 0 {
 		t.MaxQueueSize = DefaultMaxTargetQueue
@@ -99,12 +96,12 @@ func NewLogrTarget(name string, t *LogTarget) (logr.Target, error) {
 	return nil, fmt.Errorf("invalid type '%s' for target %s", t.Type, name)
 }
 
-func newFilter(levels []LogLevel) (logr.Filter, error) {
+func newFilter(levels []LogLevel) logr.Filter {
 	filter := &logr.CustomFilter{}
 	for _, lvl := range levels {
 		filter.Add(logr.Level(lvl))
 	}
-	return filter, nil
+	return filter
 }
 
 func newFormatter(name string, format string) (logr.Formatter, error) {
diff --git a/plugin/interface_generator/main.go b/plugin/interface_generator/main.go
index 676b1e9d61..67734a826f 100644
--- a/plugin/interface_generator/main.go
+++ b/plugin/interface_generator/main.go
@@ -265,6 +265,7 @@ func getPluginInfo(dir string) (*PluginInterfaceInfo, error) {
 	packages, err := parser.ParseDir(pluginInfo.FileSet, dir, nil, parser.ParseComments)
 	if err != nil {
 		log.Println("Parser error in dir "+dir+": ", err)
+		return nil, err
 	}
 
 	for _, pkg := range packages {