diff --git a/cmd/litestream/main.go b/cmd/litestream/main.go index 73b9fd8..27ba101 100644 --- a/cmd/litestream/main.go +++ b/cmd/litestream/main.go @@ -6,7 +6,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "log" "net/url" "os" @@ -253,7 +252,7 @@ func readConfigFile(filename string, expandEnv bool) (_ Config, err error) { // Read configuration. // Do not return an error if using default path and file is missing. - buf, err := ioutil.ReadFile(filename) + buf, err := os.ReadFile(filename) if err != nil { return config, err } diff --git a/cmd/litestream/main_test.go b/cmd/litestream/main_test.go index f37ff46..539534b 100644 --- a/cmd/litestream/main_test.go +++ b/cmd/litestream/main_test.go @@ -3,7 +3,6 @@ package main_test import ( "bytes" "io" - "io/ioutil" "log" "os" "path/filepath" @@ -23,7 +22,7 @@ func TestReadConfigFile(t *testing.T) { // Ensure global AWS settings are propagated down to replica configurations. t.Run("PropagateGlobalSettings", func(t *testing.T) { filename := filepath.Join(t.TempDir(), "litestream.yml") - if err := ioutil.WriteFile(filename, []byte(` + if err := os.WriteFile(filename, []byte(` access-key-id: XXX secret-access-key: YYY @@ -55,7 +54,7 @@ dbs: os.Setenv("LITESTREAM_TEST_1872363", "s3://foo/bar") filename := filepath.Join(t.TempDir(), "litestream.yml") - if err := ioutil.WriteFile(filename, []byte(` + if err := os.WriteFile(filename, []byte(` dbs: - path: $LITESTREAM_TEST_0129380 replicas: @@ -82,7 +81,7 @@ dbs: os.Setenv("LITESTREAM_TEST_9847533", "s3://foo/bar") filename := filepath.Join(t.TempDir(), "litestream.yml") - if err := ioutil.WriteFile(filename, []byte(` + if err := os.WriteFile(filename, []byte(` dbs: - path: /path/to/db replicas: diff --git a/db.go b/db.go index baeeada..22e02a4 100644 --- a/db.go +++ b/db.go @@ -9,7 +9,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "log" "math/rand" "os" @@ -292,7 +291,7 @@ func (db *DB) invalidatePos(ctx context.Context) error { } defer rd.Close() - n, err := io.Copy(ioutil.Discard, lz4.NewReader(rd)) + n, err := io.Copy(io.Discard, lz4.NewReader(rd)) if err != nil { return err } @@ -671,7 +670,7 @@ func (db *DB) cleanGenerations(ctx context.Context) error { } dir := filepath.Join(db.MetaPath(), "generations") - fis, err := ioutil.ReadDir(dir) + fis, err := os.ReadDir(dir) if os.IsNotExist(err) { return nil } else if err != nil { diff --git a/file_replica_client.go b/file_replica_client.go index fd97995..69a2fe4 100644 --- a/file_replica_client.go +++ b/file_replica_client.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "os" "path/filepath" "sort" @@ -111,7 +110,7 @@ func (c *FileReplicaClient) Generations(ctx context.Context) ([]string, error) { return nil, fmt.Errorf("cannot determine generations path: %w", err) } - fis, err := ioutil.ReadDir(root) + fis, err := os.ReadDir(root) if os.IsNotExist(err) { return nil, nil } else if err != nil { diff --git a/integration/replica_client_test.go b/integration/replica_client_test.go index b76034b..6770678 100644 --- a/integration/replica_client_test.go +++ b/integration/replica_client_test.go @@ -4,7 +4,7 @@ import ( "context" "flag" "fmt" - "io/ioutil" + "io" "math/rand" "os" "path" @@ -22,12 +22,13 @@ import ( ) func init() { - rand.Seed(time.Now().UnixNano()) + localRand = rand.New(rand.NewSource(time.Now().UnixNano())) } var ( // Enables integration tests. replicaType = flag.String("replica-type", "file", "") + localRand *rand.Rand ) // S3 settings @@ -193,7 +194,7 @@ func TestReplicaClient_WriteSnapshot(t *testing.T) { if r, err := c.SnapshotReader(context.Background(), "b16ddcf5c697540f", 1000); err != nil { t.Fatal(err) - } else if buf, err := ioutil.ReadAll(r); err != nil { + } else if buf, err := io.ReadAll(r); err != nil { t.Fatal(err) } else if err := r.Close(); err != nil { t.Fatal(err) @@ -224,7 +225,7 @@ func TestReplicaClient_SnapshotReader(t *testing.T) { } defer r.Close() - if buf, err := ioutil.ReadAll(r); err != nil { + if buf, err := io.ReadAll(r); err != nil { t.Fatal(err) } else if got, want := string(buf), "foo"; got != want { t.Fatalf("ReadAll=%v, want %v", got, want) @@ -378,7 +379,7 @@ func TestReplicaClient_WriteWALSegment(t *testing.T) { if r, err := c.WALSegmentReader(context.Background(), litestream.Pos{Generation: "b16ddcf5c697540f", Index: 1000, Offset: 2000}); err != nil { t.Fatal(err) - } else if buf, err := ioutil.ReadAll(r); err != nil { + } else if buf, err := io.ReadAll(r); err != nil { t.Fatal(err) } else if err := r.Close(); err != nil { t.Fatal(err) @@ -409,7 +410,7 @@ func TestReplicaClient_WALSegmentReader(t *testing.T) { } defer r.Close() - if buf, err := ioutil.ReadAll(r); err != nil { + if buf, err := io.ReadAll(r); err != nil { t.Fatal(err) } else if got, want := string(buf), "foobar"; got != want { t.Fatalf("ReadAll=%v, want %v", got, want) diff --git a/replica.go b/replica.go index 245565f..c1fb0d9 100644 --- a/replica.go +++ b/replica.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "log" "os" "sort" @@ -375,7 +374,7 @@ func (r *Replica) calcPos(ctx context.Context, generation string) (pos Pos, err } defer rd.Close() - n, err := io.Copy(ioutil.Discard, lz4.NewReader(rd)) + n, err := io.Copy(io.Discard, lz4.NewReader(rd)) if err != nil { return pos, err }