Skip to content

Commit 2aa16aa

Browse files
authored
[RCCA-6481] update sdk version and add default transport fields for client (#1237)
* update sdk version and add default transport fields for client * removed blank line * bump sdk
1 parent 182f674 commit 2aa16aa

File tree

7 files changed

+21
-4
lines changed

7 files changed

+21
-4
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/confluentinc/cc-structs/kafka/scheduler v0.1071.0
1616
github.com/confluentinc/cc-structs/kafka/util v0.1071.0
1717
github.com/confluentinc/cc-structs/operator v0.1071.0
18-
github.com/confluentinc/ccloud-sdk-go-v1 v0.0.100
18+
github.com/confluentinc/ccloud-sdk-go-v1 v0.0.104
1919
github.com/confluentinc/ccloud-sdk-go-v2/cmk v0.6.0
2020
github.com/confluentinc/ccloud-sdk-go-v2/iam v0.6.0
2121
github.com/confluentinc/ccloud-sdk-go-v2/org v0.5.0
@@ -73,7 +73,6 @@ require (
7373
gonum.org/v1/netlib v0.0.0-20200317120129-c5a04cffd98a // indirect
7474
gopkg.in/launchdarkly/go-sdk-common.v2 v2.5.0
7575
gopkg.in/square/go-jose.v2 v2.6.0
76-
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 // indirect
7776
)
7877

7978
require (
@@ -401,6 +400,7 @@ require (
401400
k8s.io/api v0.18.0-alpha.2 // indirect
402401
k8s.io/apiextensions-apiserver v0.17.18-rc.0 // indirect
403402
k8s.io/apimachinery v0.21.3 // indirect
403+
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 // indirect
404404
mvdan.cc/gofumpt v0.2.1 // indirect
405405
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
406406
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,8 +624,10 @@ github.com/confluentinc/cc-structs/scheduler_plugins/kafka v0.445.0/go.mod h1:jB
624624
github.com/confluentinc/cc-utils v0.225.0/go.mod h1:uI+SKDqDL/l1j7VIaXpXxGPBrbbYlyG7n/j8ra1MNcc=
625625
github.com/confluentinc/cc-utils v0.240.0/go.mod h1:l5vuobVLiwFY9S+M7aLwHzFBc354HevGtbFQkBtqG4c=
626626
github.com/confluentinc/cc-utils/idgen v0.203.0/go.mod h1:vKsrR9u7tqRE/9MP1sQn0bqNrDQSVbNe0qbqSU/xWYc=
627-
github.com/confluentinc/ccloud-sdk-go-v1 v0.0.100 h1:K3PA/9K3ufk0CttIys6my1Pnkf0edeXR3ecv3H5lMrI=
628-
github.com/confluentinc/ccloud-sdk-go-v1 v0.0.100/go.mod h1:5pA883HWkymMrWwlCvgr2Tn49qN36jdjOWo+QCBhrDE=
627+
github.com/confluentinc/ccloud-sdk-go-v1 v0.0.103 h1:5YCVyordCvIv8HorlSXdfkPt6Gp+oa/IRMRqnpBkYtc=
628+
github.com/confluentinc/ccloud-sdk-go-v1 v0.0.103/go.mod h1:5pA883HWkymMrWwlCvgr2Tn49qN36jdjOWo+QCBhrDE=
629+
github.com/confluentinc/ccloud-sdk-go-v1 v0.0.104 h1:FB06Had1Lb6fXfpwjDL1tuCIxMi0Y1k+nQd91PFpuf4=
630+
github.com/confluentinc/ccloud-sdk-go-v1 v0.0.104/go.mod h1:5pA883HWkymMrWwlCvgr2Tn49qN36jdjOWo+QCBhrDE=
629631
github.com/confluentinc/ccloud-sdk-go-v2-internal/networking v0.0.5/go.mod h1:b0fKj4FlWseVcd8CsjXUdvvDtAGHu8nDUJjPykqWInQ=
630632
github.com/confluentinc/ccloud-sdk-go-v2-internal/networking v0.0.5/go.mod h1:b0fKj4FlWseVcd8CsjXUdvvDtAGHu8nDUJjPykqWInQ=
631633
github.com/confluentinc/ccloud-sdk-go-v2/cmk v0.6.0 h1:qOBunYd2bWo/IikZ60xMDcp/KfZ/ZahCOoeTjxXOoRU=

internal/cmd/iam/command_service_account_create.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"github.com/spf13/cobra"
55

66
iamv2 "github.com/confluentinc/ccloud-sdk-go-v2/iam/v2"
7+
78
pcmd "github.com/confluentinc/cli/internal/pkg/cmd"
89
"github.com/confluentinc/cli/internal/pkg/errors"
910
"github.com/confluentinc/cli/internal/pkg/examples"

internal/cmd/iam/command_service_account_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
iamv2 "github.com/confluentinc/ccloud-sdk-go-v2/iam/v2"
1212
iamMock "github.com/confluentinc/ccloud-sdk-go-v2/iam/v2/mock"
13+
1314
"github.com/confluentinc/cli/internal/pkg/ccloudv2"
1415
v1 "github.com/confluentinc/cli/internal/pkg/config/v1"
1516
cliMock "github.com/confluentinc/cli/mock"

internal/cmd/iam/command_service_account_update.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"github.com/spf13/cobra"
55

66
iamv2 "github.com/confluentinc/ccloud-sdk-go-v2/iam/v2"
7+
78
pcmd "github.com/confluentinc/cli/internal/pkg/cmd"
89
"github.com/confluentinc/cli/internal/pkg/errors"
910
"github.com/confluentinc/cli/internal/pkg/examples"

internal/pkg/ccloudv2/iam.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"net/http"
88

99
iamv2 "github.com/confluentinc/ccloud-sdk-go-v2/iam/v2"
10+
1011
"github.com/confluentinc/cli/internal/pkg/errors"
1112
plog "github.com/confluentinc/cli/internal/pkg/log"
1213
)

internal/pkg/utils/cert_utils.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ import (
55
"crypto/x509"
66
"io"
77
"io/ioutil"
8+
"net"
89
"net/http"
910
"os"
1011
"path/filepath"
12+
"time"
1113

1214
"github.com/confluentinc/cli/internal/pkg/log"
1315

@@ -136,6 +138,15 @@ func isEmptyClientCert(cert tls.Certificate) bool {
136138

137139
func DefaultTransport() *http.Transport {
138140
return &http.Transport{
141+
Proxy: http.ProxyFromEnvironment,
142+
DialContext: (&net.Dialer{
143+
Timeout: 30 * time.Second,
144+
KeepAlive: 30 * time.Second,
145+
}).DialContext,
146+
MaxIdleConns: 100,
147+
IdleConnTimeout: 90 * time.Second,
148+
TLSHandshakeTimeout: 10 * time.Second,
149+
ExpectContinueTimeout: 1 * time.Second,
139150
TLSClientConfig: &tls.Config{
140151
MinVersion: tls.VersionTLS12,
141152
},

0 commit comments

Comments
 (0)