diff --git a/go.mod b/go.mod index 347d0752bf..2d8223b481 100644 --- a/go.mod +++ b/go.mod @@ -81,7 +81,7 @@ require ( k8s.io/client-go v0.19.3 k8s.io/cluster-bootstrap v0.19.3 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230112102153-f604caf2c2b7 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230114081825-c673c4f83be3 yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd yunion.io/x/log v1.0.0 diff --git a/go.sum b/go.sum index 0838beb9a4..71faca195f 100644 --- a/go.sum +++ b/go.sum @@ -1158,8 +1158,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230112102153-f604caf2c2b7 h1:BTxx46pcb26zuu+qH3dejDn18y9MOGKF6C931iGqLVA= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230112102153-f604caf2c2b7/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230114081825-c673c4f83be3 h1:UfALzdMyOysQkuEVLEjb2Je7sO0XzKWiOFQJtXzhgGA= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230114081825-c673c4f83be3/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/vendor/modules.txt b/vendor/modules.txt index 0f2fcc46bd..2ec1951b75 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1439,7 +1439,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230112102153-f604caf2c2b7 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230114081825-c673c4f83be3 ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/manager.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/manager.go index d174be4c7d..883add9f76 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/manager.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/manager.go @@ -17,13 +17,16 @@ package esxi import ( "bytes" "context" + "crypto/tls" "fmt" + "net" "net/http" "net/http/httputil" "net/url" "reflect" "strings" "sync" + "time" xj "github.com/basgys/goxml2json" "github.com/fatih/color" @@ -42,7 +45,6 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/errors" - "yunion.io/x/pkg/util/httputils" "yunion.io/x/pkg/utils" api "yunion.io/x/cloudmux/pkg/apis/compute" @@ -219,8 +221,20 @@ func (cli *SESXiClient) connect() error { insecure := true soapCli := soap.NewClient(u, insecure) httpClient := &soapCli.Client - transport := httputils.GetAdaptiveTransport(true) - transport.Proxy = cli.cpcfg.ProxyFunc + transport := &http.Transport{ + // 代理设置 + Proxy: cli.cpcfg.ProxyFunc, + + ExpectContinueTimeout: 5 * time.Second, + TLSClientConfig: &tls.Config{InsecureSkipVerify: insecure}, + IdleConnTimeout: time.Minute * 1, + TLSHandshakeTimeout: time.Minute * 1, + ResponseHeaderTimeout: time.Minute * 1, + DialContext: (&net.Dialer{ + Timeout: 10 * time.Second, + KeepAlive: 5 * time.Second, + }).DialContext, + } httpClient.Transport = cloudprovider.GetCheckTransport(transport, func(req *http.Request) (func(resp *http.Response), error) { if cli.debug { dump, _ := httputil.DumpRequestOut(req, false)