From bf3ff0c119a6af523c549b0ac3d94cf740a6af20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 03:56:03 +0000 Subject: [PATCH] build(deps): bump github.com/alibabacloud-go/darabonba-openapi/v2 Bumps [github.com/alibabacloud-go/darabonba-openapi/v2](https://github.com/alibabacloud-go/darabonba-openapi) from 2.0.6 to 2.0.7. - [Release notes](https://github.com/alibabacloud-go/darabonba-openapi/releases) - [Changelog](https://github.com/alibabacloud-go/darabonba-openapi/blob/master/ChangeLog.txt) - [Commits](https://github.com/alibabacloud-go/darabonba-openapi/compare/v2.0.6...v2.0.7) --- updated-dependencies: - dependency-name: github.com/alibabacloud-go/darabonba-openapi/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 +- .../darabonba-openapi/v2/client/client.go | 62 ++++++++++++++++++- vendor/modules.txt | 2 +- 4 files changed, 63 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 7d2a3fff..9b74479c 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/AliyunContainerService/ack-ram-tool/pkg/credentials/provider v0.0.0 github.com/alibabacloud-go/cs-20151215/v3 v3.0.42 github.com/alibabacloud-go/darabonba-openapi v0.2.1 - github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.6 + github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.7 github.com/alibabacloud-go/ram-20150501 v1.0.2 github.com/alibabacloud-go/sts-20150401 v1.1.0 github.com/alibabacloud-go/tea v1.2.2 diff --git a/go.sum b/go.sum index 87427de0..d4f9d4db 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,8 @@ github.com/alibabacloud-go/darabonba-openapi v0.1.18/go.mod h1:PB4HffMhJVmAgNKNq github.com/alibabacloud-go/darabonba-openapi v0.2.1 h1:WyzxxKvhdVDlwpAMOHgAiCJ+NXa6g5ZWPFEzaK/ewwY= github.com/alibabacloud-go/darabonba-openapi v0.2.1/go.mod h1:zXOqLbpIqq543oioL9IuuZYOQgHQ5B8/n5OPrnko8aY= github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.2/go.mod h1:5JHVmnHvGzR2wNdgaW1zDLQG8kOC4Uec8ubkMogW7OQ= -github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.6 h1:y1K+zKhpWcxso8zqI03CcYuwgyZPFwQdwAQOXAeuOVM= -github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.6/go.mod h1:CzQnh+94WDnJOnKZH5YRyouL+OOcdBnXY5VWAf0McgI= +github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.7 h1:20vl9plHhHuy9A72oAZSAB4ooov+yY9xfu+cCNcrLh8= +github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.7/go.mod h1:CzQnh+94WDnJOnKZH5YRyouL+OOcdBnXY5VWAf0McgI= github.com/alibabacloud-go/darabonba-string v1.0.0/go.mod h1:93cTfV3vuPhhEwGGpKKqhVW4jLe7tDpo3LUM0i0g6mA= github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68/go.mod h1:6pb/Qy8c+lqua8cFpEy7g39NRRqOWc3rOwAy8m5Y2BY= github.com/alibabacloud-go/debug v1.0.0 h1:3eIEQWfay1fB24PQIEzXAswlVJtdQok8f3EVN5VrBnA= diff --git a/vendor/github.com/alibabacloud-go/darabonba-openapi/v2/client/client.go b/vendor/github.com/alibabacloud-go/darabonba-openapi/v2/client/client.go index c747919e..bdfdaa5a 100644 --- a/vendor/github.com/alibabacloud-go/darabonba-openapi/v2/client/client.go +++ b/vendor/github.com/alibabacloud-go/darabonba-openapi/v2/client/client.go @@ -5,13 +5,14 @@ package client import ( + "io" + spi "github.com/alibabacloud-go/alibabacloud-gateway-spi/client" openapiutil "github.com/alibabacloud-go/openapi-util/service" util "github.com/alibabacloud-go/tea-utils/v2/service" xml "github.com/alibabacloud-go/tea-xml/service" "github.com/alibabacloud-go/tea/tea" credential "github.com/aliyun/credentials-go/credentials" - "io" ) type GlobalParameters struct { @@ -98,6 +99,12 @@ type Config struct { Cert *string `json:"cert,omitempty" xml:"cert,omitempty"` // server certificate Ca *string `json:"ca,omitempty" xml:"ca,omitempty"` + // disable HTTP/2 + // + // example: + // + // false + DisableHttp2 *bool `json:"disableHttp2,omitempty" xml:"disableHttp2,omitempty"` } func (s Config) String() string { @@ -248,6 +255,11 @@ func (s *Config) SetCa(v string) *Config { return s } +func (s *Config) SetDisableHttp2(v bool) *Config { + s.DisableHttp2 = &v + return s +} + type OpenApiRequest struct { Headers map[string]*string `json:"headers,omitempty" xml:"headers,omitempty"` Query map[string]*string `json:"query,omitempty" xml:"query,omitempty"` @@ -390,6 +402,7 @@ type Client struct { Key *string Cert *string Ca *string + DisableHttp2 *bool } /** @@ -455,6 +468,7 @@ func (client *Client) Init(config *Config) (_err error) { client.Key = config.Key client.Cert = config.Cert client.Ca = config.Ca + client.DisableHttp2 = config.DisableHttp2 return nil } @@ -531,6 +545,15 @@ func (client *Client) DoRPCRequest(action *string, version *string, protocol *st } + extendsHeaders := make(map[string]*string) + if !tea.BoolValue(util.IsUnset(runtime.ExtendsParameters)) { + extendsParameters := runtime.ExtendsParameters + if !tea.BoolValue(util.IsUnset(extendsParameters.Headers)) { + extendsHeaders = extendsParameters.Headers + } + + } + request_.Query = tea.Merge(map[string]*string{ "Action": action, "Format": tea.String("json"), @@ -551,7 +574,8 @@ func (client *Client) DoRPCRequest(action *string, version *string, protocol *st "x-acs-version": version, "x-acs-action": action, "user-agent": client.GetUserAgent(), - }, globalHeaders) + }, globalHeaders, + extendsHeaders) } else { request_.Headers = tea.Merge(map[string]*string{ "host": client.Endpoint, @@ -559,6 +583,7 @@ func (client *Client) DoRPCRequest(action *string, version *string, protocol *st "x-acs-action": action, "user-agent": client.GetUserAgent(), }, globalHeaders, + extendsHeaders, headers) } @@ -794,6 +819,15 @@ func (client *Client) DoROARequest(action *string, version *string, protocol *st } + extendsHeaders := make(map[string]*string) + if !tea.BoolValue(util.IsUnset(runtime.ExtendsParameters)) { + extendsParameters := runtime.ExtendsParameters + if !tea.BoolValue(util.IsUnset(extendsParameters.Headers)) { + extendsHeaders = extendsParameters.Headers + } + + } + request_.Headers = tea.Merge(map[string]*string{ "date": util.GetDateUTCString(), "host": client.Endpoint, @@ -805,6 +839,7 @@ func (client *Client) DoROARequest(action *string, version *string, protocol *st "x-acs-action": action, "user-agent": util.GetUserAgent(client.UserAgent), }, globalHeaders, + extendsHeaders, request.Headers) if !tea.BoolValue(util.IsUnset(request.Body)) { request_.Body = tea.ToReader(util.ToJSONString(request.Body)) @@ -1035,6 +1070,15 @@ func (client *Client) DoROARequestWithForm(action *string, version *string, prot } + extendsHeaders := make(map[string]*string) + if !tea.BoolValue(util.IsUnset(runtime.ExtendsParameters)) { + extendsParameters := runtime.ExtendsParameters + if !tea.BoolValue(util.IsUnset(extendsParameters.Headers)) { + extendsHeaders = extendsParameters.Headers + } + + } + request_.Headers = tea.Merge(map[string]*string{ "date": util.GetDateUTCString(), "host": client.Endpoint, @@ -1046,6 +1090,7 @@ func (client *Client) DoROARequestWithForm(action *string, version *string, prot "x-acs-action": action, "user-agent": util.GetUserAgent(client.UserAgent), }, globalHeaders, + extendsHeaders, request.Headers) if !tea.BoolValue(util.IsUnset(request.Body)) { m, _err := util.AssertAsMap(request.Body) @@ -1562,7 +1607,8 @@ func (client *Client) Execute(params *Params, request *OpenApiRequest, runtime * "policy": tea.StringValue(util.DefaultString(runtime.BackoffPolicy, tea.String("no"))), "period": tea.IntValue(util.DefaultNumber(runtime.BackoffPeriod, tea.Int(1))), }, - "ignoreSSL": tea.BoolValue(runtime.IgnoreSSL), + "ignoreSSL": tea.BoolValue(runtime.IgnoreSSL), + "disableHttp2": DefaultAny(client.DisableHttp2, tea.Bool(false)), } _resp := make(map[string]interface{}) @@ -1596,8 +1642,18 @@ func (client *Client) Execute(params *Params, request *OpenApiRequest, runtime * } + extendsHeaders := make(map[string]*string) + if !tea.BoolValue(util.IsUnset(runtime.ExtendsParameters)) { + extendsParameters := runtime.ExtendsParameters + if !tea.BoolValue(util.IsUnset(extendsParameters.Headers)) { + extendsHeaders = extendsParameters.Headers + } + + } + requestContext := &spi.InterceptorContextRequest{ Headers: tea.Merge(globalHeaders, + extendsHeaders, request.Headers, headers), Query: tea.Merge(globalQueries, diff --git a/vendor/modules.txt b/vendor/modules.txt index 578ddec9..f2b5fe72 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -15,7 +15,7 @@ github.com/alibabacloud-go/cs-20151215/v3/client # github.com/alibabacloud-go/darabonba-openapi v0.2.1 ## explicit; go 1.14 github.com/alibabacloud-go/darabonba-openapi/client -# github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.6 +# github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.7 ## explicit; go 1.14 github.com/alibabacloud-go/darabonba-openapi/v2/client # github.com/alibabacloud-go/debug v1.0.0