Skip to content

Commit bf5fed5

Browse files
AlinsRanCopilot
andcommitted
test: remove apisix-standalone-only skip in ADC validation e2e tests
Both apisix and apisix-standalone backends now support /apisix/admin/configs/validate via ADC PR api7/adc#434. The CI uses apache/apisix:dev and ghcr.io/api7/adc:dev which include this support, so the skip guard is no longer needed. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 3d240f1 commit bf5fed5

4 files changed

Lines changed: 0 additions & 32 deletions

File tree

test/e2e/webhook/apisixconsumer.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@ stringData:
8989
})
9090

9191
It("should reject invalid plugin config during ADC validation", func() {
92-
if framework.ProviderType != framework.ProviderTypeAPISIXStandalone {
93-
Skip("ADC validation requires apisix-standalone backend")
94-
}
95-
9692
privateKeyYAML := " " + strings.ReplaceAll(framework.TestKey, "\n", "\n ")
9793

9894
firstConsumer := fmt.Sprintf(`
@@ -154,10 +150,6 @@ spec:
154150
})
155151

156152
It("should reject consumer update that fails ADC validation", func() {
157-
if framework.ProviderType != framework.ProviderTypeAPISIXStandalone {
158-
Skip("ADC validation requires apisix-standalone backend")
159-
}
160-
161153
consumerName := "webhook-apisixconsumer-update"
162154

163155
validConsumer := fmt.Sprintf(`

test/e2e/webhook/apisixroute.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ spec:
9999
})
100100

101101
It("should reject routes that fail ADC validation", func() {
102-
if framework.ProviderType != framework.ProviderTypeAPISIXStandalone {
103-
Skip("ADC validation requires apisix-standalone backend")
104-
}
105-
106102
backendService := "webhook-route-backend"
107103
routeName := "webhook-apisixroute-invalid"
108104

@@ -181,10 +177,6 @@ spec:
181177
})
182178

183179
It("should reject route update that fails ADC validation", func() {
184-
if framework.ProviderType != framework.ProviderTypeAPISIXStandalone {
185-
Skip("ADC validation requires apisix-standalone backend")
186-
}
187-
188180
backendService := "webhook-route-update-backend"
189181
routeName := "webhook-apisixroute-update"
190182

test/e2e/webhook/apisixtls.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ spec:
9292
})
9393

9494
It("should reject invalid TLS material during ADC validation", func() {
95-
if framework.ProviderType != framework.ProviderTypeAPISIXStandalone {
96-
Skip("ADC validation requires apisix-standalone backend")
97-
}
98-
9995
serverSecret := "invalid-server-tls"
10096
tlsName := "webhook-apisixtls-invalid"
10197
host := "invalid-webhook.example.com"
@@ -151,10 +147,6 @@ spec:
151147
})
152148

153149
It("should reject TLS update with invalid certificate material", func() {
154-
if framework.ProviderType != framework.ProviderTypeAPISIXStandalone {
155-
Skip("ADC validation requires apisix-standalone backend")
156-
}
157-
158150
validSecret := "update-valid-tls"
159151
invalidSecret := "update-invalid-tls"
160152
tlsName := "webhook-apisixtls-update"

test/e2e/webhook/consumer.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@ stringData:
9393
})
9494

9595
It("should reject invalid plugin config during ADC validation", func() {
96-
if framework.ProviderType != framework.ProviderTypeAPISIXStandalone {
97-
Skip("ADC validation requires apisix-standalone backend")
98-
}
99-
10096
gatewayName := s.Namespace()
10197

10298
firstConsumer := fmt.Sprintf(`
@@ -161,10 +157,6 @@ spec:
161157
})
162158

163159
It("should reject consumer update that fails ADC validation", func() {
164-
if framework.ProviderType != framework.ProviderTypeAPISIXStandalone {
165-
Skip("ADC validation requires apisix-standalone backend")
166-
}
167-
168160
gatewayName := s.Namespace()
169161
consumerName := "webhook-consumer-update"
170162

0 commit comments

Comments
 (0)