From f6fe0b870df5c43925cc713c2ea72a08f792149b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <oliver.falvai@bitrise.io>
Date: Wed, 23 Feb 2022 09:12:10 +0100
Subject: [PATCH] Add context to error messages (#34)

* Add context to error messages

* Fix double prefix

* Capitalize error strings
---
 main.go | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/main.go b/main.go
index 38f49d4..76b2167 100755
--- a/main.go
+++ b/main.go
@@ -45,7 +45,7 @@ func failf(f string, args ...interface{}) {
 }
 
 func getArtifacts(gradleProject gradle.Project, started time.Time, pattern string, includeModuleName bool, isDirectoryMode bool) (artifacts []gradle.Artifact, err error) {
-	for _, t := range []time.Time{started, time.Time{}} {
+	for _, t := range []time.Time{started, {}} {
 		if isDirectoryMode {
 			artifacts, err = gradleProject.FindDirs(t, pattern, includeModuleName)
 		} else {
@@ -126,7 +126,7 @@ func filterVariants(module, variant string, variantsMap gradle.Variants) (gradle
 		}
 	}
 	if len(filteredVariants) == 0 {
-		return nil, fmt.Errorf("variant: %s not found in any module", variant)
+		return nil, fmt.Errorf("variant %s not found in any module", variant)
 	}
 	return filteredVariants, nil
 }
@@ -159,7 +159,7 @@ func main() {
 	var config Configs
 
 	if err := stepconf.Parse(&config); err != nil {
-		failf("Couldn't create step config: %v\n", err)
+		failf("Process config: couldn't create step config: %v\n", err)
 	}
 
 	stepconf.Print(config)
@@ -169,14 +169,14 @@ func main() {
 
 	gradleProject, err := gradle.NewProject(config.ProjectLocation, cmdFactory)
 	if err != nil {
-		failf("Failed to open project, error: %s", err)
+		failf("Process config: failed to open project, error: %s", err)
 	}
 
 	testTask := gradleProject.GetTask("test")
 
 	args, err := shellquote.Split(config.Arguments)
 	if err != nil {
-		failf("Failed to parse arguments, error: %s", err)
+		failf("Process config: failed to parse arguments, error: %s", err)
 	}
 
 	logger.Infof("Variants:")
@@ -184,12 +184,12 @@ func main() {
 
 	variants, err := testTask.GetVariants(args...)
 	if err != nil {
-		failf("Failed to fetch variants, error: %s", err)
+		failf("Run: failed to fetch variants, error: %s", err)
 	}
 
 	filteredVariants, err := filterVariants(config.Module, config.Variant, variants)
 	if err != nil {
-		failf("Failed to find buildable variants, error: %s", err)
+		failf("Run: failed to find buildable variants, error: %s", err)
 	}
 
 	for module, variants := range variants {
@@ -217,7 +217,7 @@ func main() {
 
 	testErr = testCommand.Run()
 	if testErr != nil {
-		logger.Errorf("Test task failed, error: %v", testErr)
+		logger.Errorf("Run: test task failed, error: %v", testErr)
 	}
 	fmt.Println()
 	logger.Infof("Export HTML results:")
@@ -225,11 +225,11 @@ func main() {
 
 	reports, err := getArtifacts(gradleProject, started, config.HTMLResultDirPattern, true, true)
 	if err != nil {
-		failf("Failed to find reports, error: %v", err)
+		failf("Export outputs: failed to find reports, error: %v", err)
 	}
 
 	if err := exportArtifacts(config.DeployDir, reports); err != nil {
-		failf("Failed to export reports, error: %v", err)
+		failf("Export outputs: failed to export reports, error: %v", err)
 	}
 
 	fmt.Println()
@@ -238,11 +238,11 @@ func main() {
 
 	results, err := getArtifacts(gradleProject, started, config.XMLResultDirPattern, true, true)
 	if err != nil {
-		failf("Failed to find results, error: %v", err)
+		failf("Export outputs: failed to find results, error: %v", err)
 	}
 
 	if err := exportArtifacts(config.DeployDir, results); err != nil {
-		failf("Failed to export results, error: %v", err)
+		failf("Export outputs: failed to export results, error: %v", err)
 	}
 
 	if config.TestResultDir != "" {