diff --git a/libnetwork/drivers/bridge/bridge.go b/libnetwork/drivers/bridge/bridge.go index 64f6ca7e39..e2e3dbe128 100644 --- a/libnetwork/drivers/bridge/bridge.go +++ b/libnetwork/drivers/bridge/bridge.go @@ -50,8 +50,10 @@ func (d defaultBridgeNetworkConflict) Error() string { return fmt.Sprintf("Stale default bridge network %s", d.ID) } -type iptableCleanFunc func() error -type iptablesCleanFuncs []iptableCleanFunc +type ( + iptableCleanFunc func() error + iptablesCleanFuncs []iptableCleanFunc +) // configuration info for the "bridge" driver. type configuration struct { @@ -969,7 +971,8 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo, // Generate and add the interface pipe host <-> sandbox veth := &netlink.Veth{ LinkAttrs: netlink.LinkAttrs{Name: hostIfName, TxQLen: 0}, - PeerName: containerIfName} + PeerName: containerIfName, + } if err = d.nlh.LinkAdd(veth); err != nil { return types.InternalErrorf("failed to add the host (%s) <=> sandbox (%s) pair interfaces: %v", hostIfName, containerIfName, err) } diff --git a/libnetwork/drivers/bridge/link.go b/libnetwork/drivers/bridge/link.go index b841da3e4e..9849afbe7e 100644 --- a/libnetwork/drivers/bridge/link.go +++ b/libnetwork/drivers/bridge/link.go @@ -52,8 +52,7 @@ func (l *link) Disable() { // that returns typed errors } -func linkContainers(action, parentIP, childIP string, ports []types.TransportPort, bridge string, - ignoreErrors bool) error { +func linkContainers(action, parentIP, childIP string, ports []types.TransportPort, bridge string, ignoreErrors bool) error { var nfAction iptables.Action switch action { diff --git a/libnetwork/drivers/bridge/network_test.go b/libnetwork/drivers/bridge/network_test.go index 0c872f5ac5..00c0f22bde 100644 --- a/libnetwork/drivers/bridge/network_test.go +++ b/libnetwork/drivers/bridge/network_test.go @@ -116,7 +116,8 @@ func TestLinkCreateTwo(t *testing.T) { config := &networkConfiguration{ BridgeName: DefaultBridgeName, - EnableIPv6: true} + EnableIPv6: true, + } genericOption := make(map[string]interface{}) genericOption[netlabel.GenericData] = config @@ -152,7 +153,8 @@ func TestLinkCreateNoEnableIPv6(t *testing.T) { } config := &networkConfiguration{ - BridgeName: DefaultBridgeName} + BridgeName: DefaultBridgeName, + } genericOption := make(map[string]interface{}) genericOption[netlabel.GenericData] = config @@ -187,7 +189,8 @@ func TestLinkDelete(t *testing.T) { config := &networkConfiguration{ BridgeName: DefaultBridgeName, - EnableIPv6: true} + EnableIPv6: true, + } genericOption := make(map[string]interface{}) genericOption[netlabel.GenericData] = config diff --git a/libnetwork/drivers/bridge/setup_bridgenetfiltering.go b/libnetwork/drivers/bridge/setup_bridgenetfiltering.go index 31ebc22cb2..8ee035d6a3 100644 --- a/libnetwork/drivers/bridge/setup_bridgenetfiltering.go +++ b/libnetwork/drivers/bridge/setup_bridgenetfiltering.go @@ -140,7 +140,7 @@ func setKernelBoolParam(path string, on bool) error { if on { value = byte('1') } - return os.WriteFile(path, []byte{value, '\n'}, 0644) + return os.WriteFile(path, []byte{value, '\n'}, 0o644) } // Checks to see if packet forwarding is enabled diff --git a/libnetwork/drivers/bridge/setup_device.go b/libnetwork/drivers/bridge/setup_device.go index 00c4ebd875..2066df2a4c 100644 --- a/libnetwork/drivers/bridge/setup_device.go +++ b/libnetwork/drivers/bridge/setup_device.go @@ -57,7 +57,7 @@ func setupDefaultSysctl(config *networkConfiguration, i *bridgeInterface) error Info("failed to read ipv6 net.ipv6.conf..accept_ra") return nil } - if err := os.WriteFile(sysPath, []byte{'0', '\n'}, 0644); err != nil { + if err := os.WriteFile(sysPath, []byte{'0', '\n'}, 0o644); err != nil { log.G(context.TODO()).WithError(err).Warn("unable to disable IPv6 router advertisement") } return nil diff --git a/libnetwork/drivers/bridge/setup_ip_forwarding.go b/libnetwork/drivers/bridge/setup_ip_forwarding.go index 096f06ee49..73853385bd 100644 --- a/libnetwork/drivers/bridge/setup_ip_forwarding.go +++ b/libnetwork/drivers/bridge/setup_ip_forwarding.go @@ -13,7 +13,7 @@ import ( const ( ipv4ForwardConf = "/proc/sys/net/ipv4/ip_forward" - ipv4ForwardConfPerm = 0644 + ipv4ForwardConfPerm = 0o644 ) func configureIPForwarding(enable bool) error { diff --git a/libnetwork/drivers/bridge/setup_ip_tables.go b/libnetwork/drivers/bridge/setup_ip_tables.go index 8c799cd01c..2821699b20 100644 --- a/libnetwork/drivers/bridge/setup_ip_tables.go +++ b/libnetwork/drivers/bridge/setup_ip_tables.go @@ -203,7 +203,6 @@ type iptRule struct { } func setupIPTablesInternal(hostIP net.IP, bridgeIface string, addr *net.IPNet, icc, ipmasq, hairpin, enable bool) error { - var ( address = addr.String() skipDNAT = iptRule{table: iptables.Nat, chain: DockerChain, preArgs: []string{"-t", "nat"}, args: []string{"-i", bridgeIface, "-j", "RETURN"}} @@ -260,7 +259,6 @@ func setupIPTablesInternal(hostIP net.IP, bridgeIface string, addr *net.IPNet, i } func programChainRule(version iptables.IPVersion, rule iptRule, ruleDescr string, insert bool) error { - iptable := iptables.GetIptable(version) var ( diff --git a/libnetwork/drivers/bridge/setup_ip_tables_test.go b/libnetwork/drivers/bridge/setup_ip_tables_test.go index 108c682d11..c6b57ec56f 100644 --- a/libnetwork/drivers/bridge/setup_ip_tables_test.go +++ b/libnetwork/drivers/bridge/setup_ip_tables_test.go @@ -82,7 +82,8 @@ func TestSetupIPChains(t *testing.T) { func getBasicTestConfig() *networkConfiguration { config := &networkConfiguration{ BridgeName: DefaultBridgeName, - AddressIPv4: &net.IPNet{IP: net.ParseIP(iptablesTestBridgeIP), Mask: net.CIDRMask(16, 32)}} + AddressIPv4: &net.IPNet{IP: net.ParseIP(iptablesTestBridgeIP), Mask: net.CIDRMask(16, 32)}, + } return config } @@ -128,8 +129,10 @@ func assertChainConfig(d *driver, t *testing.T) { // Assert function which pushes chains based on bridge config parameters. func assertBridgeConfig(config *networkConfiguration, br *bridgeInterface, d *driver, t *testing.T) { - nw := bridgeNetwork{portMapper: portmapper.New(""), - config: config} + nw := bridgeNetwork{ + portMapper: portmapper.New(""), + config: config, + } nw.driver = d // Attempt programming of ip tables. diff --git a/libnetwork/drivers/bridge/setup_ipv4.go b/libnetwork/drivers/bridge/setup_ipv4.go index 856b1f7182..ef8ee724c4 100644 --- a/libnetwork/drivers/bridge/setup_ipv4.go +++ b/libnetwork/drivers/bridge/setup_ipv4.go @@ -77,7 +77,7 @@ func setupLoopbackAddressesRouting(config *networkConfiguration, i *bridgeInterf } // Enable loopback addresses routing only if it isn't already enabled if ipv4LoRoutingData[0] != '1' { - if err := os.WriteFile(sysPath, []byte{'1', '\n'}, 0644); err != nil { + if err := os.WriteFile(sysPath, []byte{'1', '\n'}, 0o644); err != nil { return fmt.Errorf("Unable to enable local routing for hairpin mode: %v", err) } } diff --git a/libnetwork/drivers/bridge/setup_ipv4_test.go b/libnetwork/drivers/bridge/setup_ipv4_test.go index e684d2f334..d82c8857ee 100644 --- a/libnetwork/drivers/bridge/setup_ipv4_test.go +++ b/libnetwork/drivers/bridge/setup_ipv4_test.go @@ -12,7 +12,8 @@ import ( func setupTestInterface(t *testing.T, nh *netlink.Handle) (*networkConfiguration, *bridgeInterface) { config := &networkConfiguration{ - BridgeName: DefaultBridgeName} + BridgeName: DefaultBridgeName, + } br := &bridgeInterface{nlh: nh} if err := setupDevice(config, br); err != nil { @@ -74,7 +75,8 @@ func TestSetupGatewayIPv4(t *testing.T) { config := &networkConfiguration{ BridgeName: DefaultBridgeName, - DefaultGatewayIPv4: gw} + DefaultGatewayIPv4: gw, + } br := &bridgeInterface{bridgeIPv4: nw, nlh: nh} diff --git a/libnetwork/drivers/bridge/setup_ipv6.go b/libnetwork/drivers/bridge/setup_ipv6.go index e466b83338..ba42e9dfb9 100644 --- a/libnetwork/drivers/bridge/setup_ipv6.go +++ b/libnetwork/drivers/bridge/setup_ipv6.go @@ -16,7 +16,7 @@ import ( var bridgeIPv6 = &net.IPNet{IP: net.ParseIP("fe80::1"), Mask: net.CIDRMask(64, 128)} const ( - ipv6ForwardConfPerm = 0644 + ipv6ForwardConfPerm = 0o644 ipv6ForwardConfDefault = "/proc/sys/net/ipv6/conf/default/forwarding" ipv6ForwardConfAll = "/proc/sys/net/ipv6/conf/all/forwarding" ) diff --git a/libnetwork/drivers/bridge/setup_ipv6_test.go b/libnetwork/drivers/bridge/setup_ipv6_test.go index 1a95d93d9b..b554faabac 100644 --- a/libnetwork/drivers/bridge/setup_ipv6_test.go +++ b/libnetwork/drivers/bridge/setup_ipv6_test.go @@ -63,7 +63,8 @@ func TestSetupGatewayIPv6(t *testing.T) { config := &networkConfiguration{ BridgeName: DefaultBridgeName, AddressIPv6: nw, - DefaultGatewayIPv6: gw} + DefaultGatewayIPv6: gw, + } nh, err := netlink.NewHandle() if err != nil {