Update dependencies to v0.19.4 tag

Godeps/Godeps.json

@@ -360,7 +360,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/net",
-			"Rev": "69a78807bb2b"
+			"Rev": "ab3426394381"
 		},
 		{
 			"ImportPath": "golang.org/x/oauth2",
@@ -372,7 +372,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/sys",
-			"Rev": "5cba982894dd"
+			"Rev": "ed371f2e16b4"
 		},
 		{
 			"ImportPath": "golang.org/x/text",
@@ -440,11 +440,11 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "v0.19.7"
+			"Rev": "v0.19.4"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "v0.19.7"
+			"Rev": "v0.19.4"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",

go.mod

@@ -23,17 +23,17 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.4.0
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
+	golang.org/x/net v0.0.0-20200707034311-ab3426394381
 	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
-	k8s.io/api v0.19.7
-	k8s.io/apimachinery v0.19.7
+	k8s.io/api v0.19.4
+	k8s.io/apimachinery v0.19.4
 	k8s.io/klog/v2 v2.2.0
 	k8s.io/utils v0.0.0-20200729134348-d5654de09c73
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.19.7
-	k8s.io/apimachinery => k8s.io/apimachinery v0.19.7
+	k8s.io/api => k8s.io/api v0.19.4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.19.4
 )

go.sum

@@ -214,8 +214,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -240,9 +240,8 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY=
-golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4 h1:5/PjkGUjvEU5Gl6BxmvKRPpqo2uNMv4rcHBMwzk/st8=
+golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
@@ -334,8 +333,8 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-k8s.io/api v0.19.7/go.mod h1:KTryDUT3l6Mtv7K2J2486PNL9DBns3wOYTkGR+iz63Y=
-k8s.io/apimachinery v0.19.7/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q=
+k8s.io/api v0.19.4/go.mod h1:SbtJ2aHCItirzdJ36YslycFNzWADYH3tgOhvBEFtZAk=
+k8s.io/apimachinery v0.19.4/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=

rest/connection_test.go

@@ -1,164 +0,0 @@
-/*
-Copyright 2019 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package rest
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"strconv"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
-	utilnet "k8s.io/apimachinery/pkg/util/net"
-)
-
-type tcpLB struct {
-	t         *testing.T
-	ln        net.Listener
-	serverURL string
-	dials     int32
-}
-
-func (lb *tcpLB) handleConnection(in net.Conn, stopCh chan struct{}) {
-	out, err := net.Dial("tcp", lb.serverURL)
-	if err != nil {
-		lb.t.Log(err)
-		return
-	}
-	go io.Copy(out, in)
-	go io.Copy(in, out)
-	<-stopCh
-	if err := out.Close(); err != nil {
-		lb.t.Fatalf("failed to close connection: %v", err)
-	}
-}
-
-func (lb *tcpLB) serve(stopCh chan struct{}) {
-	conn, err := lb.ln.Accept()
-	if err != nil {
-		lb.t.Fatalf("failed to accept: %v", err)
-	}
-	atomic.AddInt32(&lb.dials, 1)
-	go lb.handleConnection(conn, stopCh)
-}
-
-func newLB(t *testing.T, serverURL string) *tcpLB {
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to bind: %v", err)
-	}
-	lb := tcpLB{
-		serverURL: serverURL,
-		ln:        ln,
-		t:         t,
-	}
-	return &lb
-}
-
-func setEnv(key, value string) func() {
-	originalValue := os.Getenv(key)
-	os.Setenv(key, value)
-	return func() {
-		os.Setenv(key, originalValue)
-	}
-}
-
-const (
-	readIdleTimeout int = 1
-	pingTimeout     int = 1
-)
-
-func TestReconnectBrokenTCP(t *testing.T) {
-	defer setEnv("HTTP2_READ_IDLE_TIMEOUT_SECONDS", strconv.Itoa(readIdleTimeout))()
-	defer setEnv("HTTP2_PING_TIMEOUT_SECONDS", strconv.Itoa(pingTimeout))()
-	defer setEnv("DISABLE_HTTP2", "")()
-	ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, "Hello, %s", r.Proto)
-	}))
-	ts.EnableHTTP2 = true
-	ts.StartTLS()
-	defer ts.Close()
-
-	u, err := url.Parse(ts.URL)
-	if err != nil {
-		t.Fatalf("failed to parse URL from %q: %v", ts.URL, err)
-	}
-	lb := newLB(t, u.Host)
-	defer lb.ln.Close()
-	stopCh := make(chan struct{})
-	go lb.serve(stopCh)
-	transport, ok := ts.Client().Transport.(*http.Transport)
-	if !ok {
-		t.Fatalf("failed to assert *http.Transport")
-	}
-	config := &Config{
-		Host:      "https://" + lb.ln.Addr().String(),
-		Transport: utilnet.SetTransportDefaults(transport),
-		Timeout:   1 * time.Second,
-		// These fields are required to create a REST client.
-		ContentConfig: ContentConfig{
-			GroupVersion:         &schema.GroupVersion{},
-			NegotiatedSerializer: &serializer.CodecFactory{},
-		},
-	}
-	client, err := RESTClientFor(config)
-	if err != nil {
-		t.Fatalf("failed to create REST client: %v", err)
-	}
-	data, err := client.Get().AbsPath("/").DoRaw(context.TODO())
-	if err != nil {
-		t.Fatalf("unexpected err: %s: %v", data, err)
-	}
-	if string(data) != "Hello, HTTP/2.0" {
-		t.Fatalf("unexpected response: %s", data)
-	}
-
-	// Deliberately let the LB stop proxying traffic for the current
-	// connection. This mimics a broken TCP connection that's not properly
-	// closed.
-	close(stopCh)
-
-	stopCh = make(chan struct{})
-	go lb.serve(stopCh)
-	// Sleep enough time for the HTTP/2 health check to detect and close
-	// the broken TCP connection.
-	time.Sleep(time.Duration(1+readIdleTimeout+pingTimeout) * time.Second)
-	// If the HTTP/2 health check were disabled, the broken connection
-	// would still be in the connection pool, the following request would
-	// then reuse the broken connection instead of creating a new one, and
-	// thus would fail.
-	data, err = client.Get().AbsPath("/").DoRaw(context.TODO())
-	if err != nil {
-		t.Fatalf("unexpected err: %v", err)
-	}
-	if string(data) != "Hello, HTTP/2.0" {
-		t.Fatalf("unexpected response: %s", data)
-	}
-	dials := atomic.LoadInt32(&lb.dials)
-	if dials != 2 {
-		t.Fatalf("expected %d dials, got %d", 2, dials)
-	}
-}

transport/round_trippers.go

@@ -340,7 +340,6 @@ 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))
 		}
 	}

util/jsonpath/jsonpath.go

@@ -103,23 +103,13 @@ func (j *JSONPath) FindResults(data interface{}) ([][]reflect.Value, error) {
 		if j.beginRange > 0 {
 			j.beginRange--
 			j.inRange++
-			if len(results) > 0 {
-				for _, value := range results {
-					j.parser.Root.Nodes = nodes[i+1:]
-					nextResults, err := j.FindResults(value.Interface())
-					if err != nil {
-						return nil, err
-					}
-					fullResult = append(fullResult, nextResults...)
-				}
-			} else {
-				// If the range has no results, we still need to process the nodes within the range
-				// so the position will advance to the end node
+			for _, value := range results {
 				j.parser.Root.Nodes = nodes[i+1:]
-				_, err := j.FindResults(nil)
+				nextResults, err := j.FindResults(value.Interface())
 				if err != nil {
 					return nil, err
 				}
+				fullResult = append(fullResult, nextResults...)
 			}
 			j.inRange--
 

util/jsonpath/jsonpath_test.go

@@ -393,21 +393,6 @@ func TestKubernetes(t *testing.T) {
 	testJSONPathSortOutput(randomPrintOrderTests, t)
 }
 
-func TestEmptyRange(t *testing.T) {
-	var input = []byte(`{"items":[]}`)
-	var emptyList interface{}
-	err := json.Unmarshal(input, &emptyList)
-	if err != nil {
-		t.Error(err)
-	}
-
-	tests := []jsonpathTest{
-		{"empty range", `{range .items[*]}{.metadata.name}{end}`, &emptyList, "", false},
-		{"empty nested range", `{range .items[*]}{.metadata.name}{":"}{range @.spec.containers[*]}{.name}{","}{end}{"+"}{end}`, &emptyList, "", false},
-	}
-	testJSONPath(tests, true, t)
-}
-
 func TestNestedRanges(t *testing.T) {
 	var input = []byte(`{
 		"items": [