fix(apps): remove unused and incorrect URL field (#57)

Author: Joshua-Anderson

api/apps.go

@@ -6,7 +6,6 @@ type App struct {
 	ID      string `json:"id"`
 	Owner   string `json:"owner"`
 	Updated string `json:"updated"`
-	URL     string `json:"-"`
 	UUID    string `json:"uuid"`
 }
 

api/apps_test.go

@@ -7,10 +7,10 @@ import (
 
 func TestAppsSorted(t *testing.T) {
 	apps := Apps{
-		{"2014-01-01T00:00:00UTC", "Zulu", "John", "2016-01-02", "zulu.example.com", "d57be2ba-7ae2-4825-9ace-7c86cb893046"},
-		{"2014-01-01T00:00:00UTC", "Alpha", "John", "2016-01-02", "alpha.example.com", "3d501190-1b8e-41ef-94c5-dd9a0bb707bb"},
-		{"2014-01-01T00:00:00UTC", "Gamma", "John", "2016-01-02", "gamma.example.com", "41d95133-fd4d-4f4c-92a2-e454857371cc"},
-		{"2014-01-01T00:00:00UTC", "Beta", "John", "2016-01-02", "beta.example.com", "222ed1aa-e985-4bec-9966-a88215300661"},
+		{"2014-01-01T00:00:00UTC", "Zulu", "John", "2016-01-02", "d57be2ba-7ae2-4825-9ace-7c86cb893046"},
+		{"2014-01-01T00:00:00UTC", "Alpha", "John", "2016-01-02", "3d501190-1b8e-41ef-94c5-dd9a0bb707bb"},
+		{"2014-01-01T00:00:00UTC", "Gamma", "John", "2016-01-02", "41d95133-fd4d-4f4c-92a2-e454857371cc"},
+		{"2014-01-01T00:00:00UTC", "Beta", "John", "2016-01-02", "222ed1aa-e985-4bec-9966-a88215300661"},
 	}
 
 	sort.Sort(apps)

apps/apps.go

@@ -8,7 +8,6 @@ import (
 	"io"
 	"io/ioutil"
 	"strconv"
-	"strings"
 
 	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/api"
@@ -37,12 +36,6 @@ func List(c *deis.Client, results int) (api.Apps, int, error) {
 		return []api.App{}, -1, err
 	}
 
-	for name, app := range apps {
-		// Add in app URL based on controller hostname, port included
-		app.URL = fmt.Sprintf("%s.%s", app.ID, strings.TrimPrefix(c.ControllerURL.Host, workflowURLPrefix))
-		apps[name] = app
-	}
-
 	return apps, count, nil
 }
 
@@ -78,9 +71,6 @@ func New(c *deis.Client, appID string) (api.App, error) {
 		return api.App{}, err
 	}
 
-	// Add in app URL based on controller hostname, port included
-	app.URL = fmt.Sprintf("%s.%s", app.ID, strings.TrimPrefix(c.ControllerURL.Host, workflowURLPrefix))
-
 	return app, reqErr
 }
 
@@ -104,9 +94,6 @@ func Get(c *deis.Client, appID string) (api.App, error) {
 		return api.App{}, err
 	}
 
-	// Add in app URL based on controller hostname, port included
-	app.URL = fmt.Sprintf("%s.%s", app.ID, strings.TrimPrefix(c.ControllerURL.Host, workflowURLPrefix))
-
 	return app, reqErr
 }
 

apps/apps_test.go

@@ -5,7 +5,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
-	"net/url"
 	"reflect"
 	"testing"
 
@@ -162,14 +161,11 @@ func TestAppsCreate(t *testing.T) {
 	server := httptest.NewServer(&handler)
 	defer server.Close()
 
-	u, _ := url.Parse(server.URL)
-
 	expected := api.App{
 		ID:      "example-go",
 		Created: "2014-01-01T00:00:00UTC",
 		Owner:   "test",
 		Updated: "2014-01-01T00:00:00UTC",
-		URL:     fmt.Sprintf("example-go.%s", u.Host),
 		UUID:    "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
 	}
 
@@ -198,14 +194,11 @@ func TestAppsGet(t *testing.T) {
 	server := httptest.NewServer(&handler)
 	defer server.Close()
 
-	u, _ := url.Parse(server.URL)
-
 	expected := api.App{
 		ID:      "example-go",
 		Created: "2014-01-01T00:00:00UTC",
 		Owner:   "test",
 		Updated: "2014-01-01T00:00:00UTC",
-		URL:     fmt.Sprintf("example-go.%s", u.Host),
 		UUID:    "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
 	}
 
@@ -277,15 +270,12 @@ func TestAppsList(t *testing.T) {
 	server := httptest.NewServer(&handler)
 	defer server.Close()
 
-	u, _ := url.Parse(server.URL)
-
 	expected := api.Apps{
 		{
 			ID:      "example-go",
 			Created: "2014-01-01T00:00:00UTC",
 			Owner:   "test",
 			Updated: "2014-01-01T00:00:00UTC",
-			URL:     fmt.Sprintf("example-go.%s", u.Host),
 			UUID:    "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
 		},
 	}