Skip to content

Commit 340f91f

Browse files
ronethingronething
authored
test: support apisix standalone (part 2) (#159)
Signed-off-by: ashing <axingfly@gmail.com>
1 parent 3899e70 commit 340f91f

12 files changed

Lines changed: 269 additions & 316 deletions

File tree

‎test/e2e/apisix/basic.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,19 @@ var _ = Describe("APISIX Standalone Basic Tests", func() {
3434
Expect().
3535
Status(404).Body().Contains("404 Route Not Found")
3636
})
37+
38+
It("should handle basic HTTP requests with additional gateway", func() {
39+
additionalGatewayID, _, err := s.Deployer.CreateAdditionalGateway("additional-gw")
40+
Expect(err).NotTo(HaveOccurred())
41+
42+
httpClient, err := s.NewAPISIXClientForGateway(additionalGatewayID)
43+
Expect(err).NotTo(HaveOccurred())
44+
Expect(httpClient).NotTo(BeNil())
45+
46+
httpClient.GET("/anything").
47+
Expect().
48+
Status(404).Body().Contains("404 Route Not Found")
49+
})
50+
3751
})
3852
})

‎test/e2e/crds/consumer.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,13 +476,13 @@ spec:
476476

477477
By("create additional gateway group to get new admin key")
478478
var err error
479-
additionalGatewayGroupID, _, err = s.CreateAdditionalGatewayGroup("gateway-proxy-update")
479+
additionalGatewayGroupID, _, err = s.Deployer.CreateAdditionalGateway("gateway-proxy-update")
480480
Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
481481

482-
resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
482+
resources, exists := s.GetAdditionalGateway(additionalGatewayGroupID)
483483
Expect(exists).To(BeTrue(), "additional gateway group should exist")
484484

485-
client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
485+
client, err := s.NewAPISIXClientForGateway(additionalGatewayGroupID)
486486
Expect(err).NotTo(HaveOccurred(), "creating APISIX client for additional gateway group")
487487

488488
By("Consumer not found for additional gateway group")

‎test/e2e/framework/api7_consts.go‎

Lines changed: 0 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -38,161 +38,6 @@ var (
3838
TestServerKey string
3939
)
4040

41-
const (
42-
TestCACert = `-----BEGIN CERTIFICATE-----
43-
MIIDdzCCAl+gAwIBAgIUBB5PHXyymeboPDVdYeYihYnm5XIwDQYJKoZIhvcNAQEL
44-
BQAwXTELMAkGA1UEBhMCQ04xDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5
45-
MRUwEwYDVQQKDAxPcmdhbml6YXRpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNv
46-
bTAeFw0yNDA2MjYxNTQ5NTBaFw0zNDA2MjQxNTQ5NTBaMF0xCzAJBgNVBAYTAkNO
47-
MQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UECgwMT3JnYW5p
48-
emF0aW9uMRgwFgYDVQQDDA93d3cuZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEB
49-
AQUAA4IBDwAwggEKAoIBAQCutPQZr71VAdVvLd65agMsj9xD46jdZxWzP1unfv34
50-
6VFhCFPJp39TuBkwcXmSEmSzCcQXyCvWhRV+PErr+N4dadUpoci2E/CcKAlOisxz
51-
OaPz52yS+h5kf8wpVS3Tk9JHONZp6P3HLY2yeUtRl/Bw3Fyo7nIJCtwx5jJ2cFgE
52-
dvqfruiZYTSU5vxvS2QDXvX0gcOuR4uP+RRBcwlY+oD+G0pP4vsUcLpCQpD58p1c
53-
RSLwoX6dPb3eohCXufCnskIwiIxC3jQcVrI1gOggJkZuGXNRh0aS5O7L0iu37l57
54-
UStFB4kjbnCWterNz/NRRhD2Ad8RTALnJMeGKb7uH9OzAgMBAAGjLzAtMAwGA1Ud
55-
EwQFMAMBAf8wHQYDVR0OBBYEFH78Ns0zkjTuK1EhiLMNYnXUZatxMA0GCSqGSIb3
56-
DQEBCwUAA4IBAQCVhAzUb32Qyjn5oZHsDYKaQIHfXe+/W2oM41dDTSxjFlbvBjaq
57-
JWxgAYBA5l28b+e9zUK2BTcSNzVbrfm5/qoykAQNaR4Vvhy3LxFyOd6G87as3+hv
58-
jlerjSa/gh8XCPFzs2t6wyhZqEgcNZBK6oagnaxKstoS2jXjAL+7dx4PRBdw7MTq
59-
joQ+TzLgsB9kFMnihmR+LpDFfQCqAfp5X0z9RLgnH0zVcBrRXKKb8AaOWBdkdK6g
60-
BLIW7+4ZxW5BzYmi6ZuDDjP96wLpWT7boJPi3BqnCEQIzywNMBbqZO9LiWdGf0TH
61-
EpkzMRsCTGGar43HkQgDZdjicRKiuWYFO47O
62-
-----END CERTIFICATE-----`
63-
64-
TestCAKey = `-----BEGIN PRIVATE KEY-----
65-
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCutPQZr71VAdVv
66-
Ld65agMsj9xD46jdZxWzP1unfv346VFhCFPJp39TuBkwcXmSEmSzCcQXyCvWhRV+
67-
PErr+N4dadUpoci2E/CcKAlOisxzOaPz52yS+h5kf8wpVS3Tk9JHONZp6P3HLY2y
68-
eUtRl/Bw3Fyo7nIJCtwx5jJ2cFgEdvqfruiZYTSU5vxvS2QDXvX0gcOuR4uP+RRB
69-
cwlY+oD+G0pP4vsUcLpCQpD58p1cRSLwoX6dPb3eohCXufCnskIwiIxC3jQcVrI1
70-
gOggJkZuGXNRh0aS5O7L0iu37l57UStFB4kjbnCWterNz/NRRhD2Ad8RTALnJMeG
71-
Kb7uH9OzAgMBAAECggEAQb6h73qlZrSCc8zQuHivChl3G+sz1GGjFmm83YraG03+
72-
DGRcV5IbRc+NVyAUzkXytDd0Hjj7WkaJwJAC58snFu2JRJn31KErVjBw1ChCaQgj
73-
bTlFMAhE4LABDfrafHjv1FKMyZ1exxIa9TNVBzcEygv7KK1Wp5V5KKQGkHCVhtP5
74-
PDqKwyiUqFpsM7Codr8TmavHykSfVRhxPifDNXMDMXsSUT/2dFj0QXljA3tjzk6d
75-
UHzx4z44cODbjWE74ZeQw2SFslKHgK0ZVYivE6+f3L/p7fSqq7hJ6T0BXpKolbHZ
76-
yU7Xh6BBy0WKqACkUWALZ6tglcb+KoTqhZ/fTZW6mQKBgQDr6ivPmQI4deIbWGyi
77-
EGfzrLfiVEuqCsz5gX88nvBRoGevKi7kCbIf/IoNGIm5SJ8gJDs6eSPKFwAEd29H
78-
N2muFXmune8g7lVZjQ8GPGUu4IvJMS7OAcbLmpI4pUaVGtJsh2fmXnaTSR5D5y64
79-
XtPGdkluLr/B5vz/X0D0NG80GQKBgQC9lL04p1D6kJj+JwyNm7bZ1OhgpH5Pup82
80-
Ia+5GH8m7VLS4/PrpllOmhgccaCJK7M36EXLELHRHpmOoLzUiemgtnoQ0JMmeWfN
81-
pVigWdIsCMSS1wJLNklr17eDDgvdcs0W3cujja4/2LlksNY8/zh7LJ/k/YUTnlkG
82-
VsSeLfEfqwKBgQCNinmunAaRCWkXLv4+XcmAkWfiCuE6rDA+oktMe6+DydFrbsuj
83-
VY3hUwsgwFAhMkkGZ7aBZpzqatI/28iP2dc18vyGn4sRHu1mRRN2klXCwkYb9741
84-
KyuyjJKeGcs3Olh1dOgJdzN9OqlF5DZLt9kngWCdEr9J/uRb8zJtUehGQQKBgEuD
85-
yM+dThNQr7Bk64oooXApb5q3Sx0FEFAmoPFQwa1G0Tvx0wJl06MMnFgQJssc3hmB
86-
6vMVJk9PKgl3G2BpwubiaMLz4flsWJ3ApAnTXXVu1KZNALvm1t4fIhkQ6kb+aJUY
87-
KfpvAB6sfESQb/YCD4R45QP4vB5xb7Kns0/yqt5bAoGAQ0kPRvAbdmBURLscsOpN
88-
f4sdXsJLqxAppIqrYolUVqIQPAFYT7oWLpSMmIqzjFzRFBj3ZUf3fZCNCi2kkRvs
89-
60VyICYZobrnbcbkCx7qydIuhr2+8301lcginh8DIN58c0IZmoIRv/Z44SPfl1ku
90-
zDGD28KCK1oiIZOe9sgcgf4=
91-
-----END PRIVATE KEY-----`
92-
93-
TESTCert1 = `-----BEGIN CERTIFICATE-----
94-
MIIDxDCCAqygAwIBAgIUO1cgq5OMm6h5eb5U+r3DftaM7e0wDQYJKoZIhvcNAQEL
95-
BQAwXTELMAkGA1UEBhMCQ04xDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5
96-
MRUwEwYDVQQKDAxPcmdhbml6YXRpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNv
97-
bTAeFw0yNDA2MjYxNzA4MzFaFw0yODExMTIxNzA4MzFaMGAxCzAJBgNVBAYTAkNO
98-
MQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UECgwMT3JnYW5p
99-
emF0aW9uMRswGQYDVQQDDBJzZXJ2ZXIuZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3
100-
DQEBAQUAA4IBDwAwggEKAoIBAQC+nRQiu87exjwtnTb1+dBFdMffucW84qPZ3TZY
101-
e3beLJkIjM2eeptzEVf5eFAxo9lXpi9DKJQopI9aRc3SvyWRg9bj8wm88UdA/2LO
102-
8q1oRaDzKHlMfSVqjdZ8qTalbd4FzhUWw9TWKGQxhA5yypisuQjOrVDC6bvk3WMk
103-
BoD+2zil+q05nRjUSCbGkKO0HecXt2M2jq1nyN68J5ymtmooUbSM7TAC+ymBggJc
104-
JsgJ3DrquMNqQykjsSotVaz+y857DedzJoMoMgIvJy1cNexpY6e/PK2oO9OB+OTg
105-
Rq/XtC/wQ5ZJ0/rY1q1yU8t5JmlVkrV6RPUT5SuoVeA8Fdu7AgMBAAGjeTB3MDUG
106-
A1UdEQQuMCyCEnNlcnZlci5leGFtcGxlLmNvbYIWd3d3LnNlcnZlci5leGFtcGxl
107-
LmNvbTAdBgNVHQ4EFgQUZ3hBoewum8wvVnSPLiaAI1S22cwwHwYDVR0jBBgwFoAU
108-
fvw2zTOSNO4rUSGIsw1iddRlq3EwDQYJKoZIhvcNAQELBQADggEBAC2LQ/nLc1PP
109-
ioPeqxKwF094yrifdhZGCmCSFpsnPbxhgxTRKSSMe7+XPadS4xd4VeRkbmuyDuUg
110-
kYCAr3eTpSKfc3cTHP4S/+DDPefUn8u5lbPEE1Aq2JMNubXwCUMy+hNgX7dHWzBW
111-
sqR+GErLzGGsfkTWhIxwH8Vx/hhKS/Kv5EEvZ42HrvL3570/04zq1tUYPlqPoQBc
112-
t+6M2fJQx6lYdVjtYssm/6MnjNIM59NmmmwwrLZZyB96kDAW8xFndzcJQv4uojdb
113-
UjWkMt/J7i6TWZY9DrSmAwCo2ZDCUZT5vQUkmILc9st/ie8v3755lJxoAOIyxEmi
114-
Z+TO4JGixxQ=
115-
-----END CERTIFICATE-----`
116-
TestKey1 = `-----BEGIN PRIVATE KEY-----
117-
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC+nRQiu87exjwt
118-
nTb1+dBFdMffucW84qPZ3TZYe3beLJkIjM2eeptzEVf5eFAxo9lXpi9DKJQopI9a
119-
Rc3SvyWRg9bj8wm88UdA/2LO8q1oRaDzKHlMfSVqjdZ8qTalbd4FzhUWw9TWKGQx
120-
hA5yypisuQjOrVDC6bvk3WMkBoD+2zil+q05nRjUSCbGkKO0HecXt2M2jq1nyN68
121-
J5ymtmooUbSM7TAC+ymBggJcJsgJ3DrquMNqQykjsSotVaz+y857DedzJoMoMgIv
122-
Jy1cNexpY6e/PK2oO9OB+OTgRq/XtC/wQ5ZJ0/rY1q1yU8t5JmlVkrV6RPUT5Suo
123-
VeA8Fdu7AgMBAAECggEASdlzxq06zebBw+5oL86UmYRQN+ayrKamUq848fkLqbJf
124-
rAdZVrAr793lVrr9Xu4bM7EoGH3tQP3YqGHpB2CVPpZ0uCYePLzCHXWUo5c0BfUM
125-
EYk5zZ+i0nCXi/7HNDqnzVn1o7dFi59kiiaermy90BV0Sxas9oc2C8qWMYvviE1d
126-
GS0/Prmma+H0gZDTiQTrQsR++HmSQ3jvu9LYvVx4AkNveYNbPgF1o52PgEryTH2Y
127-
4tvHuyp7KpjSSNKoRuXw25OpVLsPXaxDFnSoe8YK6ltIA4kG6f7G7JbufKdaiCbY
128-
c4d6co5xTJa77NMGzY3j55gTFU3mfhMC9QvrvcVycQKBgQDv7LvV2LNf6ixlBWXO
129-
t3TAEOMM2x6awmDDPDU8i1uIhHHA7ZqsHREIC33Sily+1NwOm/iuLWTlHv0+4cww
130-
y75Xvl8e2mDPtkoT8wNeHdKXTp4CLzrIvEHzG0qf063ob0hP24ymqy+PgO/WW8Pl
131-
K/iWTpTzc9UKUuhiNPzp2XIMYwKBgQDLYotPuKkQHwGrhI8mZKKTcefzN9Ton2Kw
132-
7qJ3qDPrbDS0yjbU5+TKaNjKlZ+fsPQkHb5aWkGK+hYU6x7X8V/MZrc5MSwtNjPI
133-
QfhTPKsxNSAPqRoTwP+QVXECQhCdjRZCpE6+4aaB/31VbIjTWdhxUyc6zrPLDimX
134-
p0hhEcH2yQKBgAnBna3HfxvSYPXGr2oliajZxvHZ4ze12ct2ok+Q9yro/9sxjk2b
135-
bPrfxMEQAU99RmmNrCIhFG5AwVmSQwRk9JuK0UFm7fLkXcTL6AImwk6G0uQR2Zka
136-
FrB1FqbDK9o81DrzGZgZc/io7JfR6XhjPluWXHY96pbd4jdEIli8D+gzAoGAAn0o
137-
O0eFOh9HA/RRVCTzIF7Ked17C4W3zXZ+Iny6de0TEAtRdHWKBTgXPxNpqqidtDtw
138-
8uYb2zmIP6VI8VeQ1o2DPH3vjnYVWCQGh+48IhQGWmq1WPyJpBiHk4F/do4dcZ9V
139-
H1zfjsOzovH7EqsMzQY5eqzA4oE/3Q09A4MWHpECgYAU3uxxs5g7QwdK01BPXznk
140-
H1y7bdn2LYS5otllOgAfZRX6BUQNFE8RtwA4HNe764SSEkk7EtTckx0d7ar8V1V2
141-
pfxfd8A0pNI54NtnFk8OS0BVkW5SGoBCWRh2nlV1r0B/7np0X61GgE95JDMslRn0
142-
0AOPIR/qFJ1YYT0a7yKyjQ==
143-
-----END PRIVATE KEY-----`
144-
145-
TESTCert2 = `-----BEGIN CERTIFICATE-----
146-
MIIDRDCCAiwCFDtXIKuTjJuoeXm+VPq9w37WjO3rMA0GCSqGSIb3DQEBCwUAMF0x
147-
CzAJBgNVBAYTAkNOMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMG
148-
A1UECgwMT3JnYW5pemF0aW9uMRgwFgYDVQQDDA93d3cuZXhhbXBsZS5jb20wHhcN
149-
MjQwNjI2MTcwNTM1WhcNMjgxMTEyMTcwNTM1WjBgMQswCQYDVQQGEwJDTjEOMAwG
150-
A1UECAwFU3RhdGUxDTALBgNVBAcMBENpdHkxFTATBgNVBAoMDE9yZ2FuaXphdGlv
151-
bjEbMBkGA1UEAwwSY2xpZW50LmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEF
152-
AAOCAQ8AMIIBCgKCAQEAihDdGYkyQUHVPCAVho2bJFIYMkCALqNbBoLcuQ4UsCzr
153-
rOZlff5CgPEwNshyH2k7jUp0D6i4PArN/y70BxhU6R/I2eKUhhlPdFxtNiEae9jn
154-
/ndOA7eb4WB9eFSHkqncMjc6X4/Fe9x5E2uaIv17atvyQwuT6yL3SOmGRp6LowgC
155-
4IhDwHLGdVEmOGlkbTaXw6Vbpv9ckjObNJ4/IRhIiifdK4NJSJIIaE/Im3SuciFP
156-
6mRIZKPeSrmKaVrpb9ElTx6NcFxAy0OKZQ3I2wnxNkIq0y3HSgkVFNKRdeHq/JQu
157-
+mOad2TAts/YuhY/jwmEz00eUVHZmAmBk33K5o6cjwIDAQABMA0GCSqGSIb3DQEB
158-
CwUAA4IBAQATI/7xbZyGqMT4jqCiWgpj8z5FxPQ7mYyh8AIvmar6tIt1EoRDC9gk
159-
1uAaFMYfdpQpfdM2/0B1aFl7cDArEyOCumlDJmmyURkacqzw0a23ELJnthg40VsN
160-
Zvg9n+z8jcj+dLKCZJuebp978XRKucZaaxI4Z4h7OzKhiJbUpwQUxM4sPuazLPDL
161-
I6BwMatU7saBQM7SVMZJcGsc0XPJXmh292HL6ZqWf/qPWmJklXAldB3rxY8CTxx7
162-
ucWSym43eXOgsTtgH8xHiRLWpMVjFzl1AZxgl9iCAXXh2s4QjP778VCX7QQFPvsR
163-
0iZCSG0R5BbpDa0NKV5SklBIj8NdMLrA
164-
-----END CERTIFICATE-----`
165-
166-
TestKey2 = `-----BEGIN PRIVATE KEY-----
167-
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCKEN0ZiTJBQdU8
168-
IBWGjZskUhgyQIAuo1sGgty5DhSwLOus5mV9/kKA8TA2yHIfaTuNSnQPqLg8Cs3/
169-
LvQHGFTpH8jZ4pSGGU90XG02IRp72Of+d04Dt5vhYH14VIeSqdwyNzpfj8V73HkT
170-
a5oi/Xtq2/JDC5PrIvdI6YZGnoujCALgiEPAcsZ1USY4aWRtNpfDpVum/1ySM5s0
171-
nj8hGEiKJ90rg0lIkghoT8ibdK5yIU/qZEhko95KuYppWulv0SVPHo1wXEDLQ4pl
172-
DcjbCfE2QirTLcdKCRUU0pF14er8lC76Y5p3ZMC2z9i6Fj+PCYTPTR5RUdmYCYGT
173-
fcrmjpyPAgMBAAECggEALMvr8S0isSm7FhcS5OVtQQuh7iwfawJ1tlcfZqu66q6o
174-
iSD4LTkiOtQG4L+Ix8hNGjreDXag0FpxHCsP4n1yj3FQqeFqb1gm/4o9pSJ4hVaL
175-
b3UmSu54FVhJXZGPq3aRi3l/5yGu4dFXN4XiLRgxwyo6IKbRB6oAsheTCbbHd83X
176-
kjAMHC+85D4k94oQ2pxTlzz3rRTAPnnVd+A1zZP54pIOtdMWncOBBVtOsaFiLl5o
177-
gHryvLW3i1GUQJAsaPFhGrIleiG/gCSaHNcN33Ky9mnjm8/LlEuJQPxR/gOPlTtJ
178-
raEWD6XsUkg8KgBNERFSA0G51k7XunkNVN0mf11YAQKBgQDB7uhpZTYlhcrhkOUt
179-
6D80iW7zsyhLL26xrc0eHd39yJmGBanoLAe58utR3nZrSLrc2ygb73183VBOAFFL
180-
/VBX2vn3b7hvJfyxpsfqIeIoCmDBUZfZbHRy4z7APXdieUVeseiDjqfDpshwrZ6P
181-
65IgZXlOGxV6AZB+MMaC/Xr7zwKBgQC2QLO2xBNMIdwRij+6zBRNnECg2Uz8vGle
182-
C3fHRodx+RTHKUt08RPbKVlvdJCcvF3kJPXTkJf6jXhEFuzzP60tnw8zztr8lBVp
183-
Mgbx6FeHLwAclGwKUzB/XscFGuCkVnzdRjt6fOp/LdTDtjavnz9+XOBedz0q44OD
184-
gcuP/prDQQKBgEj48JLX9qvf0BtYPiQsA7xtCkbA3ySLUIei8k+mxWU9GieH8gre
185-
pnmdolZH8x8jWszH2ivIzdsyG4l+LRj+1EB6sRwd+bQ5AwCF1SuQXFzcqtOTNCQn
186-
3xlr0KzddBKltyiOoQL/prjEBSAA9G0LIwz1odN19XrXI9uX1tprLt+ZAoGBAIfH
187-
MlxSPbI1c5eZsJsA2YtsgnWTDpkn4TQQRR8wO0487C7oY+/ufwWDC79OT0KFz0le
188-
A8qnaaJfbR8FGWirouBfJNtLG7iatkzV2Xi1ySfMaz/fj5Itoe7ydEEoYf3s9T+A
189-
yGUb1TQEuANKp/k1If+JQBsAqJBgSaVauIZBf5lBAoGBALew21wK6TvLOxXGRShr
190-
uQTHPT5zwebLvFSoc+7fmdoCuGI04OyGUrJR/uCqXMyyP3xFk7FmkjyavpQc9c+R
191-
+tO3iJEqGvyWC24Bzpy5z9NhdapkXKdju6vmftgBn8SOLOMH9am+EAhwKqfwyNIn
192-
jLSA1vUeTvzS6lIWMGpWq2+q
193-
-----END PRIVATE KEY-----`
194-
)
195-
19641
const (
19742
TestCert = `-----BEGIN CERTIFICATE-----
19843
MIIC1TCCAb2gAwIBAgIJANm/NDY0xwZUMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV

‎test/e2e/framework/api7_dashboard.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,11 +404,11 @@ func (f *Framework) setDpManagerEndpoints() {
404404
}
405405

406406
func (f *Framework) GetDashboardEndpoint() string {
407-
return f.dashboardHTTPTunnel.Endpoint()
407+
return _dashboardHTTPTunnel.Endpoint()
408408
}
409409

410410
func (f *Framework) GetDashboardEndpointHTTPS() string {
411-
return f.dashboardHTTPSTunnel.Endpoint()
411+
return _dashboardHTTPSTunnel.Endpoint()
412412
}
413413

414414
func (f *Framework) DashboardHTTPClient() *httpexpect.Expect {

‎test/e2e/framework/api7_framework.go‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (f *Framework) BeforeSuite() {
6666

6767
time.Sleep(1 * time.Minute)
6868
err := f.newDashboardTunnel()
69-
f.Logf("Dashboard HTTP Tunnel:" + f.dashboardHTTPTunnel.Endpoint())
69+
f.Logf("Dashboard HTTP Tunnel:" + _dashboardHTTPTunnel.Endpoint())
7070
Expect(err).ShouldNot(HaveOccurred(), "creating dashboard tunnel")
7171

7272
f.UploadLicense()
@@ -84,15 +84,6 @@ func (f *Framework) DeployComponents() {
8484
f.initDashboard()
8585
}
8686

87-
func (f *Framework) shutdownDashboardTunnel() {
88-
if f.dashboardHTTPTunnel != nil {
89-
f.dashboardHTTPTunnel.Close()
90-
}
91-
if f.dashboardHTTPSTunnel != nil {
92-
f.dashboardHTTPSTunnel.Close()
93-
}
94-
}
95-
9687
func (f *Framework) UploadLicense() {
9788
payload := map[string]any{"data": API7EELicense}
9889
payloadBytes, err := json.Marshal(payload)
@@ -169,6 +160,11 @@ func (f *Framework) initDashboard() {
169160
time.Sleep(5 * time.Second)
170161
}
171162

163+
var (
164+
_dashboardHTTPTunnel *k8s.Tunnel
165+
_dashboardHTTPSTunnel *k8s.Tunnel
166+
)
167+
172168
func (f *Framework) newDashboardTunnel() error {
173169
var (
174170
httpNodePort int
@@ -190,17 +186,26 @@ func (f *Framework) newDashboardTunnel() error {
190186
}
191187
}
192188

193-
f.dashboardHTTPTunnel = k8s.NewTunnel(f.kubectlOpts, k8s.ResourceTypeService, "api7ee3-dashboard",
189+
_dashboardHTTPTunnel = k8s.NewTunnel(f.kubectlOpts, k8s.ResourceTypeService, "api7ee3-dashboard",
194190
httpNodePort, httpPort)
195-
f.dashboardHTTPSTunnel = k8s.NewTunnel(f.kubectlOpts, k8s.ResourceTypeService, "api7ee3-dashboard",
191+
_dashboardHTTPSTunnel = k8s.NewTunnel(f.kubectlOpts, k8s.ResourceTypeService, "api7ee3-dashboard",
196192
httpsNodePort, httpsPort)
197193

198-
if err := f.dashboardHTTPTunnel.ForwardPortE(f.GinkgoT); err != nil {
194+
if err := _dashboardHTTPTunnel.ForwardPortE(f.GinkgoT); err != nil {
199195
return err
200196
}
201-
if err := f.dashboardHTTPSTunnel.ForwardPortE(f.GinkgoT); err != nil {
197+
if err := _dashboardHTTPSTunnel.ForwardPortE(f.GinkgoT); err != nil {
202198
return err
203199
}
204200

205201
return nil
206202
}
203+
204+
func (f *Framework) shutdownDashboardTunnel() {
205+
if _dashboardHTTPTunnel != nil {
206+
_dashboardHTTPTunnel.Close()
207+
}
208+
if _dashboardHTTPSTunnel != nil {
209+
_dashboardHTTPSTunnel.Close()
210+
}
211+
}

‎test/e2e/framework/framework.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ type Framework struct {
5353
clientset *kubernetes.Clientset
5454
restConfig *rest.Config
5555
K8sClient client.Client
56-
57-
// TODO: remove these tunnels
58-
dashboardHTTPTunnel *k8s.Tunnel
59-
dashboardHTTPSTunnel *k8s.Tunnel
6056
}
6157

6258
// NewFramework create a global framework with special settings.

‎test/e2e/gatewayapi/httproute.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,12 @@ spec:
303303

304304
By("Create additional gateway group")
305305
var err error
306-
additionalGatewayGroupID, additionalNamespace, err = s.CreateAdditionalGatewayGroup("multi-gw")
306+
additionalGatewayGroupID, additionalNamespace, err = s.Deployer.CreateAdditionalGateway("multi-gw")
307307
Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
308308

309309
By("Create additional GatewayProxy")
310310
// Get admin key for the additional gateway group
311-
resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
311+
resources, exists := s.GetAdditionalGateway(additionalGatewayGroupID)
312312
Expect(exists).To(BeTrue(), "additional gateway group should exist")
313313

314314
By("Create additional GatewayClass")
@@ -348,7 +348,7 @@ spec:
348348
Status(http.StatusOK)
349349

350350
By("Access through additional gateway")
351-
client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
351+
client, err := s.NewAPISIXClientForGateway(additionalGatewayGroupID)
352352
Expect(err).NotTo(HaveOccurred(), "creating client for additional gateway")
353353

354354
client.
@@ -370,7 +370,7 @@ spec:
370370
Status(http.StatusOK)
371371

372372
By("HTTPRoute should not be accessible through additional gateway")
373-
client, err = s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
373+
client, err = s.NewAPISIXClientForGateway(additionalGatewayGroupID)
374374
Expect(err).NotTo(HaveOccurred(), "creating client for additional gateway")
375375

376376
client.
@@ -1671,13 +1671,13 @@ spec:
16711671

16721672
By("create additional gateway group to get new admin key")
16731673
var err error
1674-
additionalGatewayGroupID, _, err = s.CreateAdditionalGatewayGroup("gateway-proxy-update")
1674+
additionalGatewayGroupID, _, err = s.Deployer.CreateAdditionalGateway("gateway-proxy-update")
16751675
Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
16761676

1677-
resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
1677+
resources, exists := s.GetAdditionalGateway(additionalGatewayGroupID)
16781678
Expect(exists).To(BeTrue(), "additional gateway group should exist")
16791679

1680-
client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
1680+
client, err := s.NewAPISIXClientForGateway(additionalGatewayGroupID)
16811681
Expect(err).NotTo(HaveOccurred(), "creating APISIX client for additional gateway group")
16821682

16831683
By("HTTPRoute not found for additional gateway group")

‎test/e2e/ingress/ingress.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -831,10 +831,10 @@ spec:
831831
Status(200)
832832

833833
By("create additional gateway group to get new admin key")
834-
additionalGatewayGroupID, _, err = s.CreateAdditionalGatewayGroup("gateway-proxy-update")
834+
additionalGatewayGroupID, _, err = s.Deployer.CreateAdditionalGateway("gateway-proxy-update")
835835
Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
836836

837-
client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
837+
client, err := s.NewAPISIXClientForGateway(additionalGatewayGroupID)
838838
Expect(err).NotTo(HaveOccurred(), "creating APISIX client for additional gateway group")
839839

840840
By("Ingress not found for additional gateway group")
@@ -844,7 +844,7 @@ spec:
844844
Expect().
845845
Status(404)
846846

847-
resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
847+
resources, exists := s.GetAdditionalGateway(additionalGatewayGroupID)
848848
Expect(exists).To(BeTrue(), "additional gateway group should exist")
849849

850850
By("update GatewayProxy with new admin key")
@@ -965,10 +965,10 @@ spec:
965965
Expect().Header("X-Proxy-Test").IsEqual("enabled")
966966

967967
By("create additional gateway group to get new admin key")
968-
additionalGatewayGroupID, _, err = s.CreateAdditionalGatewayGroup("gateway-proxy-update")
968+
additionalGatewayGroupID, _, err = s.Deployer.CreateAdditionalGateway("gateway-proxy-update")
969969
Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
970970

971-
client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
971+
client, err := s.NewAPISIXClientForGateway(additionalGatewayGroupID)
972972
Expect(err).NotTo(HaveOccurred(), "creating APISIX client for additional gateway group")
973973

974974
By("Ingress not found for additional gateway group")
@@ -978,7 +978,7 @@ spec:
978978
Expect().
979979
Status(http.StatusNotFound)
980980

981-
resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
981+
resources, exists := s.GetAdditionalGateway(additionalGatewayGroupID)
982982
Expect(exists).To(BeTrue(), "additional gateway group should exist")
983983

984984
By("update secret")

0 commit comments

Comments
 (0)