From ecf7b155ee0f112b7ad60b5dcd960b2221b158eb Mon Sep 17 00:00:00 2001
From: Tim Ramlot <42113979+inteon@users.noreply.github.com>
Date: Wed, 19 Jun 2024 17:33:38 +0200
Subject: [PATCH] fix CertificateOrganization matcher

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
---
 .../validation/certificates/certificates.go      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test/e2e/framework/helper/validation/certificates/certificates.go b/test/e2e/framework/helper/validation/certificates/certificates.go
index 45493bd3a..875de6ec1 100644
--- a/test/e2e/framework/helper/validation/certificates/certificates.go
+++ b/test/e2e/framework/helper/validation/certificates/certificates.go
@@ -138,6 +138,22 @@ func ExpectCertificateOrganizationToMatch(certificate *cmapi.Certificate, secret
 	if certificate.Spec.Subject != nil {
 		expectedOrganization = certificate.Spec.Subject.Organizations
 	}
+	if certificate.Spec.LiteralSubject != "" {
+		sequence, err := pki.UnmarshalSubjectStringToRDNSequence(certificate.Spec.LiteralSubject)
+		if err != nil {
+			return err
+		}
+
+		for _, rdns := range sequence {
+			for _, atv := range rdns {
+				if atv.Type.Equal(pki.OIDConstants.Organization) {
+					if str, ok := atv.Value.(string); ok {
+						expectedOrganization = append(expectedOrganization, str)
+					}
+				}
+			}
+		}
+	}
 
 	if !util.EqualUnsorted(cert.Subject.Organization, expectedOrganization) {
 		return fmt.Errorf("Expected certificate valid for O %v, but got a certificate valid for O %v", expectedOrganization, cert.Subject.Organization)