Merge pull request #95355 from sfowl/automated-cherry-pick-of-#95316-upstream-release-1.17

k8s-publishing-bot · k8s-publishing-bot · commit fac82db87be6 · 2020-12-14T17:08:38.000Z
Automated cherry pick of #95316: Mask bearer token in logs when logLevel &gt;= 9

Kubernetes-commit: 86c41868d8636cb8bba1a7c90037c12edf9e324a
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/go.mod b/go.mod
@@ -29,7 +29,7 @@ require (
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
 	google.golang.org/appengine v1.5.0 // indirect
 	k8s.io/api v0.0.0-20200903132056-f4b723619c71
-	k8s.io/apimachinery v0.0.0-20200909211649-657cd094317c
+	k8s.io/apimachinery v0.0.0-20201105142055-bd630fd6fb01
 	k8s.io/klog v1.0.0
 	k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
 	sigs.k8s.io/yaml v1.1.0
@@ -39,5 +39,5 @@ replace (
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
 	k8s.io/api => k8s.io/api v0.0.0-20200903132056-f4b723619c71
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200909211649-657cd094317c
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201105142055-bd630fd6fb01
 )
diff --git a/go.sum b/go.sum
@@ -191,7 +191,7 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8s.io/api v0.0.0-20200903132056-f4b723619c71/go.mod h1:6jldM/f+1srnQ6exBO4L0duPFhjZA0QXAuxBg1nxJd0=
-k8s.io/apimachinery v0.0.0-20200909211649-657cd094317c/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk=
+k8s.io/apimachinery v0.0.0-20201105142055-bd630fd6fb01/go.mod h1:T54ZSpncArE25c5r2PbUPsLeTpkPWY/ivafigSX6+xk=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
diff --git a/transport/round_trippers.go b/transport/round_trippers.go
@@ -340,6 +340,7 @@ func (r *requestInfo) toCurl() string {
 	headers := ""
 	for key, values := range r.RequestHeaders {
 		for _, value := range values {
+			value = maskValue(key, value)
 			headers += fmt.Sprintf(` -H %q`, fmt.Sprintf("%s: %s", key, value))
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -340,6 +340,7 @@ func (r *requestInfo) toCurl() string {`
`340`	`340`	`headers := ""`
`341`	`341`	`for key, values := range r.RequestHeaders {`
`342`	`342`	`for _, value := range values {`
	`343`	`+ value = maskValue(key, value)`
`343`	`344`	headers += fmt.Sprintf(` -H %q`, fmt.Sprintf("%s: %s", key, value))
`344`	`345`	`}`
`345`	`346`	`}`