feat(cfd) add route mapping functionality & integration test

Author: zjrgov

runner-manager/cfd/cloudgov/cf_client.go

@@ -73,7 +73,7 @@ func castApp(app *resource.App) *App {
 	if app == nil || app.GUID == "" {
 		return nil
 	}
-	return &(App{Name: app.Name, GUID: app.GUID, State: app.State})
+	return &(App{Name: app.Name, GUID: app.GUID, State: app.State, SpaceGUID: app.Relationships.Space.Data.GUID})
 }
 
 func castApps(apps []*resource.App) []*App {
@@ -109,3 +109,25 @@ func (cf *CFClientAPI) sshCode() (string, error) {
 	ctx := context.Background()
 	return cf.conn().SSHCode(ctx)
 }
+
+func (cf *CFClientAPI) mapRoute(
+	ctx context.Context,
+	app *App,
+	domain string, space string, host string, path string, port int,
+) error {
+	opts := resource.NewRouteCreateWithHost(domain, space, host, path, port)
+
+	route, err := cf.conn().Routes.Create(ctx, opts)
+	if err != nil {
+		return err
+	}
+
+	_, err = cf.conn().Routes.InsertDestinations(
+		ctx,
+		route.GUID,
+		[]*resource.RouteDestinationInsertOrReplace{{
+			App: resource.RouteDestinationApp{GUID: &app.GUID},
+		}},
+	)
+	return err
+}

runner-manager/cfd/cloudgov/cloudgov.go

@@ -1,11 +1,7 @@
 package cloudgov
 
-// Stuff we'll need to implement, for ref
-//
-// mapRoute()
-//
-// addNetworkPolicy()
-// removeNetworkPolicy()
+import "context"
+
 type ClientAPI interface {
 	connect(url string, creds *Creds) error
 
@@ -15,6 +11,8 @@ type ClientAPI interface {
 	appsList() (apps []*App, err error)
 
 	sshCode() (string, error)
+	mapRoute(ctx context.Context, app *App, domain string, space string, host string, path string, port int) error
+	addNetworkPolicy(app *App, dest string, space string, port string) error
 }
 
 type CredsGetter interface {
@@ -42,7 +40,10 @@ func (e CloudGovClientError) Error() string {
 }
 
 // TODO: we should pull this out of VCAP_APPLICATION
-const apiRootURLDefault = "https://api.fr-stage.cloud.gov"
+const (
+	apiRootURLDefault  = "https://api.fr-stage.cloud.gov"
+	internalDomainGUID = "8a5d6a8c-cfc1-4fc4-afc9-aa563ff9df5e"
+)
 
 func New(i ClientAPI, o *Opts) (*Client, error) {
 	if o == nil {
@@ -78,9 +79,10 @@ func (c *Client) Connect() (*Client, error) {
 }
 
 type App struct {
-	Name  string
-	GUID  string
-	State string
+	Name      string
+	GUID      string
+	State     string
+	SpaceGUID string
 }
 
 func (c *Client) AppGet(id string) (*App, error) {
@@ -133,3 +135,7 @@ func (c *Client) ServicesPush(manifests []*AppManifest) ([]*App, error) {
 func (c *Client) SSHCode() (string, error) {
 	return c.sshCode()
 }
+
+func (c *Client) MapServiceRoute(app *App) error {
+	return c.mapRoute(context.Background(), app, internalDomainGUID, app.SpaceGUID, app.Name, "", 0)
+}

runner-manager/cfd/cloudgov/cloudgov_integration_test.go

@@ -3,7 +3,10 @@
 package cloudgov_test
 
 import (
+	"encoding/json"
 	"errors"
+	"fmt"
+	"os/exec"
 	"regexp"
 	"testing"
 
@@ -112,3 +115,65 @@ func Test_SSHCode(t *testing.T) {
 		t.Errorf("wanted string matching /%v/, got %v", re, got)
 	}
 }
+
+func cleanupRoute(t testing.TB, app *cg.App) error {
+	t.Helper()
+
+	delRouteCmd := exec.Command(
+		"cf", "delete-route", "-f", "apps.internal",
+		fmt.Sprintf("-n%s", app.Name),
+	)
+
+	out, err := delRouteCmd.CombinedOutput()
+	if err != nil {
+		t.Log(string(out))
+		if exErr, ok := err.(*exec.ExitError); ok {
+			t.Log(exErr.Error())
+			t.Fatal(string(exErr.Stderr))
+		} else {
+			t.Fatal(err)
+		}
+	}
+
+	return err
+}
+
+func TestClient_MapServiceRoute(t *testing.T) {
+	setup(t)
+
+	apps, err := cgClient.AppsList()
+	if err != nil {
+		t.Fatal(err)
+	}
+	app := apps[0]
+
+	err = cgClient.MapServiceRoute(app)
+	defer cleanupRoute(t, app)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ckRouteCmd := exec.Command("cf", "curl", fmt.Sprintf("/v3/apps/%s/routes", app.GUID))
+	out, err := ckRouteCmd.CombinedOutput()
+	if err != nil {
+		t.Log(out)
+		t.Fatal(err)
+	}
+
+	var routeOut map[string][]map[string]string
+	if err := json.Unmarshal(out, &routeOut); err != nil {
+		t.Log("partial unmarshalling error expected…")
+		t.Log(err)
+	}
+
+	wantUrl := fmt.Sprintf("%s.apps.internal", app.Name)
+
+	for _, m := range routeOut["resources"] {
+		if m["host"] == app.Name && m["url"] == wantUrl {
+			return
+		}
+	}
+
+	t.Logf("%#v", routeOut["resources"])
+	t.Fatalf("could not find route with %s host and correct url", app.Name)
+}

runner-manager/cfd/sh/integration_setup.sh

@@ -70,7 +70,7 @@ if [[ -z "$skip_create" ]]; then
 fi
 
 # create a teeny app we can use to test client.AppGet
-cf push -k 8M -m 128M -o busybox -u process -c /bin/sh "$app_name"
+cf push --no-route -k 8M -m 128M -o busybox -u process -c /bin/sh "$app_name"
 
 out_arr=(
     # get the credentials from key and output