diff --git a/go.mod b/go.mod index f7dc0a16d2aeb..f9e6fde942316 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/alicebob/miniredis/v2 v2.33.0 github.com/aliyun/aliyun-oss-go-sdk v2.2.10+incompatible github.com/aws/aws-sdk-go v1.55.5 - github.com/baidubce/bce-sdk-go v0.9.197 + github.com/baidubce/bce-sdk-go v0.9.200 github.com/bmatcuk/doublestar v1.3.4 github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 github.com/cespare/xxhash v1.1.0 diff --git a/go.sum b/go.sum index c4168082c3d0b..db005a6b6cc80 100644 --- a/go.sum +++ b/go.sum @@ -1002,8 +1002,8 @@ github.com/aws/smithy-go v1.11.1 h1:IQ+lPZVkSM3FRtyaDox41R8YS6iwPMYIreejOgPW49g= github.com/aws/smithy-go v1.11.1/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM= github.com/axiomhq/hyperloglog v0.2.0 h1:u1XT3yyY1rjzlWuP6NQIrV4bRYHOaqZaovqjcBEvZJo= github.com/axiomhq/hyperloglog v0.2.0/go.mod h1:GcgMjz9gaDKZ3G0UMS6Fq/VkZ4l7uGgcJyxA7M+omIM= -github.com/baidubce/bce-sdk-go v0.9.197 h1:TQqa4J+FTagrywhaTQ707ffE1eG3ix1s06eSZ/K+Wk0= -github.com/baidubce/bce-sdk-go v0.9.197/go.mod h1:zbYJMQwE4IZuyrJiFO8tO8NbtYiKTFTbwh4eIsqjVdg= +github.com/baidubce/bce-sdk-go v0.9.200 h1:zF3yuKp/wkKZhutCZYl5HtIZJPziWsPEu1kxHEyOaWI= +github.com/baidubce/bce-sdk-go v0.9.200/go.mod h1:zbYJMQwE4IZuyrJiFO8tO8NbtYiKTFTbwh4eIsqjVdg= github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 h1:6df1vn4bBlDDo4tARvBm7l6KA9iVMnE3NWizDeWSrps= github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3/go.mod h1:CIWtjkly68+yqLPbvwwR/fjNJA/idrtULjZWh2v1ys0= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= diff --git a/nix/packages/loki.nix b/nix/packages/loki.nix index cbcb68d0a304a..8d3ffa54e4685 100644 --- a/nix/packages/loki.nix +++ b/nix/packages/loki.nix @@ -5,7 +5,7 @@ let pname = "lambda-promtail"; src = ./../../tools/lambda-promtail; - vendorHash = "sha256-fG+AJfniGJy9fpD2Jluh7N2FDYt9LCjXCVoWktuvus0="; + vendorHash = "sha256-nyd70qrG0fCB9gWiNRBMK8v9T3aMQ+30KlvgTR1bJUk="; doCheck = false; diff --git a/vendor/github.com/baidubce/bce-sdk-go/bce/client.go b/vendor/github.com/baidubce/bce-sdk-go/bce/client.go index d223a0987fc66..d8ea23dbe5fe6 100644 --- a/vendor/github.com/baidubce/bce-sdk-go/bce/client.go +++ b/vendor/github.com/baidubce/bce-sdk-go/bce/client.go @@ -16,24 +16,24 @@ // Package bce implements the infrastructure to access BCE services. // -// - BceClient: +// - BceClient: // It is the general client of BCE to access all services. It builds http request to access the // services based on the given client configuration. // -// - BceClientConfiguration: +// - BceClientConfiguration: // The client configuration data structure which contains endpoint, region, credentials, retry // policy, sign options and so on. It supports most of the default value and user can also // access or change the default with its public fields' name. // -// - Error types: +// - Error types: // The error types when making request or receiving response to the BCE services contains two // types: the BceClientError when making request to BCE services and the BceServiceError when // recieving response from them. // -// - BceRequest: +// - BceRequest: // The request instance stands for an request to access the BCE services. // -// - BceResponse: +// - BceResponse: // The response instance stands for an response from the BCE services. package bce @@ -67,7 +67,7 @@ type BceClient struct { // BuildHttpRequest - the helper method for the client to build http request // // PARAMS: -// - request: the input request object to be built +// - request: the input request object to be built func (c *BceClient) buildHttpRequest(request *BceRequest) { // Construct the http request instance for the special fields request.BuildHttpRequest() @@ -104,10 +104,11 @@ func (c *BceClient) buildHttpRequest(request *BceRequest) { // response from the BCE services. // // PARAMS: -// - req: the request object to be sent to the BCE service -// - resp: the response object to receive the content from BCE service +// - req: the request object to be sent to the BCE service +// - resp: the response object to receive the content from BCE service +// // RETURNS: -// - error: nil if ok otherwise the specific error +// - error: nil if ok otherwise the specific error func (c *BceClient) SendRequest(req *BceRequest, resp *BceResponse) error { // Return client error if it is not nil if req.ClientError() != nil { @@ -158,7 +159,7 @@ func (c *BceClient) SendRequest(req *BceRequest, resp *BceResponse) error { if resp.ElapsedTime().Milliseconds() > DEFAULT_WARN_LOG_TIMEOUT_IN_MILLS { log.Warnf("request time more than 5 second, debugId: %s, requestId: %s, elapsed: %v", - resp.DebugId(), resp.RequestId(), resp.ElapsedTime()) + resp.DebugId(), resp.RequestId(), resp.ElapsedTime()) } for k, v := range resp.Headers() { log.Debugf("%s=%s", k, v) @@ -187,11 +188,12 @@ func (c *BceClient) SendRequest(req *BceRequest, resp *BceResponse) error { // response from the BCE services. // // PARAMS: -// - req: the request object to be sent to the BCE service -// - resp: the response object to receive the content from BCE service -// - content: the content of body +// - req: the request object to be sent to the BCE service +// - resp: the response object to receive the content from BCE service +// - content: the content of body +// // RETURNS: -// - error: nil if ok otherwise the specific error +// - error: nil if ok otherwise the specific error func (c *BceClient) SendRequestFromBytes(req *BceRequest, resp *BceResponse, content []byte) error { // Return client error if it is not nil if req.ClientError() != nil { @@ -263,12 +265,12 @@ func NewBceClientWithAkSk(ak, sk, endPoint string) (*BceClient, error) { HeadersToSign: auth.DEFAULT_HEADERS_TO_SIGN, ExpireSeconds: auth.DEFAULT_EXPIRE_SECONDS} defaultConf := &BceClientConfiguration{ - Endpoint: endPoint, - Region: DEFAULT_REGION, - UserAgent: DEFAULT_USER_AGENT, - Credentials: credentials, - SignOption: defaultSignOptions, - Retry: DEFAULT_RETRY_POLICY, + Endpoint: endPoint, + Region: DEFAULT_REGION, + UserAgent: DEFAULT_USER_AGENT, + Credentials: credentials, + SignOption: defaultSignOptions, + Retry: DEFAULT_RETRY_POLICY, ConnectionTimeoutInMillis: DEFAULT_CONNECTION_TIMEOUT_IN_MILLIS, RedirectDisabled: false} v1Signer := &auth.BceV1Signer{} diff --git a/vendor/github.com/baidubce/bce-sdk-go/bce/config.go b/vendor/github.com/baidubce/bce-sdk-go/bce/config.go index b0c7617569cbb..57c2d025eb17f 100644 --- a/vendor/github.com/baidubce/bce-sdk-go/bce/config.go +++ b/vendor/github.com/baidubce/bce-sdk-go/bce/config.go @@ -26,7 +26,7 @@ import ( // Constants and default values for the package bce const ( - SDK_VERSION = "0.9.197" + SDK_VERSION = "0.9.200" URI_PREFIX = "/" // now support uri without prefix "v1" so just set root path DEFAULT_DOMAIN = "baidubce.com" DEFAULT_PROTOCOL = "http" diff --git a/vendor/modules.txt b/vendor/modules.txt index 138d2b05f430d..4ec13cfc55d76 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -490,7 +490,7 @@ github.com/aws/smithy-go/transport/http/internal/io # github.com/axiomhq/hyperloglog v0.2.0 ## explicit; go 1.21 github.com/axiomhq/hyperloglog -# github.com/baidubce/bce-sdk-go v0.9.197 +# github.com/baidubce/bce-sdk-go v0.9.200 ## explicit; go 1.11 github.com/baidubce/bce-sdk-go/auth github.com/baidubce/bce-sdk-go/bce