From 418a0ec10ee6410013ddd87042ebc4d50033fd8f Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 6 Nov 2018 00:28:55 -0800 Subject: [PATCH] Fixing formatting. (#9801) --- api4/terms_of_service.go | 3 +- api4/terms_of_service_test.go | 3 +- app/extension.go | 3 +- app/plugin_requests.go | 3 +- app/server_test.go | 17 ++++++----- app/webhook_test.go | 3 +- cmd/mattermost/commands/config_test.go | 29 +++++++++---------- cmd/mattermost/commands/webhook_test.go | 3 +- model/terms_of_service_test.go | 3 +- plugin/valid_test.go | 4 +-- store/sqlstore/terms_of_service_store.go | 3 +- store/sqlstore/terms_of_service_store_test.go | 3 +- store/storetest/terms_of_service_store.go | 3 +- utils/testutils/mocked_http_service.go | 3 +- 14 files changed, 46 insertions(+), 37 deletions(-) diff --git a/api4/terms_of_service.go b/api4/terms_of_service.go index de3f7499bf..8272d3c86e 100644 --- a/api4/terms_of_service.go +++ b/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() { diff --git a/api4/terms_of_service_test.go b/api4/terms_of_service_test.go index c1709df2b6..d8745e975b 100644 --- a/api4/terms_of_service_test.go +++ b/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) { diff --git a/app/extension.go b/app/extension.go index d0226bba58..787537cf7c 100644 --- a/app/extension.go +++ b/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 { diff --git a/app/plugin_requests.go b/app/plugin_requests.go index ec60910176..cf1033ce4a 100644 --- a/app/plugin_requests.go +++ b/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) { diff --git a/app/server_test.go b/app/server_test.go index 4a355e1134..b99e698513 100644 --- a/app/server_test.go +++ b/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) diff --git a/app/webhook_test.go b/app/webhook_test.go index 85c52b1448..d0cd9d3a0b 100644 --- a/app/webhook_test.go +++ b/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) { diff --git a/cmd/mattermost/commands/config_test.go b/cmd/mattermost/commands/config_test.go index 8982d1ce77..f4514924e9 100644 --- a/cmd/mattermost/commands/config_test.go +++ b/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{ - SiteUrl *string - UseLetsEncrypt *bool - TLSStrictTransportMaxAge *int64 - AllowedThemes []string +type TestNewServiceSettings struct { + SiteUrl *string + UseLetsEncrypt *bool + TLSStrictTransportMaxAge *int64 + 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{ - Name string + cases := []struct { + Name string configSettings []string - newVal []string - expected interface{} - } { + newVal []string + 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 { diff --git a/cmd/mattermost/commands/webhook_test.go b/cmd/mattermost/commands/webhook_test.go index 6da960835e..fc4bf12281 100644 --- a/cmd/mattermost/commands/webhook_test.go +++ b/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" ) diff --git a/model/terms_of_service_test.go b/model/terms_of_service_test.go index 134172a61d..b9f19d0c16 100644 --- a/model/terms_of_service_test.go +++ b/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) { diff --git a/plugin/valid_test.go b/plugin/valid_test.go index d47eeb58b1..d166fd49f2 100644 --- a/plugin/valid_test.go +++ b/plugin/valid_test.go @@ -18,8 +18,8 @@ func TestIsValid(t *testing.T) { "abc": true, "abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij": true, "abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij1": false, - "../path": false, - "/etc/passwd": false, + "../path": false, + "/etc/passwd": false, "com.mattermost.plugin_with_features-0.9": true, "PLUGINS-THAT-YELL-ARE-OK-2": true, } diff --git a/store/sqlstore/terms_of_service_store.go b/store/sqlstore/terms_of_service_store.go index dc9ce5b5c1..47557ee8ce 100644 --- a/store/sqlstore/terms_of_service_store.go +++ b/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 { diff --git a/store/sqlstore/terms_of_service_store_test.go b/store/sqlstore/terms_of_service_store_test.go index c41fe72103..8f757aecbe 100644 --- a/store/sqlstore/terms_of_service_store_test.go +++ b/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) { diff --git a/store/storetest/terms_of_service_store.go b/store/storetest/terms_of_service_store.go index 90af5c1ee5..9743721942 100644 --- a/store/storetest/terms_of_service_store.go +++ b/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) { diff --git a/utils/testutils/mocked_http_service.go b/utils/testutils/mocked_http_service.go index 8f9bc42be9..9b083ef083 100644 --- a/utils/testutils/mocked_http_service.go +++ b/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 {