Merge branch 'master' into chore/adds-watcherr

.ergo

@@ -9,3 +9,4 @@ two.domain       http://localhost:8082
 redislocal       redis://localhost:6543
 *.wildcard http://localhost:3030
 withextraspace http://localhost:2222  
+127.0.0.1:3034 mysitewithip

.version

@@ -1 +1 @@
-v0.3.2
+v0.4.2

proxy/config.go

@@ -228,6 +228,10 @@ func readServicesFromFile(filepath string) ([]Service, error) {
 			name, urlWithPort = pair[0], pair[1]
 		}
 
+		if !strings.Contains(urlWithPort, "://") {
+			urlWithPort = "http://" + urlWithPort
+		}
+
 		service, err := NewService(name, urlWithPort)
 		if err != nil {
 			return nil, fmt.Errorf("invalid service format `%v`. %v`", line, err)

proxy/config_test.go

@@ -39,7 +39,7 @@ func TestWhenHasErgoFile(t *testing.T) {
 	})
 
 	t.Run("It loads the services redirections", func(t *testing.T) {
-		expected := 10
+		expected := 11
 		service := len(config.Services)
 
 		if expected != service {

proxy/service.go

@@ -24,8 +24,12 @@ func NewService(name string, rawURL string) (Service, error) {
 	}
 
 	url, err := url.ParseRequestURI(rawURL)
+	if err != nil {
+		return Service{}, fmt.Errorf("Error parsing URL '%v': %v", rawURL, err)
+	}
+
 	isInvalidHostname := len(url.Hostname()) == 0 || strings.Contains(url.Hostname(), ":")
-	if err != nil || isInvalidHostname {
+	if isInvalidHostname {
 		return Service{}, fmt.Errorf("URL '%v' is invalid, example of valid URL 'http://example.com:8080'", rawURL)
 	}
 

proxy/service_test.go

@@ -54,6 +54,12 @@ func TestNewService(t *testing.T) {
 			serviceURL:  "http://localhost:8080",
 			expectError: true,
 		},
+		{
+			title:       "a service containing an invalid URL is invalid",
+			serviceName: "ergoproxy",
+			serviceURL:  "http:///localhost:3000\n",
+			expectError: true,
+		},
 	}
 
 	for _, tc := range testCases {