PRODENG-3148 linting update

- small linting fixes out of golang lint

Signed-off-by: James Nesbitt <[email protected]>

Author: james-nesbitt

pkg/docker/envauth.go

@@ -22,10 +22,10 @@ func DiscoverEnvLogin(prefixes []string) (user, pass string, err error) {
 			if pass == "" {
 				err = fmt.Errorf("%w; %s username env variable did not have matching password variable %s", ErrMissingPassword, userEnv, passEnv)
 			}
-			return
+			return user, pass, err
 		}
 	}
 	// if there were no matching vars, then we are not supposed to do a login
 	err = ErrNoEnvPasswordsFound
-	return
+	return user, pass, err
 }

pkg/product/common/api/mcr_config.go

@@ -141,7 +141,7 @@ func processVersionChannelMatch(config *MCRConfig) error {
 func processVersionIsAVersion(config *MCRConfig) (ver *version.Version, err error) {
 	if config.Version == "" {
 		err = ErrInvalidVersion
-		return
+		return ver, err
 	}
 
 	defer func() {
@@ -152,5 +152,5 @@ func processVersionIsAVersion(config *MCRConfig) (ver *version.Version, err erro
 	}()
 
 	ver, err = version.NewVersion(config.Version)
-	return
+	return ver, err //nolint:wrapcheck
 }