kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #127683 from mmorel-35/testifylint/nil-compare@k8s.io/apiserver 

fix: enable error-nil and nil-compare rules from testifylint in module `k8s.io/apiserver`

Kubernetes-commit: dad39bf4357dc89e105b80e16b8da5906406eb53
This commit is contained in:
Kubernetes Publisher 2024-09-28 20:24:08 +01:00
parent ad232ba084 aaeee2a449
commit efdbeb541a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -51,7 +51,7 @@ require (
gopkg.in/square/go-jose.v2 v2.6.0 gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0-20240920202009-71385f038c10 k8s.io/api v0.0.0-20240920202009-71385f038c10
k8s.io/apimachinery v0.0.0-20240926041705-dc03077c038e 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/component-base v0.0.0-20240928083227-66de10e147bc
k8s.io/klog/v2 v2.130.1 k8s.io/klog/v2 v2.130.1
k8s.io/kms v0.0.0-20240912041232-273c893e4e51 k8s.io/kms v0.0.0-20240912041232-273c893e4e51

4
go.sum
View File

@ -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/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 h1:/N2qUkIcQ8VaZbmy28grdhVBbNXO6KLZRdz6F2siNeY=
k8s.io/apimachinery v0.0.0-20240926041705-dc03077c038e/go.mod h1:5rKPDwwN9qm//xASFCZ83nyYEanHxxhc7pZ8AC4lukY= 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-20240928202509-ea4f3d0f6f99 h1:67SwvL0CAMQPF0yCTrnLWxQFvLMcZPwR06YjmjMeYzE=
k8s.io/client-go v0.0.0-20240928082459-2d7a47c42bfc/go.mod h1:+LjOIsTEpEsaW4dpOAa5PueCf6hTShgzbB0+c+KT4K0= 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 h1:rcpUSxWdWOVlC4auITDsLVD8mkDwKoO5ngGUEW1GARg=
k8s.io/component-base v0.0.0-20240928083227-66de10e147bc/go.mod h1:y3+nKeFC4lXl3nEHGAXUtoRopMfxd7um7GOQzZWcdi8= k8s.io/component-base v0.0.0-20240928083227-66de10e147bc/go.mod h1:y3+nKeFC4lXl3nEHGAXUtoRopMfxd7um7GOQzZWcdi8=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

12
pkg/util/proxy/streamtunnel_test.go
View File

@ -357,14 +357,14 @@ func TestTunnelingWebsocketUpgraderConn_LocalRemoteAddress(t *testing.T) {
func TestTunnelingWebsocketUpgraderConn_SetDeadline(t *testing.T) { func TestTunnelingWebsocketUpgraderConn_SetDeadline(t *testing.T) {
tc := &tunnelingWebsocketUpgraderConn{conn: &mockConn{}} tc := &tunnelingWebsocketUpgraderConn{conn: &mockConn{}}
expected := time.Now() 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).readDeadline, "SetDeadline() sets read deadline")
assert.Equal(t, expected, tc.conn.(*mockConn).writeDeadline, "SetDeadline() sets write deadline") assert.Equal(t, expected, tc.conn.(*mockConn).writeDeadline, "SetDeadline() sets write deadline")
expected = time.Now() 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") assert.Equal(t, expected, tc.conn.(*mockConn).writeDeadline, "Expected write deadline set")
expected = time.Now() 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") assert.Equal(t, expected, tc.conn.(*mockConn).readDeadline, "Expected read deadline set")
expectedErr := fmt.Errorf("deadline error") expectedErr := fmt.Errorf("deadline error")
tc = &tunnelingWebsocketUpgraderConn{conn: &mockConn{deadlineErr: expectedErr}} 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") assert.Equal(t, expectedErr, actualErr, "SetDeadline() expected error returned")
// Connection nil, returns nil error. // Connection nil, returns nil error.
tc.conn = nil tc.conn = nil
assert.Nil(t, tc.SetDeadline(expected), "SetDeadline() with nil connection always returns nil error") assert.NoError(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.NoError(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.SetReadDeadline(expected), "SetReadDeadline() with nil connection always returns nil error")
} }
var expectedContentLengthHeaders = http.Header{ var expectedContentLengthHeaders = http.Header{