Revert "feat: add e2e plugin test cases for ApisixPluginConfig and mo…

…dify crd yaml (apache#791)"

This reverts commit 03e93bf.

# Conflicts:
#	pkg/kube/translation/apisix_pluginconfig.go
#	samples/deploy/crd/v1/ApisixPluginConfig.yaml
#	test/e2e/plugins/plugin_config.go

test/e2e/plugins/api_breaker.go

@@ -73,8 +73,6 @@ 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")
 
@@ -132,8 +130,6 @@ 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")
 

test/e2e/plugins/cors.go

@@ -61,8 +61,6 @@ 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")
 
@@ -109,8 +107,6 @@ 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")
 
@@ -174,8 +170,6 @@ 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")
 
@@ -244,8 +238,6 @@ 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")
 
@@ -286,8 +278,6 @@ 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")
 
@@ -323,8 +313,6 @@ 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")
 

test/e2e/plugins/echo.go

@@ -70,8 +70,6 @@ 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")
 
@@ -115,8 +113,6 @@ 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")
 
@@ -157,8 +153,6 @@ 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")
 
@@ -199,8 +193,6 @@ 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")
 
@@ -232,8 +224,6 @@ 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")
 

test/e2e/plugins/fault_injection.go

@@ -69,8 +69,6 @@ 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")
 
@@ -116,8 +114,6 @@ 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")
 
@@ -166,8 +162,6 @@ 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")
 
@@ -210,8 +204,6 @@ 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")
 
@@ -241,8 +233,6 @@ 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")
 

test/e2e/plugins/ip-restriction.go

@@ -64,8 +64,6 @@ 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")
 
@@ -105,8 +103,6 @@ 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")
 
@@ -148,8 +144,6 @@ 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")
 
@@ -189,8 +183,6 @@ 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,8 +225,6 @@ 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")
 

test/e2e/plugins/limit_count.go

@@ -67,8 +67,6 @@ 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")
 
@@ -126,8 +124,6 @@ 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")
 
@@ -181,8 +177,6 @@ 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")
 
@@ -223,8 +217,6 @@ 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")
 

test/e2e/plugins/proxy_rewrite.go

@@ -64,8 +64,6 @@ 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")
 
@@ -108,8 +106,6 @@ spec:
 		time.Sleep(6 * time.Second)
 		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,8 +149,6 @@ spec:
 		time.Sleep(6 * time.Second)
 		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")
 
@@ -198,8 +192,6 @@ spec:
 		time.Sleep(6 * time.Second)
 		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,8 +230,6 @@ 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")
 

test/e2e/plugins/redirect.go

@@ -65,8 +65,6 @@ 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")
 
@@ -105,8 +103,6 @@ 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")
 
@@ -147,8 +143,6 @@ 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")
 
@@ -186,8 +180,6 @@ spec:
 		time.Sleep(5 * time.Second)
 		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")
 
@@ -218,8 +210,6 @@ 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")
 

test/e2e/plugins/referer-restriction.go

@@ -66,8 +66,6 @@ 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")
 
@@ -135,8 +133,6 @@ 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")
 
@@ -185,8 +181,6 @@ 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")
 

test/e2e/plugins/request-validation.go

@@ -78,8 +78,6 @@ 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")
 		// header schema check failure.
@@ -161,8 +159,6 @@ 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")
 		resp := s.NewAPISIXClient().POST("/post").WithHeader("Host", "httpbin.org").WithHeader("User-Agent", "bad-ua").Expect()