lint

Signed-off-by: Omer Aplatony <omerap12@gmail.com>
kubernetes · Dec 14, 2024 · 7e578bd · 7e578bd
1 parent ed7f7ce
commit 7e578bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/validation_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/validation_test.go
@@ -780,7 +780,8 @@ func TestCRValidationOnCRDUpdate(t *testing.T) {
 			// CR is now accepted
 			err = wait.PollUntilContextTimeout(context.Background(), 500*time.Millisecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (done bool, err error) {
 				_, createErr := noxuResourceClient.Create(ctx, instanceToCreate, metav1.CreateOptions{})
-				if _, isStatus := createErr.(*apierrors.StatusError); isStatus {
+				var statusErr *apierrors.StatusError
+				if errors.As(createErr, &statusErr) {
 					if apierrors.IsInvalid(createErr) {
 						return false, nil
 					}

diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/versioning_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/versioning_test.go
@@ -18,13 +18,15 @@ package integration
 
 import (
 	"context"
+	stderrors "errors"
 	"fmt"
 	"net/http"
 	"reflect"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -96,7 +98,8 @@ func TestInternalVersionIsHandlerVersion(t *testing.T) {
 			if patchErr != nil {
 				// work around "grpc: the client connection is closing" error
 				// TODO: fix the grpc error
-				if statusErr, ok := patchErr.(*errors.StatusError); ok && statusErr.Status().Code == http.StatusInternalServerError {
+				var statusErr *errors.StatusError
+				if stderrors.As(patchErr, &statusErr) && statusErr.Status().Code == http.StatusInternalServerError {
 					return false, nil
 				}
 				return false, patchErr
@@ -116,11 +119,12 @@ func TestInternalVersionIsHandlerVersion(t *testing.T) {
 			i++
 
 			_, patchErr := noxuNamespacedResourceClientV1beta2.Patch(ctx, "foo", types.MergePatchType, patch, metav1.PatchOptions{})
-			assert.Error(t, patchErr)
+			require.Error(t, patchErr)
 
 			// work around "grpc: the client connection is closing" error
 			// TODO: fix the grpc error
-			if statusErr, ok := patchErr.(*errors.StatusError); ok && statusErr.Status().Code == http.StatusInternalServerError {
+			var statusErr *errors.StatusError
+			if stderrors.As(patchErr, &statusErr) && statusErr.Status().Code == http.StatusInternalServerError {
 				return false, nil
 			}