Skip to content

Commit 15ff867

Browse files
committed
fix linter
1 parent 2652b6d commit 15ff867

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

internal/clients/http_client.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"github.com/tum-zulip/go-zulip/zulip"
1717
)
1818

19-
//nolint:funlen
2019
func buildHTTPClient(
2120
baseClient *http.Client,
2221
params *zulip.RC,
@@ -45,7 +44,10 @@ func buildHTTPClient(
4544

4645
if t, ok := transport.(*http.Transport); ok {
4746
cp := t.Clone()
48-
configureTransportTLS(cp, params, logger, warnOnInsecureTLS)
47+
err := configureTransportTLS(cp, params, logger, warnOnInsecureTLS)
48+
if err != nil {
49+
return nil, "", err
50+
}
4951
transport = cp
5052
} else {
5153
if params.CertBundle != "" || params.ClientCert != "" {
@@ -71,7 +73,12 @@ func buildHTTPClient(
7173
return &clientCopy, userAgent, nil
7274
}
7375

74-
func configureTransportTLS(transport *http.Transport, params *zulip.RC, logger *slog.Logger, warnOnInsecureTLS bool) error {
76+
func configureTransportTLS(
77+
transport *http.Transport,
78+
params *zulip.RC,
79+
logger *slog.Logger,
80+
warnOnInsecureTLS bool,
81+
) error {
7582
if transport.TLSClientConfig == nil {
7683
transport.TLSClientConfig = &tls.Config{
7784
MinVersion: tls.VersionTLS12,
@@ -162,6 +169,7 @@ func buildUserAgent(clientName string) string {
162169
vendor, version := detectPlatform()
163170
return fmt.Sprintf("%s (%s; %s)", clientName, vendor, version)
164171
}
172+
165173
func normalizePath(pathStr string) (string, error) {
166174
expanded := os.ExpandEnv(pathStr)
167175
if strings.HasPrefix(expanded, "~") {

internal/test_utils/utils.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ func getTestClient(t *testing.T, username string) (*z.RC, client.Client) {
195195
client.SkipWarnOnInsecureTLS(),
196196
client.EnableStatistics(),
197197
client.WithHTTPClient(newHTTPClientForTestSite()))
198-
199198
if err != nil {
200199
t.Fatalf("Failed to create z.client: %v", err)
201200
}
@@ -204,15 +203,18 @@ func getTestClient(t *testing.T, username string) (*z.RC, client.Client) {
204203
}
205204

206205
func newHTTPClientForTestSite() *http.Client {
206+
const timeout = 30 * time.Second
207+
const keepAlive = 30 * time.Second
208+
207209
baseTransport, ok := http.DefaultTransport.(*http.Transport)
208210
if !ok {
209211
panic("default transport is not an *http.Transport")
210212
}
211213

212214
transport := baseTransport.Clone()
213215
dialer := &net.Dialer{
214-
Timeout: 30 * time.Second,
215-
KeepAlive: 30 * time.Second,
216+
Timeout: timeout,
217+
KeepAlive: keepAlive,
216218
}
217219

218220
transport.DialContext = func(ctx context.Context, network, address string) (net.Conn, error) {
@@ -240,6 +242,7 @@ type UserInfo struct {
240242
UserID int `json:"user_id"`
241243
}
242244

245+
//nolint:funlen,gocognit,nolintlint
243246
func fetchUserInfo(t *testing.T, username string) UserInfo {
244247
t.Helper()
245248

0 commit comments

Comments
 (0)