Formatting the code with https://github.com/mvdan/gofumpt
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| ... | ... |
@@ -947,7 +947,6 @@ func (c *Controller) NewSandbox(containerID string, options ...SandboxOption) (* |
| 947 | 947 |
err := sb.osSbox.InvokeFunc(func() {
|
| 948 | 948 |
sb.osSbox.ApplyOSTweaks(sb.oslTypes) |
| 949 | 949 |
}) |
| 950 |
- |
|
| 951 | 950 |
if err != nil {
|
| 952 | 951 |
log.G(context.TODO()).Errorf("Failed to apply performance tuning sysctls to the sandbox: %v", err)
|
| 953 | 952 |
} |
| ... | ... |
@@ -649,39 +649,51 @@ func (b *badDriver) CreateNetwork(nid string, options map[string]interface{}, nI
|
| 649 | 649 |
} |
| 650 | 650 |
return nil |
| 651 | 651 |
} |
| 652 |
+ |
|
| 652 | 653 |
func (b *badDriver) DeleteNetwork(nid string) error {
|
| 653 | 654 |
return nil |
| 654 | 655 |
} |
| 656 |
+ |
|
| 655 | 657 |
func (b *badDriver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo, options map[string]interface{}) error {
|
| 656 | 658 |
return fmt.Errorf("I will not create any endpoint")
|
| 657 | 659 |
} |
| 660 |
+ |
|
| 658 | 661 |
func (b *badDriver) DeleteEndpoint(nid, eid string) error {
|
| 659 | 662 |
return nil |
| 660 | 663 |
} |
| 664 |
+ |
|
| 661 | 665 |
func (b *badDriver) EndpointOperInfo(nid, eid string) (map[string]interface{}, error) {
|
| 662 | 666 |
return nil, nil |
| 663 | 667 |
} |
| 668 |
+ |
|
| 664 | 669 |
func (b *badDriver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo, options map[string]interface{}) error {
|
| 665 | 670 |
return fmt.Errorf("I will not allow any join")
|
| 666 | 671 |
} |
| 672 |
+ |
|
| 667 | 673 |
func (b *badDriver) Leave(nid, eid string) error {
|
| 668 | 674 |
return nil |
| 669 | 675 |
} |
| 676 |
+ |
|
| 670 | 677 |
func (b *badDriver) DiscoverNew(dType discoverapi.DiscoveryType, data interface{}) error {
|
| 671 | 678 |
return nil |
| 672 | 679 |
} |
| 680 |
+ |
|
| 673 | 681 |
func (b *badDriver) DiscoverDelete(dType discoverapi.DiscoveryType, data interface{}) error {
|
| 674 | 682 |
return nil |
| 675 | 683 |
} |
| 684 |
+ |
|
| 676 | 685 |
func (b *badDriver) Type() string {
|
| 677 | 686 |
return badDriverName |
| 678 | 687 |
} |
| 688 |
+ |
|
| 679 | 689 |
func (b *badDriver) IsBuiltIn() bool {
|
| 680 | 690 |
return false |
| 681 | 691 |
} |
| 692 |
+ |
|
| 682 | 693 |
func (b *badDriver) ProgramExternalConnectivity(nid, eid string, options map[string]interface{}) error {
|
| 683 | 694 |
return nil |
| 684 | 695 |
} |
| 696 |
+ |
|
| 685 | 697 |
func (b *badDriver) RevokeExternalConnectivity(nid, eid string) error {
|
| 686 | 698 |
return nil |
| 687 | 699 |
} |
| ... | ... |
@@ -565,7 +565,7 @@ func TestEnableIPv6(t *testing.T) {
|
| 565 | 565 |
} |
| 566 | 566 |
// cleanup |
| 567 | 567 |
defer func() {
|
| 568 |
- if err := os.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
|
|
| 568 |
+ if err := os.WriteFile("/etc/resolv.conf", resolvConfSystem, 0o644); err != nil {
|
|
| 569 | 569 |
t.Fatal(err) |
| 570 | 570 |
} |
| 571 | 571 |
}() |
| ... | ... |
@@ -593,7 +593,7 @@ func TestEnableIPv6(t *testing.T) {
|
| 593 | 593 |
t.Fatal(err) |
| 594 | 594 |
} |
| 595 | 595 |
|
| 596 |
- if err := os.WriteFile("/etc/resolv.conf", tmpResolvConf, 0644); err != nil {
|
|
| 596 |
+ if err := os.WriteFile("/etc/resolv.conf", tmpResolvConf, 0o644); err != nil {
|
|
| 597 | 597 |
t.Fatal(err) |
| 598 | 598 |
} |
| 599 | 599 |
|
| ... | ... |
@@ -642,7 +642,7 @@ func TestResolvConfHost(t *testing.T) {
|
| 642 | 642 |
} |
| 643 | 643 |
// cleanup |
| 644 | 644 |
defer func() {
|
| 645 |
- if err := os.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
|
|
| 645 |
+ if err := os.WriteFile("/etc/resolv.conf", resolvConfSystem, 0o644); err != nil {
|
|
| 646 | 646 |
t.Fatal(err) |
| 647 | 647 |
} |
| 648 | 648 |
}() |
| ... | ... |
@@ -653,7 +653,7 @@ func TestResolvConfHost(t *testing.T) {
|
| 653 | 653 |
t.Fatal(err) |
| 654 | 654 |
} |
| 655 | 655 |
|
| 656 |
- if err := os.WriteFile("/etc/resolv.conf", tmpResolvConf, 0644); err != nil {
|
|
| 656 |
+ if err := os.WriteFile("/etc/resolv.conf", tmpResolvConf, 0o644); err != nil {
|
|
| 657 | 657 |
t.Fatal(err) |
| 658 | 658 |
} |
| 659 | 659 |
|
| ... | ... |
@@ -689,7 +689,7 @@ func TestResolvConfHost(t *testing.T) {
|
| 689 | 689 |
t.Fatal(err) |
| 690 | 690 |
} |
| 691 | 691 |
|
| 692 |
- fmode := (os.FileMode)(0644) |
|
| 692 |
+ fmode := (os.FileMode)(0o644) |
|
| 693 | 693 |
if finfo.Mode() != fmode {
|
| 694 | 694 |
t.Fatalf("Expected file mode %s, got %s", fmode.String(), finfo.Mode().String())
|
| 695 | 695 |
} |
| ... | ... |
@@ -720,7 +720,7 @@ func TestResolvConf(t *testing.T) {
|
| 720 | 720 |
} |
| 721 | 721 |
// cleanup |
| 722 | 722 |
defer func() {
|
| 723 |
- if err := os.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
|
|
| 723 |
+ if err := os.WriteFile("/etc/resolv.conf", resolvConfSystem, 0o644); err != nil {
|
|
| 724 | 724 |
t.Fatal(err) |
| 725 | 725 |
} |
| 726 | 726 |
}() |
| ... | ... |
@@ -745,7 +745,7 @@ func TestResolvConf(t *testing.T) {
|
| 745 | 745 |
t.Fatal(err) |
| 746 | 746 |
} |
| 747 | 747 |
|
| 748 |
- if err := os.WriteFile("/etc/resolv.conf", tmpResolvConf1, 0644); err != nil {
|
|
| 748 |
+ if err := os.WriteFile("/etc/resolv.conf", tmpResolvConf1, 0o644); err != nil {
|
|
| 749 | 749 |
t.Fatal(err) |
| 750 | 750 |
} |
| 751 | 751 |
|
| ... | ... |
@@ -772,7 +772,7 @@ func TestResolvConf(t *testing.T) {
|
| 772 | 772 |
t.Fatal(err) |
| 773 | 773 |
} |
| 774 | 774 |
|
| 775 |
- fmode := (os.FileMode)(0644) |
|
| 775 |
+ fmode := (os.FileMode)(0o644) |
|
| 776 | 776 |
if finfo.Mode() != fmode {
|
| 777 | 777 |
t.Fatalf("Expected file mode %s, got %s", fmode.String(), finfo.Mode().String())
|
| 778 | 778 |
} |
| ... | ... |
@@ -792,7 +792,7 @@ func TestResolvConf(t *testing.T) {
|
| 792 | 792 |
t.Fatal(err) |
| 793 | 793 |
} |
| 794 | 794 |
|
| 795 |
- if err := os.WriteFile("/etc/resolv.conf", tmpResolvConf2, 0644); err != nil {
|
|
| 795 |
+ if err := os.WriteFile("/etc/resolv.conf", tmpResolvConf2, 0o644); err != nil {
|
|
| 796 | 796 |
t.Fatal(err) |
| 797 | 797 |
} |
| 798 | 798 |
|
| ... | ... |
@@ -820,7 +820,7 @@ func TestResolvConf(t *testing.T) {
|
| 820 | 820 |
t.Fatalf("Expected:\n%s\nGot:\n%s", string(expectedResolvConf1), string(content))
|
| 821 | 821 |
} |
| 822 | 822 |
|
| 823 |
- if err := os.WriteFile(resolvConfPath, tmpResolvConf3, 0644); err != nil {
|
|
| 823 |
+ if err := os.WriteFile(resolvConfPath, tmpResolvConf3, 0o644); err != nil {
|
|
| 824 | 824 |
t.Fatal(err) |
| 825 | 825 |
} |
| 826 | 826 |
|
| ... | ... |
@@ -1172,7 +1172,7 @@ func TestInvalidRemoteDriver(t *testing.T) {
|
| 1172 | 1172 |
fmt.Fprintln(w, `{"Implements": ["InvalidDriver"]}`)
|
| 1173 | 1173 |
}) |
| 1174 | 1174 |
|
| 1175 |
- if err := os.MkdirAll(specPath, 0755); err != nil {
|
|
| 1175 |
+ if err := os.MkdirAll(specPath, 0o755); err != nil {
|
|
| 1176 | 1176 |
t.Fatal(err) |
| 1177 | 1177 |
} |
| 1178 | 1178 |
defer func() {
|
| ... | ... |
@@ -1181,7 +1181,7 @@ func TestInvalidRemoteDriver(t *testing.T) {
|
| 1181 | 1181 |
} |
| 1182 | 1182 |
}() |
| 1183 | 1183 |
|
| 1184 |
- if err := os.WriteFile(filepath.Join(specPath, "invalid-network-driver.spec"), []byte(server.URL), 0644); err != nil {
|
|
| 1184 |
+ if err := os.WriteFile(filepath.Join(specPath, "invalid-network-driver.spec"), []byte(server.URL), 0o644); err != nil {
|
|
| 1185 | 1185 |
t.Fatal(err) |
| 1186 | 1186 |
} |
| 1187 | 1187 |
|
| ... | ... |
@@ -1227,7 +1227,7 @@ func TestValidRemoteDriver(t *testing.T) {
|
| 1227 | 1227 |
fmt.Fprintf(w, "null") |
| 1228 | 1228 |
}) |
| 1229 | 1229 |
|
| 1230 |
- if err := os.MkdirAll(specPath, 0755); err != nil {
|
|
| 1230 |
+ if err := os.MkdirAll(specPath, 0o755); err != nil {
|
|
| 1231 | 1231 |
t.Fatal(err) |
| 1232 | 1232 |
} |
| 1233 | 1233 |
defer func() {
|
| ... | ... |
@@ -1236,7 +1236,7 @@ func TestValidRemoteDriver(t *testing.T) {
|
| 1236 | 1236 |
} |
| 1237 | 1237 |
}() |
| 1238 | 1238 |
|
| 1239 |
- if err := os.WriteFile(filepath.Join(specPath, "valid-network-driver.spec"), []byte(server.URL), 0644); err != nil {
|
|
| 1239 |
+ if err := os.WriteFile(filepath.Join(specPath, "valid-network-driver.spec"), []byte(server.URL), 0o644); err != nil {
|
|
| 1240 | 1240 |
t.Fatal(err) |
| 1241 | 1241 |
} |
| 1242 | 1242 |
|
| ... | ... |
@@ -1643,7 +1643,7 @@ func (n *network) ipamAllocateVersion(ipVer int, ipam ipamapi.Ipam) error {
|
| 1643 | 1643 |
// irrespective of whether ipam driver returned a gateway already. |
| 1644 | 1644 |
// If none of the above is true, libnetwork will allocate one. |
| 1645 | 1645 |
if cfg.Gateway != "" || d.Gateway == nil {
|
| 1646 |
- var gatewayOpts = map[string]string{
|
|
| 1646 |
+ gatewayOpts := map[string]string{
|
|
| 1647 | 1647 |
ipamapi.RequestAddressType: netlabel.Gateway, |
| 1648 | 1648 |
} |
| 1649 | 1649 |
if d.Gateway, _, err = ipam.RequestAddress(d.PoolID, net.ParseIP(cfg.Gateway), gatewayOpts); err != nil {
|
| ... | ... |
@@ -1919,7 +1919,7 @@ func (n *network) Labels() map[string]string {
|
| 1919 | 1919 |
n.mu.Lock() |
| 1920 | 1920 |
defer n.mu.Unlock() |
| 1921 | 1921 |
|
| 1922 |
- var lbls = make(map[string]string, len(n.labels)) |
|
| 1922 |
+ lbls := make(map[string]string, len(n.labels)) |
|
| 1923 | 1923 |
for k, v := range n.labels {
|
| 1924 | 1924 |
lbls[k] = v |
| 1925 | 1925 |
} |
| ... | ... |
@@ -1175,9 +1175,7 @@ func OptionLoadBalancer(nid string) SandboxOption {
|
| 1175 | 1175 |
// epi.joininfo <=> epj.joininfo # ipv6 < ipv4 |
| 1176 | 1176 |
// epi.name <=> epj.name # bar < foo |
| 1177 | 1177 |
func (epi *Endpoint) Less(epj *Endpoint) bool {
|
| 1178 |
- var ( |
|
| 1179 |
- prioi, prioj int |
|
| 1180 |
- ) |
|
| 1178 |
+ var prioi, prioj int |
|
| 1181 | 1179 |
|
| 1182 | 1180 |
sbi, _ := epi.getSandbox() |
| 1183 | 1181 |
sbj, _ := epj.getSandbox() |
| ... | ... |
@@ -105,7 +105,7 @@ func (c *Controller) startExternalKeyListener() error {
|
| 105 | 105 |
execRoot = v |
| 106 | 106 |
} |
| 107 | 107 |
udsBase := filepath.Join(execRoot, execSubdir) |
| 108 |
- if err := os.MkdirAll(udsBase, 0600); err != nil {
|
|
| 108 |
+ if err := os.MkdirAll(udsBase, 0o600); err != nil {
|
|
| 109 | 109 |
return err |
| 110 | 110 |
} |
| 111 | 111 |
shortCtlrID := stringid.TruncateID(c.id) |
| ... | ... |
@@ -114,7 +114,7 @@ func (c *Controller) startExternalKeyListener() error {
|
| 114 | 114 |
if err != nil {
|
| 115 | 115 |
return err |
| 116 | 116 |
} |
| 117 |
- if err := os.Chmod(uds, 0600); err != nil {
|
|
| 117 |
+ if err := os.Chmod(uds, 0o600); err != nil {
|
|
| 118 | 118 |
l.Close() |
| 119 | 119 |
return err |
| 120 | 120 |
} |
| ... | ... |
@@ -562,7 +562,7 @@ func (sb *Sandbox) configureFWMark(vip net.IP, fwMark uint32, ingressPorts []*Po |
| 562 | 562 |
rule := append([]string{"-t", "nat", "-A", "POSTROUTING"}, ruleParams...)
|
| 563 | 563 |
rules = append(rules, rule) |
| 564 | 564 |
|
| 565 |
- err := os.WriteFile("/proc/sys/net/ipv4/vs/conntrack", []byte{'1', '\n'}, 0644)
|
|
| 565 |
+ err := os.WriteFile("/proc/sys/net/ipv4/vs/conntrack", []byte{'1', '\n'}, 0o644)
|
|
| 566 | 566 |
if err != nil {
|
| 567 | 567 |
innerErr = err |
| 568 | 568 |
return |
| ... | ... |
@@ -25,7 +25,7 @@ func (n *network) addLBBackend(ip net.IP, lb *loadBalancer) {
|
| 25 | 25 |
|
| 26 | 26 |
lb.Lock() |
| 27 | 27 |
defer lb.Unlock() |
| 28 |
- //find the load balancer IP for the network. |
|
| 28 |
+ // find the load balancer IP for the network. |
|
| 29 | 29 |
var sourceVIP string |
| 30 | 30 |
for _, e := range n.Endpoints() {
|
| 31 | 31 |
epInfo := e.Info() |
| ... | ... |
@@ -49,7 +49,7 @@ func (n *network) addLBBackend(ip net.IP, lb *loadBalancer) {
|
| 49 | 49 |
if be.disabled {
|
| 50 | 50 |
continue |
| 51 | 51 |
} |
| 52 |
- //Call HNS to get back ID (GUID) corresponding to the endpoint. |
|
| 52 |
+ // Call HNS to get back ID (GUID) corresponding to the endpoint. |
|
| 53 | 53 |
hnsEndpoint, err := hcsshim.GetHNSEndpointByName(eid) |
| 54 | 54 |
if err != nil {
|
| 55 | 55 |
log.G(context.TODO()).Errorf("Failed to find HNS ID for endpoint %v: %v", eid, err)
|
| ... | ... |
@@ -379,9 +379,10 @@ type StaticRoute struct {
|
| 379 | 379 |
func (r *StaticRoute) GetCopy() *StaticRoute {
|
| 380 | 380 |
d := GetIPNetCopy(r.Destination) |
| 381 | 381 |
nh := GetIPCopy(r.NextHop) |
| 382 |
- return &StaticRoute{Destination: d,
|
|
| 383 |
- RouteType: r.RouteType, |
|
| 384 |
- NextHop: nh, |
|
| 382 |
+ return &StaticRoute{
|
|
| 383 |
+ Destination: d, |
|
| 384 |
+ RouteType: r.RouteType, |
|
| 385 |
+ NextHop: nh, |
|
| 385 | 386 |
} |
| 386 | 387 |
} |
| 387 | 388 |
|