From e95d13361201181b4e56f68f0c5a48b0f56038ae Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 16 Jul 2025 13:23:46 +0200 Subject: [PATCH] remove some redundant import aliases Signed-off-by: Sebastiaan van Stijn --- cli/command/container/opts.go | 24 ++++++++++++------------ cli/command/service/formatter.go | 4 ++-- cli/command/service/update.go | 26 +++++++++++++------------- cli/command/service/update_test.go | 16 ++++++++-------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/cli/command/container/opts.go b/cli/command/container/opts.go index 647dc5d510..46a6ddf476 100644 --- a/cli/command/container/opts.go +++ b/cli/command/container/opts.go @@ -16,8 +16,8 @@ import ( "github.com/docker/cli/internal/lazyregexp" "github.com/docker/cli/opts" "github.com/docker/docker/api/types/container" - mounttypes "github.com/docker/docker/api/types/mount" - networktypes "github.com/docker/docker/api/types/network" + "github.com/docker/docker/api/types/mount" + "github.com/docker/docker/api/types/network" "github.com/docker/go-connections/nat" "github.com/pkg/errors" "github.com/spf13/pflag" @@ -323,7 +323,7 @@ func addFlags(flags *pflag.FlagSet) *containerOptions { type containerConfig struct { Config *container.Config HostConfig *container.HostConfig - NetworkingConfig *networktypes.NetworkingConfig + NetworkingConfig *network.NetworkingConfig } // parse parses the args for the specified command and generates a Config, @@ -372,7 +372,7 @@ func parse(flags *pflag.FlagSet, copts *containerOptions, serverOS string) (*con if parsed.Source != "" { toBind := bind - if parsed.Type == string(mounttypes.TypeBind) { + if parsed.Type == string(mount.TypeBind) { if hostPart, targetPath, ok := strings.Cut(bind, ":"); ok { if !filepath.IsAbs(hostPart) && strings.HasPrefix(hostPart, ".") { if absHostPart, err := filepath.Abs(hostPart); err == nil { @@ -706,8 +706,8 @@ func parse(flags *pflag.FlagSet, copts *containerOptions, serverOS string) (*con config.StdinOnce = true } - networkingConfig := &networktypes.NetworkingConfig{ - EndpointsConfig: make(map[string]*networktypes.EndpointSettings), + networkingConfig := &network.NetworkingConfig{ + EndpointsConfig: make(map[string]*network.EndpointSettings), } networkingConfig.EndpointsConfig, err = parseNetworkOpts(copts) @@ -735,9 +735,9 @@ func parse(flags *pflag.FlagSet, copts *containerOptions, serverOS string) (*con // this function may return _multiple_ endpoints, which is not currently supported // by the daemon, but may be in future; it's up to the daemon to produce an error // in case that is not supported. -func parseNetworkOpts(copts *containerOptions) (map[string]*networktypes.EndpointSettings, error) { +func parseNetworkOpts(copts *containerOptions) (map[string]*network.EndpointSettings, error) { var ( - endpoints = make(map[string]*networktypes.EndpointSettings, len(copts.netMode.Value())) + endpoints = make(map[string]*network.EndpointSettings, len(copts.netMode.Value())) hasUserDefined, hasNonUserDefined bool ) @@ -783,7 +783,7 @@ func parseNetworkOpts(copts *containerOptions) (map[string]*networktypes.Endpoin // and only a single network is specified, omit the endpoint-configuration // on the client (the daemon will still create it when creating the container) if i == 0 && len(copts.netMode.Value()) == 1 { - if ep == nil || reflect.DeepEqual(*ep, networktypes.EndpointSettings{}) { + if ep == nil || reflect.DeepEqual(*ep, network.EndpointSettings{}) { continue } } @@ -841,7 +841,7 @@ func applyContainerOptions(n *opts.NetworkAttachmentOpts, copts *containerOption return nil } -func parseNetworkAttachmentOpt(ep opts.NetworkAttachmentOpts) (*networktypes.EndpointSettings, error) { +func parseNetworkAttachmentOpt(ep opts.NetworkAttachmentOpts) (*network.EndpointSettings, error) { if strings.TrimSpace(ep.Target) == "" { return nil, errors.New("no name set for network") } @@ -854,7 +854,7 @@ func parseNetworkAttachmentOpt(ep opts.NetworkAttachmentOpts) (*networktypes.End } } - epConfig := &networktypes.EndpointSettings{ + epConfig := &network.EndpointSettings{ GwPriority: ep.GwPriority, } epConfig.Aliases = append(epConfig.Aliases, ep.Aliases...) @@ -866,7 +866,7 @@ func parseNetworkAttachmentOpt(ep opts.NetworkAttachmentOpts) (*networktypes.End epConfig.Links = ep.Links } if ep.IPv4Address != "" || ep.IPv6Address != "" || len(ep.LinkLocalIPs) > 0 { - epConfig.IPAMConfig = &networktypes.EndpointIPAMConfig{ + epConfig.IPAMConfig = &network.EndpointIPAMConfig{ IPv4Address: ep.IPv4Address, IPv6Address: ep.IPv6Address, LinkLocalIPs: ep.LinkLocalIPs, diff --git a/cli/command/service/formatter.go b/cli/command/service/formatter.go index aee5453f10..1bc1c24a41 100644 --- a/cli/command/service/formatter.go +++ b/cli/command/service/formatter.go @@ -11,7 +11,7 @@ import ( "github.com/docker/cli/cli/command/formatter" "github.com/docker/cli/cli/command/inspect" "github.com/docker/docker/api/types/container" - mounttypes "github.com/docker/docker/api/types/mount" + "github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/swarm" "github.com/docker/go-units" @@ -461,7 +461,7 @@ func (ctx *serviceInspectContext) ContainerInit() bool { return *ctx.Service.Spec.TaskTemplate.ContainerSpec.Init } -func (ctx *serviceInspectContext) ContainerMounts() []mounttypes.Mount { +func (ctx *serviceInspectContext) ContainerMounts() []mount.Mount { return ctx.Service.Spec.TaskTemplate.ContainerSpec.Mounts } diff --git a/cli/command/service/update.go b/cli/command/service/update.go index 2b75b6b59b..a4516bba7b 100644 --- a/cli/command/service/update.go +++ b/cli/command/service/update.go @@ -13,7 +13,7 @@ import ( "github.com/docker/cli/opts" "github.com/docker/cli/opts/swarmopts" "github.com/docker/docker/api/types/container" - mounttypes "github.com/docker/docker/api/types/mount" + "github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" @@ -943,33 +943,33 @@ func removeItems( return newSeq } -func updateMounts(flags *pflag.FlagSet, mounts *[]mounttypes.Mount) error { - mountsByTarget := map[string]mounttypes.Mount{} +func updateMounts(flags *pflag.FlagSet, mounts *[]mount.Mount) error { + mountsByTarget := map[string]mount.Mount{} if flags.Changed(flagMountAdd) { values := flags.Lookup(flagMountAdd).Value.(*opts.MountOpt).Value() - for _, mount := range values { - if _, ok := mountsByTarget[mount.Target]; ok { + for _, mnt := range values { + if _, ok := mountsByTarget[mnt.Target]; ok { return errors.Errorf("duplicate mount target") } - mountsByTarget[mount.Target] = mount + mountsByTarget[mnt.Target] = mnt } } // Add old list of mount points minus updated one. - for _, mount := range *mounts { - if _, ok := mountsByTarget[mount.Target]; !ok { - mountsByTarget[mount.Target] = mount + for _, mnt := range *mounts { + if _, ok := mountsByTarget[mnt.Target]; !ok { + mountsByTarget[mnt.Target] = mnt } } - newMounts := []mounttypes.Mount{} + newMounts := make([]mount.Mount, 0, len(mountsByTarget)) toRemove := buildToRemoveSet(flags, flagMountRemove) - for _, mount := range mountsByTarget { - if _, exists := toRemove[mount.Target]; !exists { - newMounts = append(newMounts, mount) + for _, mnt := range mountsByTarget { + if _, exists := toRemove[mnt.Target]; !exists { + newMounts = append(newMounts, mnt) } } sort.Slice(newMounts, func(i, j int) bool { diff --git a/cli/command/service/update_test.go b/cli/command/service/update_test.go index d022b0c3d5..78ebdf87d7 100644 --- a/cli/command/service/update_test.go +++ b/cli/command/service/update_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/docker/docker/api/types/container" - mounttypes "github.com/docker/docker/api/types/mount" + "github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/swarm" "gotest.tools/v3/assert" @@ -237,9 +237,9 @@ func TestUpdateMounts(t *testing.T) { flags.Set("mount-add", "type=volume,source=vol2,target=/toadd") flags.Set("mount-rm", "/toremove") - mounts := []mounttypes.Mount{ - {Target: "/toremove", Source: "vol1", Type: mounttypes.TypeBind}, - {Target: "/tokeep", Source: "vol3", Type: mounttypes.TypeBind}, + mounts := []mount.Mount{ + {Target: "/toremove", Source: "vol1", Type: mount.TypeBind}, + {Target: "/tokeep", Source: "vol3", Type: mount.TypeBind}, } updateMounts(flags, &mounts) @@ -252,10 +252,10 @@ func TestUpdateMountsWithDuplicateMounts(t *testing.T) { flags := newUpdateCommand(nil).Flags() flags.Set("mount-add", "type=volume,source=vol4,target=/toadd") - mounts := []mounttypes.Mount{ - {Target: "/tokeep1", Source: "vol1", Type: mounttypes.TypeBind}, - {Target: "/toadd", Source: "vol2", Type: mounttypes.TypeBind}, - {Target: "/tokeep2", Source: "vol3", Type: mounttypes.TypeBind}, + mounts := []mount.Mount{ + {Target: "/tokeep1", Source: "vol1", Type: mount.TypeBind}, + {Target: "/toadd", Source: "vol2", Type: mount.TypeBind}, + {Target: "/tokeep2", Source: "vol3", Type: mount.TypeBind}, } updateMounts(flags, &mounts)