GitList

Browse code

daemon: fix empty-lines (revive)

daemon/network/filter_test.go:174:19: empty-lines: extra empty line at the end of a block (revive)
daemon/restart.go:17:116: empty-lines: extra empty line at the end of a block (revive)
daemon/daemon_linux_test.go:255:41: empty-lines: extra empty line at the end of a block (revive)
daemon/reload_test.go:340:58: empty-lines: extra empty line at the end of a block (revive)
daemon/oci_linux.go:495:101: empty-lines: extra empty line at the end of a block (revive)
daemon/seccomp_linux_test.go:17:36: empty-lines: extra empty line at the start of a block (revive)
daemon/container_operations.go:560:73: empty-lines: extra empty line at the end of a block (revive)
daemon/daemon_unix.go:558:76: empty-lines: extra empty line at the end of a block (revive)
daemon/daemon_unix.go:1092:64: empty-lines: extra empty line at the start of a block (revive)
daemon/container_operations.go:587:24: empty-lines: extra empty line at the end of a block (revive)
daemon/network.go:807:18: empty-lines: extra empty line at the end of a block (revive)
daemon/network.go:813:42: empty-lines: extra empty line at the end of a block (revive)
daemon/network.go:872:72: empty-lines: extra empty line at the end of a block (revive)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2022/09/24 05:33:15
Showing 9 changed files

daemon/container_operations.go index d8f7411..907944e 100644
daemon/daemon_linux_test.go index aab0c8a..b8c89b9 100644
daemon/daemon_unix.go index 3becb30..20b08e7 100644
daemon/network.go index c468d7f..08bcc47 100644
daemon/network/filter_test.go index 40634f8..e2ce013 100644
daemon/oci_linux.go index b0ca314..3330930 100644
daemon/reload_test.go index a5a7925..0d72f1d 100644
daemon/restart.go index a6c8ddb..2f69f0c 100644
daemon/seccomp_linux_test.go index c44af03..6b5d517 100644

daemon/container_operations.go

History View file @ ddb42f3

@@ -562,7 +562,6 @@ func (daemon *Daemon) allocateNetwork(container *container.Container) (retErr er
 		if err := daemon.connectToNetwork(container, defaultNetName, nConf.EndpointSettings, updateSettings); err != nil {
 			return err
 		}
-
 	}
 
 	// the intermediate map is necessary because "connectToNetwork" modifies "container.NetworkSettings.Networks"
@@ -601,7 +600,6 @@ func (daemon *Daemon) allocateNetwork(container *container.Container) (retErr er
 				}
 			}()
 		}
-
 	}
 
 	if _, err := container.WriteHostConfig(); err != nil {

daemon/daemon_linux_test.go

History View file @ ddb42f3

@@ -342,5 +342,4 @@ func TestRootMountCleanup(t *testing.T) {
                      		checkMounted(t, cfg.Root, false)
                      		assert.Assert(t, d.cleanupMounts())
                      	})
+                    -
+                     }

daemon/daemon_unix.go

History View file @ ddb42f3

@@ -557,7 +557,6 @@ func verifyPlatformContainerResources(resources *containertypes.Resources, sysIn
                      	if len(resources.BlkioDeviceWriteBps) > 0 && !sysInfo.BlkioWriteBpsDevice {
                      		warnings = append(warnings, "Your kernel does not support BPS Block I/O write limit or the cgroup is not mounted. Block I/O BPS write limit discarded.")
                      		resources.BlkioDeviceWriteBps = []*pblkiodev.ThrottleDevice{}
+                    -
+                     	}
                      	if len(resources.BlkioDeviceReadIOps) > 0 && !sysInfo.BlkioReadIOpsDevice {
                      		warnings = append(warnings, "Your kernel does not support IOPS Block read limit or the cgroup is not mounted. Block I/O IOPS read limit discarded.")
@@ -1089,7 +1088,6 @@ func setupInitLayer(idMapping idtools.IdentityMapping) func(string) error {
                      //
                      // If names are used, they are verified to exist in passwd/group
                      func parseRemappedRoot(usergrp string) (string, string, error) {
+                    -
                      	var (
                      		userID, groupID     int
                      		username, groupname string

daemon/network.go

History View file @ ddb42f3

@@ -815,7 +815,6 @@ func buildCreateEndpointOptions(c *container.Container, n libnetwork.Network, ep
 					return nil, errors.Errorf("Invalid link-local IP address: %s", ipam.LinkLocalIPs)
 				}
 				ipList = append(ipList, linkip)
-
 			}
 
 			if ip = net.ParseIP(ipam.IPv4Address); ip == nil && ipam.IPv4Address != "" {
@@ -828,7 +827,6 @@ func buildCreateEndpointOptions(c *container.Container, n libnetwork.Network, ep
 
 			createOptions = append(createOptions,
 				libnetwork.CreateOptionIpam(ip, ip6, ipList, nil))
-
 		}
 
 		for _, alias := range epConfig.Aliases {
@@ -882,7 +880,6 @@ func buildCreateEndpointOptions(c *container.Container, n libnetwork.Network, ep
 
 			createOptions = append(createOptions, libnetwork.EndpointOptionGeneric(genericOption))
 		}
-
 	}
 
 	// Port-mapping rules belong to the container & applicable only to non-internal networks

daemon/network/filter_test.go

History View file @ ddb42f3

@@ -173,7 +173,6 @@ func TestFilterNetworks(t *testing.T) {
                      			if testCase.err != "" {
                      				if err == nil {
                      					t.Fatalf("expect error '%s', got no error", testCase.err)
+                    -
                      				} else if !strings.Contains(err.Error(), testCase.err) {
                      					t.Fatalf("expect error '%s', got '%s'", testCase.err, err)
+                     				}

daemon/oci_linux.go

History View file @ ddb42f3

@@ -706,7 +706,6 @@ func WithMounts(daemon *Daemon, c *container.Container) coci.SpecOpts {
 		}
 
 		return nil
-
 	}
 }
 

daemon/reload_test.go

History View file @ ddb42f3

@@ -404,5 +404,4 @@ func TestDaemonReloadNetworkDiagnosticPort(t *testing.T) {
 	if !daemon.netController.IsDiagnosticEnabled() {
 		t.Fatalf("diagnostic should be enable")
 	}
-
 }

daemon/restart.go

History View file @ ddb42f3

@@ -24,7 +24,6 @@ func (daemon *Daemon) ContainerRestart(ctx context.Context, name string, options
 		return fmt.Errorf("Cannot restart container %s: %v", name, err)
 	}
 	return nil
-
 }
 
 // containerRestart attempts to gracefully stop and then start the

daemon/seccomp_linux_test.go

History View file @ ddb42f3

@@ -15,7 +15,6 @@ import (
+                     )
                      func TestWithSeccomp(t *testing.T) {
+                    -
                      	type expected struct {
                      		daemon  *Daemon
                      		c       *container.Container

...	...	@@ -562,7 +562,6 @@ func (daemon Daemon) allocateNetwork(container container.Container) (retErr er
562	562	if err := daemon.connectToNetwork(container, defaultNetName, nConf.EndpointSettings, updateSettings); err != nil {
563	563	return err
564	564	}
565		-
566	565	}
567	566
568	567	// the intermediate map is necessary because "connectToNetwork" modifies "container.NetworkSettings.Networks"
...	...	@@ -601,7 +600,6 @@ func (daemon Daemon) allocateNetwork(container container.Container) (retErr er
601	601	}
602	602	}()
603	603	}
604		-
605	604	}
606	605
607	606	if _, err := container.WriteHostConfig(); err != nil {

...	...	@@ -815,7 +815,6 @@ func buildCreateEndpointOptions(c *container.Container, n libnetwork.Network, ep
815	815	return nil, errors.Errorf("Invalid link-local IP address: %s", ipam.LinkLocalIPs)
816	816	}
817	817	ipList = append(ipList, linkip)
818		-
819	818	}
820	819
821	820	if ip = net.ParseIP(ipam.IPv4Address); ip == nil && ipam.IPv4Address != "" {
...	...	@@ -828,7 +827,6 @@ func buildCreateEndpointOptions(c *container.Container, n libnetwork.Network, ep
828	828
829	829	createOptions = append(createOptions,
830	830	libnetwork.CreateOptionIpam(ip, ip6, ipList, nil))
831		-
832	831	}
833	832
834	833	for _, alias := range epConfig.Aliases {
...	...	@@ -882,7 +880,6 @@ func buildCreateEndpointOptions(c *container.Container, n libnetwork.Network, ep
882	882
883	883	createOptions = append(createOptions, libnetwork.EndpointOptionGeneric(genericOption))
884	884	}
885		-
886	885	}
887	886
888	887	// Port-mapping rules belong to the container & applicable only to non-internal networks

...	...	@@ -706,7 +706,6 @@ func WithMounts(daemon Daemon, c container.Container) coci.SpecOpts {
706	706	}
707	707
708	708	return nil
709		-
710	709	}
711	710	}
712	711

...	...	@@ -404,5 +404,4 @@ func TestDaemonReloadNetworkDiagnosticPort(t *testing.T) {
404	404	if !daemon.netController.IsDiagnosticEnabled() {
405	405	t.Fatalf("diagnostic should be enable")
406	406	}
407		-
408	407	}

...	...	@@ -24,7 +24,6 @@ func (daemon *Daemon) ContainerRestart(ctx context.Context, name string, options
24	24	return fmt.Errorf("Cannot restart container %s: %v", name, err)
25	25	}
26	26	return nil
27		-
28	27	}
29	28
30	29	// containerRestart attempts to gracefully stop and then start the