diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index d9c02b89..08643fc8 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -348,7 +348,7 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "9768e51d191a" + "Rev": "c322e7106b58" }, { "ImportPath": "k8s.io/apimachinery", diff --git a/go.mod b/go.mod index e376bdba..9072606f 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 google.golang.org/appengine v1.5.0 // indirect - k8s.io/api v0.0.0-20200313112439-9768e51d191a + k8s.io/api v0.0.0-20200318082330-c322e7106b58 k8s.io/apimachinery v0.0.0-20200318002310-1a505bc60c6d k8s.io/klog v1.0.0 k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab @@ -38,6 +38,6 @@ require ( 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-20200313112439-9768e51d191a + k8s.io/api => k8s.io/api v0.0.0-20200318082330-c322e7106b58 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200318002310-1a505bc60c6d ) diff --git a/go.sum b/go.sum index 467a6ff9..5f74ef40 100644 --- a/go.sum +++ b/go.sum @@ -182,7 +182,7 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= 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-20200313112439-9768e51d191a/go.mod h1:4LcBtPb1OoMEmTvQLypv2jGrtMEK8ZRCPQyc+uOSi4o= +k8s.io/api v0.0.0-20200318082330-c322e7106b58/go.mod h1:fgdqjKzHnQk8FgQap4oF+mCZZ5mDwocerdaTl5NaXLQ= k8s.io/apimachinery v0.0.0-20200318002310-1a505bc60c6d/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= 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= diff --git a/tools/clientcmd/api/helpers.go b/tools/clientcmd/api/helpers.go index 65a36936..d677d651 100644 --- a/tools/clientcmd/api/helpers.go +++ b/tools/clientcmd/api/helpers.go @@ -98,6 +98,9 @@ func ShortenConfig(config *Config) { if len(authInfo.ClientCertificateData) > 0 { authInfo.ClientCertificateData = redactedBytes } + if len(authInfo.Token) > 0 { + authInfo.Token = "REDACTED" + } config.AuthInfos[key] = authInfo } for key, cluster := range config.Clusters { diff --git a/tools/clientcmd/api/helpers_test.go b/tools/clientcmd/api/helpers_test.go index 48b3cec2..67231710 100644 --- a/tools/clientcmd/api/helpers_test.go +++ b/tools/clientcmd/api/helpers_test.go @@ -243,7 +243,7 @@ func Example_minifyAndShorten() { // LocationOfOrigin: "" // client-certificate-data: REDACTED // client-key-data: REDACTED - // token: red-token + // token: REDACTED } func TestShortenSuccess(t *testing.T) { @@ -299,4 +299,7 @@ func TestShortenSuccess(t *testing.T) { if string(mutatingConfig.AuthInfos[changingAuthInfo].ClientKeyData) != redacted { t.Errorf("expected %v, got %v", redacted, string(mutatingConfig.AuthInfos[changingAuthInfo].ClientKeyData)) } + if mutatingConfig.AuthInfos[changingAuthInfo].Token != "REDACTED" { + t.Errorf("expected REDACTED, got %v", mutatingConfig.AuthInfos[changingAuthInfo].Token) + } }