diff --git a/go.mod b/go.mod index ea0cd654..8d217040 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/fsnotify/fsnotify v1.6.0 github.com/golang/mock v1.6.0 github.com/google/gofuzz v1.2.0 - github.com/kubernetes-csi/csi-lib-utils v0.12.0 + github.com/kubernetes-csi/csi-lib-utils v0.13.0 github.com/kubernetes-csi/csi-test/v4 v4.4.0 github.com/kubernetes-csi/external-snapshotter/client/v6 v6.1.0 github.com/prometheus/client_golang v1.15.1 diff --git a/go.sum b/go.sum index 4c4b1c5e..9acedd13 100644 --- a/go.sum +++ b/go.sum @@ -124,8 +124,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubernetes-csi/csi-lib-utils v0.12.0 h1:pqVHD9XvcXHFT/K3tN+HSine4AFjCYO9UkdYgHjkL1E= -github.com/kubernetes-csi/csi-lib-utils v0.12.0/go.mod h1:JS9eDIZmSjx4F9o0bLTVK/qfhIIOifdjEfVXzxWapfE= +github.com/kubernetes-csi/csi-lib-utils v0.13.0 h1:QrTdZVZbHlaSUBN9ReayBPnnF1N0edFIpUKBwVIBW3w= +github.com/kubernetes-csi/csi-lib-utils v0.13.0/go.mod h1:JS9eDIZmSjx4F9o0bLTVK/qfhIIOifdjEfVXzxWapfE= github.com/kubernetes-csi/csi-test/v4 v4.4.0 h1:r0mnAwDURI24Vw3a/LyA/ga11yD5ZGuU7+REO35Na9s= github.com/kubernetes-csi/csi-test/v4 v4.4.0/go.mod h1:t1RzseMZJKy313nezI/d7TolbbiKpUZM3SXQvXxOX0w= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= diff --git a/vendor/github.com/kubernetes-csi/csi-lib-utils/connection/connection.go b/vendor/github.com/kubernetes-csi/csi-lib-utils/connection/connection.go index ad37321e..9f8a48f9 100644 --- a/vendor/github.com/kubernetes-csi/csi-lib-utils/connection/connection.go +++ b/vendor/github.com/kubernetes-csi/csi-lib-utils/connection/connection.go @@ -19,6 +19,7 @@ package connection import ( "context" "errors" + "fmt" "io/ioutil" "net" "strings" @@ -40,6 +41,15 @@ const ( const terminationLogPath = "/dev/termination-log" +var maxLogChar int = -1 + +// SetMaxGRPCLogLength set the maximum character count for GRPC logging. +// If characterCount is set to anything smaller than or equal to 0 then there's no limit on log length. +// The default log length limit is unlimited. +func SetMaxGRPCLogLength(characterCount int) { + maxLogChar = characterCount +} + // Connect opens insecure gRPC connection to a CSI driver. Address must be either absolute path to UNIX domain socket // file or have format '://', following gRPC name resolution mechanism at // https://github.com/grpc/grpc/blob/master/doc/naming.md. @@ -183,7 +193,11 @@ func LogGRPC(ctx context.Context, method string, req, reply interface{}, cc *grp klog.V(5).Infof("GRPC call: %s", method) klog.V(5).Infof("GRPC request: %s", protosanitizer.StripSecrets(req)) err := invoker(ctx, method, req, reply, cc, opts...) - klog.V(5).Infof("GRPC response: %s", protosanitizer.StripSecrets(reply)) + cappedStr := fmt.Sprintf("%s", protosanitizer.StripSecrets(reply)) + if maxLogChar > 0 && len(cappedStr) > maxLogChar { + cappedStr = cappedStr[:maxLogChar] + fmt.Sprintf(" [response body too large, log capped to %d chars]", maxLogChar) + } + klog.V(5).Infof("GRPC response: %s", cappedStr) klog.V(5).Infof("GRPC error: %v", err) return err } diff --git a/vendor/modules.txt b/vendor/modules.txt index ae98873d..0ca1f1bb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -90,7 +90,7 @@ github.com/josharian/intern # github.com/json-iterator/go v1.1.12 ## explicit; go 1.12 github.com/json-iterator/go -# github.com/kubernetes-csi/csi-lib-utils v0.12.0 +# github.com/kubernetes-csi/csi-lib-utils v0.13.0 ## explicit; go 1.18 github.com/kubernetes-csi/csi-lib-utils/connection github.com/kubernetes-csi/csi-lib-utils/leaderelection