fix staticcheck failures: apiserver/pkg/{storage,util} #95683
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -131,6 +131,8 @@ func TestCachingObjectRaces(t *testing.T) { | |
|
|
||
| numWorkers := 1000 | ||
| wg := &sync.WaitGroup{} | ||
| errorCh := make(chan error, numWorkers) | ||
|
|
||
| wg.Add(numWorkers) | ||
|
|
||
| for i := 0; i < numWorkers; i++ { | ||
|
|
@@ -141,20 +143,34 @@ func TestCachingObjectRaces(t *testing.T) { | |
| for _, encoder := range encoders { | ||
| buffer.Reset() | ||
| if err := object.CacheEncode(encoder.identifier, encoder.encode, buffer); err != nil { | ||
| errorCh <- fmt.Errorf("unexpected error: %v", err) | ||
|
There was a problem hiding this comment. Is the staticcheck complaining these "Errorf" statements? There was a problem hiding this comment. No, the staticcheck is complaining about the |
||
| return | ||
| } | ||
| if callsNumber := atomic.LoadInt32(&encoder.callsNumber); callsNumber != 1 { | ||
| errorCh <- fmt.Errorf("unexpected number of serializations: %d", callsNumber) | ||
| return | ||
| } | ||
| } | ||
| accessor, err := meta.Accessor(object.GetObject()) | ||
| if err != nil { | ||
| errorCh <- fmt.Errorf("failed to get accessor: %v", err) | ||
| return | ||
| } | ||
| if selfLink := accessor.GetSelfLink(); selfLink != "selfLink" { | ||
| errorCh <- fmt.Errorf("unexpected selfLink: %s", selfLink) | ||
| return | ||
| } | ||
| }() | ||
| } | ||
|
|
||
| go func() { | ||
| wg.Wait() | ||
| close(errorCh) | ||
| }() | ||
|
|
||
| for err := range errorCh { | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -405,6 +405,9 @@ func TestWaitUntilFreshAndList(t *testing.T) { | |
| {IndexName: "l:not-exist-label", Value: "whatever"}, | ||
| } | ||
| list, resourceVersion, err = store.WaitUntilFreshAndList(5, matchValues, nil) | ||
| if err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
| if resourceVersion != 5 { | ||
| t.Errorf("unexpected resourceVersion: %v, expected: 5", resourceVersion) | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1911,7 +1911,6 @@ func Test_decodeContinue(t *testing.T) { | |
|
|
||
| func Test_growSlice(t *testing.T) { | ||
| type args struct { | ||
| initialCapacity int | ||
| v reflect.Value | ||
| maxCapacity int | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,18 +30,10 @@ type Ignored struct { | |
| ID string | ||
| } | ||
|
|
||
| func (obj *Ignored) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind } | ||
| func (obj *Ignored) DeepCopyObject() runtime.Object { | ||
| panic("Ignored does not support DeepCopy") | ||
| } | ||
|
|
||
| func TestSelectionPredicate(t *testing.T) { | ||
| table := map[string]struct { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -942,10 +942,10 @@ func TestWatchBookmarksWithCorrectResourceVersion(t *testing.T) { | |
| defer watcher.Stop() | ||
|
|
||
| done := make(chan struct{}) | ||
| errorCh := make(chan error) | ||
| var wg sync.WaitGroup | ||
| wg.Add(2) | ||
|
|
||
| go func() { | ||
| defer wg.Done() | ||
| for i := 0; i < 100; i++ { | ||
|
|
@@ -956,36 +956,62 @@ func TestWatchBookmarksWithCorrectResourceVersion(t *testing.T) { | |
| pod := fmt.Sprintf("foo-%d", i) | ||
| err := createPod(etcdStorage, makeTestPod(pod)) | ||
| if err != nil { | ||
| errorCh <- fmt.Errorf("failed to create pod %v: %v", pod, err) | ||
| return | ||
| } | ||
| time.Sleep(time.Second / 100) | ||
| } | ||
| } | ||
| }() | ||
|
|
||
| go func() { | ||
| defer wg.Done() | ||
| bookmarkReceived := false | ||
| lastObservedResourceVersion := uint64(0) | ||
| for event := range watcher.ResultChan() { | ||
| select { | ||
| case <-done: | ||
| return | ||
| default: | ||
| rv, err := v.ObjectResourceVersion(event.Object) | ||
| if err != nil { | ||
| errorCh <- fmt.Errorf("failed to parse resourceVersion from %#v", event) | ||
| return | ||
| } | ||
| if event.Type == watch.Bookmark { | ||
| bookmarkReceived = true | ||
| // bookmark event has a RV greater than or equal to the before one | ||
| if rv < lastObservedResourceVersion { | ||
| errorCh <- fmt.Errorf("Unexpected bookmark resourceVersion %v less than observed %v)", rv, lastObservedResourceVersion) | ||
| return | ||
| } | ||
| } else { | ||
| // non-bookmark event has a RV greater than anything before | ||
| if rv <= lastObservedResourceVersion { | ||
| errorCh <- fmt.Errorf("Unexpected event resourceVersion %v less than or equal to bookmark %v)", rv, lastObservedResourceVersion) | ||
| return | ||
| } | ||
| } | ||
| lastObservedResourceVersion = rv | ||
| } | ||
| } | ||
| // Make sure we have received a bookmark event | ||
| if !bookmarkReceived { | ||
| errorCh <- fmt.Errorf("Unpexected error, we did not received a bookmark event") | ||
| return | ||
| } | ||
|
|
||
| }() | ||
|
|
||
| go func() { | ||
| wg.Wait() // We must wait for the waitgroup to exit before we terminate the cache or the server | ||
| close(errorCh) | ||
| }() | ||
|
|
||
| for err := range errorCh { | ||
| if err != nil { | ||
| close(done) // call close first, so the goroutine knows to exit | ||
| t.Fatal(err) | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -121,6 +121,7 @@ func TestTimeouts(t *testing.T) { | |
| var ( | ||
| service Service | ||
| err error | ||
| errorCh = make(chan error, 1) | ||
| data = []byte("test data") | ||
| kubeAPIServerWG sync.WaitGroup | ||
| kmsPluginWG sync.WaitGroup | ||
|
|
@@ -138,8 +139,10 @@ func TestTimeouts(t *testing.T) { | |
|
|
||
| service, err = NewGRPCService(socketName.endpoint, tt.callTimeout) | ||
| if err != nil { | ||
| errorCh <- fmt.Errorf("failed to create envelope service, error: %v", err) | ||
| return | ||
| } | ||
| errorCh <- nil | ||
| defer destroyService(service) | ||
| kubeAPIServerWG.Done() | ||
| // Keeping kube-apiserver up to process requests. | ||
|
|
@@ -153,17 +156,25 @@ func TestTimeouts(t *testing.T) { | |
|
|
||
| f, err := mock.NewBase64Plugin(socketName.path) | ||
| if err != nil { | ||
| errorCh <- fmt.Errorf("failed to construct test KMS provider server, error: %v", err) | ||
| return | ||
| } | ||
| if err := f.Start(); err != nil { | ||
| errorCh <- fmt.Errorf("Failed to start test KMS provider server, error: %v", err) | ||
| return | ||
| } | ||
| errorCh <- nil | ||
| defer f.CleanUp() | ||
| kmsPluginWG.Done() | ||
| // Keeping plugin up to process requests. | ||
| testCompletedWG.Wait() | ||
| }() | ||
|
|
||
| // Error from kubeAPIServerWG goroutine | ||
| if err := <-errorCh; err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| kubeAPIServerWG.Wait() | ||
| _, err = service.Encrypt(data) | ||
|
|
||
|
|
@@ -175,6 +186,10 @@ func TestTimeouts(t *testing.T) { | |
| t.Fatalf("got %q, want nil", err.Error()) | ||
| } | ||
|
|
||
| // Error from kmsPluginWG goroutine | ||
| if err := <-errorCh; err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| // Collecting kms-plugin - allowing plugin to clean-up. | ||
| kmsPluginWG.Wait() | ||
| }) | ||
|
|
@@ -228,7 +243,7 @@ func TestIntermittentConnectionLoss(t *testing.T) { | |
| wg1.Done() | ||
| _, err := service.Encrypt(data) | ||
| if err != nil { | ||
| t.Errorf("failed when executing encrypt, error: %v", err) | ||
| } | ||
| }() | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry I do not follow why we need a new go routine here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is so we don't block and allow receive on errorCh on line 693
if err = <- errorCh; err != nil {...}