Enable dogsled and whitespace linters

saschagrunert · saschagrunert · commit b614d283d48c · 2019-10-25T11:33:14.000+02:00
The corresponding lints have been fixed as well.

Signed-off-by: Sascha Grunert &lt;sgrunert@suse.com&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -17,6 +17,7 @@ linters:
     - bodyclose
     - deadcode
     - depguard
+    - dogsled
     - dupl
     - errcheck
     - gochecknoinits
@@ -44,13 +45,12 @@ linters:
     - unparam
     - unused
     - varcheck
-    # - dogsled
+    - whitespace
     # - funlen
     # - gochecknoglobals
     # - gocognit
     # - godox
     # - lll
-    # - whitespace
     # - wsl
 linters-settings:
   errcheck:
diff --git a/cmd/crio/main.go b/cmd/crio/main.go
@@ -44,7 +44,6 @@ func writeCrioGoroutineStacks() {
 }
 
 func catchShutdown(ctx context.Context, cancel context.CancelFunc, gserver *grpc.Server, sserver *server.Server, hserver *http.Server, signalled *bool) {
-
 	sig := make(chan os.Signal, 2048)
 	signal.Notify(sig, signals.Interrupt, signals.Term, unix.SIGUSR1, unix.SIGPIPE, signals.Hup)
 	go func() {
diff --git a/internal/lib/config/config.go b/internal/lib/config/config.go
@@ -798,7 +798,6 @@ func (r *RuntimeHandler) ValidateRuntimePath(name string) error {
 		}
 		r.RuntimePath = executable
 		logrus.Debugf("using runtime executable from $PATH %q", executable)
-
 	} else if _, err := os.Stat(r.RuntimePath); os.IsNotExist(err) {
 		return fmt.Errorf("invalid runtime_path for runtime '%s': %q",
 			name, err)
diff --git a/internal/oci/container.go b/internal/oci/container.go
@@ -298,7 +298,6 @@ func (c *Container) AddVolume(v ContainerVolume) {
 // Volumes returns the list of container volumes.
 func (c *Container) Volumes() []ContainerVolume {
 	return c.volumes
-
 }
 
 // SetMountPoint sets the container mount point
diff --git a/internal/oci/kill.go b/internal/oci/kill.go
@@ -15,5 +15,4 @@ func findStringInSignalMap(killSignal syscall.Signal) (string, error) {
 		}
 	}
 	return "", errors.Errorf("unable to convert signal to string")
-
 }
diff --git a/internal/oci/runtime_oci.go b/internal/oci/runtime_oci.go
@@ -224,7 +224,6 @@ func (r *runtimeOCI) StartContainer(c *Container) error {
 
 	if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr,
 		r.path, rootFlag, r.root, "start", c.id); err != nil {
-
 		return err
 	}
 	c.state.Started = time.Now()
@@ -582,7 +581,6 @@ func (r *runtimeOCI) StopContainer(ctx context.Context, c *Container, timeout in
 	if timeout > 0 {
 		if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr,
 			r.path, rootFlag, r.root, "kill", c.id, c.GetStopSignal()); err != nil {
-
 			if err := checkProcessGone(c); err != nil {
 				return fmt.Errorf("failed to stop container %q: %v", c.id, err)
 			}
@@ -596,7 +594,6 @@ func (r *runtimeOCI) StopContainer(ctx context.Context, c *Container, timeout in
 
 	if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr,
 		r.path, rootFlag, r.root, "kill", c.id, "KILL"); err != nil {
-
 		if err := checkProcessGone(c); err != nil {
 			return fmt.Errorf("failed to stop container %q: %v", c.id, err)
 		}
diff --git a/internal/oci/runtime_vm.go b/internal/oci/runtime_vm.go
@@ -296,7 +296,6 @@ func (r *runtimeVM) ExecSyncContainer(c *Container, command []string, timeout in
 }
 
 func (r *runtimeVM) execContainerCommon(c *Container, cmd []string, timeout int64, stdin io.Reader, stdout, stderr io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize) (exitCode int32, err error) {
-
 	logrus.Debug("runtimeVM.execContainer() start")
 	defer logrus.Debug("runtimeVM.execContainer() end")
 
diff --git a/internal/pkg/criocli/completion.go b/internal/pkg/criocli/completion.go
@@ -110,7 +110,6 @@ func zshCompletion(c *cli.Context) error {
 			strings.Join(opts, "' '"),
 			c.App.Name))
 	return nil
-
 }
 
 func fishCompletion(c *cli.Context) error {
diff --git a/internal/pkg/log/interceptors.go b/internal/pkg/log/interceptors.go
@@ -30,7 +30,6 @@ func StreamInterceptor() grpc.StreamServerInterceptor {
 		info *grpc.StreamServerInfo,
 		handler grpc.StreamHandler,
 	) error {
-
 		newCtx := addRequestID(stream.Context())
 		newStream := NewServerStream(stream)
 		newStream.NewContext = newCtx
@@ -52,7 +51,6 @@ func UnaryInterceptor() grpc.UnaryServerInterceptor {
 		info *grpc.UnaryServerInfo,
 		handler grpc.UnaryHandler,
 	) (interface{}, error) {
-
 		newCtx := addRequestID(ctx)
 		Debugf(newCtx, "request: %+v", req)
 
diff --git a/server/container_create_linux.go b/server/container_create_linux.go
@@ -128,10 +128,8 @@ func addDevicesPlatform(ctx context.Context, sb *sandbox.Sandbox, containerConfi
 		// if the device is not a device node
 		// try to see if it's a directory holding many devices
 		if err == devices.ErrNotADevice {
-
 			// check if it is a directory
 			if e := utils.IsDirectory(path); e == nil {
-
 				// mount the internal devices recursively
 				// nolint: errcheck
 				filepath.Walk(path, func(dpath string, f os.FileInfo, e error) error {
@@ -428,7 +426,6 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID, contai
 
 	// set this container's apparmor profile if it is set by sandbox
 	if s.appArmorEnabled && !privileged {
-
 		appArmorProfileName := s.getAppArmorProfileName(containerConfig.GetLinux().GetSecurityContext().GetApparmorProfile())
 		if appArmorProfileName != "" {
 			// reload default apparmor profile if it is unloaded.
@@ -446,7 +443,6 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID, contai
 
 			specgen.SetProcessApparmorProfile(appArmorProfileName)
 		}
-
 	}
 
 	logPath := containerConfig.GetLogPath()
@@ -1072,7 +1068,6 @@ func addOCIBindMounts(ctx context.Context, mountLabel string, containerConfig *p
 			Options:     []string{"nosuid", "noexec", "nodev", "relatime", "ro"},
 		}
 		specgen.AddMount(m)
-
 	}
 
 	return volumes, ociMounts, nil
diff --git a/server/container_create_linux_test.go b/server/container_create_linux_test.go
@@ -13,7 +13,6 @@ import (
 func TestAddOCIBindsForDev(t *testing.T) {
 	specgen, err := generate.New("linux")
 	if err != nil {
-
 		t.Error(err)
 	}
 	config := &pb.ContainerConfig{
@@ -48,7 +47,6 @@ func TestAddOCIBindsForDev(t *testing.T) {
 func TestAddOCIBindsForSys(t *testing.T) {
 	specgen, err := generate.New("linux")
 	if err != nil {
-
 		t.Error(err)
 	}
 	config := &pb.ContainerConfig{
diff --git a/server/inspect.go b/server/inspect.go
@@ -91,7 +91,6 @@ func (s *Server) getContainerInfo(id string, getContainerFunc, getInfraContainer
 		Sandbox:         ctr.Sandbox(),
 		IPs:             sb.IPs(),
 	}, nil
-
 }
 
 const (
diff --git a/server/naming.go b/server/naming.go
@@ -47,7 +47,6 @@ func makeContainerName(sandboxMetadata *pb.PodSandboxMetadata, containerConfig *
 }
 
 func (s *Server) ReservePodIDAndName(config *pb.PodSandboxConfig) (id, name string, err error) {
-
 	if config == nil || config.Metadata == nil || config.Metadata.Namespace == "" {
 		return "", "", fmt.Errorf("cannot generate pod name without namespace")
 	}
@@ -62,7 +61,6 @@ func (s *Server) ReservePodIDAndName(config *pb.PodSandboxConfig) (id, name stri
 }
 
 func (s *Server) ReserveSandboxContainerIDAndName(config *pb.PodSandboxConfig) (name string, err error) {
-
 	if config == nil || config.Metadata == nil {
 		return "", fmt.Errorf("cannot generate sandbox container name without metadata")
 	}
@@ -76,7 +74,6 @@ func (s *Server) ReserveSandboxContainerIDAndName(config *pb.PodSandboxConfig) (
 }
 
 func (s *Server) ReserveContainerIDandName(sandboxMetadata *pb.PodSandboxMetadata, config *pb.ContainerConfig) (id, name string, err error) {
-
 	if config == nil || config.Metadata == nil || sandboxMetadata == nil {
 		return "", "", fmt.Errorf("cannot generate container name without metadata")
 	}
diff --git a/server/sandbox_run_linux.go b/server/sandbox_run_linux.go
@@ -613,7 +613,6 @@ func (s *Server) runPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
 				return nil, errors.Wrapf(err, "cannot chown %s to %d:%d", path, rootPair.UID, rootPair.GID)
 			}
 		}
-
 	}
 
 	if err := s.createContainerPlatform(container, nil, sb.CgroupParent()); err != nil {
@@ -753,7 +752,6 @@ func PauseCommand(cfg *config.Config, image *v1.Image) ([]string, error) {
 	if cfg.PauseCommand == "" {
 		if image == nil ||
 			(len(image.Config.Entrypoint) == 0 && len(image.Config.Cmd) == 0) {
-
 			return nil, fmt.Errorf(
 				"unable to run pause image %q: %s",
 				cfg.PauseImage,
@@ -764,7 +762,6 @@ func PauseCommand(cfg *config.Config, image *v1.Image) ([]string, error) {
 		cmd = append(cmd, image.Config.Entrypoint...)
 		cmd = append(cmd, image.Config.Cmd...)
 		return cmd, nil
-
 	}
 	return []string{cfg.PauseCommand}, nil
 }
diff --git a/server/server.go b/server/server.go
@@ -182,7 +182,6 @@ func (s *Server) restore() {
 			} else {
 				s.ReleasePodName(n)
 			}
-
 		}
 		// Go through the containers and delete any container that was under the deleted pod
 		logrus.Warnf("deleting all containers under sandbox %s since it could not be restored", sbID)
@@ -240,7 +239,6 @@ func (s *Server) cleanupSandboxesOnShutdown(ctx context.Context) {
 		if err != nil {
 			logrus.Warnf("Failed to remove %q", shutdownFile)
 		}
-
 	}
 }
 
@@ -296,7 +294,6 @@ func New(
 	configPath string,
 	configIface libconfig.Iface,
 ) (*Server, error) {
-
 	if configIface == nil || configIface.GetData() == nil {
 		return nil, fmt.Errorf("provided configuration interface or its data is nil")
 	}
diff --git a/server/utils.go b/server/utils.go
@@ -110,7 +110,6 @@ func (s *Server) newPodNetwork(sb *sandbox.Sandbox) (ocicni.PodNetwork, error) {
 		} else if iegress, isok := egressQ.AsInt64(); isok {
 			egress = iegress
 		}
-
 	}
 	if val, ok := sb.Annotations()["kubernetes.io/ingress-bandwidth"]; ok {
 		ingressQ, err := resource.ParseQuantity(val)

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ func writeCrioGoroutineStacks() {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`func catchShutdown(ctx context.Context, cancel context.CancelFunc, gserver grpc.Server, sserver server.Server, hserver http.Server, signalled bool) {`
`47`		`-`
`48`	`47`	`sig := make(chan os.Signal, 2048)`
`49`	`48`	`signal.Notify(sig, signals.Interrupt, signals.Term, unix.SIGUSR1, unix.SIGPIPE, signals.Hup)`
`50`	`49`	`go func() {`
Original file line number	Diff line number	Diff line change
`@@ -798,7 +798,6 @@ func (r *RuntimeHandler) ValidateRuntimePath(name string) error {`
`798`	`798`	`}`
`799`	`799`	`r.RuntimePath = executable`
`800`	`800`	`logrus.Debugf("using runtime executable from $PATH %q", executable)`
`801`		`-`
`802`	`801`	`} else if _, err := os.Stat(r.RuntimePath); os.IsNotExist(err) {`
`803`	`802`	`return fmt.Errorf("invalid runtime_path for runtime '%s': %q",`
`804`	`803`	`name, err)`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,6 @@ func (c *Container) AddVolume(v ContainerVolume) {`
`298`	`298`	`// Volumes returns the list of container volumes.`
`299`	`299`	`func (c *Container) Volumes() []ContainerVolume {`
`300`	`300`	`return c.volumes`
`301`		`-`
`302`	`301`	`}`
`303`	`302`
`304`	`303`	`// SetMountPoint sets the container mount point`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,4 @@ func findStringInSignalMap(killSignal syscall.Signal) (string, error) {`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`return "", errors.Errorf("unable to convert signal to string")`
`18`		`-`
`19`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,6 @@ func (r runtimeVM) ExecSyncContainer(c Container, command []string, timeout in`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`func (r runtimeVM) execContainerCommon(c Container, cmd []string, timeout int64, stdin io.Reader, stdout, stderr io.WriteCloser, tty bool, resize <-chan remotecommand.TerminalSize) (exitCode int32, err error) {`
`299`		`-`
`300`	`299`	`logrus.Debug("runtimeVM.execContainer() start")`
`301`	`300`	`defer logrus.Debug("runtimeVM.execContainer() end")`
`302`	`301`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,6 @@ func zshCompletion(c *cli.Context) error {`
`110`	`110`	`strings.Join(opts, "' '"),`
`111`	`111`	`c.App.Name))`
`112`	`112`	`return nil`
`113`		`-`
`114`	`113`	`}`
`115`	`114`
`116`	`115`	`func fishCompletion(c *cli.Context) error {`