adding go-cfclient

Author: sleungcy-sap

cloudfoundry/managers/session.go

@@ -27,12 +27,16 @@ import (
 	"github.com/terraform-providers/terraform-provider-cloudfoundry/cloudfoundry/managers/noaa"
 	"github.com/terraform-providers/terraform-provider-cloudfoundry/cloudfoundry/managers/raw"
 	"github.com/terraform-providers/terraform-provider-cloudfoundry/cloudfoundry/managers/v3appdeployers"
+
+	goClient "github.com/cloudfoundry/go-cfclient/v3/client"
+	goConfig "github.com/cloudfoundry/go-cfclient/v3/config"
 )
 
 // Session - wraps the available clients from CF cli
 type Session struct {
 	ClientV2  *ccv2.Client
 	ClientV3  *ccv3.Client
+	ClientGo  *goClient.Client
 	ClientUAA *uaa.Client
 
 	// Used for direct endpoint calls
@@ -221,30 +225,35 @@ func (s *Session) init(config *configv3.Config, configUaa *configv3.Config, conf
 	var accessToken string
 	var refreshToken string
 	var errType string
+	var goClientConfigOptions goConfig.Option
 
 	tokFromStore := s.loadTokFromStoreIfNeed(configSess.StoreTokensPath, uaaClient.RefreshAccessToken)
 	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)
@@ -256,6 +265,18 @@ func (s *Session) init(config *configv3.Config, configUaa *configv3.Config, conf
 	config.SetAccessToken(fmt.Sprintf("bearer %s", accessToken))
 	config.SetRefreshToken(refreshToken)
 
+	goconfig, err := goConfig.New(config.ConfigFile.Target, goClientConfigOptions)
+
+	if err != nil {
+		return fmt.Errorf("Error when creating go-cfconfig: %s", err)
+	}
+
+	goclient, err := goClient.New(goconfig)
+	if err != nil {
+		return fmt.Errorf("Error when creating go-cfclient: %s", err)
+	}
+	s.ClientGo = goclient
+
 	// Write access and refresh tokens to file if needed
 	err = s.saveTokToStoreIfNeed(configSess.StoreTokensPath, accessToken, refreshToken)
 	if err != nil {
@@ -402,7 +423,7 @@ func (s *Session) loadDeployer() {
 	s.Deployer = appdeployers.NewDeployer(stdStrategy, bgStrategy)
 
 	// Initialize deployment strategies in v3
-	s.V3RunBinder = v3appdeployers.NewRunBinder(s.ClientV3, s.NOAAClient)
+	s.V3RunBinder = v3appdeployers.NewRunBinder(s.ClientV3, s.ClientGo, s.NOAAClient)
 	v3std := v3appdeployers.NewStandard(s.BitsManager, s.ClientV3, s.V3RunBinder)
 	v3bg := v3appdeployers.NewBlueGreen(s.BitsManager, s.ClientV3, s.RawClient, s.V3RunBinder, v3std)
 

cloudfoundry/managers/v3appdeployers/runbinder.go

@@ -1,26 +1,31 @@
 package v3appdeployers
 
 import (
+	"context"
 	"fmt"
 	"time"
 
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant"
 	"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"
 )
 
 type RunBinder struct {
 	client     *ccv3.Client
 	noaaClient *noaa.NOAAClient
+	clientGo   *goClient.Client
 }
 
-func NewRunBinder(client *ccv3.Client, noaaClient *noaa.NOAAClient) *RunBinder {
+func NewRunBinder(client *ccv3.Client, clientGo *goClient.Client, noaaClient *noaa.NOAAClient) *RunBinder {
 	return &RunBinder{
 		client:     client,
 		noaaClient: noaaClient,
+		clientGo:   clientGo,
 	}
 }
 
@@ -39,7 +44,14 @@ func (r RunBinder) MapRoutes(appDeploy AppDeploy) ([]resources.Route, error) {
 			continue
 		}
 
-		_, err = r.client.MapRoute(mappingCur.GUID, appGUID)
+		insertOrReplaceDestinations := goResource.RouteDestinationInsertOrReplace{
+			App: goResource.RouteDestinationApp{
+				GUID: &appGUID,
+			},
+			Port: &mappingCur.Port,
+		}
+		_, err = r.clientGo.Routes.InsertDestinations(context.Background(), mappingCur.GUID, []*goResource.RouteDestinationInsertOrReplace{&insertOrReplaceDestinations})
+
 		if err != nil {
 			return mappings, err
 		}
@@ -48,18 +60,12 @@ 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)
 
-		routeMappings, _, err := r.client.GetRouteDestinations(mappingCur.GUID)
+		mappingCreated, err = r.mappingExists(appGUID, mappingCur)
+
 		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)
 		}
@@ -69,16 +75,18 @@ func (r RunBinder) MapRoutes(appDeploy AppDeploy) ([]resources.Route, error) {
 }
 
 func (r RunBinder) mappingExists(appGUID string, curMapping resources.Route) (bool, error) {
-	mappings, _, err := r.client.GetRouteDestinations(curMapping.GUID)
+	destinations, err := r.clientGo.Routes.GetDestinations(context.Background(), curMapping.GUID)
 
 	if err != nil {
 		return false, err
 	}
 
-	for _, mapping := range mappings {
-		if mapping.App.GUID == appGUID {
+	for _, destination := range destinations.Destinations {
+		if *destination.App.GUID == appGUID &&
+			*destination.Port == curMapping.Port {
 			return true, nil
 		}
+
 	}
 
 	return false, nil