Merge pull request #48104 from liggitt/tls-copy-bug

Automatic merge from submit-queue Fix tls config copy in dial test Fixes a bug introduced in https://github.com/kubernetes/kubernetes/commit/0d42da1b9345e2a649f298ac4f77807143e7befa#diff-1748ffb7995a87b1f6bfd534dc5a51abL99 that broke the mutation test check (it was checking an object against itself)

Merge pull request #48104 from liggitt/tls-copy-bug
d368afd8 · Kubernetes Submit Queue · GitHub · 93b144c4 · def7f340 · d368afd8
Commit d368afd8 authored Jul 24, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

BUILD staging/src/k8s.io/apimachinery/pkg/util/proxy/BUILD +1 -0

dial_test.go staging/src/k8s.io/apimachinery/pkg/util/proxy/dial_test.go +6 -2

No files found.
--- a/staging/src/k8s.io/apimachinery/pkg/util/proxy/BUILD
+++ b/staging/src/k8s.io/apimachinery/pkg/util/proxy/BUILD
@@ -21,6 +21,7 @@ go_test(
        "//vendor/github.com/stretchr/testify/assert:go_default_library",
        "//vendor/github.com/stretchr/testify/require:go_default_library",
        "//vendor/golang.org/x/net/websocket:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/util/httpstream:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
    ],

--- a/staging/src/k8s.io/apimachinery/pkg/util/proxy/dial_test.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/proxy/dial_test.go
@@ -28,6 +28,7 @@ import (
 	"strings"
 	"testing"

+	"k8s.io/apimachinery/pkg/util/diff"
 	utilnet "k8s.io/apimachinery/pkg/util/net"
 )

@@ -96,7 +97,10 @@ func TestDialURL(t *testing.T) {
 			ts.TLS = &tls.Config{Certificates: []tls.Certificate{cert}}
 			ts.StartTLS()

-			tlsConfigCopy := tc.TLSConfig
+			// Make a copy of the config
+			tlsConfigCopy := tc.TLSConfig.Clone()
+			// Clone() mutates the receiver (!), so also call it on the copy
+			tlsConfigCopy.Clone()
 			transport := &http.Transport{
 				Dial:            tc.Dial,
 				TLSClientConfig: tlsConfigCopy,
@@ -125,7 +129,7 @@ func TestDialURL(t *testing.T) {

 			// Make sure dialing doesn't mutate the transport's TLSConfig
 			if !reflect.DeepEqual(tc.TLSConfig, tlsConfigCopy) {
-				t.Errorf("%s: transport's copy of TLSConfig was mutated\n%#v\n\n%#v", k, tc.TLSConfig, tlsConfigCopy)
+				t.Errorf("%s: transport's copy of TLSConfig was mutated\n%s", k, diff.ObjectReflectDiff(tc.TLSConfig, tlsConfigCopy))
 			}

 			if err != nil {