more tests

Author: dspo

internal/controller/apisixroute_controller.go

@@ -22,7 +22,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	discoveryv1 "k8s.io/api/discovery/v1"
 	networkingv1 "k8s.io/api/networking/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -124,7 +123,7 @@ func (r *ApisixRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	}
 	if err = r.Provider.Update(ctx, tctx, &ar); err != nil {
 		err = ReasonError{
-			Reason:  "SyncFailed",
+			Reason:  string(apiv2.ConditionReasonSyncFailed),
 			Message: err.Error(),
 		}
 		r.Log.Error(err, "failed to process", "apisixroute", ar)
@@ -382,10 +381,10 @@ func (r *ApisixRouteReconciler) getDefaultIngressClass() (*networkingv1.IngressC
 			return &ic, nil
 		}
 	}
-	return nil, &errors.StatusError{ErrStatus: metav1.Status{
-		Reason:  metav1.StatusReasonNotFound,
+	return nil, ReasonError{
+		Reason:  string(metav1.StatusReasonNotFound),
 		Message: "default ingress class not found or dose not match the controller",
-	}}
+	}
 }
 
 // processIngressClassParameters processes the IngressClass parameters that reference GatewayProxy

internal/provider/adc/adc.go

@@ -201,7 +201,7 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
 	var resourceTypes []string
 	var labels map[string]string
 	switch obj.(type) {
-	case *gatewayv1.HTTPRoute:
+	case *gatewayv1.HTTPRoute, *apiv2.ApisixRoute:
 		resourceTypes = append(resourceTypes, "service")
 		labels = label.GenLabel(obj)
 	case *gatewayv1.Gateway:
@@ -213,10 +213,7 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
 		resourceTypes = append(resourceTypes, "consumer")
 		labels = label.GenLabel(obj)
 	case *networkingv1.IngressClass:
-	// delete all resources
-	case *apiv2.ApisixRoute:
-		resourceTypes = append(resourceTypes, "service")
-		labels = label.GenLabel(obj)
+		// delete all resources
 	case *apiv2.ApisixGlobalRule:
 		resourceTypes = append(resourceTypes, "global_rule")
 		labels = label.GenLabel(obj)

internal/provider/adc/translator/apisixroute.go

@@ -44,7 +44,6 @@ func (t *Translator) TranslateApisixRoute(tctx *provider.TranslateContext, ar *a
 		}
 
 		var plugins = make(adc.Plugins)
-		// todo: need unit test or e2e test
 		for _, plugin := range http.Plugins {
 			if !plugin.Enable {
 				continue
@@ -143,7 +142,7 @@ func (t *Translator) TranslateApisixRoute(tctx *provider.TranslateContext, ar *a
 		// translate to adc.Service
 		service.Name = adc.ComposeServiceNameWithRule(ar.Namespace, ar.Name, fmt.Sprintf("%d", ruleIndex))
 		service.ID = id.GenID(service.Name)
-		service.Labels = ar.Labels
+		service.Labels = label.GenLabel(ar)
 		service.Hosts = http.Match.Hosts
 		service.Upstream = upstream
 		service.Routes = []*adc.Route{route}

test/e2e/apisix/route.go

@@ -35,7 +35,21 @@ var _ = Describe("Test ApisixRoute", func() {
 	)
 
 	Context("Test ApisixRoute", func() {
-		const apisixRouteSpec = `
+		BeforeEach(func() {
+			By("create GatewayProxy")
+			gatewayProxy := fmt.Sprintf(gatewayProxyYaml, s.Deployer.GetAdminEndpoint(), s.AdminKey())
+			err := s.CreateResourceFromStringWithNamespace(gatewayProxy, "default")
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
+			time.Sleep(5 * time.Second)
+
+			By("create IngressClass")
+			err = s.CreateResourceFromStringWithNamespace(ingressClassYaml, "")
+			Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
+			time.Sleep(5 * time.Second)
+		})
+
+		It("Basic tests", func() {
+			const apisixRouteSpec = `
 apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
@@ -48,35 +62,31 @@ spec:
       hosts:
       - httpbin
       paths:
-      - /get
+      - %s
     backends:
     - serviceName: httpbin-service-e2e-test
       servicePort: 80
 `
+			request := func(path string) int {
+				return s.NewAPISIXClient().GET(path).WithHost("httpbin").Expect().Raw().StatusCode
+			}
 
-		BeforeEach(func() {
-			By("create GatewayProxy")
-			gatewayProxy := fmt.Sprintf(gatewayProxyYaml, s.Deployer.GetAdminEndpoint(), s.AdminKey())
-			err := s.CreateResourceFromStringWithNamespace(gatewayProxy, "default")
-			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
-			time.Sleep(5 * time.Second)
-
-			By("create IngressClass")
-			err = s.CreateResourceFromStringWithNamespace(ingressClassYaml, "")
-			Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
-			time.Sleep(5 * time.Second)
-		})
-
-		It("Basic tests", func() {
 			By("apply ApisixRoute")
 			var apisixRoute apiv2.ApisixRoute
-			applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, &apisixRoute, apisixRouteSpec)
+			applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, &apisixRoute, fmt.Sprintf(apisixRouteSpec, "/get"))
 
 			By("verify ApisixRoute works")
-			request := func() int {
-				return s.NewAPISIXClient().GET("/get").WithHost("httpbin").Expect().Raw().StatusCode
-			}
-			Eventually(request).WithTimeout(8 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusOK))
+			Eventually(request).WithArguments("/get").WithTimeout(8 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusOK))
+
+			By("update ApisixRoute")
+			applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, &apisixRoute, fmt.Sprintf(apisixRouteSpec, "/headers"))
+			Eventually(request).WithArguments("/get").WithTimeout(8 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusNotFound))
+			s.NewAPISIXClient().GET("/headers").WithHost("httpbin").Expect().Status(http.StatusOK)
+
+			By("delete ApisixRoute")
+			err := s.DeleteResource("ApisixRoute", "default")
+			Expect(err).ShouldNot(HaveOccurred(), "deleting ApisixRoute")
+			Eventually(request).WithArguments("/headers").WithTimeout(8 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusNotFound))
 		})
 
 		It("Test plugins in ApisixRoute", func() {