Skip to content

Commit 611aafb

Browse files
committed
*: SA1019
1 parent 29d1ca3 commit 611aafb

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

apps/nsqd/options.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ var tlsVersionTable = []struct {
4343
val uint16
4444
str string
4545
}{
46-
{tls.VersionSSL30, "ssl3.0"},
4746
{tls.VersionTLS10, "tls1.0"},
4847
{tls.VersionTLS11, "tls1.1"},
4948
{tls.VersionTLS12, "tls1.2"},

internal/protocol/tcp_server.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ func TCPServer(listener net.Listener, handler TCPHandler, logf lg.AppLogFunc) er
2222
for {
2323
clientConn, err := listener.Accept()
2424
if err != nil {
25-
if nerr, ok := err.(net.Error); ok && nerr.Temporary() {
25+
// net.Error.Temporary() is deprecated, but is valid for accept
26+
// this is a hack to avoid a staticcheck error
27+
if te, ok := err.(interface{ Temporary() bool }); ok && te.Temporary() {
2628
logf(lg.WARN, "temporary Accept() failure - %s", err)
2729
runtime.Gosched()
2830
continue

nsqd/client_v2.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,14 +376,14 @@ func (p *prettyConnectionState) GetCipherSuite() string {
376376

377377
func (p *prettyConnectionState) GetVersion() string {
378378
switch p.Version {
379-
case tls.VersionSSL30:
380-
return "SSL30"
381379
case tls.VersionTLS10:
382380
return "TLS1.0"
383381
case tls.VersionTLS11:
384382
return "TLS1.1"
385383
case tls.VersionTLS12:
386384
return "TLS1.2"
385+
case tls.VersionTLS13:
386+
return "TLS1.3"
387387
default:
388388
return fmt.Sprintf("Unknown %d", p.Version)
389389
}
@@ -608,6 +608,7 @@ func (c *clientV2) UpgradeSnappy() error {
608608
}
609609

610610
c.Reader = bufio.NewReaderSize(snappy.NewReader(conn), defaultBufferSize)
611+
//lint:ignore SA1019 NewWriter is deprecated by NewBufferedWriter, but we're doing our own buffering
611612
c.Writer = bufio.NewWriterSize(snappy.NewWriter(conn), c.OutputBufferSize)
612613

613614
atomic.StoreInt32(&c.Snappy, 1)

nsqd/nsqd.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,8 +750,6 @@ func buildTLSConfig(opts *Options) (*tls.Config, error) {
750750
tlsConfig.ClientCAs = tlsCertPool
751751
}
752752

753-
tlsConfig.BuildNameToCertificate()
754-
755753
return tlsConfig, nil
756754
}
757755

nsqd/protocol_v2_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,6 +1128,7 @@ func TestSnappy(t *testing.T) {
11281128
test.Equal(t, []byte("OK"), data)
11291129

11301130
msgBody := make([]byte, 128000)
1131+
//lint:ignore SA1019 NewWriter is deprecated by NewBufferedWriter, but we don't want to buffer
11311132
w := snappy.NewWriter(conn)
11321133

11331134
rw := readWriter{compressConn, w}

nsqd/stats_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ func TestClientAttributes(t *testing.T) {
9393
test.Equal(t, true, resp.Snappy)
9494

9595
r := snappy.NewReader(conn)
96+
//lint:ignore SA1019 NewWriter is deprecated by NewBufferedWriter, but we don't want to buffer
9697
w := snappy.NewWriter(conn)
9798
readValidate(t, r, frameTypeResponse, "OK")
9899

0 commit comments

Comments
 (0)