ObjectsUrl() can now return an error

Author: technoweenie

lfs/client.go

@@ -505,7 +505,11 @@ func setErrorHeaderContext(err *WrappedError, prefix string, head http.Header) {
 }
 
 func request(method, oid string) (*http.Request, Creds, error) {
-	u := Config.ObjectUrl(oid)
+	u, err := Config.ObjectUrl(oid)
+	if err != nil {
+		return nil, nil, err
+	}
+
 	req, err := http.NewRequest(method, u.String(), nil)
 	if err != nil {
 		return req, nil, err

lfs/config.go

@@ -93,10 +93,14 @@ func (c *Configuration) SetConfig(key, value string) {
 	c.gitConfig[key] = value
 }
 
-func (c *Configuration) ObjectUrl(oid string) *url.URL {
-	u, _ := url.Parse(c.Endpoint())
+func (c *Configuration) ObjectUrl(oid string) (*url.URL, error) {
+	u, err := url.Parse(c.Endpoint())
+	if err != nil {
+		return nil, err
+	}
+
 	u.Path = path.Join(u.Path, "objects", oid)
-	return u
+	return u, nil
 }
 
 type AltConfig struct {

lfs/config_test.go

@@ -107,7 +107,6 @@ func TestBareHTTPEndpointAddsMediaSuffix(t *testing.T) {
 }
 
 func TestObjectUrl(t *testing.T) {
-	oid := "oid"
 	tests := map[string]string{
 		"http://example.com":      "http://example.com/objects/oid",
 		"http://example.com/":     "http://example.com/objects/oid",
@@ -117,6 +116,13 @@ func TestObjectUrl(t *testing.T) {
 
 	for endpoint, expected := range tests {
 		Config.SetConfig("lfs.url", endpoint)
-		assert.Equal(t, expected, Config.ObjectUrl(oid).String())
+		u, err := Config.ObjectUrl("oid")
+		if err != nil {
+			t.Errorf("Error building URL for %s: %s", endpoint, err)
+		} else {
+			if actual := u.String(); expected != actual {
+				t.Errorf("Expected %s, got %s", expected, u.String())
+			}
+		}
 	}
 }