Skip to content

Commit 3aa7a5d

Browse files
authored
Merge pull request #192 from jarrpa/scrub-secrets-0.4
Scrub secrets 0.4
2 parents 3c4acd8 + de79c92 commit 3aa7a5d

File tree

22 files changed

+19038
-2
lines changed

22 files changed

+19038
-2
lines changed

Gopkg.lock

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

Gopkg.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,7 @@
6363
[[constraint]]
6464
name = "k8s.io/apiserver"
6565
version = "kubernetes-1.12.0"
66+
67+
[[constraint]]
68+
name = "github.com/kubernetes-csi/csi-lib-utils"
69+
version = "0.2.0"

pkg/controller/controller.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
_ "k8s.io/apimachinery/pkg/util/json"
3030

3131
"github.com/golang/glog"
32+
"github.com/kubernetes-csi/csi-lib-utils/protosanitizer"
3233

3334
"github.com/kubernetes-incubator/external-storage/lib/controller"
3435

@@ -122,9 +123,9 @@ var (
122123
//TODO consolidate ane librarize
123124
func logGRPC(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
124125
glog.V(5).Infof("GRPC call: %s", method)
125-
glog.V(5).Infof("GRPC request: %+v", req)
126+
glog.V(5).Infof("GRPC request: %s", protosanitizer.StripSecretsCSI03(req))
126127
err := invoker(ctx, method, req, reply, cc, opts...)
127-
glog.V(5).Infof("GRPC response: %+v", reply)
128+
glog.V(5).Infof("GRPC response: %s", protosanitizer.StripSecretsCSI03(reply))
128129
glog.V(5).Infof("GRPC error: %v", err)
129130
return err
130131
}

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: 149 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)