Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit f0da9ae

Browse filesBrowse files
vvolandvvoland
authored
Merge pull request #50773 from austinvazquez/move-container-resize-options-from-api-to-client
api/types/container: move container resize options from api to client
2 parents 036c067 + f07d359 commit f0da9ae
Copy full SHA for f0da9ae

10 files changed

+44-48Lines changed: 44 additions & 48 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎api/types/container/options.go‎

Copy file name to clipboardExpand all lines: api/types/container/options.go
-8Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@ package container
22

33
import "github.com/moby/moby/api/types/filters"
44

5-
// ResizeOptions holds parameters to resize a TTY.
6-
// It can be used to resize container TTYs and
7-
// exec process TTYs too.
8-
type ResizeOptions struct {
9-
Height uint
10-
Width uint
11-
}
12-
135
// AttachOptions holds parameters to attach to a container.
146
type AttachOptions struct {
157
Stream bool
Collapse file

‎client/client_interfaces.go‎

Copy file name to clipboardExpand all lines: client/client_interfaces.go
+2-2Lines 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 container.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 container.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)
Collapse file

‎client/container_resize.go‎

Copy file name to clipboardExpand all lines: client/container_resize.go
+10-4Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,18 @@ import (
44
"context"
55
"net/url"
66
"strconv"
7-
8-
"github.com/moby/moby/api/types/container"
97
)
108

9+
// ContainerResizeOptions holds parameters to resize a TTY.
10+
// It can be used to resize container TTYs and
11+
// exec process TTYs too.
12+
type ContainerResizeOptions struct {
13+
Height uint
14+
Width uint
15+
}
16+
1117
// ContainerResize changes the size of the pseudo-TTY for a container.
12-
func (cli *Client) ContainerResize(ctx context.Context, containerID string, options container.ResizeOptions) error {
18+
func (cli *Client) ContainerResize(ctx context.Context, containerID string, options ContainerResizeOptions) error {
1319
containerID, err := trimID("container", containerID)
1420
if err != nil {
1521
return err
@@ -18,7 +24,7 @@ func (cli *Client) ContainerResize(ctx context.Context, containerID string, opti
1824
}
1925

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

‎client/container_resize_test.go‎

Copy file name to clipboardExpand all lines: client/container_resize_test.go
+12-13Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"testing"
1010

1111
cerrdefs "github.com/containerd/errdefs"
12-
"github.com/moby/moby/api/types/container"
1312
"gotest.tools/v3/assert"
1413
is "gotest.tools/v3/assert/cmp"
1514
)
@@ -18,14 +17,14 @@ func TestContainerResizeError(t *testing.T) {
1817
client := &Client{
1918
client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
2019
}
21-
err := client.ContainerResize(context.Background(), "container_id", container.ResizeOptions{})
20+
err := client.ContainerResize(context.Background(), "container_id", ContainerResizeOptions{})
2221
assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))
2322

24-
err = client.ContainerResize(context.Background(), "", container.ResizeOptions{})
23+
err = client.ContainerResize(context.Background(), "", ContainerResizeOptions{})
2524
assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
2625
assert.Check(t, is.ErrorContains(err, "value is empty"))
2726

28-
err = client.ContainerResize(context.Background(), " ", container.ResizeOptions{})
27+
err = client.ContainerResize(context.Background(), " ", ContainerResizeOptions{})
2928
assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
3029
assert.Check(t, is.ErrorContains(err, "value is empty"))
3130
}
@@ -34,7 +33,7 @@ func TestContainerExecResizeError(t *testing.T) {
3433
client := &Client{
3534
client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
3635
}
37-
err := client.ContainerExecResize(context.Background(), "exec_id", container.ResizeOptions{})
36+
err := client.ContainerExecResize(context.Background(), "exec_id", ContainerResizeOptions{})
3837
assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))
3938
}
4039

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

4443
tests := []struct {
4544
doc string
46-
opts container.ResizeOptions
45+
opts ContainerResizeOptions
4746
expectedHeight, expectedWidth string
4847
}{
4948
{
5049
doc: "zero width height", // valid, but not very useful
51-
opts: container.ResizeOptions{},
50+
opts: ContainerResizeOptions{},
5251
expectedWidth: "0",
5352
expectedHeight: "0",
5453
},
5554
{
5655
doc: "valid resize",
57-
opts: container.ResizeOptions{
56+
opts: ContainerResizeOptions{
5857
Height: 500,
5958
Width: 600,
6059
},
@@ -63,7 +62,7 @@ func TestContainerResize(t *testing.T) {
6362
},
6463
{
6564
doc: "larger than maxint64",
66-
opts: container.ResizeOptions{
65+
opts: ContainerResizeOptions{
6766
Height: math.MaxInt64 + 1,
6867
Width: math.MaxInt64 + 2,
6968
},
@@ -86,18 +85,18 @@ func TestContainerExecResize(t *testing.T) {
8685
const expectedURL = "/exec/exec_id/resize"
8786
tests := []struct {
8887
doc string
89-
opts container.ResizeOptions
88+
opts ContainerResizeOptions
9089
expectedHeight, expectedWidth string
9190
}{
9291
{
9392
doc: "zero width height", // valid, but not very useful
94-
opts: container.ResizeOptions{},
93+
opts: ContainerResizeOptions{},
9594
expectedWidth: "0",
9695
expectedHeight: "0",
9796
},
9897
{
9998
doc: "valid resize",
100-
opts: container.ResizeOptions{
99+
opts: ContainerResizeOptions{
101100
Height: 500,
102101
Width: 600,
103102
},
@@ -106,7 +105,7 @@ func TestContainerExecResize(t *testing.T) {
106105
},
107106
{
108107
doc: "larger than maxint64",
109-
opts: container.ResizeOptions{
108+
opts: ContainerResizeOptions{
110109
Height: math.MaxInt64 + 1,
111110
Width: math.MaxInt64 + 2,
112111
},
Collapse file

‎integration-cli/docker_cli_events_test.go‎

Copy file name to clipboardExpand all lines: integration-cli/docker_cli_events_test.go
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"testing"
1414
"time"
1515

16-
"github.com/moby/moby/api/types/container"
1716
eventtypes "github.com/moby/moby/api/types/events"
1817
"github.com/moby/moby/client"
1918
eventstestutils "github.com/moby/moby/v2/daemon/events/testutils"
@@ -454,7 +453,7 @@ func (s *DockerCLIEventSuite) TestEventsResize(c *testing.T) {
454453
assert.NilError(c, err)
455454
defer apiClient.Close()
456455

457-
options := container.ResizeOptions{
456+
options := client.ContainerResizeOptions{
458457
Height: 80,
459458
Width: 24,
460459
}
Collapse file

‎integration/container/exec_test.go‎

Copy file name to clipboardExpand all lines: integration/container/exec_test.go
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
cerrdefs "github.com/containerd/errdefs"
1414
"github.com/moby/moby/api/types/common"
1515
containertypes "github.com/moby/moby/api/types/container"
16+
"github.com/moby/moby/client"
1617
"github.com/moby/moby/v2/integration/internal/build"
1718
"github.com/moby/moby/v2/integration/internal/container"
1819
"github.com/moby/moby/v2/testutil/fakecontext"
@@ -137,7 +138,7 @@ func TestExecResize(t *testing.T) {
137138
assert.NilError(t, err)
138139

139140
t.Run("success", func(t *testing.T) {
140-
err := apiClient.ContainerExecResize(ctx, execID, containertypes.ResizeOptions{
141+
err := apiClient.ContainerExecResize(ctx, execID, client.ContainerResizeOptions{
141142
Height: 40,
142143
Width: 40,
143144
})
@@ -246,7 +247,7 @@ func TestExecResize(t *testing.T) {
246247
})
247248

248249
t.Run("unknown execID", func(t *testing.T) {
249-
err = apiClient.ContainerExecResize(ctx, "no-such-exec-id", containertypes.ResizeOptions{
250+
err = apiClient.ContainerExecResize(ctx, "no-such-exec-id", client.ContainerResizeOptions{
250251
Height: 40,
251252
Width: 40,
252253
})
@@ -274,7 +275,7 @@ func TestExecResize(t *testing.T) {
274275
err := apiClient.ContainerKill(ctx, cID, "SIGKILL")
275276
assert.NilError(t, err)
276277

277-
err = apiClient.ContainerExecResize(ctx, execID, containertypes.ResizeOptions{
278+
err = apiClient.ContainerExecResize(ctx, execID, client.ContainerResizeOptions{
278279
Height: 40,
279280
Width: 40,
280281
})
Collapse file

‎integration/container/resize_test.go‎

Copy file name to clipboardExpand all lines: integration/container/resize_test.go
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
cerrdefs "github.com/containerd/errdefs"
1010
"github.com/moby/moby/api/types/common"
1111
containertypes "github.com/moby/moby/api/types/container"
12+
"github.com/moby/moby/client"
1213
"github.com/moby/moby/v2/integration/internal/container"
1314
req "github.com/moby/moby/v2/testutil/request"
1415
"gotest.tools/v3/assert"
@@ -22,7 +23,7 @@ func TestResize(t *testing.T) {
2223
t.Run("success", func(t *testing.T) {
2324
cID := container.Run(ctx, t, apiClient, container.WithTty(true))
2425
defer container.Remove(ctx, t, apiClient, cID, containertypes.RemoveOptions{Force: true})
25-
err := apiClient.ContainerResize(ctx, cID, containertypes.ResizeOptions{
26+
err := apiClient.ContainerResize(ctx, cID, client.ContainerResizeOptions{
2627
Height: 40,
2728
Width: 40,
2829
})
@@ -129,7 +130,7 @@ func TestResize(t *testing.T) {
129130
t.Run("invalid state", func(t *testing.T) {
130131
cID := container.Create(ctx, t, apiClient, container.WithCmd("echo"))
131132
defer container.Remove(ctx, t, apiClient, cID, containertypes.RemoveOptions{Force: true})
132-
err := apiClient.ContainerResize(ctx, cID, containertypes.ResizeOptions{
133+
err := apiClient.ContainerResize(ctx, cID, client.ContainerResizeOptions{
133134
Height: 40,
134135
Width: 40,
135136
})
Collapse file

‎vendor/github.com/moby/moby/api/types/container/options.go‎

Copy file name to clipboardExpand all lines: vendor/github.com/moby/moby/api/types/container/options.go
-8Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Collapse file

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

Copy file name to clipboardExpand all lines: vendor/github.com/moby/moby/client/client_interfaces.go
+2-2Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Collapse file

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

Copy file name to clipboardExpand all lines: vendor/github.com/moby/moby/client/container_resize.go
+10-4Lines changed: 10 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)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.