Skip to content

Commit b7dadac

Browse files
authored
Merge pull request #107 from msau42/release-1.0
Cherry pick #106 to release-1.0: Use logging util
2 parents 62a1270 + bf3bd90 commit b7dadac

20 files changed

+8670
-4
lines changed

Gopkg.lock

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
name = "github.com/json-iterator/go"
2525
version = "1.1.4"
2626

27-
// TODO: use [[constraint]] when kubernetes-csi/kubernetes-csi-migration-library uses 1.13 code
27+
# TODO: use [[constraint]] when kubernetes-csi/kubernetes-csi-migration-library uses 1.13 code
2828
[[override]]
2929
name = "k8s.io/api"
3030
version = "kubernetes-1.13.0-beta.2"
@@ -41,3 +41,7 @@
4141
[[override]]
4242
name = "k8s.io/csi-api"
4343
version = "kubernetes-1.13.0-beta.2"
44+
45+
[[constraint]]
46+
name = "github.com/kubernetes-csi/csi-lib-utils"
47+
version = "0.1.0"

pkg/connection/connection.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
"github.com/container-storage-interface/spec/lib/go/csi"
2727
"github.com/golang/glog"
28+
"github.com/kubernetes-csi/csi-lib-utils/protosanitizer"
2829
"google.golang.org/grpc"
2930
"google.golang.org/grpc/codes"
3031
"google.golang.org/grpc/connectivity"
@@ -239,9 +240,9 @@ func (c *csiConnection) Close() error {
239240

240241
func logGRPC(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
241242
glog.V(5).Infof("GRPC call: %s", method)
242-
glog.V(5).Infof("GRPC request: %+v", req)
243+
glog.V(5).Infof("GRPC request: %s", protosanitizer.StripSecrets(req))
243244
err := invoker(ctx, method, req, reply, cc, opts...)
244-
glog.V(5).Infof("GRPC response: %+v", reply)
245+
glog.V(5).Infof("GRPC response: %s", protosanitizer.StripSecrets(reply))
245246
glog.V(5).Infof("GRPC error: %v", err)
246247
return err
247248
}

vendor/github.com/kubernetes-csi/csi-lib-utils/CONTRIBUTING.md

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/kubernetes-csi/csi-lib-utils/Gopkg.lock

Lines changed: 154 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/kubernetes-csi/csi-lib-utils/Gopkg.toml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)