Refactor error handling

Change error handling so it's more consistent (and easier to debug) with
the rest of the project.

Author: toddmazierski

upload/uploader.go

@@ -10,10 +10,10 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"net/url"
 	"os"
 	"strings"
 	"time"
-	"net/url"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/codeclimate/test-reporter/formatters"
@@ -88,25 +88,27 @@ func (u Uploader) Upload() error {
 		return errors.WithStack(err)
 	}
 
-	postBatchURL := u.TransformPostBatchURL(batchLinks.Links.PostBatch)
+	postBatchURL, err := u.TransformPostBatchURL(batchLinks.Links.PostBatch)
+	if err != nil {
+		return errors.WithStack(err)
+	}
 
 	return u.SendBatches(testReport, postBatchURL)
 }
 
-func (u Uploader) TransformPostBatchURL(rawUrl string) string {
+func (u Uploader) TransformPostBatchURL(rawUrl string) (string, error) {
 	parsed, err := url.Parse(rawUrl)
-
 	if err != nil {
-		return rawUrl
+		return "", err
 	}
 
-	if (u.Insecure) {
+	if u.Insecure {
 		parsed.Scheme = "http"
 	} else {
 		parsed.Scheme = "https"
 	}
 
-	return parsed.String()
+	return parsed.String(), nil
 }
 
 func (u Uploader) SendBatches(rep *TestReport, url string) error {

upload/uploader_test.go

@@ -13,9 +13,11 @@ func Test_TransformPostBatchURL_Secure(t *testing.T) {
 		Insecure: false,
 	}
 
-	url := "https://example.com/"
+	rawURL := "https://example.com/"
+	actualURL, err := uploader.TransformPostBatchURL(rawURL)
 
-	r.Equal("https://example.com/", uploader.TransformPostBatchURL(url))
+	r.Equal("https://example.com/", actualURL)
+	r.Nil(err)
 }
 func Test_TransformPostBatchURL_Insecure_Success(t *testing.T) {
 	r := require.New(t)
@@ -24,9 +26,11 @@ func Test_TransformPostBatchURL_Insecure_Success(t *testing.T) {
 		Insecure: true,
 	}
 
-	url := "https://example.com/"
+	rawURL := "https://example.com/"
+	actualURL, err := uploader.TransformPostBatchURL(rawURL)
 
-	r.Equal("http://example.com/", uploader.TransformPostBatchURL(url))
+	r.Equal("http://example.com/", actualURL)
+	r.Nil(err)
 }
 
 func Test_TransformPostBatchURL_Insecure_Error(t *testing.T) {
@@ -36,7 +40,9 @@ func Test_TransformPostBatchURL_Insecure_Error(t *testing.T) {
 		Insecure: true,
 	}
 
-	url := "://example.com/"
+	rawURL := "://example.com/"
+	actualURL, err := uploader.TransformPostBatchURL(rawURL)
 
-	r.Equal(url, uploader.TransformPostBatchURL(url))
+	r.Equal("", actualURL)
+	r.Equal("parse ://example.com/: missing protocol scheme", err.Error())
 }