From 3754fe3c8ac7fce3a4356a2da2d5514df21b2e07 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 6 Oct 2025 22:49:02 +0200 Subject: [PATCH] rename some vars to prevent shadowing imports Signed-off-by: Sebastiaan van Stijn --- cli/command/network/disconnect.go | 4 ++-- cli/compose/convert/service.go | 8 ++++---- cli/compose/loader/loader.go | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cli/command/network/disconnect.go b/cli/command/network/disconnect.go index f2b6c80ecfef..df317e4f7db9 100644 --- a/cli/command/network/disconnect.go +++ b/cli/command/network/disconnect.go @@ -33,8 +33,8 @@ func newDisconnectCommand(dockerCLI command.Cli) *cobra.Command { if len(args) == 0 { return completion.NetworkNames(dockerCLI)(cmd, args, toComplete) } - network := args[0] - return completion.ContainerNames(dockerCLI, true, isConnected(network))(cmd, args, toComplete) + nw := args[0] + return completion.ContainerNames(dockerCLI, true, isConnected(nw))(cmd, args, toComplete) }, DisableFlagsInUseLine: true, } diff --git a/cli/compose/convert/service.go b/cli/compose/convert/service.go index 292c52d72856..9714cb372f47 100644 --- a/cli/compose/convert/service.go +++ b/cli/compose/convert/service.go @@ -210,16 +210,16 @@ func convertServiceNetworks( } nets := []swarm.NetworkAttachmentConfig{} - for networkName, network := range networks { + for networkName, nw := range networks { networkConfig, ok := networkConfigs[networkName] if !ok && networkName != defaultNetwork { return nil, fmt.Errorf("undefined network %q", networkName) } var aliases []string var driverOpts map[string]string - if network != nil { - aliases = network.Aliases - driverOpts = network.DriverOpts + if nw != nil { + aliases = nw.Aliases + driverOpts = nw.DriverOpts } target := namespace.Scope(networkName) if networkConfig.Name != "" { diff --git a/cli/compose/loader/loader.go b/cli/compose/loader/loader.go index 32894f767e4e..953bdd4f3d23 100644 --- a/cli/compose/loader/loader.go +++ b/cli/compose/loader/loader.go @@ -545,25 +545,25 @@ func LoadNetworks(source map[string]any, version string) (map[string]types.Netwo if err != nil { return networks, err } - for name, network := range networks { - if !network.External.External { + for name, nw := range networks { + if !nw.External.External { continue } switch { - case network.External.Name != "": - if network.Name != "" { + case nw.External.Name != "": + if nw.Name != "" { return nil, fmt.Errorf("network %s: network.external.name and network.name conflict; only use network.name", name) } if versions.GreaterThanOrEqualTo(version, "3.5") { logrus.Warnf("network %s: network.external.name is deprecated in favor of network.name", name) } - network.Name = network.External.Name - network.External.Name = "" - case network.Name == "": - network.Name = name + nw.Name = nw.External.Name + nw.External.Name = "" + case nw.Name == "": + nw.Name = name } - network.Extras = loadExtras(name, source) - networks[name] = network + nw.Extras = loadExtras(name, source) + networks[name] = nw } return networks, nil }