Fixed a bunch of lint warnings

Author: cmaglie

commands/core/download.go

@@ -68,9 +68,8 @@ func downloadPlatform(pm *packagemanager.PackageManager, platformRelease *cores.
 	if err != nil {
 		formatter.PrintError(err, "Error downloading "+platformRelease.String())
 		return err
-	} else {
-		return download(resp, platformRelease.String(), progressCallback)
 	}
+	return download(resp, platformRelease.String(), progressCallback)
 }
 
 func downloadTool(pm *packagemanager.PackageManager, tool *cores.ToolRelease, progressCallback func(*rpc.DownloadProgress)) error {
@@ -89,9 +88,8 @@ func DownloadToolRelease(pm *packagemanager.PackageManager, toolRelease *cores.T
 	if err != nil {
 		formatter.PrintError(err, "Error downloading "+toolRelease.String())
 		return err
-	} else {
-		return download(resp, toolRelease.String(), progressCallback)
 	}
+	return download(resp, toolRelease.String(), progressCallback)
 }
 
 // TODO: Refactor this into output.*?

commands/core/install.go

@@ -29,7 +29,7 @@ func PlatformInstall(ctx context.Context, req *rpc.PlatformInstallReq, progress
 	platform, tools, err := pm.FindPlatformReleaseDependencies(ref)
 	if err != nil {
 		formatter.PrintError(err, "Could not determine platform dependencies")
-		return nil, fmt.Errorf("Could not determine platform dependencies", err)
+		return nil, fmt.Errorf("Could not determine platform dependencies: %s", err)
 	}
 
 	err = installPlatform(pm, platform, tools, progress)
@@ -92,7 +92,7 @@ func installPlatform(pm *packagemanager.PackageManager,
 	if err != nil {
 		log.WithError(err).Error("Cannot install platform")
 		formatter.PrintError(err, "Cannot install platform")
-		return fmt.Errorf("Cannot install platform", err)
+		return err
 	}
 
 	// If upgrading remove previous release
@@ -108,9 +108,9 @@ func installPlatform(pm *packagemanager.PackageManager,
 			if err := pm.UninstallPlatform(platformRelease); err != nil {
 				log.WithError(err).Error("Error rolling-back changes.")
 				formatter.PrintError(err, "Error rolling-back changes.")
-				return fmt.Errorf("Error rolling-back changes.", err)
+				return fmt.Errorf("rolling-back changes: %s", err)
 			}
-			return fmt.Errorf("Error updating platform", errUn)
+			return fmt.Errorf("updating platform: %s", errUn)
 		}
 	}
 

commands/core/uninstall.go

@@ -33,8 +33,7 @@ func PlatformUninstall(ctx context.Context, req *rpc.PlatformUninstallReq) (*rpc
 	// If no version is specified consider the installed
 	version, err := semver.Parse(req.Version)
 	if err != nil {
-		formatter.PrintError(err, "version not readable")
-		return nil, fmt.Errorf("version not readable", err)
+		return nil, fmt.Errorf("invalid version: %s", err)
 	}
 	ref := &packagemanager.PlatformReference{
 		Package:              req.PlatformPackage,
@@ -45,13 +44,13 @@ func PlatformUninstall(ctx context.Context, req *rpc.PlatformUninstallReq) (*rpc
 		platform := pm.FindPlatform(ref)
 		if platform == nil {
 			formatter.PrintErrorMessage("Platform not found " + ref.String())
-			return nil, fmt.Errorf("Platform not found "+ref.String(), err)
+			return nil, fmt.Errorf("platform not found: %s", ref.String())
 
 		}
 		platformRelease := pm.GetInstalledPlatformRelease(platform)
 		if platformRelease == nil {
 			formatter.PrintErrorMessage("Platform not installed " + ref.String())
-			return nil, fmt.Errorf("Platform not installed "+ref.String(), err)
+			return nil, fmt.Errorf("platform not installed: %s", ref.String())
 
 		}
 		ref.PlatformVersion = platformRelease.Version
@@ -60,8 +59,7 @@ func PlatformUninstall(ctx context.Context, req *rpc.PlatformUninstallReq) (*rpc
 	platform, tools, err := pm.FindPlatformReleaseDependencies(ref)
 	if err != nil {
 		formatter.PrintError(err, "Could not determine platform dependencies")
-		return nil, fmt.Errorf("Could not determine platform dependencies", err)
-
+		return nil, fmt.Errorf("finding platform dependencies: %s", err)
 	}
 
 	err = uninstallPlatformRelease(pm, platform)

commands/core/upgrade.go

@@ -58,7 +58,6 @@ func PlatformUpgrade(ctx context.Context, req *rpc.PlatformUpgradeReq, progress
 }
 
 func upgradePlatform(pm *packagemanager.PackageManager, platformRef *packagemanager.PlatformReference, progress commands.ProgressCB) error {
-
 	if platformRef.PlatformVersion != nil {
 		formatter.PrintErrorMessage("Invalid item " + platformRef.String() + ", upgrade doesn't accept parameters with version")
 		return fmt.Errorf("Invalid item " + platformRef.String() + ", upgrade doesn't accept parameters with version")
@@ -80,10 +79,9 @@ func upgradePlatform(pm *packagemanager.PackageManager, platformRef *packagemana
 	if !latest.Version.GreaterThan(installed.Version) {
 		formatter.PrintResult("Platform " + platformRef.String() + " is already at the latest version.")
 		return fmt.Errorf("Platform " + platformRef.String() + " is already at the latest version.")
-	} else {
-		platformRef.PlatformVersion = latest.Version
-		toInstallRefs = append(toInstallRefs, platformRef)
 	}
+	platformRef.PlatformVersion = latest.Version
+	toInstallRefs = append(toInstallRefs, platformRef)
 
 	for _, platformRef := range toInstallRefs {
 		platform, tools, err := pm.FindPlatformReleaseDependencies(platformRef)