@@ -154,15 +154,15 @@ func fixtureIngressClass(mods ...func(*networkingv1.IngressClass)) *networkingv1
154154func fixtureAlbPayload (mods ... func (* albsdk.CreateLoadBalancerPayload )) * albsdk.CreateLoadBalancerPayload {
155155 payload := & albsdk.CreateLoadBalancerPayload {
156156 Name : ptr .To ("k8s-ingress-" + testIngressClassName ),
157- Listeners : & []albsdk.Listener {
157+ Listeners : []albsdk.Listener {
158158 {
159- Port : ptr .To (int64 (80 )),
160- Protocol : albsdk . LISTENERPROTOCOL_HTTP . Ptr ( ),
159+ Port : ptr .To (int32 (80 )),
160+ Protocol : ptr . To ( "PROTOCOL_HTTP" ),
161161 Http : & albsdk.ProtocolOptionsHTTP {
162- Hosts : & []albsdk.HostConfig {
162+ Hosts : []albsdk.HostConfig {
163163 {
164164 Host : ptr .To (testHost ),
165- Rules : & []albsdk.Rule {
165+ Rules : []albsdk.Rule {
166166 {
167167 Path : & albsdk.Path {
168168 Prefix : ptr .To (testPath ),
@@ -175,10 +175,10 @@ func fixtureAlbPayload(mods ...func(*albsdk.CreateLoadBalancerPayload)) *albsdk.
175175 },
176176 },
177177 },
178- Networks : & []albsdk.Network {{NetworkId : ptr .To (testNetworkID ), Role : albsdk . NETWORKROLE_LISTENERS_AND_TARGETS . Ptr ( )}},
178+ Networks : []albsdk.Network {{NetworkId : ptr .To (testNetworkID ), Role : ptr . To ( "ROLE_LISTENERS_AND_TARGETS" )}},
179179 Options : & albsdk.LoadBalancerOptions {EphemeralAddress : ptr .To (true )},
180- TargetPools : & []albsdk.TargetPool {
181- {Name : ptr .To ("pool-30080" ), TargetPort : ptr .To (int64 (30080 )), Targets : & []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
180+ TargetPools : []albsdk.TargetPool {
181+ {Name : ptr .To ("pool-30080" ), TargetPort : ptr .To (int32 (30080 )), Targets : []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
182182 },
183183 }
184184 for _ , mod := range mods {
@@ -247,23 +247,23 @@ func Test_albSpecFromIngress(t *testing.T) {
247247 "svc2" : * fixtureServiceWithParams (testServicePort , 30002 ),
248248 },
249249 want : fixtureAlbPayload (func (p * albsdk.CreateLoadBalancerPayload ) {
250- ( * p .Listeners ) [0 ].Http .Hosts = & []albsdk.HostConfig {
250+ p .Listeners [0 ].Http .Hosts = []albsdk.HostConfig {
251251 {
252252 Host : ptr .To ("a-host.com" ),
253- Rules : & []albsdk.Rule {
253+ Rules : []albsdk.Rule {
254254 {Path : & albsdk.Path {Prefix : ptr .To ("/a" )}, TargetPool : ptr .To ("pool-30002" )},
255255 },
256256 },
257257 {
258258 Host : ptr .To ("z-host.com" ),
259- Rules : & []albsdk.Rule {
259+ Rules : []albsdk.Rule {
260260 {Path : & albsdk.Path {Prefix : ptr .To ("/a" )}, TargetPool : ptr .To ("pool-30001" )},
261261 },
262262 },
263263 }
264- p .TargetPools = & []albsdk.TargetPool {
265- {Name : ptr .To ("pool-30001" ), TargetPort : ptr .To (int64 (30001 )), Targets : & []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
266- {Name : ptr .To ("pool-30002" ), TargetPort : ptr .To (int64 (30002 )), Targets : & []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
264+ p .TargetPools = []albsdk.TargetPool {
265+ {Name : ptr .To ("pool-30001" ), TargetPort : ptr .To (int32 (30001 )), Targets : []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
266+ {Name : ptr .To ("pool-30002" ), TargetPort : ptr .To (int32 (30002 )), Targets : []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
267267 }
268268 }),
269269 },
@@ -283,14 +283,14 @@ func Test_albSpecFromIngress(t *testing.T) {
283283 "svc2" : * fixtureServiceWithParams (testServicePort , 30004 ),
284284 },
285285 want : fixtureAlbPayload (func (p * albsdk.CreateLoadBalancerPayload ) {
286- ( * ( * p .Listeners ) [0 ].Http .Hosts ) [0 ].Host = ptr .To ("host.com" )
287- ( * ( * p .Listeners ) [0 ].Http .Hosts ) [0 ].Rules = & []albsdk.Rule {
286+ p .Listeners [0 ].Http .Hosts [0 ].Host = ptr .To ("host.com" )
287+ p .Listeners [0 ].Http .Hosts [0 ].Rules = []albsdk.Rule {
288288 {Path : & albsdk.Path {Prefix : ptr .To ("/x" )}, TargetPool : ptr .To ("pool-30004" )},
289289 {Path : & albsdk.Path {Prefix : ptr .To ("/x" )}, TargetPool : ptr .To ("pool-30003" )},
290290 }
291- p .TargetPools = & []albsdk.TargetPool {
292- {Name : ptr .To ("pool-30003" ), TargetPort : ptr .To (int64 (30003 )), Targets : & []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
293- {Name : ptr .To ("pool-30004" ), TargetPort : ptr .To (int64 (30004 )), Targets : & []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
291+ p .TargetPools = []albsdk.TargetPool {
292+ {Name : ptr .To ("pool-30003" ), TargetPort : ptr .To (int32 (30003 )), Targets : []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
293+ {Name : ptr .To ("pool-30004" ), TargetPort : ptr .To (int32 (30004 )), Targets : []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
294294 }
295295 }),
296296 },
@@ -310,14 +310,14 @@ func Test_albSpecFromIngress(t *testing.T) {
310310 "svc2" : * fixtureServiceWithParams (testServicePort , 30006 ),
311311 },
312312 want : fixtureAlbPayload (func (p * albsdk.CreateLoadBalancerPayload ) {
313- ( * ( * p .Listeners ) [0 ].Http .Hosts ) [0 ].Host = ptr .To ("host.com" )
314- ( * ( * p .Listeners ) [0 ].Http .Hosts ) [0 ].Rules = & []albsdk.Rule {
313+ p .Listeners [0 ].Http .Hosts [0 ].Host = ptr .To ("host.com" )
314+ p .Listeners [0 ].Http .Hosts [0 ].Rules = []albsdk.Rule {
315315 {Path : & albsdk.Path {Prefix : ptr .To ("/very/very/long/specific" )}, TargetPool : ptr .To ("pool-30006" )},
316316 {Path : & albsdk.Path {Prefix : ptr .To ("/short" )}, TargetPool : ptr .To ("pool-30005" )},
317317 }
318- p .TargetPools = & []albsdk.TargetPool {
319- {Name : ptr .To ("pool-30005" ), TargetPort : ptr .To (int64 (30005 )), Targets : & []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
320- {Name : ptr .To ("pool-30006" ), TargetPort : ptr .To (int64 (30006 )), Targets : & []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
318+ p .TargetPools = []albsdk.TargetPool {
319+ {Name : ptr .To ("pool-30005" ), TargetPort : ptr .To (int32 (30005 )), Targets : []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
320+ {Name : ptr .To ("pool-30006" ), TargetPort : ptr .To (int32 (30006 )), Targets : []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
321321 }
322322 }),
323323 },
@@ -337,14 +337,14 @@ func Test_albSpecFromIngress(t *testing.T) {
337337 "svc-prefix" : * fixtureServiceWithParams (testServicePort , 30101 ),
338338 },
339339 want : fixtureAlbPayload (func (p * albsdk.CreateLoadBalancerPayload ) {
340- ( * ( * p .Listeners ) [0 ].Http .Hosts ) [0 ].Host = ptr .To ("host.com" )
341- ( * ( * p .Listeners ) [0 ].Http .Hosts ) [0 ].Rules = & []albsdk.Rule {
340+ p .Listeners [0 ].Http .Hosts [0 ].Host = ptr .To ("host.com" )
341+ p .Listeners [0 ].Http .Hosts [0 ].Rules = []albsdk.Rule {
342342 {Path : & albsdk.Path {ExactMatch : ptr .To ("/same" )}, TargetPool : ptr .To ("pool-30100" )},
343343 {Path : & albsdk.Path {Prefix : ptr .To ("/same" )}, TargetPool : ptr .To ("pool-30101" )},
344344 }
345- p .TargetPools = & []albsdk.TargetPool {
346- {Name : ptr .To ("pool-30100" ), TargetPort : ptr .To (int64 (30100 )), Targets : & []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
347- {Name : ptr .To ("pool-30101" ), TargetPort : ptr .To (int64 (30101 )), Targets : & []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
345+ p .TargetPools = []albsdk.TargetPool {
346+ {Name : ptr .To ("pool-30100" ), TargetPort : ptr .To (int32 (30100 )), Targets : []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
347+ {Name : ptr .To ("pool-30101" ), TargetPort : ptr .To (int32 (30101 )), Targets : []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
348348 }
349349 }),
350350 },
@@ -364,14 +364,14 @@ func Test_albSpecFromIngress(t *testing.T) {
364364 "svc2" : * fixtureServiceWithParams (testServicePort , 30008 ),
365365 },
366366 want : fixtureAlbPayload (func (p * albsdk.CreateLoadBalancerPayload ) {
367- ( * ( * p .Listeners ) [0 ].Http .Hosts ) [0 ].Host = ptr .To ("host.com" )
368- ( * ( * p .Listeners ) [0 ].Http .Hosts ) [0 ].Rules = & []albsdk.Rule {
367+ p .Listeners [0 ].Http .Hosts [0 ].Host = ptr .To ("host.com" )
368+ p .Listeners [0 ].Http .Hosts [0 ].Rules = []albsdk.Rule {
369369 {Path : & albsdk.Path {Prefix : ptr .To ("/x" )}, TargetPool : ptr .To ("pool-30008" )},
370370 {Path : & albsdk.Path {Prefix : ptr .To ("/x" )}, TargetPool : ptr .To ("pool-30007" )},
371371 }
372- p .TargetPools = & []albsdk.TargetPool {
373- {Name : ptr .To ("pool-30007" ), TargetPort : ptr .To (int64 (30007 )), Targets : & []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
374- {Name : ptr .To ("pool-30008" ), TargetPort : ptr .To (int64 (30008 )), Targets : & []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
372+ p .TargetPools = []albsdk.TargetPool {
373+ {Name : ptr .To ("pool-30007" ), TargetPort : ptr .To (int32 (30007 )), Targets : []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
374+ {Name : ptr .To ("pool-30008" ), TargetPort : ptr .To (int32 (30008 )), Targets : []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
375375 }
376376 }),
377377 },
@@ -391,14 +391,14 @@ func Test_albSpecFromIngress(t *testing.T) {
391391 "svc2" : * fixtureServiceWithParams (testServicePort , 30010 ),
392392 },
393393 want : fixtureAlbPayload (func (p * albsdk.CreateLoadBalancerPayload ) {
394- ( * ( * p .Listeners ) [0 ].Http .Hosts ) [0 ].Host = ptr .To ("host.com" )
395- ( * ( * p .Listeners ) [0 ].Http .Hosts ) [0 ].Rules = & []albsdk.Rule {
394+ p .Listeners [0 ].Http .Hosts [0 ].Host = ptr .To ("host.com" )
395+ p .Listeners [0 ].Http .Hosts [0 ].Rules = []albsdk.Rule {
396396 {Path : & albsdk.Path {Prefix : ptr .To ("/x" )}, TargetPool : ptr .To ("pool-30010" )},
397397 {Path : & albsdk.Path {Prefix : ptr .To ("/x" )}, TargetPool : ptr .To ("pool-30009" )},
398398 }
399- p .TargetPools = & []albsdk.TargetPool {
400- {Name : ptr .To ("pool-30009" ), TargetPort : ptr .To (int64 (30009 )), Targets : & []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
401- {Name : ptr .To ("pool-30010" ), TargetPort : ptr .To (int64 (30010 )), Targets : & []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
399+ p .TargetPools = []albsdk.TargetPool {
400+ {Name : ptr .To ("pool-30009" ), TargetPort : ptr .To (int32 (30009 )), Targets : []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
401+ {Name : ptr .To ("pool-30010" ), TargetPort : ptr .To (int32 (30010 )), Targets : []albsdk.Target {{DisplayName : ptr .To (testNodeName ), Ip : ptr .To (testNodeIP )}}},
402402 }
403403 }),
404404 },
0 commit comments