Skip to content

Commit f870f35

Browse files
committed
cert set/list flaky test
1 parent e0b95a8 commit f870f35

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

pkg/deploy/elbv2/listener_manager.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,8 @@ func buildSDKModifyListenerInput(lsSpec elbv2model.ListenerSpec, desiredDefaultA
422422

423423
// buildSDKCertificates builds the certificate list for listener.
424424
// returns the default certificates and extra certificates.
425+
// All certs are included in the extra list to ensure the default cert remains
426+
// attached as an additional cert for auto-discovery (e.g., ECDSA/RSA selection).
425427
func buildSDKCertificates(modelCerts []elbv2model.Certificate) ([]elbv2types.Certificate, []elbv2types.Certificate) {
426428
if len(modelCerts) == 0 {
427429
return nil, nil

test/framework/verifier/aws_resource_verifier.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,24 +190,21 @@ func VerifyLoadBalancerListenerCertificates(ctx context.Context, f *framework.Fr
190190
listenerCerts, err := f.LBManager.GetLoadBalancerListenerCertificates(ctx, awssdk.ToString(listeners[0].ListenerArn))
191191
Expect(err).ToNot(HaveOccurred())
192192

193-
var observedCertArns []string
193+
observedCertSet := sets.New[string]()
194194
var defaultCert string
195195
for _, cert := range listenerCerts {
196196
if awssdk.ToBool(cert.IsDefault) {
197197
defaultCert = awssdk.ToString(cert.CertificateArn)
198198
}
199-
observedCertArns = append(observedCertArns, awssdk.ToString(cert.CertificateArn))
199+
observedCertSet.Insert(awssdk.ToString(cert.CertificateArn))
200200
}
201201
if defaultCert != expectedCertARNS[0] {
202202
return errors.New("default cert does not match")
203203
}
204-
//Expect(defaultCert).To(Equal(expectedCertARNS[0]))
205-
if len(expectedCertARNS) != len(observedCertArns) {
206-
return errors.New("cert len mismatch")
204+
expectedCertSet := sets.New[string](expectedCertARNS...)
205+
if !observedCertSet.Equal(expectedCertSet) {
206+
return errors.New("cert mismatch")
207207
}
208-
sort.Strings(observedCertArns)
209-
sort.Strings(expectedCertARNS)
210-
Expect(expectedCertARNS).To(Equal(observedCertArns))
211208
return nil
212209
}
213210

0 commit comments

Comments
 (0)