feat(cfd): pull cf api url out of vcap_application

Author: zjrgov

runner-manager/cfd/cloudgov/cloudgov.go

@@ -39,7 +39,6 @@ func (e CloudGovClientError) Error() string {
 	return e.msg
 }
 
-// TODO: we should pull this out of VCAP_APPLICATION
 const (
 	apiRootURLDefault  = "https://api.fr-stage.cloud.gov"
 	internalDomainGUID = "8a5d6a8c-cfc1-4fc4-afc9-aa563ff9df5e"

runner-manager/cfd/cmd/drive/stage.go

@@ -33,20 +33,23 @@ func newStage(client *cloudgov.Client) (s *stage, err error) {
 	s = &stage{}
 	s.common.stage = s
 
+	s.common.config, err = getJobConfig()
+	if err != nil {
+		return
+	}
+
 	if client != nil {
 		s.common.client = client
 	} else {
-		s.common.client, err = cloudgov.New(&cloudgov.CFClientAPI{}, nil)
+		s.common.client, err = cloudgov.New(
+			&cloudgov.CFClientAPI{},
+			&cloudgov.Opts{APIRootURL: s.common.config.CFApi},
+		)
 		if err != nil {
 			return
 		}
 	}
 
-	s.common.config, err = getJobConfig()
-	if err != nil {
-		return
-	}
-
 	// conf
 	s.prep = (*prepStage)(&s.common)
 	// run