Skip to content

Commit 9b0fea8

Browse files
kozlovickozlovic
authored
Merge pull request #1288 from nats-io/release_0_25_4
Release v0.25.4
2 parents 4cfa4f1 + f644961 commit 9b0fea8

19 files changed

+124
-173
lines changed

‎.goreleaser.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ changelog:
1111
skip: true
1212

1313
builds:
14-
- main: ./nats-streaming-server.go
14+
- main: .
1515
binary: nats-streaming-server
16+
flags:
17+
- -trimpath
1618
ldflags:
17-
- -w -X github.com/nats-io/nats-streaming-server/server.gitCommit={{.ShortCommit}} -X github.com/nats-io/nats-server/v2/server.gitCommit=23ffc16
19+
- -w -X github.com/nats-io/nats-streaming-server/server.gitCommit={{.ShortCommit}} -X github.com/nats-io/nats-server/v2/server.gitCommit=f84ca24
1820
env:
1921
- GO111MODULE=on
2022
- CGO_ENABLED=0
@@ -47,14 +49,12 @@ nfpms:
4749

4850
archives:
4951
- name_template: '{{.ProjectName}}-{{.Tag}}-{{.Os}}-{{.Arch}}{{if .Arm}}{{.Arm}}{{end}}'
50-
rlcp: true
5152
wrap_in_directory: true
5253
format: zip
5354
files:
5455
- README.md
5556
- LICENSE
5657
- name_template: '{{.ProjectName}}-{{.Tag}}-{{.Os}}-{{.Arch}}{{if .Arm}}{{.Arm}}{{end}}'
57-
rlcp: true
5858
id: targz-archives
5959
wrap_in_directory: true
6060
format: tar.gz

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ under the Apache Version 2.0 license found in the LICENSE file.
4848
[Coverage-image]: https://coveralls.io/repos/github/nats-io/nats-streaming-server/badge.svg?branch=main&t=kIxrDE
4949
[ReportCard-Url]: http://goreportcard.com/report/nats-io/nats-streaming-server
5050
[ReportCard-Image]: http://goreportcard.com/badge/github.com/nats-io/nats-streaming-server
51-
[Release-Url]: https://github.com/nats-io/nats-streaming-server/releases/tag/v0.25.3
52-
[Release-image]: https://img.shields.io/badge/release-v0.25.3-1eb0fc.svg
51+
[Release-Url]: https://github.com/nats-io/nats-streaming-server/releases/tag/v0.25.4
52+
[Release-image]: https://img.shields.io/badge/release-v0.25.4-1eb0fc.svg
5353
[github-release]: https://github.com/nats-io/nats-streaming-server/releases/

‎go.mod

+22-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,35 @@
11
module github.com/nats-io/nats-streaming-server
22

3-
go 1.14
3+
go 1.19
44

55
require (
66
github.com/go-sql-driver/mysql v1.7.0
77
github.com/gogo/protobuf v1.3.2
88
github.com/hashicorp/go-hclog v1.5.0
99
github.com/hashicorp/go-msgpack/v2 v2.1.0
1010
github.com/hashicorp/raft v1.4.0
11-
github.com/lib/pq v1.10.7
12-
github.com/nats-io/nats-server/v2 v2.9.15
11+
github.com/lib/pq v1.10.8
12+
github.com/nats-io/nats-server/v2 v2.9.16
1313
github.com/nats-io/nats.go v1.25.0
1414
github.com/nats-io/nuid v1.0.1
1515
github.com/nats-io/stan.go v0.10.4
16-
github.com/prometheus/procfs v0.8.0
17-
go.etcd.io/bbolt v1.3.6
18-
golang.org/x/crypto v0.6.0
19-
golang.org/x/sys v0.5.0
16+
github.com/prometheus/procfs v0.9.0
17+
go.etcd.io/bbolt v1.3.7
18+
golang.org/x/crypto v0.8.0
19+
golang.org/x/sys v0.7.0
20+
)
21+
22+
require (
23+
github.com/armon/go-metrics v0.4.1 // indirect
24+
github.com/fatih/color v1.13.0 // indirect
25+
github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
26+
github.com/hashicorp/go-msgpack v0.5.5 // indirect
27+
github.com/hashicorp/golang-lru v0.5.0 // indirect
28+
github.com/klauspost/compress v1.16.4 // indirect
29+
github.com/mattn/go-colorable v0.1.12 // indirect
30+
github.com/mattn/go-isatty v0.0.14 // indirect
31+
github.com/minio/highwayhash v1.0.2 // indirect
32+
github.com/nats-io/jwt/v2 v2.4.1 // indirect
33+
github.com/nats-io/nkeys v0.4.4 // indirect
34+
golang.org/x/time v0.3.0 // indirect
2035
)

‎go.sum

+16-79
Large diffs are not rendered by default.

‎logger/logger_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"errors"
1818
"flag"
1919
"fmt"
20-
"io/ioutil"
2120
"os"
2221
"path/filepath"
2322
"strings"
@@ -177,7 +176,7 @@ func TestLogger(t *testing.T) {
177176
checkLogger("Unable to close logger: dummy error")
178177

179178
// Switch to file log
180-
tmpDir, err := ioutil.TempDir("", "")
179+
tmpDir, err := os.MkdirTemp("", "")
181180
if err != nil {
182181
t.Fatalf("Unable to create temp dir: %v", err)
183182
}
@@ -188,7 +187,7 @@ func TestLogger(t *testing.T) {
188187
logger.SetFileSizeLimit(1000)
189188
// Reopen and check file content
190189
logger.ReopenLogFile()
191-
buf, err := ioutil.ReadFile(fname)
190+
buf, err := os.ReadFile(fname)
192191
if err != nil {
193192
t.Fatalf("Error reading file: %v", err)
194193
}
@@ -201,7 +200,7 @@ func TestLogger(t *testing.T) {
201200
for i := 0; i < 100; i++ {
202201
logger.Noticef(notice)
203202
}
204-
files, err := ioutil.ReadDir(tmpDir)
203+
files, err := os.ReadDir(tmpDir)
205204
if err != nil {
206205
t.Fatalf("Unable to read temp dir: %v", err)
207206
}

‎server/clustering_test.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"database/sql"
1919
"encoding/json"
2020
"fmt"
21-
"io/ioutil"
2221
"math/rand"
2322
"net"
2423
"net/http"
@@ -46,7 +45,7 @@ import (
4645
var defaultRaftLog string
4746

4847
func init() {
49-
tmpDir, err := ioutil.TempDir("", "raft_logs_")
48+
tmpDir, err := os.MkdirTemp("", "raft_logs_")
5049
if err != nil {
5150
panic("Could not create tmp dir")
5251
}
@@ -3679,7 +3678,7 @@ func TestClusteringRaftLogReplayDoesNotDeleteLatestVersionOfChannel(t *testing.T
36793678
follower := removeServer(servers, leader)[0]
36803679
follower.Shutdown()
36813680
witnessFile := filepath.Join(follower.opts.FilestoreDir, channel, "deleted.txt")
3682-
if err := ioutil.WriteFile(witnessFile, []byte("if present, channel has not been deleted then recreated"), 0666); err != nil {
3681+
if err := os.WriteFile(witnessFile, []byte("if present, channel has not been deleted then recreated"), 0666); err != nil {
36833682
t.Fatalf("Error creating file: %v", err)
36843683
}
36853684
// Now restart..
@@ -4551,7 +4550,7 @@ func TestClusteringWithCryptoStore(t *testing.T) {
45514550

45524551
check := func(t *testing.T, name, fname string) {
45534552
t.Helper()
4554-
content, err := ioutil.ReadFile(fname)
4553+
content, err := os.ReadFile(fname)
45554554
if err != nil {
45564555
t.Fatalf("Error reading file %q: %v", fname1, err)
45574556
}
@@ -6770,7 +6769,7 @@ func TestClusteringRestoreSnapshotMsgsBailIfNoLeader(t *testing.T) {
67706769
return nil
67716770
})
67726771

6773-
snaps, err := ioutil.ReadDir(filepath.Join(defaultRaftLog, "c", clusterName, "snapshots"))
6772+
snaps, err := os.ReadDir(filepath.Join(defaultRaftLog, "c", clusterName, "snapshots"))
67746773
if err != nil {
67756774
t.Fatalf("Error reading snapshots directory: %v", err)
67766775
}

‎server/conf_test.go

+11-12
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package server
1616
import (
1717
"bytes"
1818
"flag"
19-
"io/ioutil"
2019
"os"
2120
"reflect"
2221
"runtime"
@@ -314,11 +313,11 @@ func TestParsePermError(t *testing.T) {
314313
if runtime.GOOS == "windows" {
315314
t.SkipNow()
316315
}
317-
tmpDir, err := ioutil.TempDir("", "streaming")
316+
tmpDir, err := os.MkdirTemp("", "streaming")
318317
if err != nil {
319318
t.Fatalf("Could not create tmp dir: %v", err)
320319
}
321-
file, err := ioutil.TempFile(tmpDir, "config.conf")
320+
file, err := os.CreateTemp(tmpDir, "config.conf")
322321
if err != nil {
323322
t.Fatalf("Could not create tmp file: %v", err)
324323
}
@@ -339,7 +338,7 @@ func TestParsePermError(t *testing.T) {
339338

340339
func TestParseParserError(t *testing.T) {
341340
confFile := "wrong_config.conf"
342-
if err := ioutil.WriteFile(confFile, []byte("x=."), 0660); err != nil {
341+
if err := os.WriteFile(confFile, []byte("x=."), 0660); err != nil {
343342
t.Fatalf("Unexpected error creating conf file: %v", err)
344343
}
345344
defer os.Remove(confFile)
@@ -351,7 +350,7 @@ func TestParseParserError(t *testing.T) {
351350

352351
func TestParseStoreType(t *testing.T) {
353352
confFile := "wrong_config.conf"
354-
if err := ioutil.WriteFile(confFile, []byte("store=memory"), 0660); err != nil {
353+
if err := os.WriteFile(confFile, []byte("store=memory"), 0660); err != nil {
355354
t.Fatalf("Unexpected error creating conf file: %v", err)
356355
}
357356
defer os.Remove(confFile)
@@ -364,7 +363,7 @@ func TestParseStoreType(t *testing.T) {
364363
}
365364
os.Remove(confFile)
366365

367-
if err := ioutil.WriteFile(confFile, []byte("store=xyz"), 0660); err != nil {
366+
if err := os.WriteFile(confFile, []byte("store=xyz"), 0660); err != nil {
368367
t.Fatalf("Unexpected error creating conf file: %v", err)
369368
}
370369
defer os.Remove(confFile)
@@ -380,7 +379,7 @@ func TestParseStoreType(t *testing.T) {
380379
stores.TypeSQL,
381380
}
382381
for _, gs := range goodStores {
383-
if err := ioutil.WriteFile(confFile, []byte("store="+gs), 0660); err != nil {
382+
if err := os.WriteFile(confFile, []byte("store="+gs), 0660); err != nil {
384383
t.Fatalf("Unexpected error creating conf file: %v", err)
385384
}
386385
defer os.Remove(confFile)
@@ -398,7 +397,7 @@ func TestParseStoreType(t *testing.T) {
398397
func TestParsePerChannelLimitsSetToZero(t *testing.T) {
399398
confFile := "config.conf"
400399
defer os.Remove(confFile)
401-
if err := ioutil.WriteFile(confFile,
400+
if err := os.WriteFile(confFile,
402401
[]byte("store_limits: {channels: {foo: {max_msgs: 0, max_bytes: 0, max_age: \"0\", max_subs: 0, max_inactivity: \"0\"}}}"), 0660); err != nil {
403402
t.Fatalf("Unexpected error creating conf file: %v", err)
404403
}
@@ -532,7 +531,7 @@ func TestParseWrongTypes(t *testing.T) {
532531

533532
func expectFailureFor(t *testing.T, content, errorMatch string) {
534533
confFile := "wrong_config.conf"
535-
if err := ioutil.WriteFile(confFile, []byte(content), 0660); err != nil {
534+
if err := os.WriteFile(confFile, []byte(content), 0660); err != nil {
536535
t.Fatalf("Unexpected error creating conf file: %v", err)
537536
}
538537
defer os.Remove(confFile)
@@ -637,15 +636,15 @@ func TestParseConfigureOptions(t *testing.T) {
637636
streaming: {
638637
cluster_id: my_cluster
639638
}`)
640-
if err := ioutil.WriteFile(sconf, scontent, 0660); err != nil {
639+
if err := os.WriteFile(sconf, scontent, 0660); err != nil {
641640
t.Fatalf("Error creating conf file: %v", err)
642641
}
643642
ncontent := []byte(`
644643
port: 5223
645644
streaming: {
646645
cluster_id: my_cluster_2
647646
}`)
648-
if err := ioutil.WriteFile(nconf, ncontent, 0660); err != nil {
647+
if err := os.WriteFile(nconf, ncontent, 0660); err != nil {
649648
t.Fatalf("Error creating conf file: %v", err)
650649
}
651650
sopts, nopts := mustNotFail([]string{"-sc", sconf, "-c", nconf})
@@ -700,7 +699,7 @@ func TestParseConfigureOptions(t *testing.T) {
700699
} else {
701700
ncontent = []byte(`logtime: true`)
702701
}
703-
if err := ioutil.WriteFile(nconf, ncontent, 0660); err != nil {
702+
if err := os.WriteFile(nconf, ncontent, 0660); err != nil {
704703
t.Fatalf("Error creating conf file: %v", err)
705704
}
706705
_, nopts = mustNotFail([]string{"-c", nconf})

‎server/monitor_test.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ import (
1818
"crypto/x509"
1919
"encoding/json"
2020
"fmt"
21-
"io/ioutil"
21+
"io"
2222
"math/rand"
2323
"net/http"
24+
"os"
2425
"reflect"
2526
"runtime"
2627
"strings"
@@ -81,7 +82,7 @@ func getBodyEx(t *testing.T, client *http.Client, scheme, endpoint string, mp, e
8182
if ct != expectedContentType {
8283
stackFatalf(t, "Expected %s content-type, got %s\n", expectedContentType, ct)
8384
}
84-
body, err := ioutil.ReadAll(resp.Body)
85+
body, err := io.ReadAll(resp.Body)
8586
if err != nil {
8687
resp.Body.Close()
8788
stackFatalf(t, "Got an error reading the body: %v\n", err)
@@ -155,7 +156,7 @@ func TestMonitorStartOwnHTTPSServer(t *testing.T) {
155156
defer s.Shutdown()
156157

157158
tlsConfig := &tls.Config{}
158-
caCert, err := ioutil.ReadFile("../test/certs/ca.pem")
159+
caCert, err := os.ReadFile("../test/certs/ca.pem")
159160
if err != nil {
160161
t.Fatalf("Got error reading RootCA file: %s", err)
161162
}
@@ -1494,7 +1495,7 @@ func TestMonitorNoPanicOnServerRestart(t *testing.T) {
14941495
if err != nil {
14951496
continue
14961497
}
1497-
ioutil.ReadAll(resp.Body)
1498+
io.ReadAll(resp.Body)
14981499
resp.Body.Close()
14991500
select {
15001501
case <-done:

‎server/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import (
4747
// Server defaults.
4848
const (
4949
// VERSION is the current version for the NATS Streaming server.
50-
VERSION = "0.25.3"
50+
VERSION = "0.25.4"
5151

5252
DefaultClusterID = "test-cluster"
5353
DefaultDiscoverPrefix = "_STAN.discover"

‎server/server_run_test.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"crypto/tls"
1818
"flag"
1919
"fmt"
20-
"io/ioutil"
2120
"os"
2221
"reflect"
2322
"runtime"
@@ -1283,12 +1282,12 @@ func TestStreamingServerReadyLog(t *testing.T) {
12831282
}
12841283

12851284
func TestReopenLogFileStopsNATSDebugTrace(t *testing.T) {
1286-
tmpDir, err := ioutil.TempDir("", "nats-streaming-server")
1285+
tmpDir, err := os.MkdirTemp("", "nats-streaming-server")
12871286
if err != nil {
12881287
t.Fatal("Could not create tmp dir")
12891288
}
12901289
defer os.RemoveAll(tmpDir)
1291-
file, err := ioutil.TempFile(tmpDir, "log_")
1290+
file, err := os.CreateTemp(tmpDir, "log_")
12921291
if err != nil {
12931292
t.Fatalf("Could not create the temp file: %v", err)
12941293
}
@@ -1311,7 +1310,7 @@ func TestReopenLogFileStopsNATSDebugTrace(t *testing.T) {
13111310

13121311
check := func(str string, expected bool) {
13131312
t.Helper()
1314-
buf, err := ioutil.ReadFile(nOpts.LogFile)
1313+
buf, err := os.ReadFile(nOpts.LogFile)
13151314
if err != nil {
13161315
t.Fatalf("Error reading file: %v", err)
13171316
}
@@ -1352,7 +1351,7 @@ func TestReopenLogFileStopsNATSDebugTrace(t *testing.T) {
13521351
s.log.Noticef(pstr)
13531352
}
13541353
// Check that size limit has been applied.
1355-
files, err := ioutil.ReadDir(tmpDir)
1354+
files, err := os.ReadDir(tmpDir)
13561355
if err != nil {
13571356
t.Fatalf("Error reading directory: %v", err)
13581357
}

‎server/server_test.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"errors"
1818
"flag"
1919
"fmt"
20-
"io/ioutil"
2120
"os"
2221
"reflect"
2322
"regexp"
@@ -162,7 +161,7 @@ func TestMain(m *testing.M) {
162161
}
163162

164163
func init() {
165-
tmpDir, err := ioutil.TempDir(".", "data_server_")
164+
tmpDir, err := os.MkdirTemp(".", "data_server_")
166165
if err != nil {
167166
panic("Could not create tmp dir")
168167
}
@@ -409,13 +408,13 @@ func createConnectionWithNatsOpts(t tLogger, clientName string,
409408

410409
func createConfFile(t *testing.T, content []byte) string {
411410
t.Helper()
412-
conf, err := ioutil.TempFile("", "")
411+
conf, err := os.CreateTemp("", "")
413412
if err != nil {
414413
t.Fatalf("Error creating conf file: %v", err)
415414
}
416415
fName := conf.Name()
417416
conf.Close()
418-
if err := ioutil.WriteFile(fName, content, 0666); err != nil {
417+
if err := os.WriteFile(fName, content, 0666); err != nil {
419418
os.Remove(fName)
420419
t.Fatalf("Error writing conf file: %v", err)
421420
}
@@ -424,7 +423,7 @@ func createConfFile(t *testing.T, content []byte) string {
424423

425424
func changeCurrentConfigContentWithNewContent(t *testing.T, curConfig string, content []byte) {
426425
t.Helper()
427-
if err := ioutil.WriteFile(curConfig, content, 0666); err != nil {
426+
if err := os.WriteFile(curConfig, content, 0666); err != nil {
428427
t.Fatalf("Error writing config: %v", err)
429428
}
430429
}

0 commit comments

Comments
 (0)