diff --git a/go.mod b/go.mod index edf078502..ba142bbfd 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 k8s.io/api v0.0.0-20240920202009-71385f038c10 k8s.io/apimachinery v0.0.0-20240926041705-dc03077c038e - k8s.io/client-go v0.0.0-20240928082459-2d7a47c42bfc + k8s.io/client-go v0.0.0-20240928202509-ea4f3d0f6f99 k8s.io/component-base v0.0.0-20240928083227-66de10e147bc k8s.io/klog/v2 v2.130.1 k8s.io/kms v0.0.0-20240912041232-273c893e4e51 diff --git a/go.sum b/go.sum index fae212d62..ebd362cb2 100644 --- a/go.sum +++ b/go.sum @@ -373,8 +373,8 @@ k8s.io/api v0.0.0-20240920202009-71385f038c10 h1:shjQe98Co9zBlDzQkxb5IJEWtReSl7q k8s.io/api v0.0.0-20240920202009-71385f038c10/go.mod h1:KCEt6+W/Yn1Vc48pYXeLf0mGK52kJhvt+rcaUVsIaKQ= k8s.io/apimachinery v0.0.0-20240926041705-dc03077c038e h1:/N2qUkIcQ8VaZbmy28grdhVBbNXO6KLZRdz6F2siNeY= k8s.io/apimachinery v0.0.0-20240926041705-dc03077c038e/go.mod h1:5rKPDwwN9qm//xASFCZ83nyYEanHxxhc7pZ8AC4lukY= -k8s.io/client-go v0.0.0-20240928082459-2d7a47c42bfc h1:vXIj/gsKtCPO4OTLbXWOrKOoIAaqZi3sDjniQfcFuPs= -k8s.io/client-go v0.0.0-20240928082459-2d7a47c42bfc/go.mod h1:+LjOIsTEpEsaW4dpOAa5PueCf6hTShgzbB0+c+KT4K0= +k8s.io/client-go v0.0.0-20240928202509-ea4f3d0f6f99 h1:67SwvL0CAMQPF0yCTrnLWxQFvLMcZPwR06YjmjMeYzE= +k8s.io/client-go v0.0.0-20240928202509-ea4f3d0f6f99/go.mod h1:+LjOIsTEpEsaW4dpOAa5PueCf6hTShgzbB0+c+KT4K0= k8s.io/component-base v0.0.0-20240928083227-66de10e147bc h1:rcpUSxWdWOVlC4auITDsLVD8mkDwKoO5ngGUEW1GARg= k8s.io/component-base v0.0.0-20240928083227-66de10e147bc/go.mod h1:y3+nKeFC4lXl3nEHGAXUtoRopMfxd7um7GOQzZWcdi8= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= diff --git a/pkg/util/proxy/streamtunnel_test.go b/pkg/util/proxy/streamtunnel_test.go index cebf9bc04..61f337dd8 100644 --- a/pkg/util/proxy/streamtunnel_test.go +++ b/pkg/util/proxy/streamtunnel_test.go @@ -357,14 +357,14 @@ func TestTunnelingWebsocketUpgraderConn_LocalRemoteAddress(t *testing.T) { func TestTunnelingWebsocketUpgraderConn_SetDeadline(t *testing.T) { tc := &tunnelingWebsocketUpgraderConn{conn: &mockConn{}} expected := time.Now() - assert.Nil(t, tc.SetDeadline(expected), "SetDeadline does not return error") + assert.NoError(t, tc.SetDeadline(expected), "SetDeadline does not return error") assert.Equal(t, expected, tc.conn.(*mockConn).readDeadline, "SetDeadline() sets read deadline") assert.Equal(t, expected, tc.conn.(*mockConn).writeDeadline, "SetDeadline() sets write deadline") expected = time.Now() - assert.Nil(t, tc.SetWriteDeadline(expected), "SetWriteDeadline does not return error") + assert.NoError(t, tc.SetWriteDeadline(expected), "SetWriteDeadline does not return error") assert.Equal(t, expected, tc.conn.(*mockConn).writeDeadline, "Expected write deadline set") expected = time.Now() - assert.Nil(t, tc.SetReadDeadline(expected), "SetReadDeadline does not return error") + assert.NoError(t, tc.SetReadDeadline(expected), "SetReadDeadline does not return error") assert.Equal(t, expected, tc.conn.(*mockConn).readDeadline, "Expected read deadline set") expectedErr := fmt.Errorf("deadline error") tc = &tunnelingWebsocketUpgraderConn{conn: &mockConn{deadlineErr: expectedErr}} @@ -373,9 +373,9 @@ func TestTunnelingWebsocketUpgraderConn_SetDeadline(t *testing.T) { assert.Equal(t, expectedErr, actualErr, "SetDeadline() expected error returned") // Connection nil, returns nil error. tc.conn = nil - assert.Nil(t, tc.SetDeadline(expected), "SetDeadline() with nil connection always returns nil error") - assert.Nil(t, tc.SetWriteDeadline(expected), "SetWriteDeadline() with nil connection always returns nil error") - assert.Nil(t, tc.SetReadDeadline(expected), "SetReadDeadline() with nil connection always returns nil error") + assert.NoError(t, tc.SetDeadline(expected), "SetDeadline() with nil connection always returns nil error") + assert.NoError(t, tc.SetWriteDeadline(expected), "SetWriteDeadline() with nil connection always returns nil error") + assert.NoError(t, tc.SetReadDeadline(expected), "SetReadDeadline() with nil connection always returns nil error") } var expectedContentLengthHeaders = http.Header{