Skip to content

Commit 7ef8f99

Browse files
sleungcysleungcy
authored
Merge pull request #578 from sleungcy/goclient-new
adding goclient
2 parents ea11e63 + a0e1c43 commit 7ef8f99

File tree

4 files changed

+48
-9
lines changed

4 files changed

+48
-9
lines changed

‎cloudfoundry/managers/session.go‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@ import (
2727
"github.com/terraform-providers/terraform-provider-cloudfoundry/cloudfoundry/managers/noaa"
2828
"github.com/terraform-providers/terraform-provider-cloudfoundry/cloudfoundry/managers/raw"
2929
"github.com/terraform-providers/terraform-provider-cloudfoundry/cloudfoundry/managers/v3appdeployers"
30+
31+
goClient "github.com/cloudfoundry/go-cfclient/v3/client"
32+
goConfig "github.com/cloudfoundry/go-cfclient/v3/config"
3033
)
3134

3235
// Session - wraps the available clients from CF cli
3336
type Session struct {
3437
ClientV2 *ccv2.Client
3538
ClientV3 *ccv3.Client
39+
ClientGo *goClient.Client
3640
ClientUAA *uaa.Client
3741

3842
// Used for direct endpoint calls
@@ -221,6 +225,7 @@ func (s *Session) init(config *configv3.Config, configUaa *configv3.Config, conf
221225
var accessToken string
222226
var refreshToken string
223227
var errType string
228+
var goClientConfigOptions goConfig.Option
224229

225230
tokFromStore := s.loadTokFromStoreIfNeed(configSess.StoreTokensPath, uaaClient.RefreshAccessToken)
226231
if tokFromStore.IsSet() {
@@ -256,6 +261,19 @@ func (s *Session) init(config *configv3.Config, configUaa *configv3.Config, conf
256261
config.SetAccessToken(fmt.Sprintf("bearer %s", accessToken))
257262
config.SetRefreshToken(refreshToken)
258263

264+
goClientConfigOptions = goConfig.Token(accessToken, refreshToken)
265+
goconfig, err := goConfig.New(config.ConfigFile.Target, goClientConfigOptions)
266+
267+
if err != nil {
268+
return fmt.Errorf("Error when creating go-cfconfig: %s", err)
269+
}
270+
271+
goclient, err := goClient.New(goconfig)
272+
if err != nil {
273+
return fmt.Errorf("Error when creating go-cfclient: %s", err)
274+
}
275+
s.ClientGo = goclient
276+
259277
// Write access and refresh tokens to file if needed
260278
err = s.saveTokToStoreIfNeed(configSess.StoreTokensPath, accessToken, refreshToken)
261279
if err != nil {
@@ -402,7 +420,7 @@ func (s *Session) loadDeployer() {
402420
s.Deployer = appdeployers.NewDeployer(stdStrategy, bgStrategy)
403421

404422
// Initialize deployment strategies in v3
405-
s.V3RunBinder = v3appdeployers.NewRunBinder(s.ClientV3, s.NOAAClient)
423+
s.V3RunBinder = v3appdeployers.NewRunBinder(s.ClientV3, s.ClientGo, s.NOAAClient)
406424
v3std := v3appdeployers.NewStandard(s.BitsManager, s.ClientV3, s.V3RunBinder)
407425
v3bg := v3appdeployers.NewBlueGreen(s.BitsManager, s.ClientV3, s.RawClient, s.V3RunBinder, v3std)
408426

‎cloudfoundry/managers/v3appdeployers/runbinder.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,22 @@ import (
88
"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant"
99
"code.cloudfoundry.org/cli/resources"
1010
"code.cloudfoundry.org/cli/types"
11+
goClient "github.com/cloudfoundry/go-cfclient/v3/client"
1112
"github.com/terraform-providers/terraform-provider-cloudfoundry/cloudfoundry/common"
1213
"github.com/terraform-providers/terraform-provider-cloudfoundry/cloudfoundry/managers/noaa"
1314
)
1415

1516
type RunBinder struct {
1617
client *ccv3.Client
1718
noaaClient *noaa.NOAAClient
19+
clientGo *goClient.Client
1820
}
1921

20-
func NewRunBinder(client *ccv3.Client, noaaClient *noaa.NOAAClient) *RunBinder {
22+
func NewRunBinder(client *ccv3.Client, clientGo *goClient.Client, noaaClient *noaa.NOAAClient) *RunBinder {
2123
return &RunBinder{
2224
client: client,
2325
noaaClient: noaaClient,
26+
clientGo: clientGo,
2427
}
2528
}
2629

‎go.mod‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ require (
4343
)
4444

4545
require (
46+
github.com/cloudfoundry/go-cfclient/v3 v3.0.0-alpha.9
4647
github.com/google/uuid v1.3.1
4748
github.com/hashicorp/terraform-plugin-log v0.9.0
4849
)
@@ -55,8 +56,11 @@ require (
5556
github.com/agext/levenshtein v1.2.2 // indirect
5657
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
5758
github.com/cloudflare/circl v1.3.7 // indirect
59+
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
60+
github.com/davecgh/go-spew v1.1.1 // indirect
5861
github.com/emirpasic/gods v1.18.1 // indirect
5962
github.com/fatih/color v1.13.0 // indirect
63+
github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab // indirect
6064
github.com/gobwas/glob v0.2.3 // indirect
6165
github.com/golang/protobuf v1.5.3 // indirect
6266
github.com/google/go-cmp v0.6.0 // indirect
@@ -77,6 +81,7 @@ require (
7781
github.com/hashicorp/yamux v0.1.1 // indirect
7882
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
7983
github.com/kevinburke/ssh_config v1.2.0 // indirect
84+
github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11 // indirect
8085
github.com/mattn/go-colorable v0.1.12 // indirect
8186
github.com/mattn/go-isatty v0.0.14 // indirect
8287
github.com/mattn/go-runewidth v0.0.4 // indirect
@@ -87,9 +92,11 @@ require (
8792
github.com/mitchellh/mapstructure v1.5.0 // indirect
8893
github.com/mitchellh/reflectwalk v1.0.2 // indirect
8994
github.com/oklog/run v1.0.0 // indirect
95+
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
96+
github.com/pmezard/go-difflib v1.0.0 // indirect
9097
github.com/sergi/go-diff v1.2.0 // indirect
9198
github.com/src-d/gcfg v1.4.0 // indirect
92-
github.com/stretchr/testify v1.8.1 // indirect
99+
github.com/stretchr/testify v1.9.0 // indirect
93100
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
94101
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
95102
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
@@ -98,6 +105,7 @@ require (
98105
golang.org/x/crypto v0.21.0 // indirect
99106
golang.org/x/mod v0.14.0 // indirect
100107
golang.org/x/net v0.23.0 // indirect
108+
golang.org/x/oauth2 v0.21.0 // indirect
101109
golang.org/x/sys v0.18.0 // indirect
102110
golang.org/x/term v0.18.0 // indirect
103111
golang.org/x/tools v0.13.0 // indirect
@@ -110,4 +118,5 @@ require (
110118
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
111119
gopkg.in/warnings.v0 v0.1.2 // indirect
112120
gopkg.in/yaml.v2 v2.4.0 // indirect
121+
gopkg.in/yaml.v3 v3.0.1 // indirect
113122
)

‎go.sum‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ github.com/cloudfoundry/bosh-cli v5.5.0+incompatible h1:P+hlG8D9xXIi75yqTpFrNBHR
244244
github.com/cloudfoundry/bosh-cli v5.5.0+incompatible/go.mod h1:rzIB+e1sn7wQL/TJ54bl/FemPKRhXby5BIMS3tLuWFM=
245245
github.com/cloudfoundry/bosh-utils v0.0.0-20190518100210-9f9df32d41c3 h1:SbXvMoOwvn5r/uOx3ylQ5pDQxWPaV9dPW5kQ5VpfmUQ=
246246
github.com/cloudfoundry/bosh-utils v0.0.0-20190518100210-9f9df32d41c3/go.mod h1:JCrKwetZGjxbfq1U139TZuXDBfdGLtjOEAfxMWKV/QM=
247+
github.com/cloudfoundry/go-cfclient/v3 v3.0.0-alpha.9 h1:HK3+nJEPgwlhc5H74aw/V4mVowqWaTKGjHONdVQQ2Vw=
248+
github.com/cloudfoundry/go-cfclient/v3 v3.0.0-alpha.9/go.mod h1:eUjFfpsU3lRv388wKlXMmkQfsJ9pveUHZEia7AoBCPY=
247249
github.com/cloudfoundry/noaa v2.1.0+incompatible h1:hr6VnM5VlYRN3YD+NmAedQLW8686sUMknOSe0mFS2vo=
248250
github.com/cloudfoundry/noaa v2.1.0+incompatible/go.mod h1:5LmacnptvxzrTvMfL9+EJhgkUfIgcwI61BVSTh47ECo=
249251
github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 h1:cWfya7mo/zbnwYVio6eWGsFJHqYw4/k/uhwIJ1eqRPI=
@@ -257,6 +259,8 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH
257259
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
258260
github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
259261
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
262+
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 h1:sDMmm+q/3+BukdIpxwO365v/Rbspp2Nt5XntgQRXq8Q=
263+
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
260264
github.com/cppforlife/go-patch v0.2.0 h1:Y14MnCQjDlbw7WXT4k+u6DPAA9XnygN4BfrSpI/19RU=
261265
github.com/cppforlife/go-patch v0.2.0/go.mod h1:67a7aIi94FHDZdoeGSJRRFDp66l9MhaAG1yGxpUoFD8=
262266
github.com/creack/pty v1.1.7 h1:6pwm8kMQKCmgUg0ZHTm5+/YvRK0s3THD/28+T6/kk4A=
@@ -298,6 +302,8 @@ github.com/go-git/go-git/v5 v5.10.1 h1:tu8/D8i+TWxgKpzQ3Vc43e+kkhXqtsZCKI/egajKn
298302
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
299303
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
300304
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
305+
github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab h1:xveKWz2iaueeTaUgdetzel+U7exyigDYBryyVfV/rZk=
306+
github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
301307
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
302308
github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
303309
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
@@ -477,6 +483,8 @@ github.com/lunixbochs/vtclean v1.0.0 h1:xu2sLAri4lGiovBDQKxl5mrXyESr3gUr5m5SM5+L
477483
github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
478484
github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983 h1:wL11wNW7dhKIcRCHSm4sHKPWz0tt4mwBsVodG7+Xyqg=
479485
github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
486+
github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11 h1:YFh+sjyJTMQSYjKwM4dFKhJPJC/wfo98tPUc17HdoYw=
487+
github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod h1:Ah2dBMoxZEqk118as2T4u4fjfXarE0pPnMJaArZQZsI=
480488
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
481489
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
482490
github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -523,6 +531,8 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl
523531
github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
524532
github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q=
525533
github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
534+
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
535+
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
526536
github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
527537
github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
528538
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -548,19 +558,16 @@ github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
548558
github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
549559
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
550560
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
551-
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
552-
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
561+
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
553562
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
554563
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
555564
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
556565
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
557566
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
558567
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
559-
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
560568
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
561-
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
562-
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
563-
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
569+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
570+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
564571
github.com/tedsuo/rata v1.0.0 h1:Sf9aZrYy6ElSTncjnGkyC2yuVvz5YJetBIUKJ4CmeKE=
565572
github.com/tedsuo/rata v1.0.0/go.mod h1:X47ELzhOoLbfFIY0Cql9P6yo3Cdwf2CMX3FVZxRzJPc=
566573
github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
@@ -732,6 +739,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri
732739
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
733740
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
734741
golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A=
742+
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
743+
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
735744
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
736745
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
737746
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

0 commit comments

Comments
 (0)