Skip to content

Commit 7a81903

Browse files
mxpvmxpv
committed
Replace deprecated function calls
Signed-off-by: Maksym Pavlenko <[email protected]>
1 parent d8e042a commit 7a81903

File tree

6 files changed

+22
-53
lines changed

6 files changed

+22
-53
lines changed

‎cmd/podsync/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package main
22

33
import (
44
"fmt"
5-
"io/ioutil"
5+
"os"
66
"path/filepath"
77
"regexp"
88

@@ -54,7 +54,7 @@ type Log struct {
5454

5555
// LoadConfig loads TOML configuration from a file path
5656
func LoadConfig(path string) (*Config, error) {
57-
data, err := ioutil.ReadFile(path)
57+
data, err := os.ReadFile(path)
5858
if err != nil {
5959
return nil, errors.Wrapf(err, "failed to read config file: %s", path)
6060
}

‎cmd/podsync/config_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package main
22

33
import (
4-
"io/ioutil"
54
"os"
65
"testing"
76
"time"
@@ -235,7 +234,7 @@ data_dir = "/data"
235234
func setup(t *testing.T, file string) string {
236235
t.Helper()
237236

238-
f, err := ioutil.TempFile("", "")
237+
f, err := os.CreateTemp("", "")
239238
require.NoError(t, err)
240239

241240
defer f.Close()

‎pkg/db/badger_test.go‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package db
22

33
import (
44
"context"
5-
"io/ioutil"
6-
"os"
75
"testing"
86
"time"
97

@@ -16,23 +14,17 @@ import (
1614
var testCtx = context.TODO()
1715

1816
func TestNewBadger(t *testing.T) {
19-
dir, err := ioutil.TempDir("", "podsync-badger-")
20-
require.NoError(t, err)
17+
dir := t.TempDir()
2118

2219
db, err := NewBadger(&Config{Dir: dir})
2320
require.NoError(t, err)
2421

2522
err = db.Close()
2623
assert.NoError(t, err)
27-
28-
err = os.RemoveAll(dir)
29-
assert.NoError(t, err)
3024
}
3125

3226
func TestBadger_Version(t *testing.T) {
33-
dir, err := ioutil.TempDir("", "podsync-badger-")
34-
assert.NoError(t, err)
35-
defer os.RemoveAll(dir)
27+
dir := t.TempDir()
3628

3729
db, err := NewBadger(&Config{Dir: dir})
3830
require.NoError(t, err)
@@ -44,9 +36,7 @@ func TestBadger_Version(t *testing.T) {
4436
}
4537

4638
func TestBadger_AddFeed(t *testing.T) {
47-
dir, err := ioutil.TempDir("", "podsync-badger-")
48-
assert.NoError(t, err)
49-
defer os.RemoveAll(dir)
39+
dir := t.TempDir()
5040

5141
db, err := NewBadger(&Config{Dir: dir})
5242
require.NoError(t, err)
@@ -58,9 +48,7 @@ func TestBadger_AddFeed(t *testing.T) {
5848
}
5949

6050
func TestBadger_GetFeed(t *testing.T) {
61-
dir, err := ioutil.TempDir("", "podsync-badger-")
62-
assert.NoError(t, err)
63-
defer os.RemoveAll(dir)
51+
dir := t.TempDir()
6452

6553
db, err := NewBadger(&Config{Dir: dir})
6654
require.NoError(t, err)
@@ -78,9 +66,7 @@ func TestBadger_GetFeed(t *testing.T) {
7866
}
7967

8068
func TestBadger_WalkFeeds(t *testing.T) {
81-
dir, err := ioutil.TempDir("", "podsync-badger-")
82-
assert.NoError(t, err)
83-
defer os.RemoveAll(dir)
69+
dir := t.TempDir()
8470

8571
db, err := NewBadger(&Config{Dir: dir})
8672
require.NoError(t, err)
@@ -104,9 +90,7 @@ func TestBadger_WalkFeeds(t *testing.T) {
10490
}
10591

10692
func TestBadger_DeleteFeed(t *testing.T) {
107-
dir, err := ioutil.TempDir("", "podsync-badger-")
108-
assert.NoError(t, err)
109-
defer os.RemoveAll(dir)
93+
dir := t.TempDir()
11094

11195
db, err := NewBadger(&Config{Dir: dir})
11296
require.NoError(t, err)
@@ -129,9 +113,7 @@ func TestBadger_DeleteFeed(t *testing.T) {
129113
}
130114

131115
func TestBadger_UpdateEpisode(t *testing.T) {
132-
dir, err := ioutil.TempDir("", "podsync-badger-")
133-
assert.NoError(t, err)
134-
defer os.RemoveAll(dir)
116+
dir := t.TempDir()
135117

136118
db, err := NewBadger(&Config{Dir: dir})
137119
require.NoError(t, err)
@@ -159,9 +141,7 @@ func TestBadger_UpdateEpisode(t *testing.T) {
159141
}
160142

161143
func TestBadger_WalkEpisodes(t *testing.T) {
162-
dir, err := ioutil.TempDir("", "podsync-badger-")
163-
assert.NoError(t, err)
164-
defer os.RemoveAll(dir)
144+
dir := t.TempDir()
165145

166146
db, err := NewBadger(&Config{Dir: dir})
167147
require.NoError(t, err)

‎pkg/fs/local_test.go‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ package fs
33
import (
44
"bytes"
55
"context"
6-
"io/ioutil"
76
"os"
87
"path/filepath"
98
"testing"
109

1110
"github.com/stretchr/testify/assert"
12-
"github.com/stretchr/testify/require"
1311
)
1412

1513
var (
@@ -23,10 +21,8 @@ func TestNewLocal(t *testing.T) {
2321
}
2422

2523
func TestLocal_Create(t *testing.T) {
26-
tmpDir, err := ioutil.TempDir("", "podsync-local-stor-")
27-
require.NoError(t, err)
28-
29-
defer os.RemoveAll(tmpDir)
24+
tmpDir, err := os.MkdirTemp("", "")
25+
assert.NoError(t, err)
3026

3127
stor, err := NewLocal(tmpDir)
3228
assert.NoError(t, err)
@@ -41,8 +37,8 @@ func TestLocal_Create(t *testing.T) {
4137
}
4238

4339
func TestLocal_Size(t *testing.T) {
44-
tmpDir, err := ioutil.TempDir("", "podsync-local-stor-")
45-
require.NoError(t, err)
40+
tmpDir, err := os.MkdirTemp("", "")
41+
assert.NoError(t, err)
4642

4743
defer os.RemoveAll(tmpDir)
4844

@@ -66,10 +62,8 @@ func TestLocal_NoSize(t *testing.T) {
6662
}
6763

6864
func TestLocal_Delete(t *testing.T) {
69-
tmpDir, err := ioutil.TempDir("", "podsync-local-stor-")
70-
require.NoError(t, err)
71-
72-
defer os.RemoveAll(tmpDir)
65+
tmpDir, err := os.MkdirTemp("", "")
66+
assert.NoError(t, err)
7367

7468
stor, err := NewLocal(tmpDir)
7569
assert.NoError(t, err)
@@ -89,11 +83,8 @@ func TestLocal_Delete(t *testing.T) {
8983

9084
func TestLocal_copyFile(t *testing.T) {
9185
reader := bytes.NewReader([]byte{1, 2, 4})
92-
93-
tmpDir, err := ioutil.TempDir("", "podsync-test-")
94-
require.NoError(t, err)
95-
96-
defer os.RemoveAll(tmpDir)
86+
tmpDir, err := os.MkdirTemp("", "")
87+
assert.NoError(t, err)
9788

9889
file := filepath.Join(tmpDir, "1")
9990

‎pkg/fs/s3_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package fs
22

33
import (
44
"bytes"
5-
"io/ioutil"
5+
"io"
66
"os"
77
"testing"
88

@@ -98,7 +98,7 @@ func newMockS3(files map[string][]byte, prefix string) (*S3, error) {
9898
}
9999

100100
func (m *mockS3API) PutObjectRequest(input *s3.PutObjectInput) (*request.Request, *s3.PutObjectOutput) {
101-
content, _ := ioutil.ReadAll(input.Body)
101+
content, _ := io.ReadAll(input.Body)
102102
req := request.New(aws.Config{}, metadata.ClientInfo{}, request.Handlers{}, nil, &request.Operation{}, nil, nil)
103103
m.files[*input.Key] = content
104104
return req, &s3.PutObjectOutput{}

‎pkg/ytdl/ytdl.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"fmt"
66
"io"
7-
"io/ioutil"
87
"net/http"
98
"os"
109
"os/exec"
@@ -158,7 +157,7 @@ func (dl *YoutubeDl) Update(ctx context.Context) error {
158157
}
159158

160159
func (dl *YoutubeDl) Download(ctx context.Context, feedConfig *feed.Config, episode *model.Episode) (r io.ReadCloser, err error) {
161-
tmpDir, err := ioutil.TempDir("", "podsync-")
160+
tmpDir, err := os.MkdirTemp("", "podsync-")
162161
if err != nil {
163162
return nil, errors.Wrap(err, "failed to get temp dir for download")
164163
}

0 commit comments

Comments
 (0)