Skip to content

Commit 43795ec

Browse files
thaJeztahthaJeztah
committed
cli/command/manifest: remove deprecated io/ioutil and use t.TempDir()
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent d14b5bf commit 43795ec

5 files changed

Lines changed: 32 additions & 47 deletions

File tree

‎cli/command/manifest/annotate_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package manifest
22

33
import (
4-
"io/ioutil"
4+
"io"
55
"testing"
66

7+
"github.com/docker/cli/cli/manifest/store"
78
"github.com/docker/cli/internal/test"
89
"gotest.tools/v3/assert"
910
is "gotest.tools/v3/assert/cmp"
@@ -33,14 +34,13 @@ func TestManifestAnnotateError(t *testing.T) {
3334
cli := test.NewFakeCli(nil)
3435
cmd := newAnnotateCommand(cli)
3536
cmd.SetArgs(tc.args)
36-
cmd.SetOut(ioutil.Discard)
37+
cmd.SetOut(io.Discard)
3738
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
3839
}
3940
}
4041

4142
func TestManifestAnnotate(t *testing.T) {
42-
store, cleanup := newTempManifestStore(t)
43-
defer cleanup()
43+
store := store.NewStore(t.TempDir())
4444

4545
cli := test.NewFakeCli(nil)
4646
cli.SetManifestStore(store)
@@ -51,7 +51,7 @@ func TestManifestAnnotate(t *testing.T) {
5151

5252
cmd := newAnnotateCommand(cli)
5353
cmd.SetArgs([]string{"example.com/list:v1", "example.com/fake:0.0"})
54-
cmd.SetOut(ioutil.Discard)
54+
cmd.SetOut(io.Discard)
5555
expectedError := "manifest for image example.com/fake:0.0 does not exist"
5656
assert.ErrorContains(t, cmd.Execute(), expectedError)
5757

‎cli/command/manifest/create_test.go‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ package manifest
22

33
import (
44
"context"
5-
"io/ioutil"
5+
"io"
66
"testing"
77

8+
"github.com/docker/cli/cli/manifest/store"
89
manifesttypes "github.com/docker/cli/cli/manifest/types"
910
"github.com/docker/cli/internal/test"
1011
"github.com/docker/distribution/reference"
@@ -33,15 +34,14 @@ func TestManifestCreateErrors(t *testing.T) {
3334
cli := test.NewFakeCli(nil)
3435
cmd := newCreateListCommand(cli)
3536
cmd.SetArgs(tc.args)
36-
cmd.SetOut(ioutil.Discard)
37+
cmd.SetOut(io.Discard)
3738
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
3839
}
3940
}
4041

4142
// create a manifest list, then overwrite it, and inspect to see if the old one is still there
4243
func TestManifestCreateAmend(t *testing.T) {
43-
store, cleanup := newTempManifestStore(t)
44-
defer cleanup()
44+
store := store.NewStore(t.TempDir())
4545

4646
cli := test.NewFakeCli(nil)
4747
cli.SetManifestStore(store)
@@ -58,7 +58,7 @@ func TestManifestCreateAmend(t *testing.T) {
5858
cmd := newCreateListCommand(cli)
5959
cmd.SetArgs([]string{"example.com/list:v1", "example.com/alpine:3.1"})
6060
cmd.Flags().Set("amend", "true")
61-
cmd.SetOut(ioutil.Discard)
61+
cmd.SetOut(io.Discard)
6262
err = cmd.Execute()
6363
assert.NilError(t, err)
6464

@@ -75,8 +75,7 @@ func TestManifestCreateAmend(t *testing.T) {
7575

7676
// attempt to overwrite a saved manifest and get refused
7777
func TestManifestCreateRefuseAmend(t *testing.T) {
78-
store, cleanup := newTempManifestStore(t)
79-
defer cleanup()
78+
store := store.NewStore(t.TempDir())
8079

8180
cli := test.NewFakeCli(nil)
8281
cli.SetManifestStore(store)
@@ -87,15 +86,14 @@ func TestManifestCreateRefuseAmend(t *testing.T) {
8786

8887
cmd := newCreateListCommand(cli)
8988
cmd.SetArgs([]string{"example.com/list:v1", "example.com/alpine:3.0"})
90-
cmd.SetOut(ioutil.Discard)
89+
cmd.SetOut(io.Discard)
9190
err = cmd.Execute()
9291
assert.Error(t, err, "refusing to amend an existing manifest list with no --amend flag")
9392
}
9493

9594
// attempt to make a manifest list without valid images
9695
func TestManifestCreateNoManifest(t *testing.T) {
97-
store, cleanup := newTempManifestStore(t)
98-
defer cleanup()
96+
store := store.NewStore(t.TempDir())
9997

10098
cli := test.NewFakeCli(nil)
10199
cli.SetManifestStore(store)
@@ -110,7 +108,7 @@ func TestManifestCreateNoManifest(t *testing.T) {
110108

111109
cmd := newCreateListCommand(cli)
112110
cmd.SetArgs([]string{"example.com/list:v1", "example.com/alpine:3.0"})
113-
cmd.SetOut(ioutil.Discard)
111+
cmd.SetOut(io.Discard)
114112
err := cmd.Execute()
115113
assert.Error(t, err, "No such image: example.com/alpine:3.0")
116114
}

‎cli/command/manifest/inspect_test.go‎

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

33
import (
44
"context"
5-
"io/ioutil"
6-
"os"
5+
"io"
76
"testing"
87

98
"github.com/docker/cli/cli/manifest/store"
@@ -21,13 +20,6 @@ import (
2120
"gotest.tools/v3/golden"
2221
)
2322

24-
func newTempManifestStore(t *testing.T) (store.Store, func()) {
25-
tmpdir, err := ioutil.TempDir("", "test-manifest-storage")
26-
assert.NilError(t, err)
27-
28-
return store.NewStore(tmpdir), func() { os.RemoveAll(tmpdir) }
29-
}
30-
3123
func ref(t *testing.T, name string) reference.Named {
3224
named, err := reference.ParseNamed("example.com/" + name)
3325
assert.NilError(t, err)
@@ -70,22 +62,20 @@ func fullImageManifest(t *testing.T, ref reference.Named) types.ImageManifest {
7062
}
7163

7264
func TestInspectCommandLocalManifestNotFound(t *testing.T) {
73-
store, cleanup := newTempManifestStore(t)
74-
defer cleanup()
65+
store := store.NewStore(t.TempDir())
7566

7667
cli := test.NewFakeCli(nil)
7768
cli.SetManifestStore(store)
7869

7970
cmd := newInspectCommand(cli)
80-
cmd.SetOut(ioutil.Discard)
71+
cmd.SetOut(io.Discard)
8172
cmd.SetArgs([]string{"example.com/list:v1", "example.com/alpine:3.0"})
8273
err := cmd.Execute()
8374
assert.Error(t, err, "No such manifest: example.com/alpine:3.0")
8475
}
8576

8677
func TestInspectCommandNotFound(t *testing.T) {
87-
store, cleanup := newTempManifestStore(t)
88-
defer cleanup()
78+
store := store.NewStore(t.TempDir())
8979

9080
cli := test.NewFakeCli(nil)
9181
cli.SetManifestStore(store)
@@ -99,15 +89,14 @@ func TestInspectCommandNotFound(t *testing.T) {
9989
})
10090

10191
cmd := newInspectCommand(cli)
102-
cmd.SetOut(ioutil.Discard)
92+
cmd.SetOut(io.Discard)
10393
cmd.SetArgs([]string{"example.com/alpine:3.0"})
10494
err := cmd.Execute()
10595
assert.Error(t, err, "No such manifest: example.com/alpine:3.0")
10696
}
10797

10898
func TestInspectCommandLocalManifest(t *testing.T) {
109-
store, cleanup := newTempManifestStore(t)
110-
defer cleanup()
99+
store := store.NewStore(t.TempDir())
111100

112101
cli := test.NewFakeCli(nil)
113102
cli.SetManifestStore(store)
@@ -125,8 +114,7 @@ func TestInspectCommandLocalManifest(t *testing.T) {
125114
}
126115

127116
func TestInspectcommandRemoteManifest(t *testing.T) {
128-
store, cleanup := newTempManifestStore(t)
129-
defer cleanup()
117+
store := store.NewStore(t.TempDir())
130118

131119
cli := test.NewFakeCli(nil)
132120
cli.SetManifestStore(store)
@@ -137,7 +125,7 @@ func TestInspectcommandRemoteManifest(t *testing.T) {
137125
})
138126

139127
cmd := newInspectCommand(cli)
140-
cmd.SetOut(ioutil.Discard)
128+
cmd.SetOut(io.Discard)
141129
cmd.SetArgs([]string{"example.com/alpine:3.0"})
142130
assert.NilError(t, cmd.Execute())
143131
actual := cli.OutBuffer()

‎cli/command/manifest/push_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ package manifest
22

33
import (
44
"context"
5-
"io/ioutil"
5+
"io"
66
"testing"
77

8+
"github.com/docker/cli/cli/manifest/store"
89
manifesttypes "github.com/docker/cli/cli/manifest/types"
910
"github.com/docker/cli/internal/test"
1011
"github.com/docker/distribution/reference"
@@ -42,14 +43,13 @@ func TestManifestPushErrors(t *testing.T) {
4243
cli := test.NewFakeCli(nil)
4344
cmd := newPushListCommand(cli)
4445
cmd.SetArgs(tc.args)
45-
cmd.SetOut(ioutil.Discard)
46+
cmd.SetOut(io.Discard)
4647
assert.ErrorContains(t, cmd.Execute(), tc.expectedError)
4748
}
4849
}
4950

5051
func TestManifestPush(t *testing.T) {
51-
store, sCleanup := newTempManifestStore(t)
52-
defer sCleanup()
52+
store := store.NewStore(t.TempDir())
5353

5454
registry := newFakeRegistryClient()
5555

‎cli/command/manifest/rm_test.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package manifest
22

33
import (
4-
"io/ioutil"
4+
"io"
55
"testing"
66

7+
"github.com/docker/cli/cli/manifest/store"
78
"github.com/docker/cli/internal/test"
89
"gotest.tools/v3/assert"
910
)
1011

1112
// create two manifest lists and remove them both
1213
func TestRmSeveralManifests(t *testing.T) {
13-
store, cleanup := newTempManifestStore(t)
14-
defer cleanup()
14+
store := store.NewStore(t.TempDir())
1515

1616
cli := test.NewFakeCli(nil)
1717
cli.SetManifestStore(store)
@@ -31,7 +31,7 @@ func TestRmSeveralManifests(t *testing.T) {
3131

3232
cmd := newRmManifestListCommand(cli)
3333
cmd.SetArgs([]string{"example.com/first:1", "example.com/second:2"})
34-
cmd.SetOut(ioutil.Discard)
34+
cmd.SetOut(io.Discard)
3535
err = cmd.Execute()
3636
assert.NilError(t, err)
3737

@@ -43,8 +43,7 @@ func TestRmSeveralManifests(t *testing.T) {
4343

4444
// attempt to remove a manifest list which was never created
4545
func TestRmManifestNotCreated(t *testing.T) {
46-
store, cleanup := newTempManifestStore(t)
47-
defer cleanup()
46+
store := store.NewStore(t.TempDir())
4847

4948
cli := test.NewFakeCli(nil)
5049
cli.SetManifestStore(store)
@@ -56,7 +55,7 @@ func TestRmManifestNotCreated(t *testing.T) {
5655

5756
cmd := newRmManifestListCommand(cli)
5857
cmd.SetArgs([]string{"example.com/first:1", "example.com/second:2"})
59-
cmd.SetOut(ioutil.Discard)
58+
cmd.SetOut(io.Discard)
6059
err = cmd.Execute()
6160
assert.Error(t, err, "No such manifest: example.com/first:1")
6261

0 commit comments

Comments
 (0)