Fixing formatting. (#9801)

api4/terms_of_service.go

@@ -4,9 +4,10 @@
 package api4
 
 import (
+	"net/http"
+
 	"github.com/mattermost/mattermost-server/app"
 	"github.com/mattermost/mattermost-server/model"
-	"net/http"
 )
 
 func (api *API) InitTermsOfService() {

api4/terms_of_service_test.go

@@ -1,9 +1,10 @@
 package api4
 
 import (
+	"testing"
+
 	"github.com/mattermost/mattermost-server/model"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestGetTermsOfService(t *testing.T) {

app/extension.go

@@ -4,9 +4,10 @@
 package app
 
 import (
-	"github.com/mattermost/mattermost-server/model"
 	"html/template"
 	"net/http"
+
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func (a *App) isExtensionSupportEnabled() bool {

app/plugin_requests.go

@@ -9,12 +9,13 @@ import (
 	"strings"
 
 	"bytes"
+	"io/ioutil"
+
 	"github.com/gorilla/mux"
 	"github.com/mattermost/mattermost-server/mlog"
 	"github.com/mattermost/mattermost-server/model"
 	"github.com/mattermost/mattermost-server/plugin"
 	"github.com/mattermost/mattermost-server/utils"
-	"io/ioutil"
 )
 
 func (a *App) ServePluginRequest(w http.ResponseWriter, r *http.Request) {

app/server_test.go

@@ -5,13 +5,14 @@ package app
 
 import (
 	"crypto/tls"
-	"github.com/mattermost/mattermost-server/utils"
 	"net/http"
 	"path"
 	"strconv"
 	"strings"
 	"testing"
 
+	"github.com/mattermost/mattermost-server/utils"
+
 	"github.com/mattermost/mattermost-server/model"
 	"github.com/stretchr/testify/require"
 )
@@ -24,7 +25,7 @@ func TestStartServerSuccess(t *testing.T) {
 	serverErr := a.StartServer()
 
 	client := &http.Client{}
-	checkEndpoint(t, client, "http://localhost:" + strconv.Itoa(a.Srv.ListenAddr.Port) + "/", http.StatusNotFound)
+	checkEndpoint(t, client, "http://localhost:"+strconv.Itoa(a.Srv.ListenAddr.Port)+"/", http.StatusNotFound)
 
 	a.Shutdown()
 	require.NoError(t, serverErr)
@@ -77,7 +78,7 @@ func TestStartServerTLSSuccess(t *testing.T) {
 	}
 
 	client := &http.Client{Transport: tr}
-	checkEndpoint(t, client, "https://localhost:" + strconv.Itoa(a.Srv.ListenAddr.Port) + "/", http.StatusNotFound)
+	checkEndpoint(t, client, "https://localhost:"+strconv.Itoa(a.Srv.ListenAddr.Port)+"/", http.StatusNotFound)
 
 	a.Shutdown()
 	require.NoError(t, serverErr)
@@ -100,12 +101,12 @@ func TestStartServerTLSVersion(t *testing.T) {
 	tr := &http.Transport{
 		TLSClientConfig: &tls.Config{
 			InsecureSkipVerify: true,
-			MaxVersion: tls.VersionTLS11,
+			MaxVersion:         tls.VersionTLS11,
 		},
 	}
 
 	client := &http.Client{Transport: tr}
-	err = checkEndpoint(t, client, "https://localhost:" + strconv.Itoa(a.Srv.ListenAddr.Port) + "/", http.StatusNotFound)
+	err = checkEndpoint(t, client, "https://localhost:"+strconv.Itoa(a.Srv.ListenAddr.Port)+"/", http.StatusNotFound)
 
 	if !strings.Contains(err.Error(), "remote error: tls: protocol version not supported") {
 		t.Errorf("Expected protocol version error, got %s", err)
@@ -117,7 +118,7 @@ func TestStartServerTLSVersion(t *testing.T) {
 		},
 	}
 
-	err = checkEndpoint(t, client, "https://localhost:" + strconv.Itoa(a.Srv.ListenAddr.Port) + "/", http.StatusNotFound)
+	err = checkEndpoint(t, client, "https://localhost:"+strconv.Itoa(a.Srv.ListenAddr.Port)+"/", http.StatusNotFound)
 
 	if err != nil {
 		t.Errorf("Expected nil, got %s", err)
@@ -154,7 +155,7 @@ func TestStartServerTLSOverwriteCipher(t *testing.T) {
 	}
 
 	client := &http.Client{Transport: tr}
-	err = checkEndpoint(t, client, "https://localhost:" + strconv.Itoa(a.Srv.ListenAddr.Port) + "/", http.StatusNotFound)
+	err = checkEndpoint(t, client, "https://localhost:"+strconv.Itoa(a.Srv.ListenAddr.Port)+"/", http.StatusNotFound)
 
 	if !strings.Contains(err.Error(), "remote error: tls: handshake failure") {
 		t.Errorf("Expected protocol version error, got %s", err)
@@ -170,7 +171,7 @@ func TestStartServerTLSOverwriteCipher(t *testing.T) {
 		},
 	}
 
-	err = checkEndpoint(t, client, "https://localhost:" + strconv.Itoa(a.Srv.ListenAddr.Port) + "/", http.StatusNotFound)
+	err = checkEndpoint(t, client, "https://localhost:"+strconv.Itoa(a.Srv.ListenAddr.Port)+"/", http.StatusNotFound)
 
 	if err != nil {
 		t.Errorf("Expected nil, got %s", err)

app/webhook_test.go

@@ -10,10 +10,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/model"
 	"net/http"
 	"net/http/httptest"
 	"time"
+
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestCreateIncomingWebhookForChannel(t *testing.T) {

cmd/mattermost/commands/config_test.go

@@ -56,19 +56,18 @@ type TestClientRequirements struct {
 
 type TestNewConfig struct {
 	TestNewServiceSettings TestNewServiceSettings
-	TestNewTeamSettings TestNewTeamSettings
+	TestNewTeamSettings    TestNewTeamSettings
 }
 
-type TestNewServiceSettings struct{
+type TestNewServiceSettings struct {
-	SiteUrl *string
+	SiteUrl                  *string
-	UseLetsEncrypt *bool
+	UseLetsEncrypt           *bool
-	TLSStrictTransportMaxAge    *int64
+	TLSStrictTransportMaxAge *int64
-	AllowedThemes   []string
+	AllowedThemes            []string
 }
 
-
 type TestNewTeamSettings struct {
-	SiteName *string
+	SiteName       *string
 	MaxUserPerTeam *int
 }
 
@@ -469,16 +468,15 @@ func TestUpdateMap(t *testing.T) {
 		},
 	}
 
-
 	// create a map of type map[string]interface
 	configMap := configToMap(config)
 
-	cases := []struct{
+	cases := []struct {
-		Name string
+		Name           string
 		configSettings []string
-		newVal []string
+		newVal         []string
-		expected interface{}
+		expected       interface{}
-	} {
+	}{
 		{
 			Name:           "check for Map and string",
 			configSettings: []string{"TestNewServiceSettings", "SiteUrl"},
@@ -517,10 +515,9 @@ func TestUpdateMap(t *testing.T) {
 		},
 	}
 
-
 	for _, test := range cases {
 
-		t.Run(test.Name, func(t *testing.T){
+		t.Run(test.Name, func(t *testing.T) {
 			err := UpdateMap(configMap, test.configSettings, test.newVal)
 
 			if err != nil {

cmd/mattermost/commands/webhook_test.go

@@ -4,11 +4,12 @@
 package commands
 
 import (
-	"github.com/stretchr/testify/require"
 	"strconv"
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/mattermost/mattermost-server/api4"
 	"github.com/mattermost/mattermost-server/model"
 )

model/terms_of_service_test.go

@@ -4,9 +4,10 @@
 package model
 
 import (
-	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTermsOfServiceIsValid(t *testing.T) {

plugin/valid_test.go

@@ -18,8 +18,8 @@ func TestIsValid(t *testing.T) {
 		"abc": true,
 		"abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij":  true,
 		"abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij1": false,
-		"../path":                                 false,
+		"../path":     false,
-		"/etc/passwd":                             false,
+		"/etc/passwd": false,
 		"com.mattermost.plugin_with_features-0.9": true,
 		"PLUGINS-THAT-YELL-ARE-OK-2":              true,
 	}

store/sqlstore/terms_of_service_store.go

@@ -5,11 +5,12 @@ package sqlstore
 
 import (
 	"database/sql"
+	"net/http"
+
 	"github.com/mattermost/mattermost-server/einterfaces"
 	"github.com/mattermost/mattermost-server/model"
 	"github.com/mattermost/mattermost-server/store"
 	"github.com/mattermost/mattermost-server/utils"
-	"net/http"
 )
 
 type SqlTermsOfServiceStore struct {

store/sqlstore/terms_of_service_store_test.go

@@ -1,8 +1,9 @@
 package sqlstore
 
 import (
-	"github.com/mattermost/mattermost-server/store/storetest"
 	"testing"
+
+	"github.com/mattermost/mattermost-server/store/storetest"
 )
 
 func TestTermsOfServiceStore(t *testing.T) {

store/storetest/terms_of_service_store.go

@@ -4,10 +4,11 @@
 package storetest
 
 import (
+	"testing"
+
 	"github.com/mattermost/mattermost-server/model"
 	"github.com/mattermost/mattermost-server/store"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestTermsOfServiceStore(t *testing.T, ss store.Store) {

utils/testutils/mocked_http_service.go

@@ -4,9 +4,10 @@
 package testutils
 
 import (
-	"github.com/mattermost/mattermost-server/services/httpservice"
 	"net/http"
 	"net/http/httptest"
+
+	"github.com/mattermost/mattermost-server/services/httpservice"
 )
 
 type MockedHTTPService struct {