Merge pull request #4816 from vrothberg/lint

Fix golint errors

6 files changed, 45 insertions, 40 deletions

diff --git a/libpod/config/config.go b/libpod/config/config.go
index 6240bccb0..13c128688 100644
--- a/libpod/config/config.go
+++ b/libpod/config/config.go
@@ -72,7 +72,7 @@ const (
 // SetOptions contains a subset of options in a Config. It's used to indicate if
 // a given option has either been set by the user or by a parsed libpod
 // configuration file.  If not, the corresponding option might be overwritten by
-// values from the database.  This behavior guarantess backwards compat with
+// values from the database.  This behavior guarantees backwards compat with
 // older version of libpod and Podman.
 type SetOptions struct {
 	// StorageConfigRunRootSet indicates if the RunRoot has been explicitly set
@@ -119,7 +119,7 @@ type Config struct {
 	// SetOptions contains a subset of config options. It's used to indicate if
 	// a given option has either been set by the user or by a parsed libpod
 	// configuration file.  If not, the corresponding option might be
-	// overwritten by values from the database.  This behavior guarantess
+	// overwritten by values from the database.  This behavior guarantees
 	// backwards compat with older version of libpod and Podman.
 	SetOptions
 
@@ -451,45 +451,47 @@ func NewConfig(userConfigPath string) (*Config, error) {
 	}
 
 	// Now, check if the user can access system configs and merge them if needed.
-	if configs, err := systemConfigs(); err != nil {
+	configs, err := systemConfigs()
+	if err != nil {
 		return nil, errors.Wrapf(err, "error finding config on system")
-	} else {
-		migrated := false
-		for _, path := range configs {
-			systemConfig, err := readConfigFromFile(path)
-			if err != nil {
-				return nil, errors.Wrapf(err, "error reading system config %q", path)
-			}
-			// Handle CGroups v2 configuration migration.
-			// Migrate only the first config, and do it before
-			// merging.
-			if !migrated {
-				if err := cgroupV2Check(path, systemConfig); err != nil {
-					return nil, errors.Wrapf(err, "error rewriting configuration file %s", userConfigPath)
-				}
-				migrated = true
-			}
-			// Merge the it into the config. Any unset field in config will be
-			// over-written by the systemConfig.
-			if err := config.mergeConfig(systemConfig); err != nil {
-				return nil, errors.Wrapf(err, "error merging system config")
+	}
+
+	migrated := false
+	for _, path := range configs {
+		systemConfig, err := readConfigFromFile(path)
+		if err != nil {
+			return nil, errors.Wrapf(err, "error reading system config %q", path)
+		}
+		// Handle CGroups v2 configuration migration.
+		// Migrate only the first config, and do it before
+		// merging.
+		if !migrated {
+			if err := cgroupV2Check(path, systemConfig); err != nil {
+				return nil, errors.Wrapf(err, "error rewriting configuration file %s", userConfigPath)
 			}
-			logrus.Debugf("Merged system config %q: %v", path, config)
+			migrated = true
+		}
+		// Merge the it into the config. Any unset field in config will be
+		// over-written by the systemConfig.
+		if err := config.mergeConfig(systemConfig); err != nil {
+			return nil, errors.Wrapf(err, "error merging system config")
 		}
+		logrus.Debugf("Merged system config %q: %v", path, config)
 	}
 
 	// Finally, create a default config from memory and forcefully merge it into
 	// the config. This way we try to make sure that all fields are properly set
 	// and that user AND system config can partially set.
-	if defaultConfig, err := defaultConfigFromMemory(); err != nil {
+	defaultConfig, err := defaultConfigFromMemory()
+	if err != nil {
 		return nil, errors.Wrapf(err, "error generating default config from memory")
-	} else {
-		// Check if we need to switch to cgroupfs and logger=file on rootless.
-		defaultConfig.checkCgroupsAndLogger()
+	}
 
-		if err := config.mergeConfig(defaultConfig); err != nil {
-			return nil, errors.Wrapf(err, "error merging default config from memory")
-		}
+	// Check if we need to switch to cgroupfs and logger=file on rootless.
+	defaultConfig.checkCgroupsAndLogger()
+
+	if err := config.mergeConfig(defaultConfig); err != nil {
+		return nil, errors.Wrapf(err, "error merging default config from memory")
 	}
 
 	// Relative paths can cause nasty bugs, because core paths we use could
diff --git a/libpod/config/default.go b/libpod/config/default.go
index 5decaeab7..c4a4efdaf 100644
--- a/libpod/config/default.go
+++ b/libpod/config/default.go
@@ -26,11 +26,12 @@ const (
 // config is different for root and rootless. It also parses the storage.conf.
 func defaultConfigFromMemory() (*Config, error) {
 	c := new(Config)
-	if tmp, err := defaultTmpDir(); err != nil {
+	tmp, err := defaultTmpDir()
+	if err != nil {
 		return nil, err
-	} else {
-		c.TmpDir = tmp
 	}
+	c.TmpDir = tmp
+
 	c.EventsLogFilePath = filepath.Join(c.TmpDir, "events", "events.log")
 
 	storeOpts, err := storage.DefaultStoreOptions(rootless.IsRootless(), rootless.GetRootlessUID())
diff --git a/libpod/image/config.go b/libpod/image/config.go
index 40e7fd496..bb84175a3 100644
--- a/libpod/image/config.go
+++ b/libpod/image/config.go
@@ -2,7 +2,7 @@ package image
 
 // ImageDeleteResponse is the response for removing an image from storage and containers
 // what was untagged vs actually removed
-type ImageDeleteResponse struct {
+type ImageDeleteResponse struct { //nolint
 	Untagged []string `json:"untagged"`
 	Deleted  string   `json:"deleted"`
 }
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index ef881802c..0312f0ba2 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -709,7 +709,7 @@ func (r *ConmonOCIRuntime) ExecUpdateStatus(ctr *Container, sessionID string) (b
 	return true, nil
 }
 
-// ExecCleanupContainer cleans up files created when a command is run via
+// ExecContainerCleanup cleans up files created when a command is run via
 // ExecContainer. This includes the attach socket for the exec session.
 func (r *ConmonOCIRuntime) ExecContainerCleanup(ctr *Container, sessionID string) error {
 	// Clean up the sockets dir. Issue #3962
diff --git a/libpod/options.go b/libpod/options.go
index ebde4eecc..031f4f705 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -20,7 +20,9 @@ import (
 )
 
 var (
-	NameRegex  = regexp.MustCompile("^[a-zA-Z0-9][a-zA-Z0-9_.-]*$")
+	// NameRegex is a regular expression to validate container/pod names.
+	NameRegex = regexp.MustCompile("^[a-zA-Z0-9][a-zA-Z0-9_.-]*$")
+	// RegexError is thrown in presence of an invalid container/pod name.
 	RegexError = errors.Wrapf(define.ErrInvalidArg, "names must match [a-zA-Z0-9][a-zA-Z0-9_.-]*")
 )
 
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 001d850b0..b4cbde28e 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -213,11 +213,11 @@ func getLockManager(runtime *Runtime) (lock.Manager, error) {
 // Sets up containers/storage, state store, OCI runtime
 func makeRuntime(ctx context.Context, runtime *Runtime) (err error) {
 	// Find a working conmon binary
-	if cPath, err := runtime.config.FindConmon(); err != nil {
+	cPath, err := runtime.config.FindConmon()
+	if err != nil {
 		return err
-	} else {
-		runtime.conmonPath = cPath
 	}
+	runtime.conmonPath = cPath
 
 	// Make the static files directory if it does not exist
 	if err := os.MkdirAll(runtime.config.StaticDir, 0700); err != nil {