separate out routeservice changes

Author: sleungcy-sap

cloudfoundry/managers/session.go

@@ -231,29 +231,25 @@ func (s *Session) init(config *configv3.Config, configUaa *configv3.Config, conf
 	if tokFromStore.IsSet() {
 		accessToken = tokFromStore.AccessToken
 		refreshToken = tokFromStore.RefreshToken
-		goClientConfigOptions = goConfig.Token(accessToken, refreshToken)
 	} else if configSess.SSOPasscode != "" {
 		// try connecting with SSO passcode to retrieve access token and refresh token
 		accessToken, refreshToken, err = uaaClient.Authenticate(map[string]string{
 			"passcode": configSess.SSOPasscode,
 		}, configSess.Origin, constant.GrantTypePassword)
 		errType = "SSO passcode"
-		goClientConfigOptions = goConfig.Token(accessToken, refreshToken)
 	} else if config.CFUsername() != "" {
 		// try connecting with pair given on uaa to retrieve access token and refresh token
 		accessToken, refreshToken, err = uaaClient.Authenticate(map[string]string{
 			"username": config.CFUsername(),
 			"password": config.CFPassword(),
 		}, configSess.Origin, constant.GrantTypePassword)
 		errType = "username/password"
-		goClientConfigOptions = goConfig.UserPassword(config.CFUsername(), config.CFPassword())
 	} else if config.UAAOAuthClient() != "cf" {
 		accessToken, refreshToken, err = uaaClient.Authenticate(map[string]string{
 			"client_id":     config.UAAOAuthClient(),
 			"client_secret": config.UAAOAuthClientSecret(),
 		}, configSess.Origin, constant.GrantTypeClientCredentials)
 		errType = "client_id/client_secret"
-		goClientConfigOptions = goConfig.Token(accessToken, refreshToken)
 	}
 	if err != nil {
 		return fmt.Errorf("Error when authenticate on cf using %s: %s", errType, err)
@@ -265,6 +261,7 @@ func (s *Session) init(config *configv3.Config, configUaa *configv3.Config, conf
 	config.SetAccessToken(fmt.Sprintf("bearer %s", accessToken))
 	config.SetRefreshToken(refreshToken)
 
+	goClientConfigOptions = goConfig.Token(accessToken, refreshToken)
 	goconfig, err := goConfig.New(config.ConfigFile.Target, goClientConfigOptions)
 
 	if err != nil {

cloudfoundry/managers/v3appdeployers/runbinder.go

@@ -1,7 +1,6 @@
 package v3appdeployers
 
 import (
-	"context"
 	"fmt"
 	"time"
 
@@ -10,7 +9,6 @@ import (
 	"code.cloudfoundry.org/cli/resources"
 	"code.cloudfoundry.org/cli/types"
 	goClient "github.com/cloudfoundry/go-cfclient/v3/client"
-	goResource "github.com/cloudfoundry/go-cfclient/v3/resource"
 	"github.com/terraform-providers/terraform-provider-cloudfoundry/cloudfoundry/common"
 	"github.com/terraform-providers/terraform-provider-cloudfoundry/cloudfoundry/managers/noaa"
 )
@@ -44,14 +42,7 @@ func (r RunBinder) MapRoutes(appDeploy AppDeploy) ([]resources.Route, error) {
 			continue
 		}
 
-		insertOrReplaceDestinations := goResource.RouteDestinationInsertOrReplace{
-			App: goResource.RouteDestinationApp{
-				GUID: &appGUID,
-			},
-			Port: &mappingCur.Port,
-		}
-		_, err = r.clientGo.Routes.InsertDestinations(context.Background(), mappingCur.GUID, []*goResource.RouteDestinationInsertOrReplace{&insertOrReplaceDestinations})
-
+		_, err = r.client.MapRoute(mappingCur.GUID, appGUID)
 		if err != nil {
 			return mappings, err
 		}
@@ -60,12 +51,18 @@ func (r RunBinder) MapRoutes(appDeploy AppDeploy) ([]resources.Route, error) {
 		// mostly due to route emitter to perform its action inside diego
 		time.Sleep(1 * time.Second)
 
-		mappingCreated, err = r.mappingExists(appGUID, mappingCur)
-
+		routeMappings, _, err := r.client.GetRouteDestinations(mappingCur.GUID)
 		if err != nil {
 			return mappings, err
 		}
 
+		for _, mapping := range routeMappings {
+			if mapping.App.GUID == appGUID {
+				mappings = append(mappings, mappingCur)
+				mappingCreated = true
+			}
+		}
+
 		if !mappingCreated {
 			return mappings, fmt.Errorf("Failed to map route %s", mappingCur.GUID)
 		}
@@ -75,18 +72,16 @@ func (r RunBinder) MapRoutes(appDeploy AppDeploy) ([]resources.Route, error) {
 }
 
 func (r RunBinder) mappingExists(appGUID string, curMapping resources.Route) (bool, error) {
-	destinations, err := r.clientGo.Routes.GetDestinations(context.Background(), curMapping.GUID)
+	mappings, _, err := r.client.GetRouteDestinations(curMapping.GUID)
 
 	if err != nil {
 		return false, err
 	}
 
-	for _, destination := range destinations.Destinations {
-		if *destination.App.GUID == appGUID &&
-			*destination.Port == curMapping.Port {
+	for _, mapping := range mappings {
+		if mapping.App.GUID == appGUID {
 			return true, nil
 		}
-
 	}
 
 	return false, nil