github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-08-15 14:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #103023 from tiloso/staticcheck-apiserver-clientgo

Browse Source 
Fix staticcheck in k8s.io/{apiserver/pkg/storage,client-go/rest/watch}

Kubernetes-commit: 95390e6476fca15b0f55cde2c142ec18ca57aee0
This commit is contained in:
Kubernetes Publisher 2021-09-08 18:50:10 -07:00
commit 84f9a96f06
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
go.mod
View File

@ -30,8 +30,8 @@ require (
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/protobuf v1.26.0 google.golang.org/protobuf v1.26.0
k8s.io/api v0.0.0-20210825040442-f20796d02069 k8s.io/api v0.0.0-20210908033022-d21f9c983267
k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb k8s.io/apimachinery v0.0.0-20210908032828-9fff050305a4
k8s.io/klog/v2 v2.9.0 k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
@ -40,6 +40,6 @@ require (
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20210825040442-f20796d02069 k8s.io/api => k8s.io/api v0.0.0-20210908033022-d21f9c983267
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210908032828-9fff050305a4
) )

8
go.sum
View File

@ -598,10 +598,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210825040442-f20796d02069 h1:ezx9DT+tM7VpczffbJjnwyr3ulZEaXhE9J5NE4DEHac= k8s.io/api v0.0.0-20210908033022-d21f9c983267 h1:vq/GfYuNAtReYwup5R1uEGEIvwHtZIVfJ3OabSXbQx8=
k8s.io/api v0.0.0-20210825040442-f20796d02069/go.mod h1:draCg0WF1Lr137sTJ2xg26MplnLcv5PRyIJaP89ntfc= k8s.io/api v0.0.0-20210908033022-d21f9c983267/go.mod h1:c9QgRUT16khyA/63Nk32bm7l2r3/kd5zvB45ofzM0N0=
k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb h1:x865eFVcQlSLu6gCJ4NbCbKGqwgejXJ4yyaZuENYzcQ= k8s.io/apimachinery v0.0.0-20210908032828-9fff050305a4 h1:m0WqN0kyu1lmvNxu0J3NwNoCBPBsIxFfpSM4QtJH2eA=
k8s.io/apimachinery v0.0.0-20210825040238-74be3b88bedb/go.mod h1:YwXrbrp8hgDAA01lpP9HPMC6PS55tjfs3EAatyMMfeM= k8s.io/apimachinery v0.0.0-20210908032828-9fff050305a4/go.mod h1:YwXrbrp8hgDAA01lpP9HPMC6PS55tjfs3EAatyMMfeM=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=

15
rest/watch/decoder_test.go
View File

@ -18,6 +18,7 @@ package versioned_test
import ( import (
"encoding/json" "encoding/json"
"fmt"
"io" "io"
"testing" "testing"
"time" "time"
@ -51,10 +52,13 @@ func TestDecoder(t *testing.T) {
expect := &v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}} expect := &v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}
encoder := json.NewEncoder(in) encoder := json.NewEncoder(in)
eType := eventType eType := eventType
errc := make(chan error)
go func() { go func() {
data, err := runtime.Encode(scheme.Codecs.LegacyCodec(v1.SchemeGroupVersion), expect) data, err := runtime.Encode(scheme.Codecs.LegacyCodec(v1.SchemeGroupVersion), expect)
if err != nil { if err != nil {
t.Fatalf("Unexpected error %v", err) errc <- fmt.Errorf("Unexpected error %v", err)
return
} }
event := metav1.WatchEvent{ event := metav1.WatchEvent{
Type: string(eType), Type: string(eType),
@ -70,7 +74,8 @@ func TestDecoder(t *testing.T) {
go func() { go func() {
action, got, err := decoder.Decode() action, got, err := decoder.Decode()
if err != nil { if err != nil {
t.Fatalf("Unexpected error %v", err) errc <- fmt.Errorf("Unexpected error %v", err)
return
} }
if e, a := eType, action; e != a { if e, a := eType, action; e != a {
t.Errorf("Expected %v, got %v", e, a) t.Errorf("Expected %v, got %v", e, a)
@ -81,7 +86,11 @@ func TestDecoder(t *testing.T) {
t.Logf("Exited read") t.Logf("Exited read")
close(done) close(done)
}() }()
<-done select {
case err := <-errc:
t.Fatal(err)
case <-done:
}
done = make(chan struct{}) done = make(chan struct{})
go func() { go func() {