Merge pull request #685 from HumairAK/RHOAIENG-11297-main

add newlines between certs
opendatahub-io · Aug 13, 2024 · a7c12ce · a7c12ce
2 parents 94eb6c6 + 89b8aee
commit a7c12ce
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/controllers/dspipeline_params.go b/controllers/dspipeline_params.go
@@ -798,7 +798,7 @@ func (p *DSPAParams) ExtractParams(ctx context.Context, dsp *dspa.DataSciencePip
 				},
 
 				Data: map[string]string{
-					p.CustomCABundle.ConfigMapKey: string(bytes.Join(p.APICustomPemCerts, []byte{})),
+					p.CustomCABundle.ConfigMapKey: string(bytes.Join(p.APICustomPemCerts, []byte("\n"))),
 				},
 			}
 

diff --git a/controllers/testdata/declarative/case_6/deploy/00_configmap.yaml b/controllers/testdata/declarative/case_6/deploy/00_configmap.yaml
@@ -36,6 +36,7 @@ data:
     WBV3KJBsYK/wijtLeip1oKobU76oE0ML/bnhV10k6usvl4n8cDmcONo5FnGoT8Pk
     80htx6w5fanMFu4MnoBeyJhhzNfg7ywJcc2VZSM27s2B
     -----END CERTIFICATE-----
+
   odh-ca-bundle.crt: |
     -----BEGIN CERTIFICATE-----
     MIIFLTCCAxWgAwIBAgIUIvY4jV0212P/ddjuCZhcUyJfoocwDQYJKoZIhvcNAQEL

diff --git a/controllers/testdata/declarative/case_6/expected/created/configmap_dspa_trusted_ca.yaml b/controllers/testdata/declarative/case_6/expected/created/configmap_dspa_trusted_ca.yaml
@@ -34,6 +34,7 @@ data:
     WBV3KJBsYK/wijtLeip1oKobU76oE0ML/bnhV10k6usvl4n8cDmcONo5FnGoT8Pk
     80htx6w5fanMFu4MnoBeyJhhzNfg7ywJcc2VZSM27s2B
     -----END CERTIFICATE-----
+
     -----BEGIN CERTIFICATE-----
     MIIFLTCCAxWgAwIBAgIUIvY4jV0212P/ddjuCZhcUyJfoocwDQYJKoZIhvcNAQEL
     BQAwJjELMAkGA1UEBhMCWFgxFzAVBgNVBAMMDnJoLWRzcC1kZXZzLmlvMB4XDTI0
@@ -64,6 +65,7 @@ data:
     WBV3KJBsYK/wijtLeip1oKobU76oE0ML/bnhV10k6usvl4n8cDmcONo5FnGoT8Pk
     80htx6w5fanMFu4MnoBeyJhhzNfg7ywJcc2VZSM27s2B
     -----END CERTIFICATE-----
+
     -----BEGIN CERTIFICATE-----
     MIIFlTCCA32gAwIBAgIUQTPwwkR17jDrdIe4VqhzNQ6OY1MwDQYJKoZIhvcNAQEL
     BQAwJjELMAkGA1UEBhMCWFgxFzAVBgNVBAMMDnJoLWRzcC1kZXZzLmlvMB4XDTI0
@@ -96,6 +98,7 @@ data:
     lsiMw+o9r32W0fzjQRwipTLNM0lEbgWyErsVXFb67vY/rjy9ybuFlKMMOIlZpmut
     wcr1vUGA985Lhv2jire2GTlixOiqZtuQS08lGa7kkcO8sB+7MdRdgEI=
     -----END CERTIFICATE-----
+
     -----BEGIN CERTIFICATE-----
     MIIFLTCCAxWgAwIBAgIUIvY4jV0212P/ddjuCZhcUyJfoocwDQYJKoZIhvcNAQEL
     BQAwJjELMAkGA1UEBhMCWFgxFzAVBgNVBAMMDnJoLWRzcC1kZXZzLmlvMB4XDTI0

diff --git a/controllers/testdata/declarative/case_8/expected/created/configmap_dspa_trusted_ca.yaml b/controllers/testdata/declarative/case_8/expected/created/configmap_dspa_trusted_ca.yaml
@@ -34,6 +34,7 @@ data:
     WBV3KJBsYK/wijtLeip1oKobU76oE0ML/bnhV10k6usvl4n8cDmcONo5FnGoT8Pk
     80htx6w5fanMFu4MnoBeyJhhzNfg7ywJcc2VZSM27s2B
     -----END CERTIFICATE-----
+
     -----BEGIN CERTIFICATE-----
     MIIFLTCCAxWgAwIBAgIUIvY4jV0212P/ddjuCZhcUyJfoocwDQYJKoZIhvcNAQEL
     BQAwJjELMAkGA1UEBhMCWFgxFzAVBgNVBAMMDnJoLWRzcC1kZXZzLmlvMB4XDTI0
@@ -64,6 +65,7 @@ data:
     WBV3KJBsYK/wijtLeip1oKobU76oE0ML/bnhV10k6usvl4n8cDmcONo5FnGoT8Pk
     80htx6w5fanMFu4MnoBeyJhhzNfg7ywJcc2VZSM27s2B
     -----END CERTIFICATE-----
+
     -----BEGIN CERTIFICATE-----
     MIIFLTCCAxWgAwIBAgIUIvY4jV0212P/ddjuCZhcUyJfoocwDQYJKoZIhvcNAQEL
     BQAwJjELMAkGA1UEBhMCWFgxFzAVBgNVBAMMDnJoLWRzcC1kZXZzLmlvMB4XDTI0

diff --git a/controllers/testutil/equalities.go b/controllers/testutil/equalities.go
@@ -18,6 +18,7 @@ package testutil
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/go-test/deep"
 
@@ -52,6 +53,16 @@ func configMapsAreEqual(expected, actual *unstructured.Unstructured) (bool, erro
 		return false, notEqualMsg("Configmap Names are not equal.")
 	}
 
+	// Functional tests are very buggy when it comes to accounting for trailing white spaces and can be hard to
+	// diagnose, we trim these so we are only comparing the core contents, to account for whitespace testing
+	// defer to unit testing
+	for k := range expectedConfigMap.Data {
+		expectedConfigMap.Data[k] = strings.TrimSpace(expectedConfigMap.Data[k])
+	}
+	for k := range actualConfigMap.Data {
+		actualConfigMap.Data[k] = strings.TrimSpace(actualConfigMap.Data[k])
+	}
+
 	diff := deep.Equal(expectedConfigMap.Data, actualConfigMap.Data)
 	if diff != nil {
 		return false, notDeeplyEqualMsg("Configmap's Data values", diff)