This is an automated email from the ASF dual-hosted git repository. kvn pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
The following commit(s) were added to refs/heads/master by this push: new 1141e15 fix: test case param error (#780) 1141e15 is described below commit 1141e15c2678fc9aa8f9e36ffdf804c6f4c2e441 Author: LXM <lxm.x...@gmail.com> AuthorDate: Fri Dec 3 12:16:51 2021 +0800 fix: test case param error (#780) Signed-off-by: lxm <lxm.x...@gmail.com> --- cmd/ingress/ingress_test.go | 22 ++-- pkg/api/router/router_test.go | 8 +- pkg/api/server_test.go | 4 +- pkg/apisix/cache/memdb_test.go | 30 ++--- pkg/apisix/consumer_test.go | 8 +- pkg/apisix/plugin_test.go | 2 +- pkg/apisix/route_test.go | 8 +- pkg/apisix/ssl_test.go | 8 +- pkg/apisix/upstream_test.go | 8 +- pkg/ingress/ingress_test.go | 14 +-- pkg/ingress/manifest_test.go | 72 +++++------ pkg/ingress/pod_test.go | 14 +-- pkg/kube/translation/annotations/cors_test.go | 8 +- .../translation/annotations/iprestriction_test.go | 14 +-- pkg/kube/translation/apisix_consumer_test.go | 6 +- pkg/kube/translation/apisix_route_test.go | 86 ++++++------- pkg/kube/translation/apisix_upstream_test.go | 84 ++++++------- pkg/kube/translation/context_test.go | 14 +-- pkg/kube/translation/ingress_test.go | 134 ++++++++++----------- pkg/kube/translation/plugin_test.go | 74 ++++++------ pkg/kube/translation/translator_test.go | 32 ++--- pkg/kube/translation/util_test.go | 2 +- pkg/log/default_logger_test.go | 16 +-- pkg/log/logger_test.go | 16 +-- pkg/metrics/prometheus_test.go | 40 +++--- pkg/types/event_test.go | 8 +- pkg/types/labels_test.go | 6 +- pkg/types/pod_test.go | 12 +- pkg/types/timeduration_test.go | 8 +- 29 files changed, 379 insertions(+), 379 deletions(-) diff --git a/cmd/ingress/ingress_test.go b/cmd/ingress/ingress_test.go index 4594b72..7035a5c 100644 --- a/cmd/ingress/ingress_test.go +++ b/cmd/ingress/ingress_test.go @@ -127,29 +127,29 @@ func TestNewIngressCommandEffectiveLog(t *testing.T) { buf := bufio.NewReader(file) f := parseLog(t, buf) assert.Contains(t, f.Message, "apisix ingress controller started") - assert.Equal(t, f.Level, "info") + assert.Equal(t, "info", f.Level) f = parseLog(t, buf) assert.Contains(t, f.Message, "version:") - assert.Equal(t, f.Level, "info") + assert.Equal(t, "info", f.Level) f = parseLog(t, buf) assert.Contains(t, f.Message, "use configuration") - assert.Equal(t, f.Level, "info") + assert.Equal(t, "info", f.Level) var cfg config.Config data := strings.TrimPrefix(f.Message, "use configuration\n") err = json.Unmarshal([]byte(data), &cfg) assert.Nil(t, err) - assert.Equal(t, cfg.LogOutput, "./test.log") - assert.Equal(t, cfg.LogLevel, "debug") - assert.Equal(t, cfg.HTTPListen, listen) - assert.Equal(t, cfg.EnableProfiling, true) - assert.Equal(t, cfg.Kubernetes.Kubeconfig, "/foo/bar/baz") - assert.Equal(t, cfg.Kubernetes.ResyncInterval, types.TimeDuration{Duration: 24 * time.Hour}) - assert.Equal(t, cfg.APISIX.AdminKey, "0x123") - assert.Equal(t, cfg.APISIX.BaseURL, "http://apisixgw.default.cluster.local/apisix") + assert.Equal(t, "./test.log", cfg.LogOutput) + assert.Equal(t, "debug", cfg.LogLevel) + assert.Equal(t, listen, cfg.HTTPListen) + assert.Equal(t, true, cfg.EnableProfiling) + assert.Equal(t, "/foo/bar/baz", cfg.Kubernetes.Kubeconfig) + assert.Equal(t, types.TimeDuration{Duration: 24 * time.Hour}, cfg.Kubernetes.ResyncInterval) + assert.Equal(t, "0x123", cfg.APISIX.AdminKey) + assert.Equal(t, "http://apisixgw.default.cluster.local/apisix", cfg.APISIX.BaseURL) } func parseLog(t *testing.T, r *bufio.Reader) *fields { diff --git a/pkg/api/router/router_test.go b/pkg/api/router/router_test.go index 34b0766..0063276 100644 --- a/pkg/api/router/router_test.go +++ b/pkg/api/router/router_test.go @@ -32,13 +32,13 @@ func TestHealthz(t *testing.T) { mountHealthz(r) healthz(c) - assert.Equal(t, w.Code, http.StatusOK) + assert.Equal(t, http.StatusOK, w.Code) var resp healthzResponse dec := json.NewDecoder(w.Body) assert.Nil(t, dec.Decode(&resp)) - assert.Equal(t, resp, healthzResponse{Status: "ok"}) + assert.Equal(t, healthzResponse{Status: "ok"}, resp) } func TestMetrics(t *testing.T) { @@ -50,7 +50,7 @@ func TestMetrics(t *testing.T) { mountMetrics(r) metrics(c) - assert.Equal(t, w.Code, http.StatusOK) + assert.Equal(t, http.StatusOK, w.Code) } func TestWebhooks(t *testing.T) { @@ -61,5 +61,5 @@ func TestWebhooks(t *testing.T) { c.Request = req MountWebhooks(r, &apisix.ClusterOptions{}) - assert.Equal(t, w.Code, http.StatusOK) + assert.Equal(t, http.StatusOK, w.Code) } diff --git a/pkg/api/server_test.go b/pkg/api/server_test.go index 2c1c8b0..24488ea 100644 --- a/pkg/api/server_test.go +++ b/pkg/api/server_test.go @@ -143,7 +143,7 @@ func TestProfileNotMount(t *testing.T) { resp, err := http.Get(u) assert.Nil(t, err, nil) - assert.Equal(t, resp.StatusCode, http.StatusNotFound) + assert.Equal(t, http.StatusNotFound, resp.StatusCode) close(stopCh) } @@ -165,6 +165,6 @@ func TestProfile(t *testing.T) { resp, err := http.Get(u) assert.Nil(t, err, nil) - assert.Equal(t, resp.StatusCode, http.StatusOK) + assert.Equal(t, http.StatusOK, resp.StatusCode) close(stopCh) } diff --git a/pkg/apisix/cache/memdb_test.go b/pkg/apisix/cache/memdb_test.go index ff06c9a..3e8494c 100644 --- a/pkg/apisix/cache/memdb_test.go +++ b/pkg/apisix/cache/memdb_test.go @@ -66,8 +66,8 @@ func TestMemDBCacheRoute(t *testing.T) { if routes[0].Name > routes[1].Name { routes[0], routes[1] = routes[1], routes[0] } - assert.Equal(t, routes[0], r1) - assert.Equal(t, routes[1], r2) + assert.Equal(t, r1, routes[0]) + assert.Equal(t, r2, routes[1]) r4 := &v1.Route{ Metadata: v1.Metadata{ @@ -112,8 +112,8 @@ func TestMemDBCacheSSL(t *testing.T) { if ssl[0].ID > ssl[1].ID { ssl[0], ssl[1] = ssl[1], ssl[0] } - assert.Equal(t, ssl[0], s1) - assert.Equal(t, ssl[1], s2) + assert.Equal(t, s1, ssl[0]) + assert.Equal(t, s2, ssl[1]) s4 := &v1.Ssl{ ID: "id4", @@ -165,8 +165,8 @@ func TestMemDBCacheUpstream(t *testing.T) { if upstreams[0].Name > upstreams[1].Name { upstreams[0], upstreams[1] = upstreams[1], upstreams[0] } - assert.Equal(t, upstreams[0], u1) - assert.Equal(t, upstreams[1], u2) + assert.Equal(t, u1, upstreams[0]) + assert.Equal(t, u2, upstreams[1]) u4 := &v1.Upstream{ Metadata: v1.Metadata{ @@ -251,8 +251,8 @@ func TestMemDBCacheStreamRoute(t *testing.T) { if routes[0].ID > routes[1].ID { routes[0], routes[1] = routes[1], routes[0] } - assert.Equal(t, routes[0], r1) - assert.Equal(t, routes[1], r2) + assert.Equal(t, r1, routes[0]) + assert.Equal(t, r2, routes[1]) r4 := &v1.StreamRoute{ ID: "4", @@ -284,7 +284,7 @@ func TestMemDBCacheGlobalRule(t *testing.T) { gr, err = c.GetGlobalRule("3") assert.Nil(t, err) - assert.Equal(t, gr, gr3) + assert.Equal(t, gr3, gr) assert.Nil(t, c.DeleteGlobalRule(gr), "delete global_rule r3") @@ -294,8 +294,8 @@ func TestMemDBCacheGlobalRule(t *testing.T) { if grs[0].ID > grs[1].ID { grs[0], grs[1] = grs[1], grs[0] } - assert.Equal(t, grs[0], gr1) - assert.Equal(t, grs[1], gr2) + assert.Equal(t, gr1, grs[0]) + assert.Equal(t, gr2, grs[1]) gr4 := &v1.GlobalRule{ ID: "4", @@ -337,8 +337,8 @@ func TestMemDBCacheConsumer(t *testing.T) { if consumers[0].Username > consumers[1].Username { consumers[0], consumers[1] = consumers[1], consumers[0] } - assert.Equal(t, consumers[0], c1) - assert.Equal(t, consumers[1], c2) + assert.Equal(t, c1, consumers[0]) + assert.Equal(t, c2, consumers[1]) c4 := &v1.Consumer{ Username: "chandler", @@ -381,8 +381,8 @@ func TestMemDBCacheSchema(t *testing.T) { if schemaList[0].Name > schemaList[1].Name { schemaList[0], schemaList[1] = schemaList[1], schemaList[0] } - assert.Equal(t, schemaList[0], s1) - assert.Equal(t, schemaList[1], s2) + assert.Equal(t, s1, schemaList[0]) + assert.Equal(t, s2, schemaList[1]) s4 := &v1.Schema{ Name: "plugins/p4", diff --git a/pkg/apisix/consumer_test.go b/pkg/apisix/consumer_test.go index 95bb0b4..822845d 100644 --- a/pkg/apisix/consumer_test.go +++ b/pkg/apisix/consumer_test.go @@ -164,20 +164,20 @@ func TestConsumerClient(t *testing.T) { Username: "1", }) assert.Nil(t, err) - assert.Equal(t, obj.Username, "1") + assert.Equal(t, "1", obj.Username) obj, err = cli.Create(context.Background(), &v1.Consumer{ Username: "2", }) assert.Nil(t, err) - assert.Equal(t, obj.Username, "2") + assert.Equal(t, "2", obj.Username) // List objs, err := cli.List(context.Background()) assert.Nil(t, err) assert.Len(t, objs, 2) - assert.Equal(t, objs[0].Username, "1") - assert.Equal(t, objs[1].Username, "2") + assert.Equal(t, "1", objs[0].Username) + assert.Equal(t, "2", objs[1].Username) // Delete then List assert.Nil(t, cli.Delete(context.Background(), objs[0])) diff --git a/pkg/apisix/plugin_test.go b/pkg/apisix/plugin_test.go index 159e887..630cd62 100644 --- a/pkg/apisix/plugin_test.go +++ b/pkg/apisix/plugin_test.go @@ -102,6 +102,6 @@ func TestPluginClient(t *testing.T) { assert.Nil(t, err) assert.Len(t, objs, len(fakePluginNames)) for i := range fakePluginNames { - assert.Equal(t, objs[i], fakePluginNames[i]) + assert.Equal(t, fakePluginNames[i], objs[i]) } } diff --git a/pkg/apisix/route_test.go b/pkg/apisix/route_test.go index 050c368..dfce794 100644 --- a/pkg/apisix/route_test.go +++ b/pkg/apisix/route_test.go @@ -191,7 +191,7 @@ func TestRouteClient(t *testing.T) { UpstreamId: "1", }) assert.Nil(t, err) - assert.Equal(t, obj.ID, "1") + assert.Equal(t, "1", obj.ID) obj, err = cli.Create(context.Background(), &v1.Route{ Metadata: v1.Metadata{ @@ -203,14 +203,14 @@ func TestRouteClient(t *testing.T) { UpstreamId: "1", }) assert.Nil(t, err) - assert.Equal(t, obj.ID, "2") + assert.Equal(t, "2", obj.ID) // List objs, err := cli.List(context.Background()) assert.Nil(t, err) assert.Len(t, objs, 2) - assert.Equal(t, objs[0].ID, "1") - assert.Equal(t, objs[1].ID, "2") + assert.Equal(t, "1", objs[0].ID) + assert.Equal(t, "2", objs[1].ID) // Delete then List assert.Nil(t, cli.Delete(context.Background(), objs[0])) diff --git a/pkg/apisix/ssl_test.go b/pkg/apisix/ssl_test.go index c1af804..8c2468b 100644 --- a/pkg/apisix/ssl_test.go +++ b/pkg/apisix/ssl_test.go @@ -165,21 +165,21 @@ func TestSSLClient(t *testing.T) { Snis: []string{"bar.com"}, }) assert.Nil(t, err) - assert.Equal(t, obj.ID, "1") + assert.Equal(t, "1", obj.ID) obj, err = cli.Create(context.TODO(), &v1.Ssl{ ID: "2", Snis: []string{"bar.com"}, }) assert.Nil(t, err) - assert.Equal(t, obj.ID, "2") + assert.Equal(t, "2", obj.ID) // List objs, err := cli.List(context.Background()) assert.Nil(t, err) assert.Len(t, objs, 2) - assert.Equal(t, objs[0].ID, "1") - assert.Equal(t, objs[1].ID, "2") + assert.Equal(t, "1", objs[0].ID) + assert.Equal(t, "2", objs[1].ID) // Delete then List assert.Nil(t, cli.Delete(context.Background(), objs[0])) diff --git a/pkg/apisix/upstream_test.go b/pkg/apisix/upstream_test.go index c6b75d4..da3a3fc 100644 --- a/pkg/apisix/upstream_test.go +++ b/pkg/apisix/upstream_test.go @@ -183,7 +183,7 @@ func TestUpstreamClient(t *testing.T) { Nodes: nodes, }) assert.Nil(t, err) - assert.Equal(t, obj.ID, "1") + assert.Equal(t, "1", obj.ID) id2 := "2" obj, err = cli.Create(context.TODO(), &v1.Upstream{ @@ -196,14 +196,14 @@ func TestUpstreamClient(t *testing.T) { Nodes: nodes, }) assert.Nil(t, err) - assert.Equal(t, obj.ID, "2") + assert.Equal(t, "2", obj.ID) // List objs, err := cli.List(context.Background()) assert.Nil(t, err) assert.Len(t, objs, 2) - assert.Equal(t, objs[0].ID, "1") - assert.Equal(t, objs[1].ID, "2") + assert.Equal(t, "1", objs[0].ID) + assert.Equal(t, "2", objs[1].ID) // Delete then List assert.Nil(t, cli.Delete(context.Background(), objs[0])) diff --git a/pkg/ingress/ingress_test.go b/pkg/ingress/ingress_test.go index 21388d3..d83e422 100644 --- a/pkg/ingress/ingress_test.go +++ b/pkg/ingress/ingress_test.go @@ -53,7 +53,7 @@ func TestIsIngressEffective(t *testing.T) { ing, err := kube.NewIngress(ingV1) assert.Nil(t, err) // Annotations takes precedence. - assert.Equal(t, c.isIngressEffective(ing), true) + assert.Equal(t, true, c.isIngressEffective(ing)) ingV1 = &networkingv1.Ingress{ TypeMeta: metav1.TypeMeta{ @@ -71,7 +71,7 @@ func TestIsIngressEffective(t *testing.T) { ing, err = kube.NewIngress(ingV1) assert.Nil(t, err) // Spec.IngressClassName takes the precedence. - assert.Equal(t, c.isIngressEffective(ing), false) + assert.Equal(t, false, c.isIngressEffective(ing)) ingV1beta1 := &networkingv1beta1.Ingress{ TypeMeta: metav1.TypeMeta{ @@ -92,7 +92,7 @@ func TestIsIngressEffective(t *testing.T) { ing, err = kube.NewIngress(ingV1beta1) assert.Nil(t, err) // Annotations takes precedence. - assert.Equal(t, c.isIngressEffective(ing), true) + assert.Equal(t, true, c.isIngressEffective(ing)) ingV1beta1 = &networkingv1beta1.Ingress{ TypeMeta: metav1.TypeMeta{ @@ -110,7 +110,7 @@ func TestIsIngressEffective(t *testing.T) { ing, err = kube.NewIngress(ingV1beta1) assert.Nil(t, err) // Spec.IngressClassName takes the precedence. - assert.Equal(t, c.isIngressEffective(ing), false) + assert.Equal(t, false, c.isIngressEffective(ing)) ingV1 = &networkingv1.Ingress{ TypeMeta: metav1.TypeMeta{ @@ -128,7 +128,7 @@ func TestIsIngressEffective(t *testing.T) { ing, err = kube.NewIngress(ingV1) assert.Nil(t, err) // Spec.IngressClassName takes the precedence. - assert.Equal(t, c.isIngressEffective(ing), false) + assert.Equal(t, false, c.isIngressEffective(ing)) ingExtV1beta1 := &extensionsv1beta1.Ingress{ TypeMeta: metav1.TypeMeta{ @@ -149,7 +149,7 @@ func TestIsIngressEffective(t *testing.T) { ing, err = kube.NewIngress(ingExtV1beta1) assert.Nil(t, err) // Annotations takes precedence. - assert.Equal(t, c.isIngressEffective(ing), true) + assert.Equal(t, true, c.isIngressEffective(ing)) ingExtV1beta1 = &extensionsv1beta1.Ingress{ TypeMeta: metav1.TypeMeta{ @@ -167,5 +167,5 @@ func TestIsIngressEffective(t *testing.T) { ing, err = kube.NewIngress(ingExtV1beta1) assert.Nil(t, err) // Spec.IngressClassName takes the precedence. - assert.Equal(t, c.isIngressEffective(ing), false) + assert.Equal(t, false, c.isIngressEffective(ing)) } diff --git a/pkg/ingress/manifest_test.go b/pkg/ingress/manifest_test.go index 8f8b285..847e179 100644 --- a/pkg/ingress/manifest_test.go +++ b/pkg/ingress/manifest_test.go @@ -40,9 +40,9 @@ func TestDiffRoutes(t *testing.T) { assert.Nil(t, updated) assert.Nil(t, deleted) assert.Len(t, added, 2) - assert.Equal(t, added[0].ID, "1") - assert.Equal(t, added[1].ID, "3") - assert.Equal(t, added[1].Methods, []string{"POST"}) + assert.Equal(t, "1", added[0].ID) + assert.Equal(t, "3", added[1].ID) + assert.Equal(t, []string{"POST"}, added[1].Methods) olds := []*apisixv1.Route{ { @@ -61,18 +61,18 @@ func TestDiffRoutes(t *testing.T) { assert.Nil(t, updated) assert.Nil(t, added) assert.Len(t, deleted, 2) - assert.Equal(t, deleted[0].ID, "2") - assert.Equal(t, deleted[1].ID, "3") - assert.Equal(t, deleted[1].Methods, []string{"POST", "PUT"}) + assert.Equal(t, "2", deleted[0].ID) + assert.Equal(t, "3", deleted[1].ID) + assert.Equal(t, []string{"POST", "PUT"}, deleted[1].Methods) added, updated, deleted = diffRoutes(olds, news) assert.Len(t, added, 1) - assert.Equal(t, added[0].ID, "1") + assert.Equal(t, "1", added[0].ID) assert.Len(t, updated, 1) - assert.Equal(t, updated[0].ID, "3") - assert.Equal(t, updated[0].Methods, []string{"POST"}) + assert.Equal(t, "3", updated[0].ID) + assert.Equal(t, []string{"POST"}, updated[0].Methods) assert.Len(t, deleted, 1) - assert.Equal(t, deleted[0].ID, "2") + assert.Equal(t, "2", deleted[0].ID) } func TestDiffStreamRoutes(t *testing.T) { @@ -89,9 +89,9 @@ func TestDiffStreamRoutes(t *testing.T) { assert.Nil(t, updated) assert.Nil(t, deleted) assert.Len(t, added, 2) - assert.Equal(t, added[0].ID, "1") - assert.Equal(t, added[1].ID, "3") - assert.Equal(t, added[1].ServerPort, int32(8080)) + assert.Equal(t, "1", added[0].ID) + assert.Equal(t, "3", added[1].ID) + assert.Equal(t, int32(8080), added[1].ServerPort) olds := []*apisixv1.StreamRoute{ { @@ -106,18 +106,18 @@ func TestDiffStreamRoutes(t *testing.T) { assert.Nil(t, updated) assert.Nil(t, added) assert.Len(t, deleted, 2) - assert.Equal(t, deleted[0].ID, "2") - assert.Equal(t, deleted[1].ID, "3") - assert.Equal(t, deleted[1].ServerPort, int32(8081)) + assert.Equal(t, "2", deleted[0].ID) + assert.Equal(t, "3", deleted[1].ID) + assert.Equal(t, int32(8081), deleted[1].ServerPort) added, updated, deleted = diffStreamRoutes(olds, news) assert.Len(t, added, 1) - assert.Equal(t, added[0].ID, "1") + assert.Equal(t, "1", added[0].ID) assert.Len(t, updated, 1) - assert.Equal(t, updated[0].ID, "3") - assert.Equal(t, updated[0].ServerPort, int32(8080)) + assert.Equal(t, "3", updated[0].ID) + assert.Equal(t, int32(8080), updated[0].ServerPort) assert.Len(t, deleted, 1) - assert.Equal(t, deleted[0].ID, "2") + assert.Equal(t, "2", deleted[0].ID) } func TestDiffUpstreams(t *testing.T) { @@ -139,9 +139,9 @@ func TestDiffUpstreams(t *testing.T) { assert.Nil(t, updated) assert.Nil(t, deleted) assert.Len(t, added, 2) - assert.Equal(t, added[0].ID, "1") - assert.Equal(t, added[1].ID, "3") - assert.Equal(t, *added[1].Retries, 3) + assert.Equal(t, "1", added[0].ID) + assert.Equal(t, "3", added[1].ID) + assert.Equal(t, 3, *added[1].Retries) retries1 := 5 olds := []*apisixv1.Upstream{ @@ -164,20 +164,20 @@ func TestDiffUpstreams(t *testing.T) { assert.Nil(t, updated) assert.Nil(t, added) assert.Len(t, deleted, 2) - assert.Equal(t, deleted[0].ID, "2") - assert.Equal(t, deleted[1].ID, "3") - assert.Equal(t, *deleted[1].Retries, 5) - assert.Equal(t, deleted[1].Timeout.Connect, 10) + assert.Equal(t, "2", deleted[0].ID) + assert.Equal(t, "3", deleted[1].ID) + assert.Equal(t, 5, *deleted[1].Retries) + assert.Equal(t, 10, deleted[1].Timeout.Connect) added, updated, deleted = diffUpstreams(olds, news) assert.Len(t, added, 1) - assert.Equal(t, added[0].ID, "1") + assert.Equal(t, "1", added[0].ID) assert.Len(t, updated, 1) - assert.Equal(t, updated[0].ID, "3") + assert.Equal(t, "3", updated[0].ID) assert.Nil(t, updated[0].Timeout) - assert.Equal(t, *updated[0].Retries, 3) + assert.Equal(t, 3, *updated[0].Retries) assert.Len(t, deleted, 1) - assert.Equal(t, deleted[0].ID, "2") + assert.Equal(t, "2", deleted[0].ID) } func TestManifestDiff(t *testing.T) { @@ -223,16 +223,16 @@ func TestManifestDiff(t *testing.T) { added, updated, deleted := m.diff(om) assert.Len(t, added.routes, 1) - assert.Equal(t, added.routes[0].ID, "1") + assert.Equal(t, "1", added.routes[0].ID) assert.Len(t, added.upstreams, 1) - assert.Equal(t, added.upstreams[0].ID, "4") + assert.Equal(t, "4", added.upstreams[0].ID) assert.Len(t, updated.routes, 1) - assert.Equal(t, updated.routes[0].ID, "3") - assert.Equal(t, updated.routes[0].Methods, []string{"GET"}) + assert.Equal(t, "3", updated.routes[0].ID) + assert.Equal(t, []string{"GET"}, updated.routes[0].Methods) assert.Nil(t, updated.upstreams) assert.Len(t, deleted.routes, 1) - assert.Equal(t, deleted.routes[0].ID, "2") + assert.Equal(t, "2", deleted.routes[0].ID) assert.Nil(t, updated.upstreams) } diff --git a/pkg/ingress/pod_test.go b/pkg/ingress/pod_test.go index a0d8549..10a2fe0 100644 --- a/pkg/ingress/pod_test.go +++ b/pkg/ingress/pod_test.go @@ -51,7 +51,7 @@ func TestPodOnAdd(t *testing.T) { ctl.onAdd(pod) name, err := ctl.controller.podCache.GetNameByIP("10.0.5.12") assert.Nil(t, err) - assert.Equal(t, name, "nginx") + assert.Equal(t, "nginx", name) pod2 := &corev1.Pod{ ObjectMeta: metav1.ObjectMeta{ @@ -66,7 +66,7 @@ func TestPodOnAdd(t *testing.T) { ctl.onAdd(pod2) name, err = ctl.controller.podCache.GetNameByIP("10.0.5.13") assert.Empty(t, name) - assert.Equal(t, err, types.ErrPodNotFound) + assert.Equal(t, types.ErrPodNotFound, err) } func TestPodOnDelete(t *testing.T) { @@ -95,7 +95,7 @@ func TestPodOnDelete(t *testing.T) { ctl.onDelete(pod) name, err := ctl.controller.podCache.GetNameByIP("10.0.5.12") assert.Empty(t, name) - assert.Equal(t, err, types.ErrPodNotFound) + assert.Equal(t, types.ErrPodNotFound, err) pod2 := &corev1.Pod{ ObjectMeta: metav1.ObjectMeta{ @@ -110,7 +110,7 @@ func TestPodOnDelete(t *testing.T) { assert.Nil(t, ctl.controller.podCache.Add(pod2), "adding pod") ctl.onDelete(pod2) name, err = ctl.controller.podCache.GetNameByIP("10.0.5.13") - assert.Equal(t, name, "abc") + assert.Equal(t, "abc", name) assert.Nil(t, err) } @@ -142,8 +142,8 @@ func TestPodOnUpdate(t *testing.T) { ctl.onUpdate(nil, pod) name, err := ctl.controller.podCache.GetNameByIP("10.0.5.12") - assert.Equal(t, name, "nginx") - assert.Equal(t, err, nil) + assert.Equal(t, "nginx", name) + assert.Equal(t, nil, err) pod2 := &corev1.Pod{ ObjectMeta: metav1.ObjectMeta{ @@ -158,6 +158,6 @@ func TestPodOnUpdate(t *testing.T) { assert.Nil(t, ctl.controller.podCache.Add(pod2), "adding pod") ctl.onUpdate(nil, pod2) name, err = ctl.controller.podCache.GetNameByIP("10.0.5.13") - assert.Equal(t, name, "abc") + assert.Equal(t, "abc", name) assert.Nil(t, err) } diff --git a/pkg/kube/translation/annotations/cors_test.go b/pkg/kube/translation/annotations/cors_test.go index d1b6b22..342c0f2 100644 --- a/pkg/kube/translation/annotations/cors_test.go +++ b/pkg/kube/translation/annotations/cors_test.go @@ -33,11 +33,11 @@ func TestCorsHandler(t *testing.T) { out, err := p.Handle(NewExtractor(annotations)) assert.Nil(t, err, "checking given error") config := out.(*apisixv1.CorsConfig) - assert.Equal(t, config.AllowHeaders, "abc,def") - assert.Equal(t, config.AllowOrigins, "https://a.com") - assert.Equal(t, config.AllowMethods, "GET,HEAD") + assert.Equal(t, "abc,def", config.AllowHeaders) + assert.Equal(t, "https://a.com", config.AllowOrigins) + assert.Equal(t, "GET,HEAD", config.AllowMethods) - assert.Equal(t, p.PluginName(), "cors") + assert.Equal(t, "cors", p.PluginName()) annotations[_enableCors] = "false" out, err = p.Handle(NewExtractor(annotations)) diff --git a/pkg/kube/translation/annotations/iprestriction_test.go b/pkg/kube/translation/annotations/iprestriction_test.go index d36d72f..cfc3fca 100644 --- a/pkg/kube/translation/annotations/iprestriction_test.go +++ b/pkg/kube/translation/annotations/iprestriction_test.go @@ -31,20 +31,20 @@ func TestIPRestrictionHandler(t *testing.T) { assert.Nil(t, err, "checking given error") config := out.(*apisixv1.IPRestrictConfig) assert.Len(t, config.Allowlist, 2, "checking size of white list") - assert.Equal(t, config.Allowlist[0], "10.2.2.2") - assert.Equal(t, config.Allowlist[1], "192.168.0.0/16") - assert.Equal(t, p.PluginName(), "ip-restriction") + assert.Equal(t, "10.2.2.2", config.Allowlist[0]) + assert.Equal(t, "192.168.0.0/16", config.Allowlist[1]) + assert.Equal(t, "ip-restriction", p.PluginName()) annotations[_blocklistSourceRange] = "172.17.0.0/16,127.0.0.1" out, err = p.Handle(NewExtractor(annotations)) assert.Nil(t, err, "checking given error") config = out.(*apisixv1.IPRestrictConfig) assert.Len(t, config.Allowlist, 2, "checking size of white list") - assert.Equal(t, config.Allowlist[0], "10.2.2.2") - assert.Equal(t, config.Allowlist[1], "192.168.0.0/16") + assert.Equal(t, "10.2.2.2", config.Allowlist[0]) + assert.Equal(t, "192.168.0.0/16", config.Allowlist[1]) assert.Len(t, config.Blocklist, 2, "checking size of black list") - assert.Equal(t, config.Blocklist[0], "172.17.0.0/16") - assert.Equal(t, config.Blocklist[1], "127.0.0.1") + assert.Equal(t, "172.17.0.0/16", config.Blocklist[0]) + assert.Equal(t, "127.0.0.1", config.Blocklist[1]) delete(annotations, _allowlistSourceRange) delete(annotations, _blocklistSourceRange) diff --git a/pkg/kube/translation/apisix_consumer_test.go b/pkg/kube/translation/apisix_consumer_test.go index cf1c796..5a81bd8 100644 --- a/pkg/kube/translation/apisix_consumer_test.go +++ b/pkg/kube/translation/apisix_consumer_test.go @@ -45,8 +45,8 @@ func TestTranslateApisixConsumer(t *testing.T) { assert.Nil(t, err) assert.Len(t, consumer.Plugins, 1) cfg := consumer.Plugins["basic-auth"].(*apisixv1.BasicAuthConsumerConfig) - assert.Equal(t, cfg.Username, "jack") - assert.Equal(t, cfg.Password, "jacknice") + assert.Equal(t, "jack", cfg.Username) + assert.Equal(t, "jacknice", cfg.Password) ac = &configv2alpha1.ApisixConsumer{ ObjectMeta: metav1.ObjectMeta{ @@ -67,7 +67,7 @@ func TestTranslateApisixConsumer(t *testing.T) { assert.Nil(t, err) assert.Len(t, consumer.Plugins, 1) cfg2 := consumer.Plugins["key-auth"].(*apisixv1.KeyAuthConsumerConfig) - assert.Equal(t, cfg2.Key, "qwerty") + assert.Equal(t, "qwerty", cfg2.Key) // No test test cases for secret references as we already test them // in plugin_test.go. diff --git a/pkg/kube/translation/apisix_route_test.go b/pkg/kube/translation/apisix_route_test.go index 424b412..66049bf 100644 --- a/pkg/kube/translation/apisix_route_test.go +++ b/pkg/kube/translation/apisix_route_test.go @@ -132,56 +132,56 @@ func TestRouteMatchExpr(t *testing.T) { assert.Len(t, results, 10) assert.Len(t, results[0], 3) - assert.Equal(t, results[0][0].StrVal, "http_content_type") - assert.Equal(t, results[0][1].StrVal, "==") - assert.Equal(t, results[0][2].StrVal, "text/plain") + assert.Equal(t, "http_content_type", results[0][0].StrVal) + assert.Equal(t, "==", results[0][1].StrVal) + assert.Equal(t, "text/plain", results[0][2].StrVal) assert.Len(t, results[1], 3) - assert.Equal(t, results[1][0].StrVal, "http_content_encoding") - assert.Equal(t, results[1][1].StrVal, "~=") - assert.Equal(t, results[1][2].StrVal, "gzip") + assert.Equal(t, "http_content_encoding", results[1][0].StrVal) + assert.Equal(t, "~=", results[1][1].StrVal) + assert.Equal(t, "gzip", results[1][2].StrVal) assert.Len(t, results[2], 3) - assert.Equal(t, results[2][0].StrVal, "arg_id") - assert.Equal(t, results[2][1].StrVal, ">") - assert.Equal(t, results[2][2].StrVal, "13") + assert.Equal(t, "arg_id", results[2][0].StrVal) + assert.Equal(t, ">", results[2][1].StrVal) + assert.Equal(t, "13", results[2][2].StrVal) assert.Len(t, results[3], 3) - assert.Equal(t, results[3][0].StrVal, "arg_id") - assert.Equal(t, results[3][1].StrVal, "<") - assert.Equal(t, results[3][2].StrVal, "13") + assert.Equal(t, "arg_id", results[3][0].StrVal) + assert.Equal(t, "<", results[3][1].StrVal) + assert.Equal(t, "13", results[3][2].StrVal) assert.Len(t, results[4], 3) - assert.Equal(t, results[4][0].StrVal, "arg_id") - assert.Equal(t, results[4][1].StrVal, "~~") - assert.Equal(t, results[4][2].StrVal, ".*\\.php") + assert.Equal(t, "arg_id", results[4][0].StrVal) + assert.Equal(t, "~~", results[4][1].StrVal) + assert.Equal(t, ".*\\.php", results[4][2].StrVal) assert.Len(t, results[5], 3) - assert.Equal(t, results[5][0].StrVal, "arg_id") - assert.Equal(t, results[5][1].StrVal, "~*") - assert.Equal(t, results[5][2].StrVal, ".*\\.php") + assert.Equal(t, "arg_id", results[5][0].StrVal) + assert.Equal(t, "~*", results[5][1].StrVal) + assert.Equal(t, ".*\\.php", results[5][2].StrVal) assert.Len(t, results[6], 4) - assert.Equal(t, results[6][0].StrVal, "arg_id") - assert.Equal(t, results[6][1].StrVal, "!") - assert.Equal(t, results[6][2].StrVal, "~~") - assert.Equal(t, results[6][3].StrVal, ".*\\.php") + assert.Equal(t, "arg_id", results[6][0].StrVal) + assert.Equal(t, "!", results[6][1].StrVal) + assert.Equal(t, "~~", results[6][2].StrVal) + assert.Equal(t, ".*\\.php", results[6][3].StrVal) assert.Len(t, results[7], 4) - assert.Equal(t, results[7][0].StrVal, "arg_id") - assert.Equal(t, results[7][1].StrVal, "!") - assert.Equal(t, results[7][2].StrVal, "~*") - assert.Equal(t, results[7][3].StrVal, ".*\\.php") + assert.Equal(t, "arg_id", results[7][0].StrVal) + assert.Equal(t, "!", results[7][1].StrVal) + assert.Equal(t, "~*", results[7][2].StrVal) + assert.Equal(t, ".*\\.php", results[7][3].StrVal) assert.Len(t, results[8], 3) - assert.Equal(t, results[8][0].StrVal, "cookie_domain") - assert.Equal(t, results[8][1].StrVal, "in") - assert.Equal(t, results[8][2].SliceVal, []string{"a.com", "b.com"}) + assert.Equal(t, "cookie_domain", results[8][0].StrVal) + assert.Equal(t, "in", results[8][1].StrVal) + assert.Equal(t, []string{"a.com", "b.com"}, results[8][2].SliceVal) assert.Len(t, results[9], 3) - assert.Equal(t, results[9][0].StrVal, "cookie_X-Foo") - assert.Equal(t, results[9][1].StrVal, "in") - assert.Equal(t, results[9][2].SliceVal, []string{"foo.com"}) + assert.Equal(t, "cookie_X-Foo", results[9][0].StrVal) + assert.Equal(t, "in", results[9][1].StrVal) + assert.Equal(t, []string{"foo.com"}, results[9][2].SliceVal) } func TestTranslateApisixRouteV2alpha1WithDuplicatedName(t *testing.T) { @@ -321,7 +321,7 @@ func TestTranslateApisixRouteV2alpha1WithDuplicatedName(t *testing.T) { _, err = tr.TranslateRouteV2alpha1(ar) assert.NotNil(t, err) - assert.Equal(t, err.Error(), "duplicated route rule name") + assert.Equal(t, "duplicated route rule name", err.Error()) } func TestTranslateApisixRouteV2alpha1NotStrictly(t *testing.T) { @@ -370,16 +370,16 @@ func TestTranslateApisixRouteV2alpha1NotStrictly(t *testing.T) { tx, err := tr.TranslateRouteV2alpha1NotStrictly(ar) fmt.Println(tx) assert.NoError(t, err, "translateRoute not strictly should be no error") - assert.Equal(t, len(tx.Routes), 2, "There should be 2 routes") - assert.Equal(t, len(tx.Upstreams), 2, "There should be 2 upstreams") - assert.Equal(t, tx.Routes[0].Name, "test_ar_rule1", "route1 name error") - assert.Equal(t, tx.Routes[1].Name, "test_ar_rule2", "route2 name error") - assert.Equal(t, tx.Upstreams[0].Name, "test_svc1_81", "upstream1 name error") - assert.Equal(t, tx.Upstreams[1].Name, "test_svc2_82", "upstream2 name error") + assert.Equal(t, 2, len(tx.Routes), "There should be 2 routes") + assert.Equal(t, 2, len(tx.Upstreams), "There should be 2 upstreams") + assert.Equal(t, "test_ar_rule1", tx.Routes[0].Name, "route1 name error") + assert.Equal(t, "test_ar_rule2", tx.Routes[1].Name, "route2 name error") + assert.Equal(t, "test_svc1_81", tx.Upstreams[0].Name, "upstream1 name error") + assert.Equal(t, "test_svc2_82", tx.Upstreams[1].Name, "upstream2 name error") - assert.Equal(t, tx.Routes[0].ID, id.GenID("test_ar_rule1"), "route1 id error") - assert.Equal(t, tx.Routes[1].ID, id.GenID("test_ar_rule2"), "route2 id error") - assert.Equal(t, tx.Upstreams[0].ID, id.GenID("test_svc1_81"), "upstream1 id error") - assert.Equal(t, tx.Upstreams[1].ID, id.GenID("test_svc2_82"), "upstream2 id error") + assert.Equal(t, id.GenID("test_ar_rule1"), tx.Routes[0].ID, "route1 id error") + assert.Equal(t, id.GenID("test_ar_rule2"), tx.Routes[1].ID, "route2 id error") + assert.Equal(t, id.GenID("test_svc1_81"), tx.Upstreams[0].ID, "upstream1 id error") + assert.Equal(t, id.GenID("test_svc2_82"), tx.Upstreams[1].ID, "upstream2 id error") } diff --git a/pkg/kube/translation/apisix_upstream_test.go b/pkg/kube/translation/apisix_upstream_test.go index 2293838..df1bd90 100644 --- a/pkg/kube/translation/apisix_upstream_test.go +++ b/pkg/kube/translation/apisix_upstream_test.go @@ -105,10 +105,10 @@ func TestTranslateUpstreamPassiveHealthCheckUnusually(t *testing.T) { } err := tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.passive.Type", reason: "invalid value", - }) + }, err) // invalid passive health check healthy successes hc = &configv1.HealthCheck{ @@ -120,10 +120,10 @@ func TestTranslateUpstreamPassiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.passive.healthy.successes", reason: "invalid value", - }) + }, err) // empty passive health check healthy httpCodes. hc = &configv1.HealthCheck{ @@ -136,10 +136,10 @@ func TestTranslateUpstreamPassiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.passive.healthy.httpCodes", reason: "empty", - }) + }, err) // empty passive health check unhealthy httpFailures. hc = &configv1.HealthCheck{ @@ -151,10 +151,10 @@ func TestTranslateUpstreamPassiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.passive.unhealthy.httpFailures", reason: "invalid value", - }) + }, err) // empty passive health check unhealthy tcpFailures. hc = &configv1.HealthCheck{ @@ -166,10 +166,10 @@ func TestTranslateUpstreamPassiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.passive.unhealthy.tcpFailures", reason: "invalid value", - }) + }, err) // empty passive health check unhealthy httpCodes. hc = &configv1.HealthCheck{ @@ -181,10 +181,10 @@ func TestTranslateUpstreamPassiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.passive.unhealthy.httpCodes", reason: "empty", - }) + }, err) } func TestTranslateUpstreamActiveHealthCheckUnusually(t *testing.T) { @@ -197,10 +197,10 @@ func TestTranslateUpstreamActiveHealthCheckUnusually(t *testing.T) { }, } err := tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.active.Type", reason: "invalid value", - }) + }, err) // invalid active health check port value hc = &configv1.HealthCheck{ @@ -210,10 +210,10 @@ func TestTranslateUpstreamActiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.active.port", reason: "invalid value", - }) + }, err) // invalid active health check concurrency value hc = &configv1.HealthCheck{ @@ -223,10 +223,10 @@ func TestTranslateUpstreamActiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.active.concurrency", reason: "invalid value", - }) + }, err) // invalid active health check healthy successes value hc = &configv1.HealthCheck{ @@ -240,10 +240,10 @@ func TestTranslateUpstreamActiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.active.healthy.successes", reason: "invalid value", - }) + }, err) // invalid active health check healthy successes value hc = &configv1.HealthCheck{ @@ -257,10 +257,10 @@ func TestTranslateUpstreamActiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.active.healthy.httpCodes", reason: "empty", - }) + }, err) // invalid active health check healthy interval hc = &configv1.HealthCheck{ @@ -272,10 +272,10 @@ func TestTranslateUpstreamActiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.active.healthy.interval", reason: "invalid value", - }) + }, err) // missing active health check healthy interval hc = &configv1.HealthCheck{ @@ -285,10 +285,10 @@ func TestTranslateUpstreamActiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.active.healthy.interval", reason: "invalid value", - }) + }, err) // invalid active health check unhealthy httpFailures hc = &configv1.HealthCheck{ @@ -302,10 +302,10 @@ func TestTranslateUpstreamActiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.active.unhealthy.httpFailures", reason: "invalid value", - }) + }, err) // invalid active health check unhealthy tcpFailures hc = &configv1.HealthCheck{ @@ -319,10 +319,10 @@ func TestTranslateUpstreamActiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.active.unhealthy.tcpFailures", reason: "invalid value", - }) + }, err) // invalid active health check unhealthy httpCodes hc = &configv1.HealthCheck{ @@ -336,10 +336,10 @@ func TestTranslateUpstreamActiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.active.unhealthy.httpCodes", reason: "empty", - }) + }, err) // invalid active health check unhealthy interval hc = &configv1.HealthCheck{ @@ -351,10 +351,10 @@ func TestTranslateUpstreamActiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.active.unhealthy.interval", reason: "invalid value", - }) + }, err) // missing active health check unhealthy interval hc = &configv1.HealthCheck{ @@ -364,20 +364,20 @@ func TestTranslateUpstreamActiveHealthCheckUnusually(t *testing.T) { }, } err = tr.translateUpstreamHealthCheck(hc, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "healthCheck.active.unhealthy.interval", reason: "invalid value", - }) + }, err) } func TestUpstreamRetriesAndTimeout(t *testing.T) { tr := &translator{} retries := -1 err := tr.translateUpstreamRetriesAndTimeout(&retries, nil, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "retries", reason: "invalid value", - }) + }, err) var ups apisixv1.Upstream retries = 3 @@ -391,10 +391,10 @@ func TestUpstreamRetriesAndTimeout(t *testing.T) { } retries = 3 err = tr.translateUpstreamRetriesAndTimeout(&retries, timeout, &ups) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "timeout.read", reason: "invalid value", - }) + }, err) timeout = &configv1.UpstreamTimeout{ Connect: metav1.Duration{Duration: time.Second}, @@ -403,9 +403,9 @@ func TestUpstreamRetriesAndTimeout(t *testing.T) { retries = 3 err = tr.translateUpstreamRetriesAndTimeout(&retries, timeout, &ups) assert.Nil(t, err) - assert.Equal(t, ups.Timeout, &apisixv1.UpstreamTimeout{ + assert.Equal(t, &apisixv1.UpstreamTimeout{ Connect: 1, Send: 60, Read: 15, - }) + }, ups.Timeout) } diff --git a/pkg/kube/translation/context_test.go b/pkg/kube/translation/context_test.go index b1097a6..20f55a8 100644 --- a/pkg/kube/translation/context_test.go +++ b/pkg/kube/translation/context_test.go @@ -65,12 +65,12 @@ func TestTranslateContext(t *testing.T) { assert.Len(t, ctx.StreamRoutes, 2) assert.Len(t, ctx.Upstreams, 1) - assert.Equal(t, ctx.Routes[0], r1) - assert.Equal(t, ctx.Routes[1], r2) - assert.Equal(t, ctx.StreamRoutes[0], sr1) - assert.Equal(t, ctx.StreamRoutes[1], sr2) - assert.Equal(t, ctx.Upstreams[0], u1) + assert.Equal(t, r1, ctx.Routes[0]) + assert.Equal(t, r2, ctx.Routes[1]) + assert.Equal(t, sr1, ctx.StreamRoutes[0]) + assert.Equal(t, sr2, ctx.StreamRoutes[1]) + assert.Equal(t, u1, ctx.Upstreams[0]) - assert.Equal(t, ctx.checkUpstreamExist("aaa"), true) - assert.Equal(t, ctx.checkUpstreamExist("bbb"), false) + assert.Equal(t, true, ctx.checkUpstreamExist("aaa")) + assert.Equal(t, false, ctx.checkUpstreamExist("bbb")) } diff --git a/pkg/kube/translation/ingress_test.go b/pkg/kube/translation/ingress_test.go index feb0026..3a18074 100644 --- a/pkg/kube/translation/ingress_test.go +++ b/pkg/kube/translation/ingress_test.go @@ -120,8 +120,8 @@ func TestTranslateIngressV1NoBackend(t *testing.T) { assert.Nil(t, err) assert.Len(t, ctx.Routes, 1) assert.Len(t, ctx.Upstreams, 0) - assert.Equal(t, ctx.Routes[0].UpstreamId, "") - assert.Equal(t, ctx.Routes[0].Uris, []string{"/foo", "/foo/*"}) + assert.Equal(t, "", ctx.Routes[0].UpstreamId) + assert.Equal(t, []string{"/foo", "/foo/*"}, ctx.Routes[0].Uris) } func TestTranslateIngressV1BackendWithInvalidService(t *testing.T) { @@ -170,7 +170,7 @@ func TestTranslateIngressV1BackendWithInvalidService(t *testing.T) { ctx, err := tr.translateIngressV1(ing) assert.NotNil(t, err) assert.Nil(t, ctx) - assert.Equal(t, err.Error(), "service \"test-service\" not found") + assert.Equal(t, "service \"test-service\" not found", err.Error()) processCh := make(chan struct{}) svcInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{ @@ -192,10 +192,10 @@ func TestTranslateIngressV1BackendWithInvalidService(t *testing.T) { <-processCh ctx, err = tr.translateIngressV1(ing) assert.Nil(t, ctx, nil) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "service", reason: "port not found", - }) + }, err) } func TestTranslateIngressV1(t *testing.T) { @@ -288,28 +288,28 @@ func TestTranslateIngressV1(t *testing.T) { assert.Len(t, ctx.Routes, 2) assert.Len(t, ctx.Upstreams, 2) - assert.Equal(t, ctx.Routes[0].Uris, []string{"/foo", "/foo/*"}) - assert.Equal(t, ctx.Routes[0].UpstreamId, ctx.Upstreams[0].ID) - assert.Equal(t, ctx.Routes[0].Host, "apisix.apache.org") - assert.Equal(t, ctx.Routes[1].Uris, []string{"/bar"}) - assert.Equal(t, ctx.Routes[1].UpstreamId, ctx.Upstreams[1].ID) - assert.Equal(t, ctx.Routes[1].Host, "apisix.apache.org") + assert.Equal(t, []string{"/foo", "/foo/*"}, ctx.Routes[0].Uris) + assert.Equal(t, ctx.Upstreams[0].ID, ctx.Routes[0].UpstreamId) + assert.Equal(t, "apisix.apache.org", ctx.Routes[0].Host) + assert.Equal(t, []string{"/bar"}, ctx.Routes[1].Uris) + assert.Equal(t, ctx.Upstreams[1].ID, ctx.Routes[1].UpstreamId) + assert.Equal(t, "apisix.apache.org", ctx.Routes[1].Host) - assert.Equal(t, ctx.Upstreams[0].Type, "roundrobin") - assert.Equal(t, ctx.Upstreams[0].Scheme, "http") + assert.Equal(t, "roundrobin", ctx.Upstreams[0].Type) + assert.Equal(t, "http", ctx.Upstreams[0].Scheme) assert.Len(t, ctx.Upstreams[0].Nodes, 2) - assert.Equal(t, ctx.Upstreams[0].Nodes[0].Port, 9080) - assert.Equal(t, ctx.Upstreams[0].Nodes[0].Host, "192.168.1.1") - assert.Equal(t, ctx.Upstreams[0].Nodes[1].Port, 9080) - assert.Equal(t, ctx.Upstreams[0].Nodes[1].Host, "192.168.1.2") + assert.Equal(t, 9080, ctx.Upstreams[0].Nodes[0].Port) + assert.Equal(t, "192.168.1.1", ctx.Upstreams[0].Nodes[0].Host) + assert.Equal(t, 9080, ctx.Upstreams[0].Nodes[1].Port) + assert.Equal(t, "192.168.1.2", ctx.Upstreams[0].Nodes[1].Host) - assert.Equal(t, ctx.Upstreams[1].Type, "roundrobin") - assert.Equal(t, ctx.Upstreams[1].Scheme, "http") + assert.Equal(t, "roundrobin", ctx.Upstreams[1].Type) + assert.Equal(t, "http", ctx.Upstreams[1].Scheme) assert.Len(t, ctx.Upstreams[1].Nodes, 2) - assert.Equal(t, ctx.Upstreams[1].Nodes[0].Port, 9443) - assert.Equal(t, ctx.Upstreams[1].Nodes[0].Host, "192.168.1.1") - assert.Equal(t, ctx.Upstreams[1].Nodes[1].Port, 9443) - assert.Equal(t, ctx.Upstreams[1].Nodes[1].Host, "192.168.1.2") + assert.Equal(t, 9443, ctx.Upstreams[1].Nodes[0].Port) + assert.Equal(t, "192.168.1.1", ctx.Upstreams[1].Nodes[0].Host) + assert.Equal(t, 9443, ctx.Upstreams[1].Nodes[1].Port) + assert.Equal(t, "192.168.1.2", ctx.Upstreams[1].Nodes[1].Host) } func TestTranslateIngressV1beta1NoBackend(t *testing.T) { @@ -343,8 +343,8 @@ func TestTranslateIngressV1beta1NoBackend(t *testing.T) { assert.Nil(t, err) assert.Len(t, ctx.Routes, 1) assert.Len(t, ctx.Upstreams, 0) - assert.Equal(t, ctx.Routes[0].UpstreamId, "") - assert.Equal(t, ctx.Routes[0].Uris, []string{"/foo", "/foo/*"}) + assert.Equal(t, "", ctx.Routes[0].UpstreamId) + assert.Equal(t, []string{"/foo", "/foo/*"}, ctx.Routes[0].Uris) } func TestTranslateIngressV1beta1BackendWithInvalidService(t *testing.T) { @@ -392,7 +392,7 @@ func TestTranslateIngressV1beta1BackendWithInvalidService(t *testing.T) { ctx, err := tr.translateIngressV1beta1(ing) assert.NotNil(t, err) assert.Nil(t, ctx) - assert.Equal(t, err.Error(), "service \"test-service\" not found") + assert.Equal(t, "service \"test-service\" not found", err.Error()) processCh := make(chan struct{}) svcInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{ @@ -414,10 +414,10 @@ func TestTranslateIngressV1beta1BackendWithInvalidService(t *testing.T) { <-processCh ctx, err = tr.translateIngressV1beta1(ing) assert.Nil(t, ctx) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "service", reason: "port not found", - }) + }, err) } func TestTranslateIngressV1beta1(t *testing.T) { @@ -508,28 +508,28 @@ func TestTranslateIngressV1beta1(t *testing.T) { assert.Len(t, ctx.Routes, 2) assert.Len(t, ctx.Upstreams, 2) - assert.Equal(t, ctx.Routes[0].Uris, []string{"/foo", "/foo/*"}) - assert.Equal(t, ctx.Routes[0].UpstreamId, ctx.Upstreams[0].ID) - assert.Equal(t, ctx.Routes[0].Host, "apisix.apache.org") - assert.Equal(t, ctx.Routes[1].Uris, []string{"/bar"}) - assert.Equal(t, ctx.Routes[1].UpstreamId, ctx.Upstreams[1].ID) - assert.Equal(t, ctx.Routes[1].Host, "apisix.apache.org") + assert.Equal(t, []string{"/foo", "/foo/*"}, ctx.Routes[0].Uris) + assert.Equal(t, ctx.Upstreams[0].ID, ctx.Routes[0].UpstreamId) + assert.Equal(t, "apisix.apache.org", ctx.Routes[0].Host) + assert.Equal(t, []string{"/bar"}, ctx.Routes[1].Uris) + assert.Equal(t, ctx.Upstreams[1].ID, ctx.Routes[1].UpstreamId) + assert.Equal(t, "apisix.apache.org", ctx.Routes[1].Host) - assert.Equal(t, ctx.Upstreams[0].Type, "roundrobin") - assert.Equal(t, ctx.Upstreams[0].Scheme, "http") + assert.Equal(t, "roundrobin", ctx.Upstreams[0].Type) + assert.Equal(t, "http", ctx.Upstreams[0].Scheme) assert.Len(t, ctx.Upstreams[0].Nodes, 2) - assert.Equal(t, ctx.Upstreams[0].Nodes[0].Port, 9080) - assert.Equal(t, ctx.Upstreams[0].Nodes[0].Host, "192.168.1.1") - assert.Equal(t, ctx.Upstreams[0].Nodes[1].Port, 9080) - assert.Equal(t, ctx.Upstreams[0].Nodes[1].Host, "192.168.1.2") + assert.Equal(t, 9080, ctx.Upstreams[0].Nodes[0].Port) + assert.Equal(t, "192.168.1.1", ctx.Upstreams[0].Nodes[0].Host) + assert.Equal(t, 9080, ctx.Upstreams[0].Nodes[1].Port) + assert.Equal(t, "192.168.1.2", ctx.Upstreams[0].Nodes[1].Host) - assert.Equal(t, ctx.Upstreams[1].Type, "roundrobin") - assert.Equal(t, ctx.Upstreams[1].Scheme, "http") + assert.Equal(t, "roundrobin", ctx.Upstreams[1].Type) + assert.Equal(t, "http", ctx.Upstreams[1].Scheme) assert.Len(t, ctx.Upstreams[1].Nodes, 2) - assert.Equal(t, ctx.Upstreams[1].Nodes[0].Port, 9443) - assert.Equal(t, ctx.Upstreams[1].Nodes[0].Host, "192.168.1.1") - assert.Equal(t, ctx.Upstreams[1].Nodes[1].Port, 9443) - assert.Equal(t, ctx.Upstreams[1].Nodes[1].Host, "192.168.1.2") + assert.Equal(t, 9443, ctx.Upstreams[1].Nodes[0].Port) + assert.Equal(t, "192.168.1.1", ctx.Upstreams[1].Nodes[0].Host) + assert.Equal(t, 9443, ctx.Upstreams[1].Nodes[1].Port) + assert.Equal(t, "192.168.1.2", ctx.Upstreams[1].Nodes[1].Host) } func TestTranslateIngressExtensionsV1beta1(t *testing.T) { @@ -620,28 +620,28 @@ func TestTranslateIngressExtensionsV1beta1(t *testing.T) { assert.Len(t, ctx.Routes, 2) assert.Len(t, ctx.Upstreams, 2) - assert.Equal(t, ctx.Routes[0].Uris, []string{"/foo", "/foo/*"}) - assert.Equal(t, ctx.Routes[0].UpstreamId, ctx.Upstreams[0].ID) - assert.Equal(t, ctx.Routes[0].Host, "apisix.apache.org") - assert.Equal(t, ctx.Routes[1].Uris, []string{"/bar"}) - assert.Equal(t, ctx.Routes[1].UpstreamId, ctx.Upstreams[1].ID) - assert.Equal(t, ctx.Routes[1].Host, "apisix.apache.org") + assert.Equal(t, []string{"/foo", "/foo/*"}, ctx.Routes[0].Uris) + assert.Equal(t, ctx.Upstreams[0].ID, ctx.Routes[0].UpstreamId) + assert.Equal(t, "apisix.apache.org", ctx.Routes[0].Host) + assert.Equal(t, []string{"/bar"}, ctx.Routes[1].Uris) + assert.Equal(t, ctx.Upstreams[1].ID, ctx.Routes[1].UpstreamId) + assert.Equal(t, "apisix.apache.org", ctx.Routes[1].Host) - assert.Equal(t, ctx.Upstreams[0].Type, "roundrobin") - assert.Equal(t, ctx.Upstreams[0].Scheme, "http") + assert.Equal(t, "roundrobin", ctx.Upstreams[0].Type) + assert.Equal(t, "http", ctx.Upstreams[0].Scheme) assert.Len(t, ctx.Upstreams[0].Nodes, 2) - assert.Equal(t, ctx.Upstreams[0].Nodes[0].Port, 9080) - assert.Equal(t, ctx.Upstreams[0].Nodes[0].Host, "192.168.1.1") - assert.Equal(t, ctx.Upstreams[0].Nodes[1].Port, 9080) - assert.Equal(t, ctx.Upstreams[0].Nodes[1].Host, "192.168.1.2") + assert.Equal(t, 9080, ctx.Upstreams[0].Nodes[0].Port) + assert.Equal(t, "192.168.1.1", ctx.Upstreams[0].Nodes[0].Host) + assert.Equal(t, 9080, ctx.Upstreams[0].Nodes[1].Port) + assert.Equal(t, "192.168.1.2", ctx.Upstreams[0].Nodes[1].Host) - assert.Equal(t, ctx.Upstreams[1].Type, "roundrobin") - assert.Equal(t, ctx.Upstreams[1].Scheme, "http") + assert.Equal(t, "roundrobin", ctx.Upstreams[1].Type) + assert.Equal(t, "http", ctx.Upstreams[1].Scheme) assert.Len(t, ctx.Upstreams[1].Nodes, 2) - assert.Equal(t, ctx.Upstreams[1].Nodes[0].Port, 9443) - assert.Equal(t, ctx.Upstreams[1].Nodes[0].Host, "192.168.1.1") - assert.Equal(t, ctx.Upstreams[1].Nodes[1].Port, 9443) - assert.Equal(t, ctx.Upstreams[1].Nodes[1].Host, "192.168.1.2") + assert.Equal(t, 9443, ctx.Upstreams[1].Nodes[0].Port) + assert.Equal(t, "192.168.1.1", ctx.Upstreams[1].Nodes[0].Host) + assert.Equal(t, 9443, ctx.Upstreams[1].Nodes[1].Port) + assert.Equal(t, "192.168.1.2", ctx.Upstreams[1].Nodes[1].Host) } func TestTranslateIngressExtensionsV1beta1BackendWithInvalidService(t *testing.T) { @@ -689,7 +689,7 @@ func TestTranslateIngressExtensionsV1beta1BackendWithInvalidService(t *testing.T ctx, err := tr.translateIngressExtensionsV1beta1(ing) assert.Nil(t, ctx) assert.NotNil(t, err) - assert.Equal(t, err.Error(), "service \"test-service\" not found") + assert.Equal(t, "service \"test-service\" not found", err.Error()) processCh := make(chan struct{}) svcInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{ @@ -711,8 +711,8 @@ func TestTranslateIngressExtensionsV1beta1BackendWithInvalidService(t *testing.T <-processCh ctx, err = tr.translateIngressExtensionsV1beta1(ing) assert.Nil(t, ctx) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "service", reason: "port not found", - }) + }, err) } diff --git a/pkg/kube/translation/plugin_test.go b/pkg/kube/translation/plugin_test.go index 9a2642c..b349810 100644 --- a/pkg/kube/translation/plugin_test.go +++ b/pkg/kube/translation/plugin_test.go @@ -182,26 +182,26 @@ func TestTranslateTrafficSplitPlugin(t *testing.T) { assert.Nil(t, err) assert.Len(t, ctx.Upstreams, 2) - assert.Equal(t, ctx.Upstreams[0].Name, "test_svc-1_80") + assert.Equal(t, "test_svc-1_80", ctx.Upstreams[0].Name) assert.Len(t, ctx.Upstreams[0].Nodes, 2) - assert.Equal(t, ctx.Upstreams[0].Nodes[0].Host, "192.168.1.1") - assert.Equal(t, ctx.Upstreams[0].Nodes[0].Port, 9080) - assert.Equal(t, ctx.Upstreams[0].Nodes[1].Host, "192.168.1.2") - assert.Equal(t, ctx.Upstreams[0].Nodes[1].Port, 9080) + assert.Equal(t, "192.168.1.1", ctx.Upstreams[0].Nodes[0].Host) + assert.Equal(t, 9080, ctx.Upstreams[0].Nodes[0].Port) + assert.Equal(t, "192.168.1.2", ctx.Upstreams[0].Nodes[1].Host) + assert.Equal(t, 9080, ctx.Upstreams[0].Nodes[1].Port) - assert.Equal(t, ctx.Upstreams[1].Name, "test_svc-1_443") + assert.Equal(t, "test_svc-1_443", ctx.Upstreams[1].Name) assert.Len(t, ctx.Upstreams[1].Nodes, 1) - assert.Equal(t, ctx.Upstreams[1].Nodes[0].Host, "10.0.5.3") - assert.Equal(t, ctx.Upstreams[1].Nodes[0].Port, 443) + assert.Equal(t, "10.0.5.3", ctx.Upstreams[1].Nodes[0].Host) + assert.Equal(t, 443, ctx.Upstreams[1].Nodes[0].Port) assert.Len(t, cfg.Rules, 1) assert.Len(t, cfg.Rules[0].WeightedUpstreams, 3) - assert.Equal(t, cfg.Rules[0].WeightedUpstreams[0].UpstreamID, id.GenID("test_svc-1_80")) - assert.Equal(t, cfg.Rules[0].WeightedUpstreams[0].Weight, 10) - assert.Equal(t, cfg.Rules[0].WeightedUpstreams[1].UpstreamID, id.GenID("test_svc-1_443")) - assert.Equal(t, cfg.Rules[0].WeightedUpstreams[1].Weight, 20) - assert.Equal(t, cfg.Rules[0].WeightedUpstreams[2].UpstreamID, "") - assert.Equal(t, cfg.Rules[0].WeightedUpstreams[2].Weight, 30) + assert.Equal(t, id.GenID("test_svc-1_80"), cfg.Rules[0].WeightedUpstreams[0].UpstreamID) + assert.Equal(t, 10, cfg.Rules[0].WeightedUpstreams[0].Weight) + assert.Equal(t, id.GenID("test_svc-1_443"), cfg.Rules[0].WeightedUpstreams[1].UpstreamID) + assert.Equal(t, 20, cfg.Rules[0].WeightedUpstreams[1].Weight) + assert.Equal(t, "", cfg.Rules[0].WeightedUpstreams[2].UpstreamID) + assert.Equal(t, 30, cfg.Rules[0].WeightedUpstreams[2].Weight) } func TestTranslateTrafficSplitPluginWithSameUpstreams(t *testing.T) { @@ -351,21 +351,21 @@ func TestTranslateTrafficSplitPluginWithSameUpstreams(t *testing.T) { assert.Nil(t, err) assert.Len(t, ctx.Upstreams, 1) - assert.Equal(t, ctx.Upstreams[0].Name, "test_svc-1_80") + assert.Equal(t, "test_svc-1_80", ctx.Upstreams[0].Name) assert.Len(t, ctx.Upstreams[0].Nodes, 2) - assert.Equal(t, ctx.Upstreams[0].Nodes[0].Host, "192.168.1.1") - assert.Equal(t, ctx.Upstreams[0].Nodes[0].Port, 9080) - assert.Equal(t, ctx.Upstreams[0].Nodes[1].Host, "192.168.1.2") - assert.Equal(t, ctx.Upstreams[0].Nodes[1].Port, 9080) + assert.Equal(t, "192.168.1.1", ctx.Upstreams[0].Nodes[0].Host) + assert.Equal(t, 9080, ctx.Upstreams[0].Nodes[0].Port) + assert.Equal(t, "192.168.1.2", ctx.Upstreams[0].Nodes[1].Host) + assert.Equal(t, 9080, ctx.Upstreams[0].Nodes[1].Port) assert.Len(t, cfg.Rules, 1) assert.Len(t, cfg.Rules[0].WeightedUpstreams, 3) - assert.Equal(t, cfg.Rules[0].WeightedUpstreams[0].UpstreamID, id.GenID("test_svc-1_80")) - assert.Equal(t, cfg.Rules[0].WeightedUpstreams[0].Weight, 10) - assert.Equal(t, cfg.Rules[0].WeightedUpstreams[1].UpstreamID, id.GenID("test_svc-1_80")) - assert.Equal(t, cfg.Rules[0].WeightedUpstreams[1].Weight, 20) - assert.Equal(t, cfg.Rules[0].WeightedUpstreams[2].UpstreamID, "") - assert.Equal(t, cfg.Rules[0].WeightedUpstreams[2].Weight, 30) + assert.Equal(t, id.GenID("test_svc-1_80"), cfg.Rules[0].WeightedUpstreams[0].UpstreamID) + assert.Equal(t, 10, cfg.Rules[0].WeightedUpstreams[0].Weight) + assert.Equal(t, id.GenID("test_svc-1_80"), cfg.Rules[0].WeightedUpstreams[1].UpstreamID) + assert.Equal(t, 20, cfg.Rules[0].WeightedUpstreams[1].Weight) + assert.Equal(t, "", cfg.Rules[0].WeightedUpstreams[2].UpstreamID) + assert.Equal(t, 30, cfg.Rules[0].WeightedUpstreams[2].Weight) } func TestTranslateTrafficSplitPluginBadCases(t *testing.T) { @@ -515,7 +515,7 @@ func TestTranslateTrafficSplitPluginBadCases(t *testing.T) { assert.Nil(t, cfg) assert.Len(t, ctx.Upstreams, 0) assert.NotNil(t, err) - assert.Equal(t, err.Error(), "service \"svc-2\" not found") + assert.Equal(t, "service \"svc-2\" not found", err.Error()) backends[0].ServiceName = "svc-1" backends[1].ServicePort.StrVal = "port-not-found" @@ -523,7 +523,7 @@ func TestTranslateTrafficSplitPluginBadCases(t *testing.T) { cfg, err = tr.translateTrafficSplitPlugin(ctx, ar1.Namespace, 30, backends) assert.Nil(t, cfg) assert.NotNil(t, err) - assert.Equal(t, err.Error(), "service.spec.ports: port not defined") + assert.Equal(t, "service.spec.ports: port not defined", err.Error()) backends[1].ServicePort.StrVal = "port2" backends[1].ResolveGranularity = "service" @@ -531,7 +531,7 @@ func TestTranslateTrafficSplitPluginBadCases(t *testing.T) { cfg, err = tr.translateTrafficSplitPlugin(ctx, ar1.Namespace, 30, backends) assert.Nil(t, cfg) assert.NotNil(t, err) - assert.Equal(t, err.Error(), "conflict headless service and backend resolve granularity") + assert.Equal(t, "conflict headless service and backend resolve granularity", err.Error()) } func TestTranslateConsumerKeyAuthPluginWithInPlaceValue(t *testing.T) { @@ -540,7 +540,7 @@ func TestTranslateConsumerKeyAuthPluginWithInPlaceValue(t *testing.T) { } cfg, err := (&translator{}).translateConsumerKeyAuthPlugin("default", keyAuth) assert.Nil(t, err) - assert.Equal(t, cfg.Key, "abc") + assert.Equal(t, "abc", cfg.Key) } func TestTranslateConsumerKeyAuthWithSecretRef(t *testing.T) { @@ -583,7 +583,7 @@ func TestTranslateConsumerKeyAuthWithSecretRef(t *testing.T) { } cfg, err := tr.translateConsumerKeyAuthPlugin("default", keyAuth) assert.Nil(t, err) - assert.Equal(t, cfg.Key, "abc") + assert.Equal(t, "abc", cfg.Key) cfg, err = tr.translateConsumerKeyAuthPlugin("default2", keyAuth) assert.Nil(t, cfg) @@ -597,7 +597,7 @@ func TestTranslateConsumerKeyAuthWithSecretRef(t *testing.T) { cfg, err = tr.translateConsumerKeyAuthPlugin("default", keyAuth) assert.Nil(t, cfg) - assert.Equal(t, err, _errKeyNotFoundOrInvalid) + assert.Equal(t, _errKeyNotFoundOrInvalid, err) close(processCh) close(stopCh) @@ -612,8 +612,8 @@ func TestTranslateConsumerBasicAuthPluginWithInPlaceValue(t *testing.T) { } cfg, err := (&translator{}).translateConsumerBasicAuthPlugin("default", basicAuth) assert.Nil(t, err) - assert.Equal(t, cfg.Username, "jack") - assert.Equal(t, cfg.Password, "jacknice") + assert.Equal(t, "jack", cfg.Username) + assert.Equal(t, "jacknice", cfg.Password) } func TestTranslateConsumerBasicAuthWithSecretRef(t *testing.T) { @@ -657,8 +657,8 @@ func TestTranslateConsumerBasicAuthWithSecretRef(t *testing.T) { } cfg, err := tr.translateConsumerBasicAuthPlugin("default", basicAuth) assert.Nil(t, err) - assert.Equal(t, cfg.Username, "jack") - assert.Equal(t, cfg.Password, "jacknice") + assert.Equal(t, "jack", cfg.Username) + assert.Equal(t, "jacknice", cfg.Password) cfg, err = tr.translateConsumerBasicAuthPlugin("default2", basicAuth) assert.Nil(t, cfg) @@ -672,7 +672,7 @@ func TestTranslateConsumerBasicAuthWithSecretRef(t *testing.T) { cfg, err = tr.translateConsumerBasicAuthPlugin("default", basicAuth) assert.Nil(t, cfg) - assert.Equal(t, err, _errPasswordNotFoundOrInvalid) + assert.Equal(t, _errPasswordNotFoundOrInvalid, err) delete(sec.Data, "username") _, err = client.CoreV1().Secrets("default").Update(context.Background(), sec, metav1.UpdateOptions{}) @@ -681,7 +681,7 @@ func TestTranslateConsumerBasicAuthWithSecretRef(t *testing.T) { cfg, err = tr.translateConsumerBasicAuthPlugin("default", basicAuth) assert.Nil(t, cfg) - assert.Equal(t, err, _errUsernameNotFoundOrInvalid) + assert.Equal(t, _errUsernameNotFoundOrInvalid, err) close(processCh) close(stopCh) diff --git a/pkg/kube/translation/translator_test.go b/pkg/kube/translation/translator_test.go index 19fe3cf..097de32 100644 --- a/pkg/kube/translation/translator_test.go +++ b/pkg/kube/translation/translator_test.go @@ -42,8 +42,8 @@ func TestTranslateUpstreamConfig(t *testing.T) { ups, err := tr.TranslateUpstreamConfig(au) assert.Nil(t, err, "checking upstream config translating") - assert.Equal(t, ups.Type, apisixv1.LbRoundRobin) - assert.Equal(t, ups.Scheme, apisixv1.SchemeGRPC) + assert.Equal(t, apisixv1.LbRoundRobin, ups.Type) + assert.Equal(t, apisixv1.SchemeGRPC, ups.Scheme) au = &configv1.ApisixUpstreamConfig{ LoadBalancer: &configv1.LoadBalancer{ @@ -55,10 +55,10 @@ func TestTranslateUpstreamConfig(t *testing.T) { } ups, err = tr.TranslateUpstreamConfig(au) assert.Nil(t, err, "checking upstream config translating") - assert.Equal(t, ups.Type, apisixv1.LbConsistentHash) - assert.Equal(t, ups.Key, "user-agent") - assert.Equal(t, ups.HashOn, apisixv1.HashOnHeader) - assert.Equal(t, ups.Scheme, apisixv1.SchemeHTTP) + assert.Equal(t, apisixv1.LbConsistentHash, ups.Type) + assert.Equal(t, "user-agent", ups.Key) + assert.Equal(t, apisixv1.HashOnHeader, ups.HashOn) + assert.Equal(t, apisixv1.SchemeHTTP, ups.Scheme) au = &configv1.ApisixUpstreamConfig{ LoadBalancer: &configv1.LoadBalancer{ @@ -179,14 +179,14 @@ func TestTranslateUpstreamNodes(t *testing.T) { nodes, err := tr.TranslateUpstreamNodes(kube.NewEndpoint(endpoints), 10080, nil) assert.Nil(t, nodes) - assert.Equal(t, err, &translateError{ + assert.Equal(t, &translateError{ field: "service.spec.ports", reason: "port not defined", - }) + }, err) nodes, err = tr.TranslateUpstreamNodes(kube.NewEndpoint(endpoints), 80, nil) assert.Nil(t, err) - assert.Equal(t, nodes, apisixv1.UpstreamNodes{ + assert.Equal(t, apisixv1.UpstreamNodes{ { Host: "192.168.1.1", Port: 9080, @@ -197,11 +197,11 @@ func TestTranslateUpstreamNodes(t *testing.T) { Port: 9080, Weight: 100, }, - }) + }, nodes) nodes, err = tr.TranslateUpstreamNodes(kube.NewEndpoint(endpoints), 443, nil) assert.Nil(t, err) - assert.Equal(t, nodes, apisixv1.UpstreamNodes{ + assert.Equal(t, apisixv1.UpstreamNodes{ { Host: "192.168.1.1", Port: 9443, @@ -212,7 +212,7 @@ func TestTranslateUpstreamNodes(t *testing.T) { Port: 9443, Weight: 100, }, - }) + }, nodes) } func TestTranslateUpstreamNodesWithEndpointSlices(t *testing.T) { @@ -315,7 +315,7 @@ func TestTranslateUpstreamNodesWithEndpointSlices(t *testing.T) { nodes, err = tr.TranslateUpstreamNodes(kube.NewEndpointWithSlice(ep), 80, nil) assert.Nil(t, err) - assert.Equal(t, nodes, apisixv1.UpstreamNodes{ + assert.Equal(t, apisixv1.UpstreamNodes{ { Host: "192.168.1.1", Port: 9080, @@ -326,11 +326,11 @@ func TestTranslateUpstreamNodesWithEndpointSlices(t *testing.T) { Port: 9080, Weight: 100, }, - }) + }, nodes) nodes, err = tr.TranslateUpstreamNodes(kube.NewEndpointWithSlice(ep), 443, nil) assert.Nil(t, err) - assert.Equal(t, nodes, apisixv1.UpstreamNodes{ + assert.Equal(t, apisixv1.UpstreamNodes{ { Host: "192.168.1.1", Port: 9443, @@ -341,5 +341,5 @@ func TestTranslateUpstreamNodesWithEndpointSlices(t *testing.T) { Port: 9443, Weight: 100, }, - }) + }, nodes) } diff --git a/pkg/kube/translation/util_test.go b/pkg/kube/translation/util_test.go index f990a4d..4c812d3 100644 --- a/pkg/kube/translation/util_test.go +++ b/pkg/kube/translation/util_test.go @@ -27,7 +27,7 @@ func TestValidateRemoteAddrs(t *testing.T) { "123", } err := validateRemoteAddrs(addrs) - assert.Equal(t, err, _errInvalidAddress) + assert.Equal(t, _errInvalidAddress, err) addrs = []string{ "192.168.3.4", diff --git a/pkg/log/default_logger_test.go b/pkg/log/default_logger_test.go index 8bee9fa..a6f4c07 100644 --- a/pkg/log/default_logger_test.go +++ b/pkg/log/default_logger_test.go @@ -72,25 +72,25 @@ func TestDefaultLogger(t *testing.T) { assert.Nil(t, logger.Sync(), "failed to sync logger") fields := unmarshalLogMessage(t, fws.bytes()) - assert.Equal(t, fields.Level, level, "bad log level ", fields.Level) - assert.Equal(t, fields.Message, "hello", "bad log message ", fields.Message) + assert.Equal(t, level, fields.Level, "bad log level ", fields.Level) + assert.Equal(t, "hello", fields.Message, "bad log message ", fields.Message) handlers[1].Call([]reflect.Value{reflect.ValueOf("hello I am %s"), reflect.ValueOf("alex")}) assert.Nil(t, logger.Sync(), "failed to sync logger") fields = unmarshalLogMessage(t, fws.bytes()) - assert.Equal(t, fields.Level, level, "bad log level ", fields.Level) - assert.Equal(t, fields.Message, "hello I am alex", "bad log message ", fields.Message) + assert.Equal(t, level, fields.Level, "bad log level ", fields.Level) + assert.Equal(t, "hello I am alex", fields.Message, "bad log message ", fields.Message) handlers[2].Call([]reflect.Value{reflect.ValueOf("hello"), reflect.ValueOf(zap.String("name", "alex")), reflect.ValueOf(zap.Int("age", 3))}) assert.Nil(t, logger.Sync(), "failed to sync logger") fields = unmarshalLogMessage(t, fws.bytes()) - assert.Equal(t, fields.Level, level, "bad log level ", fields.Level) - assert.Equal(t, fields.Message, "hello", "bad log message ", fields.Message) - assert.Equal(t, fields.Name, "alex", "bad name field ", fields.Name) - assert.Equal(t, fields.Age, 3, "bad age field ", fields.Age) + assert.Equal(t, level, fields.Level, "bad log level ", fields.Level) + assert.Equal(t, "hello", fields.Message, "bad log message ", fields.Message) + assert.Equal(t, "alex", fields.Name, "bad name field ", fields.Name) + assert.Equal(t, 3, fields.Age, "bad age field ", fields.Age) }) } } diff --git a/pkg/log/logger_test.go b/pkg/log/logger_test.go index ce1adfe..4040672 100644 --- a/pkg/log/logger_test.go +++ b/pkg/log/logger_test.go @@ -76,8 +76,8 @@ func TestLogger(t *testing.T) { assert.Nil(t, logger.Sync(), "failed to sync logger") fields := unmarshalLogMessage(t, fws.bytes()) - assert.Equal(t, fields.Level, level, "bad log level ", fields.Level) - assert.Equal(t, fields.Message, "hello", "bad log message ", fields.Message) + assert.Equal(t, level, fields.Level, "bad log level ", fields.Level) + assert.Equal(t, "hello", fields.Message, "bad log message ", fields.Message) handler = rv.MethodByName(http.CanonicalHeaderKey(level) + "f") handler.Call([]reflect.Value{reflect.ValueOf("hello I am %s"), reflect.ValueOf("alex")}) @@ -85,8 +85,8 @@ func TestLogger(t *testing.T) { assert.Nil(t, logger.Sync(), "failed to sync logger") fields = unmarshalLogMessage(t, fws.bytes()) - assert.Equal(t, fields.Level, level, "bad log level ", fields.Level) - assert.Equal(t, fields.Message, "hello I am alex", "bad log message ", fields.Message) + assert.Equal(t, level, fields.Level, "bad log level ", fields.Level) + assert.Equal(t, "hello I am alex", fields.Message, "bad log message ", fields.Message) handler = rv.MethodByName(http.CanonicalHeaderKey(level) + "w") handler.Call([]reflect.Value{reflect.ValueOf("hello"), reflect.ValueOf(zap.String("name", "alex")), reflect.ValueOf(zap.Int("age", 3))}) @@ -94,10 +94,10 @@ func TestLogger(t *testing.T) { assert.Nil(t, logger.Sync(), "failed to sync logger") fields = unmarshalLogMessage(t, fws.bytes()) - assert.Equal(t, fields.Level, level, "bad log level ", fields.Level) - assert.Equal(t, fields.Message, "hello", "bad log message ", fields.Message) - assert.Equal(t, fields.Name, "alex", "bad name field ", fields.Name) - assert.Equal(t, fields.Age, 3, "bad age field ", fields.Age) + assert.Equal(t, level, fields.Level, "bad log level ", fields.Level) + assert.Equal(t, "hello", fields.Message, "bad log message ", fields.Message) + assert.Equal(t, "alex", fields.Name, "bad name field ", fields.Name) + assert.Equal(t, 3, fields.Age, "bad age field ", fields.Age) }) } } diff --git a/pkg/metrics/prometheus_test.go b/pkg/metrics/prometheus_test.go index 09d9d7f..dd5bafb 100644 --- a/pkg/metrics/prometheus_test.go +++ b/pkg/metrics/prometheus_test.go @@ -27,29 +27,29 @@ func apisixBadStatusCodesTestHandler(t *testing.T, metrics []*io_prometheus_clie return func(t *testing.T) { metric := findMetric("apisix_ingress_controller_apisix_bad_status_codes", metrics) assert.NotNil(t, metric) - assert.Equal(t, metric.Type.String(), "GAUGE") + assert.Equal(t, "GAUGE", metric.Type.String()) m := metric.GetMetric() assert.Len(t, m, 2) - assert.Equal(t, *m[0].Gauge.Value, float64(1)) - assert.Equal(t, *m[0].Label[0].Name, "controller_namespace") - assert.Equal(t, *m[0].Label[0].Value, "default") - assert.Equal(t, *m[0].Label[1].Name, "controller_pod") - assert.Equal(t, *m[0].Label[1].Value, "") - assert.Equal(t, *m[0].Label[2].Name, "resource") - assert.Equal(t, *m[0].Label[2].Value, "route") - assert.Equal(t, *m[0].Label[3].Name, "status_code") - assert.Equal(t, *m[0].Label[3].Value, "404") - - assert.Equal(t, *m[1].Gauge.Value, float64(1)) - assert.Equal(t, *m[1].Label[0].Name, "controller_namespace") - assert.Equal(t, *m[1].Label[0].Value, "default") - assert.Equal(t, *m[1].Label[1].Name, "controller_pod") - assert.Equal(t, *m[1].Label[1].Value, "") - assert.Equal(t, *m[1].Label[2].Name, "resource") - assert.Equal(t, *m[1].Label[2].Value, "upstream") - assert.Equal(t, *m[1].Label[3].Name, "status_code") - assert.Equal(t, *m[1].Label[3].Value, "500") + assert.Equal(t, float64(1), *m[0].Gauge.Value) + assert.Equal(t, "controller_namespace", *m[0].Label[0].Name) + assert.Equal(t, "default", *m[0].Label[0].Value) + assert.Equal(t, "controller_pod", *m[0].Label[1].Name) + assert.Equal(t, "", *m[0].Label[1].Value) + assert.Equal(t, "resource", *m[0].Label[2].Name) + assert.Equal(t, "route", *m[0].Label[2].Value) + assert.Equal(t, "status_code", *m[0].Label[3].Name) + assert.Equal(t, "404", *m[0].Label[3].Value) + + assert.Equal(t, float64(1), *m[1].Gauge.Value) + assert.Equal(t, "controller_namespace", *m[1].Label[0].Name) + assert.Equal(t, "default", *m[1].Label[0].Value) + assert.Equal(t, "controller_pod", *m[1].Label[1].Name) + assert.Equal(t, "", *m[1].Label[1].Value) + assert.Equal(t, "resource", *m[1].Label[2].Name) + assert.Equal(t, "upstream", *m[1].Label[2].Value) + assert.Equal(t, "status_code", *m[1].Label[3].Name) + assert.Equal(t, "500", *m[1].Label[3].Value) } } diff --git a/pkg/types/event_test.go b/pkg/types/event_test.go index cd009e7..606d1db 100644 --- a/pkg/types/event_test.go +++ b/pkg/types/event_test.go @@ -23,14 +23,14 @@ import ( func TestEvent(t *testing.T) { ev := Event{} - assert.Equal(t, ev.Type.String(), "unknown") + assert.Equal(t, "unknown", ev.Type.String()) ev.Type = EventAdd - assert.Equal(t, ev.Type.String(), "add") + assert.Equal(t, "add", ev.Type.String()) ev.Type = EventDelete - assert.Equal(t, ev.Type.String(), "delete") + assert.Equal(t, "delete", ev.Type.String()) ev.Type = EventUpdate - assert.Equal(t, ev.Type.String(), "update") + assert.Equal(t, "update", ev.Type.String()) } diff --git a/pkg/types/labels_test.go b/pkg/types/labels_test.go index 7ba1e4c..8aea282 100644 --- a/pkg/types/labels_test.go +++ b/pkg/types/labels_test.go @@ -26,9 +26,9 @@ func TestLabelsIsSubsetOf(t *testing.T) { "version": "v1", "env": "prod", } - assert.Equal(t, l.IsSubsetOf(f), true) + assert.Equal(t, true, l.IsSubsetOf(f)) l["env"] = "prod" - assert.Equal(t, l.IsSubsetOf(f), true) + assert.Equal(t, true, l.IsSubsetOf(f)) l["env"] = "qa" - assert.Equal(t, l.IsSubsetOf(f), false) + assert.Equal(t, false, l.IsSubsetOf(f)) } diff --git a/pkg/types/pod_test.go b/pkg/types/pod_test.go index 8eed03d..e9021a5 100644 --- a/pkg/types/pod_test.go +++ b/pkg/types/pod_test.go @@ -35,8 +35,8 @@ func TestPodCacheBadCases(t *testing.T) { Phase: corev1.PodPending, }, } - assert.Equal(t, pc.Add(pod1), ErrPodNoAssignedIP, "adding pod") - assert.Equal(t, pc.Delete(pod1), nil, "deleting pod") + assert.Equal(t, ErrPodNoAssignedIP, pc.Add(pod1), "adding pod") + assert.Equal(t, nil, pc.Delete(pod1), "deleting pod") } func TestPodCache(t *testing.T) { @@ -52,18 +52,18 @@ func TestPodCache(t *testing.T) { PodIP: "10.0.5.11", }, } - assert.Equal(t, pc.Add(pod1), nil, "adding pod") + assert.Equal(t, nil, pc.Add(pod1), "adding pod") name, err := pc.GetNameByIP("10.0.5.11") assert.Nil(t, err) - assert.Equal(t, name, "pod1") + assert.Equal(t, "pod1", name) name, err = pc.GetNameByIP("10.0.5.12") assert.Empty(t, name) - assert.Equal(t, err, ErrPodNotFound) + assert.Equal(t, ErrPodNotFound, err) assert.Nil(t, pc.Delete(pod1), nil, "deleting pod") name, err = pc.GetNameByIP("10.0.5.11") assert.Empty(t, name) - assert.Equal(t, err, ErrPodNotFound) + assert.Equal(t, ErrPodNotFound, err) } diff --git a/pkg/types/timeduration_test.go b/pkg/types/timeduration_test.go index 25a12ac..6087cb4 100644 --- a/pkg/types/timeduration_test.go +++ b/pkg/types/timeduration_test.go @@ -48,8 +48,8 @@ func TestTimeDurationUnmarshalJSON(t *testing.T) { var value structure1 err := json.Unmarshal([]byte(data), &value) assert.Nil(t, err, "failed to unmarshal data to structure1: %v", err) - assert.Equal(t, value.Name, "alex", "bad name: %s", value.Name) - assert.Equal(t, value.Interval, TimeDuration{3 * time.Minute}, "bad interval: %v", value.Interval) + assert.Equal(t, "alex", value.Name, "bad name: %s", value.Name) + assert.Equal(t, TimeDuration{3 * time.Minute}, value.Interval, "bad interval: %v", value.Interval) } func TestTimeDurationMarshalYAML(t *testing.T) { @@ -70,6 +70,6 @@ name: alex var value structure1 err := yaml.Unmarshal([]byte(data), &value) assert.Nil(t, err, "failed to unmarshal data to structure1: %v", err) - assert.Equal(t, value.Name, "alex", "bad name: %s", value.Name) - assert.Equal(t, value.Interval, TimeDuration{3 * time.Minute}, "bad interval: %v", value.Interval) + assert.Equal(t, "alex", value.Name, "bad name: %s", value.Name) + assert.Equal(t, TimeDuration{3 * time.Minute}, value.Interval, "bad interval: %v", value.Interval) }