Enable whitespace linter

Use the whitespace linter and fix the reported problems.

[NO TESTS NEEDED]

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>

169 files changed, 0 insertions, 291 deletions

diff --git a/.golangci.yml b/.golangci.yml
index 5e98f5fb6..76cf0cad8 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -39,7 +39,6 @@ linters:
     - staticcheck
     - forbidigo
     - exhaustive
-    - whitespace
     - unparam
     - gofumpt
     - gci
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go
index d8935628e..fe43967a2 100644
--- a/cmd/podman/common/create.go
+++ b/cmd/podman/common/create.go
@@ -804,5 +804,4 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) {
 		"Configure cgroup v2 (key=value)",
 	)
 	_ = cmd.RegisterFlagCompletionFunc(cgroupConfFlagName, completion.AutocompleteNone)
-
 }
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go
index 67d40ac43..430354ee9 100644
--- a/cmd/podman/common/create_opts.go
+++ b/cmd/podman/common/create_opts.go
@@ -269,7 +269,6 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
 		endpointsConfig := cc.NetworkingConfig.EndpointsConfig
 		cniNetworks := make([]string, 0, len(endpointsConfig))
 		for netName, endpoint := range endpointsConfig {
-
 			cniNetworks = append(cniNetworks, netName)
 
 			if endpoint == nil {
diff --git a/cmd/podman/common/createparse.go b/cmd/podman/common/createparse.go
index 3a69f11b6..140518cf7 100644
--- a/cmd/podman/common/createparse.go
+++ b/cmd/podman/common/createparse.go
@@ -26,5 +26,4 @@ func (c *ContainerCLIOpts) validate() error {
 		return errors.Errorf("invalid image-volume type %q. Pick one of bind, tmpfs, or ignore", c.ImageVolume)
 	}
 	return nil
-
 }
diff --git a/cmd/podman/containers/attach.go b/cmd/podman/containers/attach.go
index f00c5378b..7c7d780bc 100644
--- a/cmd/podman/containers/attach.go
+++ b/cmd/podman/containers/attach.go
@@ -68,7 +68,6 @@ func init() {
 	})
 	attachFlags(containerAttachCommand)
 	validate.AddLatestFlag(containerAttachCommand, &attachOpts.Latest)
-
 }
 
 func attach(cmd *cobra.Command, args []string) error {
diff --git a/cmd/podman/containers/restore.go b/cmd/podman/containers/restore.go
index 49c0be88e..61bd84219 100644
--- a/cmd/podman/containers/restore.go
+++ b/cmd/podman/containers/restore.go
@@ -118,5 +118,4 @@ func restore(_ *cobra.Command, args []string) error {
 		}
 	}
 	return errs.PrintErrors()
-
 }
diff --git a/cmd/podman/containers/wait.go b/cmd/podman/containers/wait.go
index 7a531b98a..7831ef1c9 100644
--- a/cmd/podman/containers/wait.go
+++ b/cmd/podman/containers/wait.go
@@ -56,7 +56,6 @@ func waitFlags(cmd *cobra.Command) {
 	conditionFlagName := "condition"
 	flags.StringVar(&waitCondition, conditionFlagName, "stopped", "Condition to wait on")
 	_ = cmd.RegisterFlagCompletionFunc(conditionFlagName, common.AutocompleteWaitCondition)
-
 }
 
 func init() {
diff --git a/cmd/podman/generate/systemd.go b/cmd/podman/generate/systemd.go
index f9099d3b8..7b2d9ebb7 100644
--- a/cmd/podman/generate/systemd.go
+++ b/cmd/podman/generate/systemd.go
@@ -128,7 +128,6 @@ func systemd(cmd *cobra.Command, args []string) error {
 	default:
 		return errors.Errorf("unknown --format argument: %s", format)
 	}
-
 }
 
 func printDefault(units map[string]string) error {
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go
index 8a7951923..65486e3ba 100644
--- a/cmd/podman/images/list.go
+++ b/cmd/podman/images/list.go
@@ -275,7 +275,6 @@ func tokenRepoTag(ref string) (string, string, error) {
 	}
 
 	return name, tag, nil
-
 }
 
 func sortFunc(key string, data []imageReporter) func(i, j int) bool {
diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go
index 268a68681..8ded8d352 100644
--- a/cmd/podman/images/prune.go
+++ b/cmd/podman/images/prune.go
@@ -48,7 +48,6 @@ func init() {
 	flags.StringArrayVar(&filter, filterFlagName, []string{}, "Provide filter values (e.g. 'label=<key>=<value>')")
 	//TODO: add completion for filters
 	_ = pruneCmd.RegisterFlagCompletionFunc(filterFlagName, completion.AutocompleteNone)
-
 }
 
 func prune(cmd *cobra.Command, args []string) error {
diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go
index fe92baebe..3b2595757 100644
--- a/cmd/podman/images/pull.go
+++ b/cmd/podman/images/pull.go
@@ -110,11 +110,9 @@ func pullFlags(cmd *cobra.Command) {
 	_ = cmd.RegisterFlagCompletionFunc(authfileFlagName, completion.AutocompleteDefault)
 
 	if !registry.IsRemote() {
-
 		certDirFlagName := "cert-dir"
 		flags.StringVar(&pullOptions.CertDir, certDirFlagName, "", "`Pathname` of a directory containing TLS certificates and keys")
 		_ = cmd.RegisterFlagCompletionFunc(certDirFlagName, completion.AutocompleteDefault)
-
 	}
 	_ = flags.MarkHidden("signature-policy")
 }
diff --git a/cmd/podman/images/trust_show.go b/cmd/podman/images/trust_show.go
index dc35dc6a1..89733a1aa 100644
--- a/cmd/podman/images/trust_show.go
+++ b/cmd/podman/images/trust_show.go
@@ -42,7 +42,6 @@ func init() {
 	_ = showFlags.MarkHidden("policypath")
 	showFlags.StringVar(&showTrustOptions.RegistryPath, "registrypath", "", "")
 	_ = showFlags.MarkHidden("registrypath")
-
 }
 
 func showTrust(cmd *cobra.Command, args []string) error {
diff --git a/cmd/podman/networks/create.go b/cmd/podman/networks/create.go
index 1a091f111..d1cbe253f 100644
--- a/cmd/podman/networks/create.go
+++ b/cmd/podman/networks/create.go
@@ -80,7 +80,6 @@ func init() {
 		Parent:  networkCmd,
 	})
 	networkCreateFlags(networkCreateCommand)
-
 }
 
 func networkCreate(cmd *cobra.Command, args []string) error {
diff --git a/cmd/podman/networks/inspect.go b/cmd/podman/networks/inspect.go
index 671b0265f..bd9f76ea9 100644
--- a/cmd/podman/networks/inspect.go
+++ b/cmd/podman/networks/inspect.go
@@ -39,5 +39,4 @@ func init() {
 func networkInspect(_ *cobra.Command, args []string) error {
 	inspectOpts.Type = inspect.NetworkType
 	return inspect.Inspect(args, *inspectOpts)
-
 }
diff --git a/cmd/podman/networks/list.go b/cmd/podman/networks/list.go
index 16ae980dc..6f63e97cc 100644
--- a/cmd/podman/networks/list.go
+++ b/cmd/podman/networks/list.go
@@ -51,7 +51,6 @@ func networkListFlags(flags *pflag.FlagSet) {
 	filterFlagName := "filter"
 	flags.StringArrayVarP(&filters, filterFlagName, "f", nil, "Provide filter values (e.g. 'name=podman')")
 	_ = networklistCommand.RegisterFlagCompletionFunc(filterFlagName, common.AutocompleteNetworkFilters)
-
 }
 
 func init() {
diff --git a/cmd/podman/play/kube.go b/cmd/podman/play/kube.go
index 4c44fa30f..511e208cf 100644
--- a/cmd/podman/play/kube.go
+++ b/cmd/podman/play/kube.go
@@ -77,7 +77,6 @@ func init() {
 	_ = kubeCmd.RegisterFlagCompletionFunc(authfileFlagName, completion.AutocompleteDefault)
 
 	if !registry.IsRemote() {
-
 		certDirFlagName := "cert-dir"
 		flags.StringVar(&kubeOptions.CertDir, certDirFlagName, "", "`Pathname` of a directory containing TLS certificates and keys")
 		_ = kubeCmd.RegisterFlagCompletionFunc(certDirFlagName, completion.AutocompleteDefault)
diff --git a/cmd/podman/pods/inspect.go b/cmd/podman/pods/inspect.go
index e809be0c9..0fbb730ce 100644
--- a/cmd/podman/pods/inspect.go
+++ b/cmd/podman/pods/inspect.go
@@ -50,7 +50,6 @@ func init() {
 }
 
 func inspect(cmd *cobra.Command, args []string) error {
-
 	if len(args) < 1 && !inspectOptions.Latest {
 		return errors.Errorf("you must provide the name or id of a running pod")
 	}
diff --git a/cmd/podman/secrets/create.go b/cmd/podman/secrets/create.go
index ef5d703ca..8f3ebc3ec 100644
--- a/cmd/podman/secrets/create.go
+++ b/cmd/podman/secrets/create.go
@@ -59,7 +59,6 @@ func create(cmd *cobra.Command, args []string) error {
 		}
 		if (stat.Mode() & os.ModeNamedPipe) == 0 {
 			return errors.New("if `-` is used, data must be passed into stdin")
-
 		}
 		reader = os.Stdin
 	} else {
diff --git a/cmd/podman/secrets/list.go b/cmd/podman/secrets/list.go
index dff4bfdca..d79e125e8 100644
--- a/cmd/podman/secrets/list.go
+++ b/cmd/podman/secrets/list.go
@@ -48,7 +48,6 @@ func init() {
 	formatFlagName := "format"
 	flags.StringVar(&listFlag.format, formatFlagName, "{{.ID}}\t{{.Name}}\t{{.Driver}}\t{{.CreatedAt}}\t{{.UpdatedAt}}\t\n", "Format volume output using Go template")
 	_ = lsCmd.RegisterFlagCompletionFunc(formatFlagName, common.AutocompleteJSONFormat)
-
 }
 
 func ls(cmd *cobra.Command, args []string) error {
@@ -65,7 +64,6 @@ func ls(cmd *cobra.Command, args []string) error {
 			UpdatedAt: units.HumanDuration(time.Since(response.UpdatedAt)) + " ago",
 			Driver:    response.Spec.Driver.Name,
 		})
-
 	}
 	return outputTemplate(cmd, listed)
 }
diff --git a/cmd/podman/shell_completion_test.go b/cmd/podman/shell_completion_test.go
index d2b500b09..3f6f56fbe 100644
--- a/cmd/podman/shell_completion_test.go
+++ b/cmd/podman/shell_completion_test.go
@@ -26,14 +26,11 @@ import (
 )
 
 func TestShellCompletionFunctions(t *testing.T) {
-
 	rootCmd := parseCommands()
 	checkCommand(t, rootCmd)
-
 }
 
 func checkCommand(t *testing.T, cmd *cobra.Command) {
-
 	if cmd.HasSubCommands() {
 		for _, childCmd := range cmd.Commands() {
 			checkCommand(t, childCmd)
@@ -46,7 +43,6 @@ func checkCommand(t *testing.T, cmd *cobra.Command) {
 
 	// loop over all local flags
 	cmd.LocalFlags().VisitAll(func(flag *pflag.Flag) {
-
 		// an error means that there is a completion function for this flag
 		err := cmd.RegisterFlagCompletionFunc(flag.Name, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 			return nil, cobra.ShellCompDirectiveDefault
diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go
index a9eab24bb..68b244e35 100644
--- a/cmd/podman/system/df.go
+++ b/cmd/podman/system/df.go
@@ -50,7 +50,6 @@ func init() {
 	formatFlagName := "format"
 	flags.StringVar(&dfOptions.Format, formatFlagName, "", "Pretty-print images using a Go template")
 	_ = dfSystemCommand.RegisterFlagCompletionFunc(formatFlagName, completion.AutocompleteNone)
-
 }
 
 func df(cmd *cobra.Command, args []string) error {
diff --git a/cmd/podman/system/prune.go b/cmd/podman/system/prune.go
index 5e96a654a..7ec08366e 100644
--- a/cmd/podman/system/prune.go
+++ b/cmd/podman/system/prune.go
@@ -51,7 +51,6 @@ func init() {
 	filterFlagName := "filter"
 	flags.StringArrayVar(&filters, filterFlagName, []string{}, "Provide filter values (e.g. 'label=<key>=<value>')")
 	_ = pruneCommand.RegisterFlagCompletionFunc(filterFlagName, completion.AutocompleteNone)
-
 }
 
 func prune(cmd *cobra.Command, args []string) error {
diff --git a/cmd/podman/system/renumber.go b/cmd/podman/system/renumber.go
index b1683395f..37f9a5865 100644
--- a/cmd/podman/system/renumber.go
+++ b/cmd/podman/system/renumber.go
@@ -39,7 +39,6 @@ func init() {
 		Command: renumberCommand,
 		Parent:  systemCmd,
 	})
-
 }
 func renumber(cmd *cobra.Command, args []string) {
 	// Shutdown all running engines, `renumber` will hijack all methods
diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go
index df00a8851..c9d214cd0 100644
--- a/libpod/boltdb_state.go
+++ b/libpod/boltdb_state.go
@@ -904,7 +904,6 @@ func (s *BoltState) ContainerInUse(ctr *Container) ([]string, error) {
 	}
 
 	return depCtrs, nil
-
 }
 
 // AllContainers retrieves all the containers in the database
@@ -962,7 +961,6 @@ func (s *BoltState) AllContainers() ([]*Container, error) {
 			}
 
 			return nil
-
 		})
 	})
 	if err != nil {
@@ -2580,7 +2578,6 @@ func (s *BoltState) LookupVolume(name string) (*Volume, error) {
 	}
 
 	return volume, nil
-
 }
 
 // HasVolume returns true if the given volume exists in the state, otherwise it returns false
diff --git a/libpod/container.go b/libpod/container.go
index e667cd991..613a02554 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -1057,7 +1057,6 @@ func (c *Container) NetworkDisabled() (bool, error) {
 		return container.NetworkDisabled()
 	}
 	return networkDisabled(c)
-
 }
 
 func networkDisabled(c *Container) (bool, error) {
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go
index efe09af92..e87e26c61 100644
--- a/libpod/container_inspect.go
+++ b/libpod/container_inspect.go
@@ -796,7 +796,6 @@ func (c *Container) generateInspectContainerHostConfig(ctrSpec *spec.Spec, named
 	if c.config.UTSNsCtr != "" {
 		utsMode = fmt.Sprintf("container:%s", c.config.UTSNsCtr)
 	} else if ctrSpec.Linux != nil {
-
 		// Locate the spec's UTS namespace.
 		// If there is none, it's uts=host.
 		// If there is one and it has a path, it's "ns:".
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index da8f07c9e..a3476f42e 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -1614,7 +1614,6 @@ func (c *Container) makeBindMounts() error {
 				return errors.Wrapf(err, "error setting timezone for container %s", c.ID())
 			}
 			c.state.BindMounts["/etc/localtime"] = localtimePath
-
 		}
 	}
 
diff --git a/libpod/container_path_resolution.go b/libpod/container_path_resolution.go
index 51e3844c8..5245314ae 100644
--- a/libpod/container_path_resolution.go
+++ b/libpod/container_path_resolution.go
@@ -86,14 +86,12 @@ func (c *Container) resolvePath(mountPoint string, containerPath string) (string
 				return "", "", err
 			}
 			return mount.Source, absolutePathOnTheBindMount, nil
-
 		}
 
 		if searchPath == "/" {
 			// Cannot go beyond "/", so we're done.
 			break
 		}
-
 		// Walk *down* the path (e.g., "/foo/bar/x" -> "/foo/bar").
 		searchPath = filepath.Dir(searchPath)
 	}
diff --git a/libpod/events/events.go b/libpod/events/events.go
index aa0401b62..01ea6a386 100644
--- a/libpod/events/events.go
+++ b/libpod/events/events.go
@@ -97,7 +97,6 @@ func newEventFromJSONString(event string) (*Event, error) {
 		return nil, err
 	}
 	return &e, nil
-
 }
 
 // ToString converts a Type to a string
diff --git a/libpod/events/filters.go b/libpod/events/filters.go
index 62891d32c..26e1e10ba 100644
--- a/libpod/events/filters.go
+++ b/libpod/events/filters.go
@@ -86,7 +86,6 @@ func generateEventSinceOption(timeSince time.Time) func(e *Event) bool {
 func generateEventUntilOption(timeUntil time.Time) func(e *Event) bool {
 	return func(e *Event) bool {
 		return e.Time.Before(timeUntil)
-
 	}
 }
 
diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go
index 05ae3ce52..c5feabe66 100644
--- a/libpod/events/logfile.go
+++ b/libpod/events/logfile.go
@@ -39,7 +39,6 @@ func (e EventLogFile) Write(ee Event) error {
 		return err
 	}
 	return nil
-
 }
 
 // Reads from the log file
diff --git a/libpod/image/image.go b/libpod/image/image.go
index d732aecfe..8d8af0064 100644
--- a/libpod/image/image.go
+++ b/libpod/image/image.go
@@ -1688,7 +1688,6 @@ func (i *Image) GetConfigBlob(ctx context.Context) (*manifest.Schema2Image, erro
 		return nil, errors.Wrapf(err, "unable to parse image blob for %s", i.ID())
 	}
 	return &blob, nil
-
 }
 
 // GetHealthCheck returns a HealthConfig for an image.  This function only works with
diff --git a/libpod/image/image_test.go b/libpod/image/image_test.go
index 2704b8baf..8055ef7b1 100644
--- a/libpod/image/image_test.go
+++ b/libpod/image/image_test.go
@@ -66,7 +66,6 @@ func makeLocalMatrix(b, bg *Image) []localImageTest {
 
 	l = append(l, busybox, busyboxGlibc)
 	return l
-
 }
 
 func TestMain(m *testing.M) {
diff --git a/libpod/image/prune.go b/libpod/image/prune.go
index 587c99333..6f026f630 100644
--- a/libpod/image/prune.go
+++ b/libpod/image/prune.go
@@ -52,7 +52,6 @@ func generatePruneFilterFuncs(filter, filterValue string) (ImageFilter, error) {
 			}
 			return false
 		}, nil
-
 	}
 	return nil, nil
 }
@@ -170,7 +169,6 @@ func (ir *Runtime) PruneImages(ctx context.Context, all bool, filter []string) (
 				Size: uint64(imgSize),
 			})
 		}
-
 	}
 	return preports, nil
 }
diff --git a/libpod/image/utils.go b/libpod/image/utils.go
index 6cc613b28..8882adcc1 100644
--- a/libpod/image/utils.go
+++ b/libpod/image/utils.go
@@ -45,7 +45,6 @@ func findImageInRepotags(search imageParts, images []*Image) (*storage.Image, er
 		}
 	}
 	if len(candidates) == 0 {
-
 		return nil, errors.Wrapf(define.ErrNoSuchImage, "unable to find a name and tag match for %s in repotags", searchName)
 	}
 
diff --git a/libpod/network/create.go b/libpod/network/create.go
index deacf487a..c58d62575 100644
--- a/libpod/network/create.go
+++ b/libpod/network/create.go
@@ -75,7 +75,6 @@ func validateBridgeOptions(options entities.NetworkCreateOptions) error {
 	}
 
 	return nil
-
 }
 
 // parseMTU parses the mtu option
diff --git a/libpod/network/create_test.go b/libpod/network/create_test.go
index 0b828e635..017bf31fe 100644
--- a/libpod/network/create_test.go
+++ b/libpod/network/create_test.go
@@ -8,7 +8,6 @@ import (
 )
 
 func Test_validateBridgeOptions(t *testing.T) {
-
 	tests := []struct {
 		name    string
 		subnet  net.IPNet
diff --git a/libpod/network/netconflist_test.go b/libpod/network/netconflist_test.go
index 5ff733f0f..161764ed9 100644
--- a/libpod/network/netconflist_test.go
+++ b/libpod/network/netconflist_test.go
@@ -7,7 +7,6 @@ import (
 )
 
 func TestNewIPAMDefaultRoute(t *testing.T) {
-
 	tests := []struct {
 		name   string
 		isIPv6 bool
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index 23bfb29d7..38ffba7d2 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -1228,7 +1228,6 @@ func prepareProcessExec(c *Container, options *ExecOptions, env []string, sessio
 
 	if options.Cwd != "" {
 		pspec.Cwd = options.Cwd
-
 	}
 
 	var addGroups []string
@@ -1798,5 +1797,4 @@ func httpAttachNonTerminalCopy(container *net.UnixConn, http *bufio.ReadWriter,
 			return err
 		}
 	}
-
 }
diff --git a/libpod/oci_util.go b/libpod/oci_util.go
index d40cf13bd..4ec050d6d 100644
--- a/libpod/oci_util.go
+++ b/libpod/oci_util.go
@@ -103,7 +103,6 @@ func bindPorts(ports []ocicni.PortMapping) ([]*os.File, error) {
 			}
 		default:
 			return nil, fmt.Errorf("unknown protocol %s", i.Protocol)
-
 		}
 	}
 	return files, nil
diff --git a/libpod/options.go b/libpod/options.go
index 74ee60fef..8831f527e 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -1109,7 +1109,6 @@ func WithLogTag(tag string) CtrCreateOption {
 
 		return nil
 	}
-
 }
 
 // WithCgroupsMode disables the creation of CGroups for the conmon process.
@@ -1131,7 +1130,6 @@ func WithCgroupsMode(mode string) CtrCreateOption {
 
 		return nil
 	}
-
 }
 
 // WithCgroupParent sets the Cgroup Parent of the new container.
@@ -1430,7 +1428,6 @@ func WithOverlayVolumes(volumes []*ContainerOverlayVolume) CtrCreateOption {
 		}
 
 		for _, vol := range volumes {
-
 			ctr.config.OverlayVolumes = append(ctr.config.OverlayVolumes, &ContainerOverlayVolume{
 				Dest:   vol.Dest,
 				Source: vol.Source,
diff --git a/libpod/reset.go b/libpod/reset.go
index 24efeed40..3346f9d3f 100644
--- a/libpod/reset.go
+++ b/libpod/reset.go
@@ -16,7 +16,6 @@ import (
 
 // Reset removes all storage
 func (r *Runtime) Reset(ctx context.Context) error {
-
 	pods, err := r.GetAllPods()
 	if err != nil {
 		return err
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 1ad39fe2f..42af2046d 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -146,7 +146,6 @@ func NewRuntime(ctx context.Context, options ...RuntimeOption) (*Runtime, error)
 // An error will be returned if the configuration file at the given path does
 // not exist or cannot be loaded
 func NewRuntimeFromConfig(ctx context.Context, userConfig *config.Config, options ...RuntimeOption) (*Runtime, error) {
-
 	return newRuntimeFromConfig(ctx, userConfig, options...)
 }
 
@@ -382,7 +381,6 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
 
 	// Initialize remaining OCI runtimes
 	for name, paths := range runtime.config.Engine.OCIRuntimes {
-
 		ociRuntime, err := newConmonOCIRuntime(name, paths, runtime.conmonPath, runtime.runtimeFlags, runtime.config)
 		if err != nil {
 			// Don't fatally error.
@@ -437,7 +435,6 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
 
 	// Set up the CNI net plugin
 	if !rootless.IsRootless() {
-
 		netPlugin, err := ocicni.InitCNI(runtime.config.Network.DefaultNetwork, runtime.config.Network.NetworkConfigDir, runtime.config.Network.CNIPluginDirs...)
 		if err != nil {
 			return errors.Wrapf(err, "error configuring CNI network plugin")
@@ -484,7 +481,6 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
 			if became {
 				os.Exit(ret)
 			}
-
 		}
 		// If the file doesn't exist, we need to refresh the state
 		// This will trigger on first use as well, but refreshing an
@@ -787,7 +783,6 @@ type DBConfig struct {
 
 // mergeDBConfig merges the configuration from the database.
 func (r *Runtime) mergeDBConfig(dbConfig *DBConfig) {
-
 	c := &r.config.Engine
 	if !r.storageSet.RunRootSet && dbConfig.StorageTmp != "" {
 		if r.storageConfig.RunRoot != dbConfig.StorageTmp &&
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
index 49cf42626..1b3532f1f 100644
--- a/libpod/runtime_ctr.go
+++ b/libpod/runtime_ctr.go
@@ -1139,7 +1139,6 @@ func (r *Runtime) IsStorageContainerMounted(id string) (bool, string, error) {
 // StorageContainers returns a list of containers from containers/storage that
 // are not currently known to Podman.
 func (r *Runtime) StorageContainers() ([]storage.Container, error) {
-
 	if r.store == nil {
 		return nil, define.ErrStoreNotInitialized
 	}
diff --git a/libpod/runtime_img_test.go b/libpod/runtime_img_test.go
index 6ca4d900b..40d5860cf 100644
--- a/libpod/runtime_img_test.go
+++ b/libpod/runtime_img_test.go
@@ -26,7 +26,6 @@ func createTmpFile(content []byte) (string, error) {
 
 	if _, err := tmpfile.Write(content); err != nil {
 		return "", err
-
 	}
 	if err := tmpfile.Close(); err != nil {
 		return "", err
diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go
index 564851f4e..bc37bdb23 100644
--- a/libpod/runtime_pod_infra_linux.go
+++ b/libpod/runtime_pod_infra_linux.go
@@ -24,7 +24,6 @@ const (
 )
 
 func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, rawImageName, imgID string, config *v1.ImageConfig) (*Container, error) {
-
 	// Set up generator for infra container defaults
 	g, err := generate.New("linux")
 	if err != nil {
diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go
index 82a74e419..7dad5f566 100644
--- a/pkg/api/handlers/compat/events.go
+++ b/pkg/api/handlers/compat/events.go
@@ -111,7 +111,6 @@ func GetEvents(w http.ResponseWriter, r *http.Request) {
 			Until:        query.Until,
 		}
 		errorChannel <- runtime.Events(r.Context(), readOpts)
-
 	}()
 
 	var flush = func() {}
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go
index 0ae0f3bcf..63a329c03 100644
--- a/pkg/api/handlers/compat/images.go
+++ b/pkg/api/handlers/compat/images.go
@@ -202,7 +202,6 @@ func CreateImageFromSrc(w http.ResponseWriter, r *http.Request) {
 		ProgressDetail: map[string]string{},
 		Id:             iid,
 	})
-
 }
 
 func CreateImageFromImage(w http.ResponseWriter, r *http.Request) {
diff --git a/pkg/api/handlers/compat/images_history.go b/pkg/api/handlers/compat/images_history.go
index 3b72798e4..174bc6234 100644
--- a/pkg/api/handlers/compat/images_history.go
+++ b/pkg/api/handlers/compat/images_history.go
@@ -17,7 +17,6 @@ func HistoryImage(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		utils.Error(w, "Something went wrong.", http.StatusNotFound, errors.Wrapf(err, "failed to find image %s", name))
 		return
-
 	}
 	history, err := newImage.History(r.Context())
 	if err != nil {
diff --git a/pkg/api/handlers/compat/images_remove.go b/pkg/api/handlers/compat/images_remove.go
index 9731c521c..dd2d96bbb 100644
--- a/pkg/api/handlers/compat/images_remove.go
+++ b/pkg/api/handlers/compat/images_remove.go
@@ -54,5 +54,4 @@ func RemoveImage(w http.ResponseWriter, r *http.Request) {
 	}
 
 	utils.WriteResponse(w, http.StatusOK, response)
-
 }
diff --git a/pkg/api/handlers/compat/secrets.go b/pkg/api/handlers/compat/secrets.go
index ea2dfc707..571888eba 100644
--- a/pkg/api/handlers/compat/secrets.go
+++ b/pkg/api/handlers/compat/secrets.go
@@ -58,7 +58,6 @@ func InspectSecret(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	utils.WriteResponse(w, http.StatusOK, reports[0])
-
 }
 
 func RemoveSecret(w http.ResponseWriter, r *http.Request) {
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go
index 619cbfd8b..4e79e4a42 100644
--- a/pkg/api/handlers/libpod/containers.go
+++ b/pkg/api/handlers/libpod/containers.go
@@ -48,7 +48,6 @@ func ContainerExists(w http.ResponseWriter, r *http.Request) {
 		}
 		utils.InternalServerError(w, err)
 		return
-
 	}
 	if report.Value {
 		utils.WriteResponse(w, http.StatusNoContent, "")
@@ -162,7 +161,6 @@ func UnmountContainer(w http.ResponseWriter, r *http.Request) {
 		utils.InternalServerError(w, err)
 	}
 	utils.WriteResponse(w, http.StatusNoContent, "")
-
 }
 func MountContainer(w http.ResponseWriter, r *http.Request) {
 	runtime := r.Context().Value("runtime").(*libpod.Runtime)
@@ -361,7 +359,6 @@ func ShouldRestart(w http.ResponseWriter, r *http.Request) {
 		}
 		utils.InternalServerError(w, err)
 		return
-
 	}
 	if report.Value {
 		utils.WriteResponse(w, http.StatusNoContent, "")
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
index 3b531652f..0d4160a6e 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -266,7 +266,6 @@ func ExportImages(w http.ResponseWriter, r *http.Request) {
 	if len(query.References) > 1 && query.Format != define.V2s2Archive {
 		utils.Error(w, "unsupported format", http.StatusInternalServerError, errors.Errorf("multi-image archives must use format of %s", define.V2s2Archive))
 		return
-
 	}
 
 	switch query.Format {
@@ -445,7 +444,6 @@ func PushImage(w http.ResponseWriter, r *http.Request) {
 	if authconf != nil {
 		username = authconf.Username
 		password = authconf.Password
-
 	}
 	options := entities.ImagePushOptions{
 		Authfile: authfile,
diff --git a/pkg/api/handlers/libpod/networks.go b/pkg/api/handlers/libpod/networks.go
index 998f89d96..8330b6a45 100644
--- a/pkg/api/handlers/libpod/networks.go
+++ b/pkg/api/handlers/libpod/networks.go
@@ -42,7 +42,6 @@ func CreateNetwork(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	utils.WriteResponse(w, http.StatusOK, report)
-
 }
 func ListNetworks(w http.ResponseWriter, r *http.Request) {
 	runtime := r.Context().Value("runtime").(*libpod.Runtime)
diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go
index f281c616d..ba202cad0 100644
--- a/pkg/api/handlers/utils/containers.go
+++ b/pkg/api/handlers/utils/containers.go
@@ -140,7 +140,6 @@ func WaitContainerLibpod(w http.ResponseWriter, r *http.Request) {
 type containerWaitFn func(conditions ...define.ContainerStatus) (int32, error)
 
 func createContainerWaitFn(ctx context.Context, containerName string, interval time.Duration) containerWaitFn {
-
 	runtime := ctx.Value("runtime").(*libpod.Runtime)
 	var containerEngine entities.ContainerEngine = &abi.ContainerEngine{Libpod: runtime}
 
@@ -169,7 +168,6 @@ func isValidDockerCondition(cond string) bool {
 }
 
 func waitDockerCondition(ctx context.Context, containerName string, interval time.Duration, dockerCondition string) (int32, error) {
-
 	containerWait := createContainerWaitFn(ctx, containerName, interval)
 
 	var err error
diff --git a/pkg/api/server/register_ping.go b/pkg/api/server/register_ping.go
index 446a12a68..0343d2608 100644
--- a/pkg/api/server/register_ping.go
+++ b/pkg/api/server/register_ping.go
@@ -8,7 +8,6 @@ import (
 )
 
 func (s *APIServer) registerPingHandlers(r *mux.Router) error {
-
 	r.Handle("/_ping", s.APIHandler(compat.Ping)).Methods(http.MethodGet, http.MethodHead)
 	r.Handle(VersionedPath("/_ping"), s.APIHandler(compat.Ping)).Methods(http.MethodGet, http.MethodHead)
 	// swagger:operation GET /libpod/_ping libpod libpodPingGet
diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go
index 86d92c028..ecfa6651c 100644
--- a/pkg/auth/auth.go
+++ b/pkg/auth/auth.go
@@ -41,7 +41,6 @@ func GetCredentials(r *http.Request) (*types.DockerAuthConfig, string, HeaderAut
 	case has(XRegistryAuthHeader):
 		c, f, err := getAuthCredentials(r)
 		return c, f, XRegistryAuthHeader, err
-
 	}
 	return nil, "", "", nil
 }
diff --git a/pkg/bindings/containers/containers.go b/pkg/bindings/containers/containers.go
index 0a180c73d..c84595011 100644
--- a/pkg/bindings/containers/containers.go
+++ b/pkg/bindings/containers/containers.go
@@ -137,7 +137,6 @@ func Kill(ctx context.Context, nameOrID string, options *KillOptions) error {
 		return err
 	}
 	return response.Process(nil)
-
 }
 
 // Pause pauses a given container.  The nameOrID can be a container name
diff --git a/pkg/bindings/containers/types_attach_options.go b/pkg/bindings/containers/types_attach_options.go
index ab5a1615c..88ade89b4 100644
--- a/pkg/bindings/containers/types_attach_options.go
+++ b/pkg/bindings/containers/types_attach_options.go
@@ -60,7 +60,6 @@ func (o *AttachOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *AttachOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_checkpoint_options.go b/pkg/bindings/containers/types_checkpoint_options.go
index d239c476f..002a08e00 100644
--- a/pkg/bindings/containers/types_checkpoint_options.go
+++ b/pkg/bindings/containers/types_checkpoint_options.go
@@ -60,7 +60,6 @@ func (o *CheckpointOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *CheckpointOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_commit_options.go b/pkg/bindings/containers/types_commit_options.go
index 061f16e25..006fe7ae7 100644
--- a/pkg/bindings/containers/types_commit_options.go
+++ b/pkg/bindings/containers/types_commit_options.go
@@ -60,7 +60,6 @@ func (o *CommitOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *CommitOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_create_options.go b/pkg/bindings/containers/types_create_options.go
index 8cde11335..914a6ed3e 100644
--- a/pkg/bindings/containers/types_create_options.go
+++ b/pkg/bindings/containers/types_create_options.go
@@ -60,7 +60,6 @@ func (o *CreateOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *CreateOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_diff_options.go b/pkg/bindings/containers/types_diff_options.go
index e912bf041..ebf3a7ad8 100644
--- a/pkg/bindings/containers/types_diff_options.go
+++ b/pkg/bindings/containers/types_diff_options.go
@@ -60,7 +60,6 @@ func (o *DiffOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *DiffOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_execinspect_options.go b/pkg/bindings/containers/types_execinspect_options.go
index b870db46b..772318cd3 100644
--- a/pkg/bindings/containers/types_execinspect_options.go
+++ b/pkg/bindings/containers/types_execinspect_options.go
@@ -60,7 +60,6 @@ func (o *ExecInspectOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ExecInspectOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_execstart_options.go b/pkg/bindings/containers/types_execstart_options.go
index 95f97b1d7..9a032d200 100644
--- a/pkg/bindings/containers/types_execstart_options.go
+++ b/pkg/bindings/containers/types_execstart_options.go
@@ -60,7 +60,6 @@ func (o *ExecStartOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ExecStartOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_execstartandattach_options.go b/pkg/bindings/containers/types_execstartandattach_options.go
index 1981c319a..6bc288de3 100644
--- a/pkg/bindings/containers/types_execstartandattach_options.go
+++ b/pkg/bindings/containers/types_execstartandattach_options.go
@@ -62,7 +62,6 @@ func (o *ExecStartAndAttachOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -71,7 +70,6 @@ func (o *ExecStartAndAttachOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_exists_options.go b/pkg/bindings/containers/types_exists_options.go
index a52777600..6a9086c78 100644
--- a/pkg/bindings/containers/types_exists_options.go
+++ b/pkg/bindings/containers/types_exists_options.go
@@ -60,7 +60,6 @@ func (o *ExistsOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ExistsOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_export_options.go b/pkg/bindings/containers/types_export_options.go
index 3943a5a3b..595d2cf87 100644
--- a/pkg/bindings/containers/types_export_options.go
+++ b/pkg/bindings/containers/types_export_options.go
@@ -60,7 +60,6 @@ func (o *ExportOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ExportOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_healthcheck_options.go b/pkg/bindings/containers/types_healthcheck_options.go
index a548232cd..3e2b445af 100644
--- a/pkg/bindings/containers/types_healthcheck_options.go
+++ b/pkg/bindings/containers/types_healthcheck_options.go
@@ -60,7 +60,6 @@ func (o *HealthCheckOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *HealthCheckOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_init_options.go b/pkg/bindings/containers/types_init_options.go
index 92e8a6c17..5a107435e 100644
--- a/pkg/bindings/containers/types_init_options.go
+++ b/pkg/bindings/containers/types_init_options.go
@@ -60,7 +60,6 @@ func (o *InitOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *InitOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_inspect_options.go b/pkg/bindings/containers/types_inspect_options.go
index fdb84bda8..347521488 100644
--- a/pkg/bindings/containers/types_inspect_options.go
+++ b/pkg/bindings/containers/types_inspect_options.go
@@ -60,7 +60,6 @@ func (o *InspectOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *InspectOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_kill_options.go b/pkg/bindings/containers/types_kill_options.go
index 45bd790a4..0fdbef2f1 100644
--- a/pkg/bindings/containers/types_kill_options.go
+++ b/pkg/bindings/containers/types_kill_options.go
@@ -60,7 +60,6 @@ func (o *KillOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *KillOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_list_options.go b/pkg/bindings/containers/types_list_options.go
index 3293320ec..51ae98dac 100644
--- a/pkg/bindings/containers/types_list_options.go
+++ b/pkg/bindings/containers/types_list_options.go
@@ -60,7 +60,6 @@ func (o *ListOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ListOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_log_options.go b/pkg/bindings/containers/types_log_options.go
index e78eb7bd0..51e01f1b4 100644
--- a/pkg/bindings/containers/types_log_options.go
+++ b/pkg/bindings/containers/types_log_options.go
@@ -60,7 +60,6 @@ func (o *LogOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *LogOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_mount_options.go b/pkg/bindings/containers/types_mount_options.go
index cc8df1255..0fa028e72 100644
--- a/pkg/bindings/containers/types_mount_options.go
+++ b/pkg/bindings/containers/types_mount_options.go
@@ -60,7 +60,6 @@ func (o *MountOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *MountOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_mountedcontainerpaths_options.go b/pkg/bindings/containers/types_mountedcontainerpaths_options.go
index 78fa2fca0..abfe9d95e 100644
--- a/pkg/bindings/containers/types_mountedcontainerpaths_options.go
+++ b/pkg/bindings/containers/types_mountedcontainerpaths_options.go
@@ -60,7 +60,6 @@ func (o *MountedContainerPathsOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *MountedContainerPathsOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_pause_options.go b/pkg/bindings/containers/types_pause_options.go
index 55f14bef0..5f15035d9 100644
--- a/pkg/bindings/containers/types_pause_options.go
+++ b/pkg/bindings/containers/types_pause_options.go
@@ -60,7 +60,6 @@ func (o *PauseOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *PauseOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_prune_options.go b/pkg/bindings/containers/types_prune_options.go
index 000c7c0bd..99a85584e 100644
--- a/pkg/bindings/containers/types_prune_options.go
+++ b/pkg/bindings/containers/types_prune_options.go
@@ -60,7 +60,6 @@ func (o *PruneOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *PruneOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_remove_options.go b/pkg/bindings/containers/types_remove_options.go
index dfb5367eb..99947f607 100644
--- a/pkg/bindings/containers/types_remove_options.go
+++ b/pkg/bindings/containers/types_remove_options.go
@@ -60,7 +60,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_rename_options.go b/pkg/bindings/containers/types_rename_options.go
index f4f5d1426..05d7138cd 100644
--- a/pkg/bindings/containers/types_rename_options.go
+++ b/pkg/bindings/containers/types_rename_options.go
@@ -60,7 +60,6 @@ func (o *RenameOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *RenameOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_resizeexectty_options.go b/pkg/bindings/containers/types_resizeexectty_options.go
index e63d965eb..554d6fb85 100644
--- a/pkg/bindings/containers/types_resizeexectty_options.go
+++ b/pkg/bindings/containers/types_resizeexectty_options.go
@@ -60,7 +60,6 @@ func (o *ResizeExecTTYOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ResizeExecTTYOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_resizetty_options.go b/pkg/bindings/containers/types_resizetty_options.go
index 3170f4053..a018993eb 100644
--- a/pkg/bindings/containers/types_resizetty_options.go
+++ b/pkg/bindings/containers/types_resizetty_options.go
@@ -60,7 +60,6 @@ func (o *ResizeTTYOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ResizeTTYOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_restart_options.go b/pkg/bindings/containers/types_restart_options.go
index d59176e67..fa1019a1f 100644
--- a/pkg/bindings/containers/types_restart_options.go
+++ b/pkg/bindings/containers/types_restart_options.go
@@ -60,7 +60,6 @@ func (o *RestartOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *RestartOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_restore_options.go b/pkg/bindings/containers/types_restore_options.go
index e9f14fc47..793222af3 100644
--- a/pkg/bindings/containers/types_restore_options.go
+++ b/pkg/bindings/containers/types_restore_options.go
@@ -60,7 +60,6 @@ func (o *RestoreOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *RestoreOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_shouldrestart_options.go b/pkg/bindings/containers/types_shouldrestart_options.go
index 49f943460..e9585dc61 100644
--- a/pkg/bindings/containers/types_shouldrestart_options.go
+++ b/pkg/bindings/containers/types_shouldrestart_options.go
@@ -60,7 +60,6 @@ func (o *ShouldRestartOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ShouldRestartOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_start_options.go b/pkg/bindings/containers/types_start_options.go
index a0f0b3077..0ca2ee832 100644
--- a/pkg/bindings/containers/types_start_options.go
+++ b/pkg/bindings/containers/types_start_options.go
@@ -60,7 +60,6 @@ func (o *StartOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *StartOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_stats_options.go b/pkg/bindings/containers/types_stats_options.go
index 79e35ba62..1ecd99536 100644
--- a/pkg/bindings/containers/types_stats_options.go
+++ b/pkg/bindings/containers/types_stats_options.go
@@ -60,7 +60,6 @@ func (o *StatsOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *StatsOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_stop_options.go b/pkg/bindings/containers/types_stop_options.go
index f221b16e8..fcc5b1be8 100644
--- a/pkg/bindings/containers/types_stop_options.go
+++ b/pkg/bindings/containers/types_stop_options.go
@@ -60,7 +60,6 @@ func (o *StopOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *StopOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_top_options.go b/pkg/bindings/containers/types_top_options.go
index 570dd4e90..2f04a2069 100644
--- a/pkg/bindings/containers/types_top_options.go
+++ b/pkg/bindings/containers/types_top_options.go
@@ -60,7 +60,6 @@ func (o *TopOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *TopOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_unmount_options.go b/pkg/bindings/containers/types_unmount_options.go
index 24249073e..ede1dbdc7 100644
--- a/pkg/bindings/containers/types_unmount_options.go
+++ b/pkg/bindings/containers/types_unmount_options.go
@@ -60,7 +60,6 @@ func (o *UnmountOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *UnmountOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_unpause_options.go b/pkg/bindings/containers/types_unpause_options.go
index 3b1d75001..0004219bf 100644
--- a/pkg/bindings/containers/types_unpause_options.go
+++ b/pkg/bindings/containers/types_unpause_options.go
@@ -60,7 +60,6 @@ func (o *UnpauseOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *UnpauseOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/containers/types_wait_options.go b/pkg/bindings/containers/types_wait_options.go
index a3f1e3b8c..7ff6fc6f0 100644
--- a/pkg/bindings/containers/types_wait_options.go
+++ b/pkg/bindings/containers/types_wait_options.go
@@ -61,7 +61,6 @@ func (o *WaitOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -70,7 +69,6 @@ func (o *WaitOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/generate/types_kube_options.go b/pkg/bindings/generate/types_kube_options.go
index 218d308e1..7d7b5d335 100644
--- a/pkg/bindings/generate/types_kube_options.go
+++ b/pkg/bindings/generate/types_kube_options.go
@@ -60,7 +60,6 @@ func (o *KubeOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *KubeOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/generate/types_systemd_options.go b/pkg/bindings/generate/types_systemd_options.go
index faf981d1b..132904cf1 100644
--- a/pkg/bindings/generate/types_systemd_options.go
+++ b/pkg/bindings/generate/types_systemd_options.go
@@ -60,7 +60,6 @@ func (o *SystemdOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *SystemdOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/generator/generator.go b/pkg/bindings/generator/generator.go
index dad154166..f65d136ea 100644
--- a/pkg/bindings/generator/generator.go
+++ b/pkg/bindings/generator/generator.go
@@ -71,7 +71,6 @@ func (o *{{.StructName}}) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -80,7 +79,6 @@ func (o *{{.StructName}}) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
@@ -239,7 +237,6 @@ func main() {
 					os.Exit(1)
 				}
 			}
-
 		}
 		return true
 	})
diff --git a/pkg/bindings/images/pull.go b/pkg/bindings/images/pull.go
index 5669c704e..9149b7445 100644
--- a/pkg/bindings/images/pull.go
+++ b/pkg/bindings/images/pull.go
@@ -93,7 +93,6 @@ func Pull(ctx context.Context, rawImage string, options *PullOptions) ([]string,
 		default:
 			return images, errors.New("failed to parse pull results stream, unexpected input")
 		}
-
 	}
 	return images, mErr
 }
diff --git a/pkg/bindings/images/types_diff_options.go b/pkg/bindings/images/types_diff_options.go
index edfc7bfa2..4f2bf0f6b 100644
--- a/pkg/bindings/images/types_diff_options.go
+++ b/pkg/bindings/images/types_diff_options.go
@@ -60,7 +60,6 @@ func (o *DiffOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *DiffOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_exists_options.go b/pkg/bindings/images/types_exists_options.go
index 649be4862..689c80902 100644
--- a/pkg/bindings/images/types_exists_options.go
+++ b/pkg/bindings/images/types_exists_options.go
@@ -60,7 +60,6 @@ func (o *ExistsOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ExistsOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_export_options.go b/pkg/bindings/images/types_export_options.go
index ebd053165..31361deb2 100644
--- a/pkg/bindings/images/types_export_options.go
+++ b/pkg/bindings/images/types_export_options.go
@@ -60,7 +60,6 @@ func (o *ExportOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ExportOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_get_options.go b/pkg/bindings/images/types_get_options.go
index 33ebe2611..5eb178a74 100644
--- a/pkg/bindings/images/types_get_options.go
+++ b/pkg/bindings/images/types_get_options.go
@@ -60,7 +60,6 @@ func (o *GetOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *GetOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_history_options.go b/pkg/bindings/images/types_history_options.go
index b2c37acea..becabaa59 100644
--- a/pkg/bindings/images/types_history_options.go
+++ b/pkg/bindings/images/types_history_options.go
@@ -60,7 +60,6 @@ func (o *HistoryOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *HistoryOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_import_options.go b/pkg/bindings/images/types_import_options.go
index e2aed0866..6e9160b63 100644
--- a/pkg/bindings/images/types_import_options.go
+++ b/pkg/bindings/images/types_import_options.go
@@ -60,7 +60,6 @@ func (o *ImportOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ImportOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_list_options.go b/pkg/bindings/images/types_list_options.go
index e194474b9..12d186f6b 100644
--- a/pkg/bindings/images/types_list_options.go
+++ b/pkg/bindings/images/types_list_options.go
@@ -60,7 +60,6 @@ func (o *ListOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ListOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_load_options.go b/pkg/bindings/images/types_load_options.go
index 7e15d4e03..913568937 100644
--- a/pkg/bindings/images/types_load_options.go
+++ b/pkg/bindings/images/types_load_options.go
@@ -60,7 +60,6 @@ func (o *LoadOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *LoadOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_prune_options.go b/pkg/bindings/images/types_prune_options.go
index f86676d53..dad83dd2f 100644
--- a/pkg/bindings/images/types_prune_options.go
+++ b/pkg/bindings/images/types_prune_options.go
@@ -60,7 +60,6 @@ func (o *PruneOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *PruneOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_pull_options.go b/pkg/bindings/images/types_pull_options.go
index 59e2b6354..c3c7a3dc4 100644
--- a/pkg/bindings/images/types_pull_options.go
+++ b/pkg/bindings/images/types_pull_options.go
@@ -60,7 +60,6 @@ func (o *PullOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *PullOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_push_options.go b/pkg/bindings/images/types_push_options.go
index 85f1ffee5..26a8d7e91 100644
--- a/pkg/bindings/images/types_push_options.go
+++ b/pkg/bindings/images/types_push_options.go
@@ -60,7 +60,6 @@ func (o *PushOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *PushOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_remove_options.go b/pkg/bindings/images/types_remove_options.go
index d79186565..fba4f63b6 100644
--- a/pkg/bindings/images/types_remove_options.go
+++ b/pkg/bindings/images/types_remove_options.go
@@ -60,7 +60,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_search_options.go b/pkg/bindings/images/types_search_options.go
index a55c9ac89..812a9abd3 100644
--- a/pkg/bindings/images/types_search_options.go
+++ b/pkg/bindings/images/types_search_options.go
@@ -60,7 +60,6 @@ func (o *SearchOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *SearchOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_tag_options.go b/pkg/bindings/images/types_tag_options.go
index b323ea41c..e1217a9aa 100644
--- a/pkg/bindings/images/types_tag_options.go
+++ b/pkg/bindings/images/types_tag_options.go
@@ -60,7 +60,6 @@ func (o *TagOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *TagOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_tree_options.go b/pkg/bindings/images/types_tree_options.go
index 8e1b16c5c..0a574ffc1 100644
--- a/pkg/bindings/images/types_tree_options.go
+++ b/pkg/bindings/images/types_tree_options.go
@@ -60,7 +60,6 @@ func (o *TreeOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *TreeOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/images/types_untag_options.go b/pkg/bindings/images/types_untag_options.go
index b28670134..ced84876e 100644
--- a/pkg/bindings/images/types_untag_options.go
+++ b/pkg/bindings/images/types_untag_options.go
@@ -60,7 +60,6 @@ func (o *UntagOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *UntagOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/manifests/types_add_options.go b/pkg/bindings/manifests/types_add_options.go
index 61314c479..8947b1286 100644
--- a/pkg/bindings/manifests/types_add_options.go
+++ b/pkg/bindings/manifests/types_add_options.go
@@ -60,7 +60,6 @@ func (o *AddOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *AddOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/manifests/types_create_options.go b/pkg/bindings/manifests/types_create_options.go
index 4c7c1397a..ee8b56df7 100644
--- a/pkg/bindings/manifests/types_create_options.go
+++ b/pkg/bindings/manifests/types_create_options.go
@@ -60,7 +60,6 @@ func (o *CreateOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *CreateOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/manifests/types_exists_options.go b/pkg/bindings/manifests/types_exists_options.go
index 2a4962ae6..16527660c 100644
--- a/pkg/bindings/manifests/types_exists_options.go
+++ b/pkg/bindings/manifests/types_exists_options.go
@@ -60,7 +60,6 @@ func (o *ExistsOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ExistsOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/manifests/types_inspect_options.go b/pkg/bindings/manifests/types_inspect_options.go
index 0b82fc3cf..a2a40e6a4 100644
--- a/pkg/bindings/manifests/types_inspect_options.go
+++ b/pkg/bindings/manifests/types_inspect_options.go
@@ -60,7 +60,6 @@ func (o *InspectOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *InspectOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/manifests/types_remove_options.go b/pkg/bindings/manifests/types_remove_options.go
index 6ed0fd329..d3cac775e 100644
--- a/pkg/bindings/manifests/types_remove_options.go
+++ b/pkg/bindings/manifests/types_remove_options.go
@@ -60,7 +60,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/network/types_connect_options.go b/pkg/bindings/network/types_connect_options.go
index 4440bbed4..930fb5531 100644
--- a/pkg/bindings/network/types_connect_options.go
+++ b/pkg/bindings/network/types_connect_options.go
@@ -60,7 +60,6 @@ func (o *ConnectOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ConnectOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/network/types_create_options.go b/pkg/bindings/network/types_create_options.go
index 5fbdce93a..4b4afc4a8 100644
--- a/pkg/bindings/network/types_create_options.go
+++ b/pkg/bindings/network/types_create_options.go
@@ -61,7 +61,6 @@ func (o *CreateOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -70,7 +69,6 @@ func (o *CreateOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/network/types_disconnect_options.go b/pkg/bindings/network/types_disconnect_options.go
index 947f2f114..cbcea8f7e 100644
--- a/pkg/bindings/network/types_disconnect_options.go
+++ b/pkg/bindings/network/types_disconnect_options.go
@@ -60,7 +60,6 @@ func (o *DisconnectOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *DisconnectOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/network/types_exists_options.go b/pkg/bindings/network/types_exists_options.go
index 2fad34789..0de2a00b5 100644
--- a/pkg/bindings/network/types_exists_options.go
+++ b/pkg/bindings/network/types_exists_options.go
@@ -60,7 +60,6 @@ func (o *ExistsOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ExistsOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/network/types_inspect_options.go b/pkg/bindings/network/types_inspect_options.go
index 144ccbfae..3c69b37ec 100644
--- a/pkg/bindings/network/types_inspect_options.go
+++ b/pkg/bindings/network/types_inspect_options.go
@@ -60,7 +60,6 @@ func (o *InspectOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *InspectOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/network/types_list_options.go b/pkg/bindings/network/types_list_options.go
index 60632ce33..e00430809 100644
--- a/pkg/bindings/network/types_list_options.go
+++ b/pkg/bindings/network/types_list_options.go
@@ -60,7 +60,6 @@ func (o *ListOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ListOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/network/types_prune_options.go b/pkg/bindings/network/types_prune_options.go
index c56dcd0d3..f9685a225 100644
--- a/pkg/bindings/network/types_prune_options.go
+++ b/pkg/bindings/network/types_prune_options.go
@@ -60,7 +60,6 @@ func (o *PruneOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *PruneOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/network/types_remove_options.go b/pkg/bindings/network/types_remove_options.go
index 4ad4a2301..f42f6c256 100644
--- a/pkg/bindings/network/types_remove_options.go
+++ b/pkg/bindings/network/types_remove_options.go
@@ -60,7 +60,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/play/types_kube_options.go b/pkg/bindings/play/types_kube_options.go
index ea3872aae..649522908 100644
--- a/pkg/bindings/play/types_kube_options.go
+++ b/pkg/bindings/play/types_kube_options.go
@@ -60,7 +60,6 @@ func (o *KubeOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *KubeOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_create_options.go b/pkg/bindings/pods/types_create_options.go
index cfa29c6be..90312e6e6 100644
--- a/pkg/bindings/pods/types_create_options.go
+++ b/pkg/bindings/pods/types_create_options.go
@@ -60,7 +60,6 @@ func (o *CreateOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *CreateOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_exists_options.go b/pkg/bindings/pods/types_exists_options.go
index 6149ab1cc..0a7fbe3c9 100644
--- a/pkg/bindings/pods/types_exists_options.go
+++ b/pkg/bindings/pods/types_exists_options.go
@@ -60,7 +60,6 @@ func (o *ExistsOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ExistsOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_inspect_options.go b/pkg/bindings/pods/types_inspect_options.go
index 281717ff1..9913eaa50 100644
--- a/pkg/bindings/pods/types_inspect_options.go
+++ b/pkg/bindings/pods/types_inspect_options.go
@@ -60,7 +60,6 @@ func (o *InspectOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *InspectOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_kill_options.go b/pkg/bindings/pods/types_kill_options.go
index 4c310d50c..dac91840c 100644
--- a/pkg/bindings/pods/types_kill_options.go
+++ b/pkg/bindings/pods/types_kill_options.go
@@ -60,7 +60,6 @@ func (o *KillOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *KillOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_list_options.go b/pkg/bindings/pods/types_list_options.go
index 20f3229e5..ab945c253 100644
--- a/pkg/bindings/pods/types_list_options.go
+++ b/pkg/bindings/pods/types_list_options.go
@@ -60,7 +60,6 @@ func (o *ListOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ListOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_pause_options.go b/pkg/bindings/pods/types_pause_options.go
index 0f0f5bd97..177679e2a 100644
--- a/pkg/bindings/pods/types_pause_options.go
+++ b/pkg/bindings/pods/types_pause_options.go
@@ -60,7 +60,6 @@ func (o *PauseOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *PauseOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_prune_options.go b/pkg/bindings/pods/types_prune_options.go
index ef8aae17f..389a95579 100644
--- a/pkg/bindings/pods/types_prune_options.go
+++ b/pkg/bindings/pods/types_prune_options.go
@@ -60,7 +60,6 @@ func (o *PruneOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *PruneOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_remove_options.go b/pkg/bindings/pods/types_remove_options.go
index f51f67129..dcb4106f8 100644
--- a/pkg/bindings/pods/types_remove_options.go
+++ b/pkg/bindings/pods/types_remove_options.go
@@ -60,7 +60,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_restart_options.go b/pkg/bindings/pods/types_restart_options.go
index ec05e9fc9..61b06f70e 100644
--- a/pkg/bindings/pods/types_restart_options.go
+++ b/pkg/bindings/pods/types_restart_options.go
@@ -60,7 +60,6 @@ func (o *RestartOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *RestartOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_start_options.go b/pkg/bindings/pods/types_start_options.go
index ec9f5b1de..80e3c04d5 100644
--- a/pkg/bindings/pods/types_start_options.go
+++ b/pkg/bindings/pods/types_start_options.go
@@ -60,7 +60,6 @@ func (o *StartOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *StartOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_stats_options.go b/pkg/bindings/pods/types_stats_options.go
index 8be7d175d..c8be15ee9 100644
--- a/pkg/bindings/pods/types_stats_options.go
+++ b/pkg/bindings/pods/types_stats_options.go
@@ -60,7 +60,6 @@ func (o *StatsOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *StatsOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_stop_options.go b/pkg/bindings/pods/types_stop_options.go
index fa3577e72..22b04012e 100644
--- a/pkg/bindings/pods/types_stop_options.go
+++ b/pkg/bindings/pods/types_stop_options.go
@@ -60,7 +60,6 @@ func (o *StopOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *StopOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_top_options.go b/pkg/bindings/pods/types_top_options.go
index c3c701dad..da2457809 100644
--- a/pkg/bindings/pods/types_top_options.go
+++ b/pkg/bindings/pods/types_top_options.go
@@ -60,7 +60,6 @@ func (o *TopOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *TopOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/pods/types_unpause_options.go b/pkg/bindings/pods/types_unpause_options.go
index 281f0ea8d..5e2c9454b 100644
--- a/pkg/bindings/pods/types_unpause_options.go
+++ b/pkg/bindings/pods/types_unpause_options.go
@@ -60,7 +60,6 @@ func (o *UnpauseOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *UnpauseOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/secrets/types_create_options.go b/pkg/bindings/secrets/types_create_options.go
index 84cf38fa3..7629b3e5d 100644
--- a/pkg/bindings/secrets/types_create_options.go
+++ b/pkg/bindings/secrets/types_create_options.go
@@ -60,7 +60,6 @@ func (o *CreateOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *CreateOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/secrets/types_inspect_options.go b/pkg/bindings/secrets/types_inspect_options.go
index cd36b0531..8213c73bf 100644
--- a/pkg/bindings/secrets/types_inspect_options.go
+++ b/pkg/bindings/secrets/types_inspect_options.go
@@ -60,7 +60,6 @@ func (o *InspectOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *InspectOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/secrets/types_list_options.go b/pkg/bindings/secrets/types_list_options.go
index d313d8f73..eab0f5466 100644
--- a/pkg/bindings/secrets/types_list_options.go
+++ b/pkg/bindings/secrets/types_list_options.go
@@ -60,7 +60,6 @@ func (o *ListOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ListOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/secrets/types_remove_options.go b/pkg/bindings/secrets/types_remove_options.go
index ca970e30e..151c1d90c 100644
--- a/pkg/bindings/secrets/types_remove_options.go
+++ b/pkg/bindings/secrets/types_remove_options.go
@@ -60,7 +60,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/system/types_disk_options.go b/pkg/bindings/system/types_disk_options.go
index 6f0c3735a..77428c10c 100644
--- a/pkg/bindings/system/types_disk_options.go
+++ b/pkg/bindings/system/types_disk_options.go
@@ -60,7 +60,6 @@ func (o *DiskOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *DiskOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/system/types_events_options.go b/pkg/bindings/system/types_events_options.go
index 401a9807e..dd7706178 100644
--- a/pkg/bindings/system/types_events_options.go
+++ b/pkg/bindings/system/types_events_options.go
@@ -60,7 +60,6 @@ func (o *EventsOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *EventsOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/system/types_info_options.go b/pkg/bindings/system/types_info_options.go
index 7c07b5081..162ec3e88 100644
--- a/pkg/bindings/system/types_info_options.go
+++ b/pkg/bindings/system/types_info_options.go
@@ -60,7 +60,6 @@ func (o *InfoOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *InfoOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/system/types_prune_options.go b/pkg/bindings/system/types_prune_options.go
index c677ccca6..f2ae5e657 100644
--- a/pkg/bindings/system/types_prune_options.go
+++ b/pkg/bindings/system/types_prune_options.go
@@ -60,7 +60,6 @@ func (o *PruneOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *PruneOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/system/types_version_options.go b/pkg/bindings/system/types_version_options.go
index 60ebfced9..b6026fa8c 100644
--- a/pkg/bindings/system/types_version_options.go
+++ b/pkg/bindings/system/types_version_options.go
@@ -60,7 +60,6 @@ func (o *VersionOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *VersionOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/volumes/types_create_options.go b/pkg/bindings/volumes/types_create_options.go
index 2254f8c13..2dcbaf611 100644
--- a/pkg/bindings/volumes/types_create_options.go
+++ b/pkg/bindings/volumes/types_create_options.go
@@ -60,7 +60,6 @@ func (o *CreateOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *CreateOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/volumes/types_exists_options.go b/pkg/bindings/volumes/types_exists_options.go
index 9840b1bcd..ebfabc061 100644
--- a/pkg/bindings/volumes/types_exists_options.go
+++ b/pkg/bindings/volumes/types_exists_options.go
@@ -60,7 +60,6 @@ func (o *ExistsOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ExistsOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/volumes/types_inspect_options.go b/pkg/bindings/volumes/types_inspect_options.go
index 51ac2d348..3176e0ef6 100644
--- a/pkg/bindings/volumes/types_inspect_options.go
+++ b/pkg/bindings/volumes/types_inspect_options.go
@@ -60,7 +60,6 @@ func (o *InspectOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *InspectOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/volumes/types_list_options.go b/pkg/bindings/volumes/types_list_options.go
index c96e647b0..e7770d5ee 100644
--- a/pkg/bindings/volumes/types_list_options.go
+++ b/pkg/bindings/volumes/types_list_options.go
@@ -60,7 +60,6 @@ func (o *ListOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *ListOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/volumes/types_prune_options.go b/pkg/bindings/volumes/types_prune_options.go
index 06d16b659..78245f649 100644
--- a/pkg/bindings/volumes/types_prune_options.go
+++ b/pkg/bindings/volumes/types_prune_options.go
@@ -60,7 +60,6 @@ func (o *PruneOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *PruneOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/bindings/volumes/types_remove_options.go b/pkg/bindings/volumes/types_remove_options.go
index 4b0037234..13ac6a346 100644
--- a/pkg/bindings/volumes/types_remove_options.go
+++ b/pkg/bindings/volumes/types_remove_options.go
@@ -60,7 +60,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 			iter := f.MapRange()
 			for iter.Next() {
 				lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string)
-
 			}
 			s, err := json.MarshalToString(lowerCaseKeys)
 			if err != nil {
@@ -69,7 +68,6 @@ func (o *RemoveOptions) ToParams() (url.Values, error) {
 
 			params.Set(fieldName, s)
 		}
-
 	}
 	return params, nil
 }
diff --git a/pkg/cgroups/cpu.go b/pkg/cgroups/cpu.go
index a73187dc8..05223c2e1 100644
--- a/pkg/cgroups/cpu.go
+++ b/pkg/cgroups/cpu.go
@@ -155,7 +155,6 @@ func GetSystemCPUUsage() (uint64, error) {
 			}
 			total += v * 1000
 		}
-
 	}
 	return total, nil
 }
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index cf108ba9c..fb01c72b6 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -269,7 +269,6 @@ func pull(ctx context.Context, runtime *image.Runtime, rawImage string, options
 	}
 	if _, isTagged := namedRef.(reference.Tagged); isTagged {
 		return nil, errors.New("--all-tags requires a reference without a tag")
-
 	}
 
 	systemContext := image.GetSystemContext("", options.Authfile, false)
@@ -502,7 +501,6 @@ func (ir *ImageEngine) Config(_ context.Context) (*config.Config, error) {
 }
 
 func (ir *ImageEngine) Build(ctx context.Context, containerFiles []string, opts entities.BuildOptions) (*entities.BuildReport, error) {
-
 	id, _, err := ir.Libpod.Build(ctx, opts.BuildOptions, containerFiles...)
 	if err != nil {
 		return nil, err
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index 70c7104f1..35a84106f 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -60,7 +60,6 @@ func (ic *ContainerEngine) PlayKube(ctx context.Context, path string, options en
 	default:
 		return nil, errors.Errorf("invalid YAML kind: %q. [Pod|Deployment] are the only supported Kubernetes Kinds", kubeObject.Kind)
 	}
-
 }
 
 func (ic *ContainerEngine) playKubeDeployment(ctx context.Context, deploymentYAML *v1apps.Deployment, options entities.PlayKubeOptions) (*entities.PlayKubeReport, error) {
diff --git a/pkg/domain/infra/abi/secrets.go b/pkg/domain/infra/abi/secrets.go
index b1fe60e01..355971a5b 100644
--- a/pkg/domain/infra/abi/secrets.go
+++ b/pkg/domain/infra/abi/secrets.go
@@ -65,7 +65,6 @@ func (ic *ContainerEngine) SecretInspect(ctx context.Context, nameOrIDs []string
 			},
 		}
 		reports = append(reports, report)
-
 	}
 
 	return reports, errs, nil
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index e9c513f8e..c2c282ef9 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -290,7 +290,6 @@ func (ic *ContainerEngine) ContainerCheckpoint(ctx context.Context, namesOrIds [
 				ctrs = append(ctrs, c)
 			}
 		}
-
 	} else {
 		ctrs, err = getContainersByContext(ic.ClientCtx, false, false, namesOrIds)
 		if err != nil {
@@ -326,7 +325,6 @@ func (ic *ContainerEngine) ContainerRestore(ctx context.Context, namesOrIds []st
 				ctrs = append(ctrs, c)
 			}
 		}
-
 	} else {
 		ctrs, err = getContainersByContext(ic.ClientCtx, false, false, namesOrIds)
 		if err != nil {
@@ -570,7 +568,6 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 		}
 		// Start the container if it's not running already.
 		if !ctrRunning {
-
 			err = containers.Start(ic.ClientCtx, name, new(containers.StartOptions).WithDetachKeys(options.DetachKeys))
 			if err != nil {
 				if ctr.AutoRemove {
diff --git a/pkg/domain/infra/tunnel/helpers.go b/pkg/domain/infra/tunnel/helpers.go
index 0a806d860..e40e27596 100644
--- a/pkg/domain/infra/tunnel/helpers.go
+++ b/pkg/domain/infra/tunnel/helpers.go
@@ -55,7 +55,6 @@ func getContainersByContext(contextWithConnection context.Context, all, ignore b
 				found = true
 				break
 			}
-
 		}
 
 		if !found && !ignore {
@@ -107,7 +106,6 @@ func getPodsByContext(contextWithConnection context.Context, all bool, namesOrID
 				found = true
 				break
 			}
-
 		}
 
 		if !found {
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
index daad911cd..c6faaa9bb 100644
--- a/pkg/domain/infra/tunnel/images.go
+++ b/pkg/domain/infra/tunnel/images.go
@@ -32,7 +32,6 @@ func (ir *ImageEngine) Remove(ctx context.Context, imagesArg []string, opts enti
 }
 
 func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) ([]*entities.ImageSummary, error) {
-
 	filters := make(map[string][]string, len(opts.Filter))
 	for _, filter := range opts.Filter {
 		f := strings.Split(filter, "=")
diff --git a/pkg/domain/infra/tunnel/secrets.go b/pkg/domain/infra/tunnel/secrets.go
index f7c0f7d13..336297528 100644
--- a/pkg/domain/infra/tunnel/secrets.go
+++ b/pkg/domain/infra/tunnel/secrets.go
@@ -76,7 +76,6 @@ func (ic *ContainerEngine) SecretRm(ctx context.Context, nameOrIDs []string, opt
 			Err: secrets.Remove(ic.ClientCtx, name),
 			ID:  secret.ID,
 		})
-
 	}
 	return allRm, nil
 }
diff --git a/pkg/lookup/lookup.go b/pkg/lookup/lookup.go
index 8f241edf2..0b22a1974 100644
--- a/pkg/lookup/lookup.go
+++ b/pkg/lookup/lookup.go
@@ -66,7 +66,6 @@ func GetUserGroupInfo(containerMount, containerUser string, override *Overrides)
 		//	Gid:  0,
 		//	Home: "/",
 		defaultExecUser = nil
-
 	}
 
 	return user.GetExecUserPath(containerUser, defaultExecUser, passwdDest, groupDest)
diff --git a/pkg/netns/netns_linux.go b/pkg/netns/netns_linux.go
index 6817a3abd..95b50e073 100644
--- a/pkg/netns/netns_linux.go
+++ b/pkg/netns/netns_linux.go
@@ -51,7 +51,6 @@ func getNSRunDir() (string, error) {
 // NewNS creates a new persistent (bind-mounted) network namespace and returns
 // an object representing that namespace, without switching to it.
 func NewNS() (ns.NetNS, error) {
-
 	nsRunDir, err := getNSRunDir()
 	if err != nil {
 		return nil, err
@@ -92,7 +91,6 @@ func NewNS() (ns.NetNS, error) {
 		if err != nil {
 			return nil, fmt.Errorf("mount --make-rshared %s failed: %q", nsRunDir, err)
 		}
-
 	}
 
 	nsName := fmt.Sprintf("cni-%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
diff --git a/pkg/rootlessport/rootlessport_linux.go b/pkg/rootlessport/rootlessport_linux.go
index 80e1309a5..7cb54a7c3 100644
--- a/pkg/rootlessport/rootlessport_linux.go
+++ b/pkg/rootlessport/rootlessport_linux.go
@@ -64,7 +64,6 @@ func init() {
 			os.Exit(1)
 		}
 	})
-
 }
 
 func loadConfig(r io.Reader) (*Config, io.ReadCloser, io.WriteCloser, error) {
diff --git a/pkg/systemd/generate/common_test.go b/pkg/systemd/generate/common_test.go
index a0691d1ad..3787e461e 100644
--- a/pkg/systemd/generate/common_test.go
+++ b/pkg/systemd/generate/common_test.go
@@ -8,7 +8,6 @@ import (
 )
 
 func TestFilterPodFlags(t *testing.T) {
-
 	tests := []struct {
 		input []string
 	}{
diff --git a/pkg/trust/trust.go b/pkg/trust/trust.go
index a30611b74..18a6a1717 100644
--- a/pkg/trust/trust.go
+++ b/pkg/trust/trust.go
@@ -179,7 +179,6 @@ func CreateTmpFile(dir, pattern string, content []byte) (string, error) {
 
 	if _, err := tmpfile.Write(content); err != nil {
 		return "", err
-
 	}
 	return tmpfile.Name(), nil
 }
diff --git a/pkg/util/utils.go b/pkg/util/utils.go
index 901a482f6..32bb66332 100644
--- a/pkg/util/utils.go
+++ b/pkg/util/utils.go
@@ -388,7 +388,6 @@ func GetKeepIDMapping() (*storage.IDMappingOptions, int, int, error) {
 
 		options.HostUIDMapping = false
 		options.HostGIDMapping = false
-
 	}
 	// Simply ignore the setting and do not setup an inner namespace for root as it is a no-op
 	return &options, uid, gid, nil