From f09f756851f0c686d1944967e02040d945e623db Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 18 Jun 2024 10:42:56 +0200 Subject: [PATCH 1/3] daemon/cluster: minor linting issues and cleanup - rename variables that shadowed imports - remove some intermediate vars - slight reformating for readability Signed-off-by: Sebastiaan van Stijn --- daemon/cluster/tasks.go | 14 ++++++++------ daemon/cluster/volumes.go | 22 ++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/daemon/cluster/tasks.go b/daemon/cluster/tasks.go index ec81538707..28540cf3b6 100644 --- a/daemon/cluster/tasks.go +++ b/daemon/cluster/tasks.go @@ -15,7 +15,7 @@ import ( func (c *Cluster) GetTasks(options apitypes.TaskListOptions) ([]types.Task, error) { var r *swarmapi.ListTasksResponse - if err := c.lockedManagerAction(func(ctx context.Context, state nodeState) error { + err := c.lockedManagerAction(func(ctx context.Context, state nodeState) error { filterTransform := func(filter filters.Args) error { if filter.Contains("service") { serviceFilters := filter.Get("service") @@ -47,18 +47,19 @@ func (c *Cluster) GetTasks(options apitypes.TaskListOptions) ([]types.Task, erro return nil } - filters, err := newListTasksFilters(options.Filters, filterTransform) + f, err := newListTasksFilters(options.Filters, filterTransform) if err != nil { return err } r, err = state.controlClient.ListTasks( ctx, - &swarmapi.ListTasksRequest{Filters: filters}, + &swarmapi.ListTasksRequest{Filters: f}, grpc.MaxCallRecvMsgSize(defaultRecvSizeForListResponse), ) return err - }); err != nil { + }) + if err != nil { return nil, err } @@ -76,14 +77,15 @@ func (c *Cluster) GetTasks(options apitypes.TaskListOptions) ([]types.Task, erro // GetTask returns a task by an ID. func (c *Cluster) GetTask(input string) (types.Task, error) { var task *swarmapi.Task - if err := c.lockedManagerAction(func(ctx context.Context, state nodeState) error { + err := c.lockedManagerAction(func(ctx context.Context, state nodeState) error { t, err := getTask(ctx, state.controlClient, input) if err != nil { return err } task = t return nil - }); err != nil { + }) + if err != nil { return types.Task{}, err } return convert.TaskFromGRPC(*task) diff --git a/daemon/cluster/volumes.go b/daemon/cluster/volumes.go index 7b53dd4691..3d22066e57 100644 --- a/daemon/cluster/volumes.go +++ b/daemon/cluster/volumes.go @@ -96,11 +96,10 @@ func (c *Cluster) RemoveVolume(nameOrID string, force bool) error { return err } - req := &swarmapi.RemoveVolumeRequest{ + _, err = state.controlClient.RemoveVolume(ctx, &swarmapi.RemoveVolumeRequest{ VolumeID: volume.ID, Force: force, - } - _, err = state.controlClient.RemoveVolume(ctx, req) + }) return err }) } @@ -125,19 +124,18 @@ func (c *Cluster) UpdateVolume(nameOrID string, version uint64, volume volumetyp v.Spec.Availability = swarmapi.VolumeAvailabilityPause case volumetypes.AvailabilityDrain: v.Spec.Availability = swarmapi.VolumeAvailabilityDrain + default: + // if default empty value, change nothing. } - // if default empty value, change nothing. } - _, err = state.controlClient.UpdateVolume( - ctx, &swarmapi.UpdateVolumeRequest{ - VolumeID: nameOrID, - VolumeVersion: &swarmapi.Version{ - Index: version, - }, - Spec: &v.Spec, + _, err = state.controlClient.UpdateVolume(ctx, &swarmapi.UpdateVolumeRequest{ + VolumeID: nameOrID, + VolumeVersion: &swarmapi.Version{ + Index: version, }, - ) + Spec: &v.Spec, + }) return err }) } From 25f44885ed8159cee5580f32eeee029efc22e2ff Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 18 Jun 2024 11:14:01 +0200 Subject: [PATCH 2/3] daemon/cluster/executor/container: use consistent alias for import The canonical alias is "containertypes" for this import. Signed-off-by: Sebastiaan van Stijn --- .../cluster/executor/container/container.go | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/daemon/cluster/executor/container/container.go b/daemon/cluster/executor/container/container.go index c805568a88..f40b186fcd 100644 --- a/daemon/cluster/executor/container/container.go +++ b/daemon/cluster/executor/container/container.go @@ -11,7 +11,7 @@ import ( "github.com/containerd/log" "github.com/distribution/reference" - enginecontainer "github.com/docker/docker/api/types/container" + containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" enginemount "github.com/docker/docker/api/types/mount" @@ -160,7 +160,7 @@ func (c *containerConfig) portBindings() nat.PortMap { return portBindings } -func (c *containerConfig) isolation() enginecontainer.Isolation { +func (c *containerConfig) isolation() containertypes.Isolation { return convert.IsolationFromGRPC(c.spec().Isolation) } @@ -190,11 +190,11 @@ func (c *containerConfig) exposedPorts() map[nat.Port]struct{} { return exposedPorts } -func (c *containerConfig) config() *enginecontainer.Config { +func (c *containerConfig) config() *containertypes.Config { genericEnvs := genericresource.EnvFormat(c.task.AssignedGenericResources, "DOCKER_RESOURCE") env := append(c.spec().Env, genericEnvs...) - config := &enginecontainer.Config{ + config := &containertypes.Config{ Labels: c.labels(), StopSignal: c.spec().StopSignal, Tty: c.spec().TTY, @@ -375,7 +375,7 @@ func convertMount(m api.Mount) enginemount.Mount { return mount } -func (c *containerConfig) healthcheck() *enginecontainer.HealthConfig { +func (c *containerConfig) healthcheck() *containertypes.HealthConfig { hcSpec := c.spec().Healthcheck if hcSpec == nil { return nil @@ -384,7 +384,7 @@ func (c *containerConfig) healthcheck() *enginecontainer.HealthConfig { timeout, _ := gogotypes.DurationFromProto(hcSpec.Timeout) startPeriod, _ := gogotypes.DurationFromProto(hcSpec.StartPeriod) startInterval, _ := gogotypes.DurationFromProto(hcSpec.StartInterval) - return &enginecontainer.HealthConfig{ + return &containertypes.HealthConfig{ Test: hcSpec.Test, Interval: interval, Timeout: timeout, @@ -394,8 +394,8 @@ func (c *containerConfig) healthcheck() *enginecontainer.HealthConfig { } } -func (c *containerConfig) hostConfig(deps exec.VolumeGetter) *enginecontainer.HostConfig { - hc := &enginecontainer.HostConfig{ +func (c *containerConfig) hostConfig(deps exec.VolumeGetter) *containertypes.HostConfig { + hc := &containertypes.HostConfig{ Resources: c.resources(), GroupAdd: c.spec().Groups, PortBindings: c.portBindings(), @@ -432,7 +432,7 @@ func (c *containerConfig) hostConfig(deps exec.VolumeGetter) *enginecontainer.Ho } if c.task.LogDriver != nil { - hc.LogConfig = enginecontainer.LogConfig{ + hc.LogConfig = containertypes.LogConfig{ Type: c.task.LogDriver.Name, Config: c.task.LogDriver.Options, } @@ -442,7 +442,7 @@ func (c *containerConfig) hostConfig(deps exec.VolumeGetter) *enginecontainer.Ho labels := c.task.Networks[0].Network.Spec.Annotations.Labels name := c.task.Networks[0].Network.Spec.Annotations.Name if v, ok := labels["com.docker.swarm.predefined"]; ok && v == "true" { - hc.NetworkMode = enginecontainer.NetworkMode(name) + hc.NetworkMode = containertypes.NetworkMode(name) } } @@ -474,8 +474,8 @@ func (c *containerConfig) volumeCreateRequest(mount *api.Mount) *volume.CreateOp return nil } -func (c *containerConfig) resources() enginecontainer.Resources { - resources := enginecontainer.Resources{} +func (c *containerConfig) resources() containertypes.Resources { + resources := containertypes.Resources{} // set pids limit pidsLimit := c.spec().PidsLimit @@ -672,7 +672,7 @@ func (c *containerConfig) networkCreateRequest(name string) (clustertypes.Networ }, nil } -func (c *containerConfig) applyPrivileges(hc *enginecontainer.HostConfig) { +func (c *containerConfig) applyPrivileges(hc *containertypes.HostConfig) { privileges := c.spec().Privileges if privileges == nil { return From ad716b223b2c82545ffe55bf4f16543dbe5e3b6e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 18 Jun 2024 11:15:59 +0200 Subject: [PATCH 3/3] integration/container: use consistent alias for import The canonical alias is "containertypes" for this import. Signed-off-by: Sebastiaan van Stijn --- integration/container/list_test.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/integration/container/list_test.go b/integration/container/list_test.go index 7d58fe9116..6b8ab8a378 100644 --- a/integration/container/list_test.go +++ b/integration/container/list_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - typecontainer "github.com/docker/docker/api/types/container" + containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" "github.com/docker/docker/integration/internal/container" @@ -32,15 +32,12 @@ func TestListAnnotations(t *testing.T) { t.Run(fmt.Sprintf("run with version v%s", tc.apiVersion), func(t *testing.T) { apiClient := request.NewAPIClient(t, client.WithVersion(tc.apiVersion)) id := container.Create(ctx, t, apiClient, container.WithAnnotations(annotations)) - defer container.Remove(ctx, t, apiClient, id, typecontainer.RemoveOptions{Force: true}) + defer container.Remove(ctx, t, apiClient, id, containertypes.RemoveOptions{Force: true}) - containers, err := apiClient.ContainerList( - ctx, - typecontainer.ListOptions{ - All: true, - Filters: filters.NewArgs(filters.Arg("id", id)), - }, - ) + containers, err := apiClient.ContainerList(ctx, containertypes.ListOptions{ + All: true, + Filters: filters.NewArgs(filters.Arg("id", id)), + }) assert.NilError(t, err) assert.Assert(t, is.Len(containers, 1)) assert.Equal(t, containers[0].ID, id)