Skip to content

Commit fc738cb

Browse files
danielqsjdanielqsj
committed
unify alias of api errors under test
1 parent 2914ba8 commit fc738cb

32 files changed

+110
-111
lines changed

‎test/e2e/apimachinery/aggregator.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
appsv1 "k8s.io/api/apps/v1"
2929
v1 "k8s.io/api/core/v1"
3030
rbacv1 "k8s.io/api/rbac/v1"
31-
apierrs "k8s.io/apimachinery/pkg/api/errors"
31+
apierrors "k8s.io/apimachinery/pkg/api/errors"
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
3434
unstructuredv1 "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -367,7 +367,7 @@ func TestSampleAPIServer(f *framework.Framework, aggrclient *aggregatorclient.Cl
367367
request.SetHeader("Accept", "application/json")
368368
_, err := request.DoRaw()
369369
if err != nil {
370-
status, ok := err.(*apierrs.StatusError)
370+
status, ok := err.(*apierrors.StatusError)
371371
if !ok {
372372
return false, err
373373
}

‎test/e2e/auth/pod_security_policy.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
v1 "k8s.io/api/core/v1"
2323
policyv1beta1 "k8s.io/api/policy/v1beta1"
2424
rbacv1 "k8s.io/api/rbac/v1"
25-
apierrs "k8s.io/apimachinery/pkg/api/errors"
25+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/runtime/schema"
2828
"k8s.io/apiserver/pkg/authentication/serviceaccount"
@@ -122,7 +122,7 @@ var _ = SIGDescribe("PodSecurityPolicy", func() {
122122

123123
func expectForbidden(err error) {
124124
framework.ExpectError(err, "should be forbidden")
125-
framework.ExpectEqual(apierrs.IsForbidden(err), true, "should be forbidden error")
125+
framework.ExpectEqual(apierrors.IsForbidden(err), true, "should be forbidden error")
126126
}
127127

128128
func testPrivilegedPods(tester func(pod *v1.Pod)) {

‎test/e2e/cloud/nodes.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"time"
2121

2222
v1 "k8s.io/api/core/v1"
23-
apierrs "k8s.io/apimachinery/pkg/api/errors"
23+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
clientset "k8s.io/client-go/kubernetes"
2626
"k8s.io/kubernetes/test/e2e/framework"
@@ -67,7 +67,7 @@ var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() {
6767
_, err = c.CoreV1().Nodes().Get(nodeToDelete.Name, metav1.GetOptions{})
6868
if err == nil {
6969
framework.Failf("node %q still exists when it should be deleted", nodeToDelete.Name)
70-
} else if !apierrs.IsNotFound(err) {
70+
} else if !apierrors.IsNotFound(err) {
7171
framework.Failf("failed to get node %q err: %q", nodeToDelete.Name, err)
7272
}
7373

‎test/e2e/common/runtimeclass.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
v1 "k8s.io/api/core/v1"
2424
"k8s.io/apimachinery/pkg/api/errors"
25-
apierrs "k8s.io/apimachinery/pkg/api/errors"
25+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/fields"
2828
"k8s.io/apimachinery/pkg/util/wait"
@@ -124,7 +124,7 @@ func expectPodRejection(f *framework.Framework, pod *v1.Pod) {
124124
} else {
125125
_, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(pod)
126126
framework.ExpectError(err, "should be forbidden")
127-
framework.ExpectEqual(apierrs.IsForbidden(err), true, "should be forbidden error")
127+
framework.ExpectEqual(apierrors.IsForbidden(err), true, "should be forbidden error")
128128
}
129129
}
130130

‎test/e2e/framework/ingress/ingress_utils.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
appsv1 "k8s.io/api/apps/v1"
4242
v1 "k8s.io/api/core/v1"
4343
networkingv1beta1 "k8s.io/api/networking/v1beta1"
44-
apierrs "k8s.io/apimachinery/pkg/api/errors"
44+
apierrors "k8s.io/apimachinery/pkg/api/errors"
4545
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4646
"k8s.io/apimachinery/pkg/labels"
4747
"k8s.io/apimachinery/pkg/util/intstr"
@@ -522,7 +522,7 @@ func (j *TestJig) Update(update func(ing *networkingv1beta1.Ingress)) {
522522
framework.DescribeIng(j.Ingress.Namespace)
523523
return
524524
}
525-
if !apierrs.IsConflict(err) && !apierrs.IsServerTimeout(err) {
525+
if !apierrors.IsConflict(err) && !apierrors.IsServerTimeout(err) {
526526
framework.Failf("failed to update ingress %s/%s: %v", ns, name, err)
527527
}
528528
}

‎test/e2e/framework/node/wait_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"testing"
2222

2323
v1 "k8s.io/api/core/v1"
24-
apierrs "k8s.io/apimachinery/pkg/api/errors"
24+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/runtime"
2727
"k8s.io/client-go/kubernetes/fake"
@@ -157,7 +157,7 @@ func TestCheckReadyForTests(t *testing.T) {
157157
expectedErr: "Forced error",
158158
}, {
159159
desc: "Retryable errors from node list are reported but still return false",
160-
nodeListErr: apierrs.NewTimeoutError("Retryable error", 10),
160+
nodeListErr: apierrors.NewTimeoutError("Retryable error", 10),
161161
expected: false,
162162
},
163163
}

‎test/e2e/framework/pod/delete.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/onsi/ginkgo"
2424

2525
v1 "k8s.io/api/core/v1"
26-
apierrs "k8s.io/apimachinery/pkg/api/errors"
26+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2727
clientset "k8s.io/client-go/kubernetes"
2828
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
2929
)
@@ -55,7 +55,7 @@ func DeletePodWithWaitByName(c clientset.Interface, podName, podNamespace string
5555
e2elog.Logf("Deleting pod %q in namespace %q", podName, podNamespace)
5656
err := c.CoreV1().Pods(podNamespace).Delete(podName, nil)
5757
if err != nil {
58-
if apierrs.IsNotFound(err) {
58+
if apierrors.IsNotFound(err) {
5959
return nil // assume pod was already deleted
6060
}
6161
return fmt.Errorf("pod Delete API error: %v", err)

‎test/e2e/framework/pod/wait.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/onsi/ginkgo"
2828

2929
v1 "k8s.io/api/core/v1"
30-
apierrs "k8s.io/apimachinery/pkg/api/errors"
30+
apierrors "k8s.io/apimachinery/pkg/api/errors"
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
"k8s.io/apimachinery/pkg/labels"
3333
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -213,7 +213,7 @@ func WaitForPodCondition(c clientset.Interface, ns, podName, desc string, timeou
213213
for start := time.Now(); time.Since(start) < timeout; time.Sleep(poll) {
214214
pod, err := c.CoreV1().Pods(ns).Get(podName, metav1.GetOptions{})
215215
if err != nil {
216-
if apierrs.IsNotFound(err) {
216+
if apierrors.IsNotFound(err) {
217217
e2elog.Logf("Pod %q in namespace %q not found. Error: %v", podName, ns, err)
218218
return err
219219
}
@@ -387,7 +387,7 @@ func WaitForPodSuccessInNamespaceSlow(c clientset.Interface, podName string, nam
387387
func WaitForPodNotFoundInNamespace(c clientset.Interface, podName, ns string, timeout time.Duration) error {
388388
return wait.PollImmediate(poll, timeout, func() (bool, error) {
389389
_, err := c.CoreV1().Pods(ns).Get(podName, metav1.GetOptions{})
390-
if apierrs.IsNotFound(err) {
390+
if apierrors.IsNotFound(err) {
391391
return true, nil // done
392392
}
393393
if err != nil {

‎test/e2e/framework/psp.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
v1 "k8s.io/api/core/v1"
2424
policyv1beta1 "k8s.io/api/policy/v1beta1"
2525
rbacv1 "k8s.io/api/rbac/v1"
26-
apierrs "k8s.io/apimachinery/pkg/api/errors"
26+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/runtime/schema"
2929
"k8s.io/apiserver/pkg/authentication/serviceaccount"
@@ -111,15 +111,15 @@ func CreatePrivilegedPSPBinding(kubeClient clientset.Interface, namespace string
111111
privilegedPSPOnce.Do(func() {
112112
_, err := kubeClient.PolicyV1beta1().PodSecurityPolicies().Get(
113113
podSecurityPolicyPrivileged, metav1.GetOptions{})
114-
if !apierrs.IsNotFound(err) {
114+
if !apierrors.IsNotFound(err) {
115115
// Privileged PSP was already created.
116116
ExpectNoError(err, "Failed to get PodSecurityPolicy %s", podSecurityPolicyPrivileged)
117117
return
118118
}
119119

120120
psp := privilegedPSP(podSecurityPolicyPrivileged)
121121
_, err = kubeClient.PolicyV1beta1().PodSecurityPolicies().Create(psp)
122-
if !apierrs.IsAlreadyExists(err) {
122+
if !apierrors.IsAlreadyExists(err) {
123123
ExpectNoError(err, "Failed to create PSP %s", podSecurityPolicyPrivileged)
124124
}
125125

@@ -134,7 +134,7 @@ func CreatePrivilegedPSPBinding(kubeClient clientset.Interface, namespace string
134134
Verbs: []string{"use"},
135135
}},
136136
})
137-
if !apierrs.IsAlreadyExists(err) {
137+
if !apierrors.IsAlreadyExists(err) {
138138
ExpectNoError(err, "Failed to create PSP role")
139139
}
140140
}

‎test/e2e/framework/pv/pv.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"github.com/onsi/ginkgo"
2424
v1 "k8s.io/api/core/v1"
25-
apierrs "k8s.io/apimachinery/pkg/api/errors"
25+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2626
"k8s.io/apimachinery/pkg/api/resource"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/labels"
@@ -186,7 +186,7 @@ func DeletePersistentVolume(c clientset.Interface, pvName string) error {
186186
if c != nil && len(pvName) > 0 {
187187
framework.Logf("Deleting PersistentVolume %q", pvName)
188188
err := c.CoreV1().PersistentVolumes().Delete(pvName, nil)
189-
if err != nil && !apierrs.IsNotFound(err) {
189+
if err != nil && !apierrors.IsNotFound(err) {
190190
return fmt.Errorf("PV Delete API error: %v", err)
191191
}
192192
}
@@ -198,7 +198,7 @@ func DeletePersistentVolumeClaim(c clientset.Interface, pvcName string, ns strin
198198
if c != nil && len(pvcName) > 0 {
199199
framework.Logf("Deleting PersistentVolumeClaim %q", pvcName)
200200
err := c.CoreV1().PersistentVolumeClaims(ns).Delete(pvcName, nil)
201-
if err != nil && !apierrs.IsNotFound(err) {
201+
if err != nil && !apierrors.IsNotFound(err) {
202202
return fmt.Errorf("PVC Delete API error: %v", err)
203203
}
204204
}
@@ -275,10 +275,10 @@ func DeletePVCandValidatePVGroup(c clientset.Interface, ns string, pvols PVMap,
275275
if err = DeletePVCandValidatePV(c, ns, pvc, pv, expectPVPhase); err != nil {
276276
return err
277277
}
278-
} else if !apierrs.IsNotFound(err) {
278+
} else if !apierrors.IsNotFound(err) {
279279
return fmt.Errorf("PVC Get API error: %v", err)
280280
}
281-
// delete pvckey from map even if apierrs.IsNotFound above is true and thus the
281+
// delete pvckey from map even if apierrors.IsNotFound above is true and thus the
282282
// claim was not actually deleted here
283283
delete(claims, pvcKey)
284284
deletedPVCs++

0 commit comments

Comments
 (0)