Skip to content

Commit 312900c

Browse files
mxpvmxpv
authored
Merge pull request #604 from mxpv/deps
Update dependencies and Go version
2 parents fac6fb7 + 7a81903 commit 312900c

File tree

11 files changed

+43
-77
lines changed

11 files changed

+43
-77
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/checkout@v4
5454
- uses: golangci/golangci-lint-action@v4
5555
with:
56-
version: v1.50.1
56+
version: v1.57.2
5757

5858
- name: Go mod
5959
env:

‎.golangci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ linters:
1515
- interfacer
1616
- unconvert
1717
- maligned
18-
- depguard
18+
# - depguard
1919
- nakedret
2020
- prealloc
2121
- whitespace

‎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()

‎go.mod‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module github.com/mxpv/podsync
22

3+
go 1.21
4+
35
require (
46
github.com/BrianHicks/finch v0.0.0-20140409222414-419bd73c29ec
57
github.com/aws/aws-sdk-go v1.44.144
@@ -22,4 +24,20 @@ require (
2224
gopkg.in/natefinch/lumberjack.v2 v2.2.1
2325
)
2426

25-
go 1.13
27+
require (
28+
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
29+
github.com/cespare/xxhash v1.1.0 // indirect
30+
github.com/davecgh/go-spew v1.1.1 // indirect
31+
github.com/dgraph-io/ristretto v0.0.2 // indirect
32+
github.com/dustin/go-humanize v1.0.0 // indirect
33+
github.com/golang/protobuf v1.5.2 // indirect
34+
github.com/grafov/m3u8 v0.11.1 // indirect
35+
github.com/hashicorp/errwrap v1.0.0 // indirect
36+
github.com/jmespath/go-jmespath v0.4.0 // indirect
37+
github.com/pmezard/go-difflib v1.0.0 // indirect
38+
golang.org/x/net v0.11.0 // indirect
39+
golang.org/x/sys v0.9.0 // indirect
40+
google.golang.org/appengine v1.6.7 // indirect
41+
google.golang.org/protobuf v1.28.0 // indirect
42+
gopkg.in/yaml.v3 v3.0.1 // indirect
43+
)

‎go.sum‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
21
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M=
32
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
43
github.com/BrianHicks/finch v0.0.0-20140409222414-419bd73c29ec h1:1VPruZMM1WQC7POhjxbZOWK564cuFz1hlpwYW6ocM4E=
@@ -87,15 +86,9 @@ github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb6
8786
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
8887
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
8988
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
90-
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
91-
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
92-
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
9389
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
9490
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
9591
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
96-
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
97-
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
98-
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
9992
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
10093
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
10194
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
@@ -108,27 +101,22 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnf
108101
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
109102
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
110103
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
111-
golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
112104
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
113105
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
114-
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
115106
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
116107
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
117108
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
118109
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
119110
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
120111
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
121112
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
122-
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
123-
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
124113
golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
125114
golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
126115
golang.org/x/oauth2 v0.9.0 h1:BPpt2kU7oMRq3kCHAA1tbSEshXRw1LpG2ztgDwrzuAs=
127116
golang.org/x/oauth2 v0.9.0/go.mod h1:qYgFZaFiu6Wg24azG8bdV52QJXJGbZzIIsRCdVKzbLw=
128117
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
129118
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
130119
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
131-
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
132120
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
133121
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
134122
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -144,30 +132,22 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
144132
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
145133
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
146134
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
147-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
148-
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
149135
golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
150136
golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
151137
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
152138
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
153139
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
154-
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
155-
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
156-
golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
157140
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
158141
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
159142
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
160143
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
161144
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
162-
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
163-
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
164145
golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
165146
golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
166147
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
167148
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
168149
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
169150
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
170-
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
171151
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
172152
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
173153
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎pkg/builder/youtube_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ func TestYT_BuildFeed(t *testing.T) {
4343
require.NoError(t, err)
4444

4545
urls := []string{
46-
"https://youtube.com/user/fxigr1",
4746
"https://www.youtube.com/channel/UCupvZG-5ko_eiXAupbDfxWw",
4847
"https://www.youtube.com/playlist?list=PLF7tUDhGkiCk_Ne30zu7SJ9gZF9R9ZruE",
4948
"https://www.youtube.com/channel/UCK9lZ2lHRBgx2LOcqPifukA",

‎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{}

0 commit comments

Comments
 (0)