feat: add e2e plugin test cases for ApisixPluginConfig and modify crd…

… yaml (apache#791)
neverCase · Dec 27, 2021 · 03e93bf · 03e93bf
1 parent 78470a5
commit 03e93bf
Show file tree

Hide file tree

Showing 16 changed files with 281 additions and 8 deletions.
diff --git a/pkg/kube/translation/apisix_pluginconfig.go b/pkg/kube/translation/apisix_pluginconfig.go
@@ -15,7 +15,10 @@
 package translation
 
 import (
+	"go.uber.org/zap"
+
 	configv2beta3 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta3"
+	"github.com/apache/apisix-ingress-controller/pkg/log"
 	apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
 )
 
@@ -25,6 +28,13 @@ func (t *translator) TranslateApisixPluginConfig(apc *configv2beta3.ApisixPlugin
 		for _, plugin := range apc.Spec.Plugins {
 			for k, v := range plugin {
 				// Here, it will override same key.
+				if t, ok := pluginMap[k]; ok {
+					log.Infow("TranslateApisixPluginConfig override same plugin key",
+						zap.String("key", k),
+						zap.Any("old", t),
+						zap.Any("new", v),
+					)
+				}
 				pluginMap[k] = v
 			}
 		}

diff --git a/samples/deploy/crd/v1/ApisixPluginConfig.yaml b/samples/deploy/crd/v1/ApisixPluginConfig.yaml
@@ -49,20 +49,13 @@ spec:
                 - plugins
               properties:
                 plugins:
+                  x-kubernetes-preserve-unknown-fields: true # we have to enable it since plugin config
                   type: array
                   items:
                     type: object
                     properties:
-                      name:
-                        type: string
-                        minLength: 1
-                      enable:
-                        type: boolean
                       config:
                         type: object
-                  required:
-                    - name
-                    - enable
             status:
               type: object
               properties:

diff --git a/test/e2e/plugins/api_breaker.go b/test/e2e/plugins/api_breaker.go
@@ -73,6 +73,8 @@ spec:
 		assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -130,6 +132,8 @@ spec:
 		assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(0)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 

diff --git a/test/e2e/plugins/cors.go b/test/e2e/plugins/cors.go
@@ -61,6 +61,8 @@ spec:
 		assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -107,6 +109,8 @@ spec:
 		assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -170,6 +174,8 @@ spec:
 		assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -238,6 +244,8 @@ spec:
 		assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(0)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -278,6 +286,8 @@ spec:
 		assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -313,6 +323,8 @@ spec:
 		assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
 		err = s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(0)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 

diff --git a/test/e2e/plugins/echo.go b/test/e2e/plugins/echo.go
@@ -70,6 +70,8 @@ spec:
 
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -113,6 +115,8 @@ spec:
 
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -153,6 +157,8 @@ spec:
 		time.Sleep(6 * time.Second)
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(0)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -193,6 +199,8 @@ spec:
 
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -224,6 +232,8 @@ spec:
 
 		err = s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(0)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 

diff --git a/test/e2e/plugins/fault_injection.go b/test/e2e/plugins/fault_injection.go
@@ -69,6 +69,8 @@ spec:
 
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -114,6 +116,8 @@ spec:
 
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -162,6 +166,8 @@ spec:
 
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(0)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -204,6 +210,8 @@ spec:
 
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -233,6 +241,8 @@ spec:
 
 		err = s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(0)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 

diff --git a/test/e2e/plugins/ip-restriction.go b/test/e2e/plugins/ip-restriction.go
@@ -64,6 +64,8 @@ spec:
 
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -103,6 +105,8 @@ spec:
 
 		err = s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -144,6 +148,8 @@ spec:
 
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -183,6 +189,8 @@ spec:
 
 		err = s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -225,6 +233,8 @@ spec:
 
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(0)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 

diff --git a/test/e2e/plugins/limit_count.go b/test/e2e/plugins/limit_count.go
@@ -67,6 +67,8 @@ spec:
 
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -124,6 +126,8 @@ spec:
 
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(0)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -177,6 +181,8 @@ spec:
 
 		err := s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
 
@@ -217,6 +223,8 @@ spec:
 
 		err = s.EnsureNumApisixUpstreamsCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixPluginConfigCreated(0)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of pluginConfigs")
 		err = s.EnsureNumApisixRoutesCreated(1)
 		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")