ref(client): deis open uses the controller hostname for the app hostname

Author: helgi

client/controller/api/apps.go

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

client/controller/models/apps/apps.go

@@ -23,6 +23,12 @@ func List(c *client.Client, results int) ([]api.App, 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, c.ControllerURL.Host)
+		apps[name] = app
+	}
+
 	return apps, count, nil
 }
 
@@ -51,6 +57,9 @@ func New(c *client.Client, id 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, c.ControllerURL.Host)
+
 	return app, nil
 }
 
@@ -70,6 +79,9 @@ func Get(c *client.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, c.ControllerURL.Host)
+
 	return app, nil
 }
 

client/controller/models/apps/apps_test.go

@@ -21,7 +21,6 @@ const appFixture string = `
     "owner": "test",
     "structure": {},
     "updated": "2014-01-01T00:00:00UTC",
-    "url": "example-go.example.com",
     "uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
 }`
 
@@ -37,7 +36,6 @@ const appsFixture string = `
             "owner": "test",
             "structure": {},
             "updated": "2014-01-01T00:00:00UTC",
-            "url": "example-go.example.com",
             "uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
         }
     ]
@@ -157,15 +155,6 @@ func (f *fakeHTTPServer) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 func TestAppsCreate(t *testing.T) {
 	t.Parallel()
 
-	expected := api.App{
-		ID:      "example-go",
-		Created: "2014-01-01T00:00:00UTC",
-		Owner:   "test",
-		Updated: "2014-01-01T00:00:00UTC",
-		URL:     "example-go.example.com",
-		UUID:    "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
-	}
-
 	handler := fakeHTTPServer{createID: false, createWithoutID: false}
 	server := httptest.NewServer(&handler)
 	defer server.Close()
@@ -176,6 +165,15 @@ func TestAppsCreate(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	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",
+	}
+
 	httpClient := client.CreateHTTPClient(false)
 
 	client := client.Client{HTTPClient: httpClient, ControllerURL: *u, Token: "abc"}
@@ -196,15 +194,6 @@ func TestAppsCreate(t *testing.T) {
 func TestAppsGet(t *testing.T) {
 	t.Parallel()
 
-	expected := api.App{
-		ID:      "example-go",
-		Created: "2014-01-01T00:00:00UTC",
-		Owner:   "test",
-		Updated: "2014-01-01T00:00:00UTC",
-		URL:     "example-go.example.com",
-		UUID:    "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
-	}
-
 	handler := fakeHTTPServer{}
 	server := httptest.NewServer(&handler)
 	defer server.Close()
@@ -215,6 +204,15 @@ func TestAppsGet(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	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",
+	}
+
 	httpClient := client.CreateHTTPClient(false)
 
 	client := client.Client{HTTPClient: httpClient, ControllerURL: *u, Token: "abc"}
@@ -288,17 +286,6 @@ func TestAppsRun(t *testing.T) {
 func TestAppsList(t *testing.T) {
 	t.Parallel()
 
-	expected := []api.App{
-		{
-			ID:      "example-go",
-			Created: "2014-01-01T00:00:00UTC",
-			Owner:   "test",
-			Updated: "2014-01-01T00:00:00UTC",
-			URL:     "example-go.example.com",
-			UUID:    "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
-		},
-	}
-
 	handler := fakeHTTPServer{}
 	server := httptest.NewServer(&handler)
 	defer server.Close()
@@ -309,6 +296,17 @@ func TestAppsList(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	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",
+		},
+	}
+
 	httpClient := client.CreateHTTPClient(false)
 
 	client := client.Client{HTTPClient: httpClient, ControllerURL: *u, Token: "abc"}