8000 client: rename `ResizeOptions` type to `ContainerResizeOptions` · moby/moby@f07d359 · GitHub
[go: up one dir, main page]
Skip to content

Commit f07d359

Browse files
austinvazquezaustinvazquez
committed
client: rename ResizeOptions type to ContainerResizeOptions
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
1 parent 882fd68 commit f07d359

File tree

8 files changed

+30
-30
lines changed

8 files changed

+30
-30
lines changed

‎client/client_interfaces.go‎

10000 Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ type ContainerAPIClient interface {
7272
ContainerExecAttach(ctx context.Context, execID string, options container.ExecAttachOptions) (HijackedResponse, error)
7373
ContainerExecCreate(ctx context.Context, container string, options container.ExecOptions) (container.ExecCreateResponse, error)
7474
ContainerExecInspect(ctx context.Context, execID string) (container.ExecInspect, error)
75-
ContainerExecResize(ctx context.Context, execID string, options ResizeOptions) error
75+
ContainerExecResize(ctx context.Context, execID string, options ContainerResizeOptions) error
7676
ContainerExecStart(ctx context.Context, execID string, options container.ExecStartOptions) error
7777
ContainerExport(ctx context.Context, container string) (io.ReadCloser, error)
7878
ContainerInspect(ctx context.Context, container string) (container.InspectResponse, error)
@@ -83,7 +83,7 @@ type ContainerAPIClient interface {
8383
ContainerPause(ctx context.Context, container string) error
8484
ContainerRemove(ctx context.Context, container string, options container.RemoveOptions) error
8585
ContainerRename(ctx context.Context, container, newContainerName string) error
86-
ContainerResize(ctx context.Context, container string, options ResizeOptions) error
86+
ContainerResize(ctx context.Context, container string, options ContainerResizeOptions) error
8787
ContainerRestart(ctx context.Context, container string, options container.StopOptions) error
8888
ContainerStatPath(ctx context.Context, container, path string) (container.PathStat, error)
8989
ContainerStats(ctx context.Context, container string, stream bool) (StatsResponseReader, error)

‎client/container_resize.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ import (
66
"strconv"
77
)
88

9-
// ResizeOptions holds parameters to resize a TTY.
9+
// ContainerResizeOptions holds parameters to resize a TTY.
1010
// It can be used to resize container TTYs and
1111
// exec process TTYs too.
12-
type ResizeOptions struct {
12+
type ContainerResizeOptions struct {
1313
Height uint
1414
Width uint
1515
}
1616

1717
// ContainerResize changes the size of the pseudo-TTY for a container.
18-
func (cli *Client) ContainerResize(ctx context.Context, containerID string, options ResizeOptions) error {
18+
func (cli *Client) ContainerResize(ctx context.Context, containerID string, options ContainerResizeOptions) error {
1919
containerID, err := trimID("container", containerID)
2020
if err != nil {
2121
return err
@@ -24,7 +24,7 @@ func (cli *Client) ContainerResize(ctx context.Context, containerID string, opti
2424
}
2525

2626
// ContainerExecResize changes the size of the tty for an exec process running inside a container.
27-
func (cli *Client) ContainerExecResize(ctx context.Context, execID string, options ResizeOptions) error {
27+
func (cli *Client) ContainerExecResize(ctx context.Context, execID string, options ContainerResizeOptions) error {
2828
execID, err := trimID("exec", execID)
2929
if err != nil {
3030
return err

‎client/container_resize_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ func TestContainerResizeError(t *testing.T) {
1717
client := &Client{
1818
client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
1919
}
20-
err := client.ContainerResize(context.Background(), "container_id", ResizeOptions{})
20+
err := client.ContainerResize(context.Background(), "container_id", ContainerResizeOptions{})
2121
assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))
2222

23-
err = client.ContainerResize(context.Background(), "", ResizeOptions{})
23+
err = client.ContainerResize(context.Background(), "", ContainerResizeOptions{})
2424
assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
2525
assert.Check(t, is.ErrorContains(err, "value is empty"))
2626

27-
err = client.ContainerResize(context.Background(), " ", ResizeOptions{})
27+
err = client.ContainerResize(context.Background(), " ", ContainerResizeOptions{})
2828
assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
2929
assert.Check(t, is.ErrorContains(err, "value is empty"))
3030
}
@@ -33,7 +33,7 @@ func TestContainerExecResizeError(t *testing.T) {
3333
client := &Client{
3434
client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
3535
}
36-
err := client.ContainerExecResize(context.Background(), "exec_id", ResizeOptions{})
36+
err := client.ContainerExecResize(context.Background(), "exec_id", ContainerResizeOptions{})
3737
assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))
3838
}
3939

@@ -42,18 +42,18 @@ func TestContainerResize(t *testing.T) {
4242

4343
tests := []struct {
4444
doc string
45-
opts ResizeOptions
45+
opts ContainerResizeOptions
4646
expectedHeight, expectedWidth string
4747
}{
4848
{
4949
doc: "zero width height", // valid, but not very useful
50-
opts: ResizeOptions{},
50+
opts: ContainerResizeOptions{},
5151
expectedWidth: "0",
5252
expectedHeight: "0",
5353
},
5454
{
5555
doc: "valid resize",
56-
opts: ResizeOptions{
56+
opts: ContainerResizeOptions{
5757
Height: 500,
5858
Width: 600,
5959
},
@@ -62,7 +62,7 @@ func TestContainerResize(t *testing.T) {
6262
},
6363
{
6464
doc: "larger than maxint64",
65-
opts: ResizeOptions{
65+
opts: ContainerResizeOptions{
6666
Height: math.MaxInt64 + 1,
6767
Width: math.MaxInt64 + 2,
6868
},
@@ -85,18 +85,18 @@ func TestContainerExecResize(t *testing.T) {
8585
const expectedURL = "/exec/exec_id/resize"
8686
tests := []struct {
8787
doc string
88-
opts ResizeOptions
88+
opts ContainerResizeOptions
8989
expectedHeight, expectedWidth string
9090
}{
9191
{
9292
doc: "zero width height", // valid, but not very useful
93-
opts: ResizeOptions{},
93+
opts: ContainerResizeOptions{},
9494
expectedWidth: "0",
9595
expectedHeight: "0",
9696
},
9797
{
9898
doc: "valid resize",
99-
opts: ResizeOptions{
99+
opts: ContainerResizeOptions{
100100
Height: 500,
101101
Width: 600,
102102
},
@@ -105,7 +105,7 @@ func TestContainerExecResize(t *testing.T) {
105105
},
106106
{
107107
doc: "larger than maxint64",
108-
opts: ResizeOptions{
108+
opts: ContainerResizeOptions{
109109
Height: math.MaxInt64 + 1,
110110
Width: math.MaxInt64 + 2,
111111
},

‎integration-cli/docker_cli_events_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ func (s *DockerCLIEventSuite) TestEventsResize(c *testing.T) {
453453
assert.NilError(c, err)
454454
defer apiClient.Close()
455455

456-
options := client.ResizeOptions{
456+
options := client.ContainerResizeOptions{
457457
Height: 80,
458458
Width: 24,
459459
}

‎integration/container/exec_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func TestExecResize(t *testing.T) {
138138
assert.NilError(t, err)
139139

140140
t.Run("success", func(t *testing.T) {
141-
err := apiClient.ContainerExecResize(ctx, execID, client.ResizeOptions{
141+
err := apiClient.ContainerExecResize(ctx, execID, client.ContainerResizeOptions{
142142
Height: 40,
143143
Width: 40,
144144
})
@@ -247,7 +247,7 @@ func TestExecResize(t *testing.T) {
247247
})
248248

249249
t.Run("unknown execID", func(t *testing.T) {
250-
err = apiClient.ContainerExecResize(ctx, "no-such-exec-id", client.ResizeOptions{
250+
err = apiClient.ContainerExecResize(ctx, "no-such-exec-id", client.ContainerResizeOptions{
251251
Height: 40,
252252
Width: 40,
253253
})
@@ -275,7 +275,7 @@ func TestExecResize(t *testing.T) {
275275
err := apiClient.ContainerKill(ctx, cID, "SIGKILL")
276276
assert.NilError(t, err)
277277

278-
err = apiClient.ContainerExecResize(ctx, execID, client.ResizeOptions{
278+
err = apiClient.ContainerExecResize(ctx, execID, client.ContainerResizeOptions{
279279
Height: 40,
280280
Width: 40,
281281
})

‎integration/container/resize_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestResize(t *testing.T) {
2323
t.Run("success", func(t *testing.T) {
2424
cID := container.Run(ctx, t, apiClient, container.WithTty(true))
2525
defer container.Remove(ctx, t, apiClient, cID, containertypes.RemoveOptions{Force: true})
26-
err := apiClient.ContainerResize(ctx, cID, client.ResizeOptions{
26+
err := apiClient.ContainerResize(ctx, cID, client.ContainerResizeOptions{
2727
Height: 40,
2828
Width: 40,
2929
})
@@ -130,7 +130,7 @@ func TestResize(t *testing.T) {
130130
t.Run("invalid state", func(t *testing.T) {
131131
cID := container.Create(ctx, t, apiClient, container.WithCmd("echo"))
132132
defer container.Remove(ctx, t, apiClient, cID, containertypes.RemoveOptions{Force: true})
133-
err := apiClient.ContainerResize(ctx, cID, client.ResizeOptions{
133+
err := apiClient.ContainerResize(ctx, cID, client.ContainerResizeOptions{
134134
Height: 40,
135135
Width: 40,
136136
})

‎vendor/github.com/moby/moby/client/client_interfaces.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/moby/moby/client/container_resize.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0