chore: add crd v2 API testing for API7 (#190)

Author: AlinsRan

Makefile

@@ -29,7 +29,7 @@ KIND_NAME ?= apisix-ingress-cluster
 
 GATEAY_API_VERSION ?= v1.2.0
 DASHBOARD_VERSION ?= dev
-ADC_VERSION ?= 0.19.0
+ADC_VERSION ?= 0.20.0
 
 TEST_TIMEOUT ?= 80m
 TEST_DIR ?= ./test/e2e/

internal/provider/adc/adc.go

@@ -194,7 +194,7 @@ func (d *adcClient) Update(ctx context.Context, tctx *provider.TranslateContext,
 	// This mode is full synchronization,
 	// which only needs to be saved in cache
 	// and triggered by a timer for synchronization
-	if d.BackendMode == BackendModeAPISIXStandalone || d.BackendMode == BackendModeAPISIX || apiv2.Is(obj) {
+	if d.BackendMode == BackendModeAPISIXStandalone || d.BackendMode == BackendModeAPISIX {
 		return nil
 	}
 

test/e2e/apisix/e2e_test.go

@@ -24,7 +24,8 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	_ "github.com/apache/apisix-ingress-controller/test/e2e/crds"
+	_ "github.com/apache/apisix-ingress-controller/test/e2e/crds/v1alpha1"
+	_ "github.com/apache/apisix-ingress-controller/test/e2e/crds/v2"
 	"github.com/apache/apisix-ingress-controller/test/e2e/framework"
 	_ "github.com/apache/apisix-ingress-controller/test/e2e/gatewayapi"
 	_ "github.com/apache/apisix-ingress-controller/test/e2e/ingress"
@@ -38,9 +39,7 @@ func TestAPISIXE2E(t *testing.T) {
 	_ = framework.NewFramework()
 
 	// init newDeployer function
-	scaffold.NewDeployer = func(s *scaffold.Scaffold) scaffold.Deployer {
-		return scaffold.NewAPISIXDeployer(s)
-	}
+	scaffold.NewDeployer = scaffold.NewAPISIXDeployer
 
 	_, _ = fmt.Fprintf(GinkgoWriter, "Starting APISIX standalone e2e suite\n")
 	RunSpecs(t, "apisix standalone e2e suite")

test/e2e/crds/backendtrafficpolicy.go renamed to test/e2e/crds/v1alpha1/backendtrafficpolicy.go

@@ -286,14 +286,17 @@ spec:
 			applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "test-consumer"}, &apiv2.ApisixConsumer{}, basicAuth)
 
 			By("verify ApisixRoute with ApisixConsumer")
-			Eventually(request).WithArguments("/get", "invalid-username", "invalid-password").WithTimeout(5 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusUnauthorized))
+			Eventually(request).WithArguments("/get", "invalid-username", "invalid-password").
+				WithTimeout(5 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusUnauthorized))
 
 			Eventually(request).WithArguments("/get", "test-user", "test-password").WithTimeout(5 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusOK))
 
 			By("Delete ApisixConsumer")
 			err := s.DeleteResource("ApisixConsumer", "test-consumer")
 			Expect(err).ShouldNot(HaveOccurred(), "deleting ApisixConsumer")
-			Eventually(request).WithArguments("/get", "test-user", "test-password").WithTimeout(5 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusUnauthorized))
+			Eventually(request).WithArguments("/get", "test-user", "test-password").
+				WithTimeout(5 * time.Second).ProbeEvery(time.Second).
+				Should(Equal(http.StatusUnauthorized))
 
 			By("delete ApisixRoute")
 			err = s.DeleteResource("ApisixRoute", "default")
@@ -321,12 +324,16 @@ spec:
 			Expect(err).ShouldNot(HaveOccurred(), "updating Secret for ApisixConsumer")
 
 			Eventually(request).WithArguments("/get", "foo", "bar").WithTimeout(5 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusUnauthorized))
-			Eventually(request).WithArguments("/get", "foo-new-user", "bar-new-password").WithTimeout(5 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusOK))
+			Eventually(request).WithArguments("/get", "foo-new-user", "bar-new-password").
+				WithTimeout(5 * time.Second).ProbeEvery(time.Second).
+				Should(Equal(http.StatusOK))
 
 			By("Delete ApisixConsumer")
 			err = s.DeleteResource("ApisixConsumer", "test-consumer")
 			Expect(err).ShouldNot(HaveOccurred(), "deleting ApisixConsumer")
-			Eventually(request).WithArguments("/get", "foo-new-user", "bar-new-password").WithTimeout(5 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusUnauthorized))
+			Eventually(request).WithArguments("/get", "foo-new-user", "bar-new-password").
+				WithTimeout(5 * time.Second).ProbeEvery(time.Second).
+				Should(Equal(http.StatusUnauthorized))
 
 			By("delete ApisixRoute")
 			err = s.DeleteResource("ApisixRoute", "default")

test/e2e/crds/consumer.go renamed to test/e2e/crds/v1alpha1/consumer.go

@@ -88,6 +88,9 @@ spec:
 
 	Context("ApisixGlobalRule Basic Operations", func() {
 		BeforeEach(func() {
+			if s.Deployer.Name() == "api7ee" {
+				Skip("GlobalRule is not supported in api7ee")
+			}
 			By("create GatewayProxy")
 			gatewayProxy := fmt.Sprintf(gatewayProxyYaml, s.Deployer.GetAdminEndpoint(), s.AdminKey())
 			err := s.CreateResourceFromStringWithNamespace(gatewayProxy, "default")

test/e2e/apisix/consumer.go renamed to test/e2e/crds/v2/consumer.go

@@ -189,6 +189,9 @@ spec:
 		})
 
 		It("Test ApisixRoute filterFunc", func() {
+			if s.Deployer.Name() == "api7ee" {
+				Skip("filterFunc is not supported in api7ee")
+			}
 			const apisixRouteSpec = `
 apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
@@ -201,7 +204,22 @@ spec:
     match:
       paths:
       - /*
-      filter_func: "function(vars)\n  local core = require ('apisix.core')\n  local body, err = core.request.get_body()\n  if not body then\n      return false\n  end\n\n  local data, err = core.json.decode(body)\n  if not data then\n      return false\n  end\n\n  if data['foo'] == 'bar' then\n      return true\n  end\n\n  return false\nend"
+      filter_func: |
+        function(vars)
+          local core = require ('apisix.core')
+          local body, err = core.request.get_body()
+          if not body then
+              return false
+          end
+          local data, err = core.json.decode(body)
+          if not data then
+              return false
+          end
+          if data['foo'] == 'bar' then
+              return true
+          end
+          return false
+        end
     backends:
     - serviceName: httpbin-service-e2e-test
       servicePort: 80

test/e2e/apisix/globalrule.go renamed to test/e2e/crds/v2/globalrule.go

@@ -126,6 +126,9 @@ var _ = Describe("Test ApisixTls", Label("apisix.apache.org", "v2", "apisixtls")
 			err = s.DeleteResourceFromStringWithNamespace(ingressClassYamlTls, "")
 			Expect(err).ShouldNot(HaveOccurred(), "deleting IngressClass")
 		})
+		normalizePEM := func(s string) string {
+			return strings.TrimSpace(s)
+		}
 
 		It("Basic ApisixTls test", func() {
 			const host = "api6.com"
@@ -252,11 +255,11 @@ spec:
 			assert.Nil(GinkgoT(), err, "list tls error")
 			assert.Len(GinkgoT(), tls, 1, "tls number not expect")
 			assert.Len(GinkgoT(), tls[0].Certificates, 1, "length of certificates not expect")
-			assert.Equal(GinkgoT(), serverCert, tls[0].Certificates[0].Certificate, "tls cert not expect")
+			assert.Equal(GinkgoT(), normalizePEM(serverCert), normalizePEM(tls[0].Certificates[0].Certificate), "tls cert not expect")
 			assert.ElementsMatch(GinkgoT(), []string{host}, tls[0].Snis)
 			assert.NotNil(GinkgoT(), tls[0].Client, "client configuration should not be nil")
 			assert.NotEmpty(GinkgoT(), tls[0].Client.CA, "client CA should not be empty")
-			assert.Equal(GinkgoT(), caCert, tls[0].Client.CA, "client CA should be test-ca-secret")
+			assert.Equal(GinkgoT(), normalizePEM(caCert), normalizePEM(tls[0].Client.CA), "client CA should be test-ca-secret")
 			assert.Equal(GinkgoT(), int64(1), *tls[0].Client.Depth, "client depth should be 1")
 		})