From 2e449413e88815e145f7efaff111cf0eb2613576 Mon Sep 17 00:00:00 2001 From: Matthew Straughn Date: Tue, 22 Aug 2023 03:15:51 -0400 Subject: [PATCH] fixed initialism errors in accordance with golang conventions in 7 files. (#24287) --- server/channels/app/import_functions_test.go | 2 +- server/channels/app/post_metadata_test.go | 2 +- server/channels/utils/file.go | 4 ++-- server/channels/utils/file_test.go | 4 ++-- server/platform/services/httpservice/client.go | 4 ++-- server/platform/services/httpservice/client_test.go | 4 ++-- server/platform/services/slackimport/slackimport.go | 12 ++++++------ 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/server/channels/app/import_functions_test.go b/server/channels/app/import_functions_test.go index b897df9f5e..7e44a652d3 100644 --- a/server/channels/app/import_functions_test.go +++ b/server/channels/app/import_functions_test.go @@ -4189,7 +4189,7 @@ func TestImportImportEmoji(t *testing.T) { data = imports.EmojiImportData{Name: ptrStr(model.NewId()), Image: ptrStr(largeImage)} appErr = th.App.importEmoji(th.Context, &data, false) require.NotNil(t, appErr) - require.ErrorIs(t, appErr.Unwrap(), utils.SizeLimitExceeded) + require.ErrorIs(t, appErr.Unwrap(), utils.ErrSizeLimitExceeded) } func TestImportAttachment(t *testing.T) { diff --git a/server/channels/app/post_metadata_test.go b/server/channels/app/post_metadata_test.go index e664e04b41..7eacc4796d 100644 --- a/server/channels/app/post_metadata_test.go +++ b/server/channels/app/post_metadata_test.go @@ -2473,7 +2473,7 @@ func TestGetLinkMetadata(t *testing.T) { assert.Nil(t, img) assert.Error(t, err) assert.IsType(t, &url.Error{}, err) - assert.Equal(t, httpservice.AddressForbidden, err.(*url.Error).Err) + assert.Equal(t, httpservice.ErrAddressForbidden, err.(*url.Error).Err) requestURL = th.App.GetSiteURL() + "/api/v4/image?url=" + url.QueryEscape(requestURL) diff --git a/server/channels/utils/file.go b/server/channels/utils/file.go index 495a554311..d59d278955 100644 --- a/server/channels/utils/file.go +++ b/server/channels/utils/file.go @@ -8,7 +8,7 @@ import ( "io" ) -var SizeLimitExceeded = errors.New("Size limit exceeded") +var ErrSizeLimitExceeded = errors.New("size limit exceeded") type LimitedReaderWithError struct { limitedReader *io.LimitedReader @@ -23,7 +23,7 @@ func NewLimitedReaderWithError(reader io.Reader, maxBytes int64) *LimitedReaderW func (l *LimitedReaderWithError) Read(p []byte) (int, error) { n, err := l.limitedReader.Read(p) if l.limitedReader.N <= 0 && err == io.EOF { - return n, SizeLimitExceeded + return n, ErrSizeLimitExceeded } return n, err } diff --git a/server/channels/utils/file_test.go b/server/channels/utils/file_test.go index 9b5bccb0bf..d811b02624 100644 --- a/server/channels/utils/file_test.go +++ b/server/channels/utils/file_test.go @@ -51,7 +51,7 @@ func TestLimitedReaderWithError(t *testing.T) { buf := make([]byte, moreThanMaxBytes) _, err = io.ReadFull(lr, buf) require.Error(t, err) - require.Equal(t, SizeLimitExceeded, err) + require.Equal(t, ErrSizeLimitExceeded, err) }) t.Run("multiple small reads, total larger than max size", func(t *testing.T) { @@ -71,6 +71,6 @@ func TestLimitedReaderWithError(t *testing.T) { // lets do it again _, err = io.ReadFull(lr, buf) require.Error(t, err) - require.Equal(t, SizeLimitExceeded, err) + require.Equal(t, ErrSizeLimitExceeded, err) }) } diff --git a/server/platform/services/httpservice/client.go b/server/platform/services/httpservice/client.go index bbfca0da9b..1aca082cc0 100644 --- a/server/platform/services/httpservice/client.go +++ b/server/platform/services/httpservice/client.go @@ -89,7 +89,7 @@ func init() { type DialContextFunction func(ctx context.Context, network, addr string) (net.Conn, error) -var AddressForbidden = errors.New("address forbidden, you may need to set AllowedUntrustedInternalConnections to allow an integration access to your internal network") +var ErrAddressForbidden = errors.New("address forbidden, you may need to set AllowedUntrustedInternalConnections to allow an integration access to your internal network") func dialContextFilter(dial DialContextFunction, allowHost func(host string) bool, allowIP func(ip net.IP) bool) DialContextFunction { return func(ctx context.Context, network, addr string) (net.Conn, error) { @@ -128,7 +128,7 @@ func dialContextFilter(dial DialContextFunction, allowHost func(host string) boo } } if firstErr == nil { - return nil, AddressForbidden + return nil, ErrAddressForbidden } return nil, firstErr } diff --git a/server/platform/services/httpservice/client_test.go b/server/platform/services/httpservice/client_test.go index a274ebf5f3..4d35b0ac16 100644 --- a/server/platform/services/httpservice/client_test.go +++ b/server/platform/services/httpservice/client_test.go @@ -89,7 +89,7 @@ func TestHTTPClient(t *testing.T) { require.NoError(t, err) } else { require.IsType(t, &url.Error{}, err) - require.Equal(t, AddressForbidden, err.(*url.Error).Err) + require.Equal(t, ErrAddressForbidden, err.(*url.Error).Err) } }) } @@ -154,7 +154,7 @@ func TestDialContextFilter(t *testing.T) { require.True(t, didDial) } else { require.Error(t, err) - require.Equal(t, err, AddressForbidden) + require.Equal(t, err, ErrAddressForbidden) require.False(t, didDial) } } diff --git a/server/platform/services/slackimport/slackimport.go b/server/platform/services/slackimport/slackimport.go index f8d75970ad..4f59256c41 100644 --- a/server/platform/services/slackimport/slackimport.go +++ b/server/platform/services/slackimport/slackimport.go @@ -143,35 +143,35 @@ func (si *SlackImporter) SlackImport(c request.CTX, fileData multipart.File, fil reader := utils.NewLimitedReaderWithError(fileReader, slackImportMaxFileSize) if file.Name == "channels.json" { publicChannels, err = slackParseChannels(reader, model.ChannelTypeOpen) - if errors.Is(err, utils.SizeLimitExceeded) { + if errors.Is(err, utils.ErrSizeLimitExceeded) { log.WriteString(i18n.T("api.slackimport.slack_import.zip.file_too_large", map[string]any{"Filename": file.Name})) continue } channels = append(channels, publicChannels...) } else if file.Name == "dms.json" { directChannels, err = slackParseChannels(reader, model.ChannelTypeDirect) - if errors.Is(err, utils.SizeLimitExceeded) { + if errors.Is(err, utils.ErrSizeLimitExceeded) { log.WriteString(i18n.T("api.slackimport.slack_import.zip.file_too_large", map[string]any{"Filename": file.Name})) continue } channels = append(channels, directChannels...) } else if file.Name == "groups.json" { privateChannels, err = slackParseChannels(reader, model.ChannelTypePrivate) - if errors.Is(err, utils.SizeLimitExceeded) { + if errors.Is(err, utils.ErrSizeLimitExceeded) { log.WriteString(i18n.T("api.slackimport.slack_import.zip.file_too_large", map[string]any{"Filename": file.Name})) continue } channels = append(channels, privateChannels...) } else if file.Name == "mpims.json" { groupChannels, err = slackParseChannels(reader, model.ChannelTypeGroup) - if errors.Is(err, utils.SizeLimitExceeded) { + if errors.Is(err, utils.ErrSizeLimitExceeded) { log.WriteString(i18n.T("api.slackimport.slack_import.zip.file_too_large", map[string]any{"Filename": file.Name})) continue } channels = append(channels, groupChannels...) } else if file.Name == "users.json" { users, err = slackParseUsers(reader) - if errors.Is(err, utils.SizeLimitExceeded) { + if errors.Is(err, utils.ErrSizeLimitExceeded) { log.WriteString(i18n.T("api.slackimport.slack_import.zip.file_too_large", map[string]any{"Filename": file.Name})) continue } @@ -179,7 +179,7 @@ func (si *SlackImporter) SlackImport(c request.CTX, fileData multipart.File, fil spl := strings.Split(file.Name, "/") if len(spl) == 2 && strings.HasSuffix(spl[1], ".json") { newposts, err := slackParsePosts(reader) - if errors.Is(err, utils.SizeLimitExceeded) { + if errors.Is(err, utils.ErrSizeLimitExceeded) { log.WriteString(i18n.T("api.slackimport.slack_import.zip.file_too_large", map[string]any{"Filename": file.Name})) continue }