more test fixes

porthorian · porthorian · commit 37640468d3f8 · 2025-01-17T19:04:33.000-05:00
diff --git a/internal/mode/static/state/change_processor_test.go b/internal/mode/static/state/change_processor_test.go
@@ -594,6 +594,9 @@ var _ = Describe("ChangeProcessor", func() {
 				}
 
 				diffNsTLSSecret = &apiv1.Secret{
+					TypeMeta: metav1.TypeMeta{
+						Kind: "Secret",
+					},
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "different-ns-tls-secret",
 						Namespace: "cert-ns",
diff --git a/internal/mode/static/state/graph/configmaps.go b/internal/mode/static/state/graph/configmaps.go
@@ -68,7 +68,7 @@ func (r *configMapResolver) resolve(nsname types.NamespacedName) error {
 	r.resolvedCaCertConfigMaps[nsname] = &caCertConfigMapEntry{
 		caCertConfigMap: CaCertConfigMap{
 			Source:     cm,
-			CertBundle: NewCertificateBundle(nsname, cm.Kind, cert),
+			CertBundle: NewCertificateBundle(nsname, "ConfigMap", cert),
 		},
 		err: validationErr,
 	}
diff --git a/internal/mode/static/state/graph/secret.go b/internal/mode/static/state/graph/secret.go
@@ -69,7 +69,7 @@ func (r *secretResolver) resolve(nsname types.NamespacedName) error {
 
 		validationErr = validateTLS(cert.TLSCert, cert.TLSPrivateKey)
 
-		certBundle = NewCertificateBundle(nsname, secret.Kind, cert)
+		certBundle = NewCertificateBundle(nsname, "Secret", cert)
 	}
 
 	r.resolvedSecrets[nsname] = &secretEntry{

Original file line number	Diff line number	Diff line change
`@@ -594,6 +594,9 @@ var _ = Describe("ChangeProcessor", func() {`
`594`	`594`	`}`
`595`	`595`
`596`	`596`	`diffNsTLSSecret = &apiv1.Secret{`
	`597`	`+ TypeMeta: metav1.TypeMeta{`
	`598`	`+ Kind: "Secret",`
	`599`	`+ },`
`597`	`600`	`ObjectMeta: metav1.ObjectMeta{`
`598`	`601`	`Name: "different-ns-tls-secret",`
`599`	`602`	`Namespace: "cert-ns",`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func (r *configMapResolver) resolve(nsname types.NamespacedName) error {`
`68`	`68`	`r.resolvedCaCertConfigMaps[nsname] = &caCertConfigMapEntry{`
`69`	`69`	`caCertConfigMap: CaCertConfigMap{`
`70`	`70`	`Source: cm,`
`71`		`- CertBundle: NewCertificateBundle(nsname, cm.Kind, cert),`
	`71`	`+ CertBundle: NewCertificateBundle(nsname, "ConfigMap", cert),`
`72`	`72`	`},`
`73`	`73`	`err: validationErr,`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func (r *secretResolver) resolve(nsname types.NamespacedName) error {`
`69`	`69`
`70`	`70`	`validationErr = validateTLS(cert.TLSCert, cert.TLSPrivateKey)`
`71`	`71`
`72`		`- certBundle = NewCertificateBundle(nsname, secret.Kind, cert)`
	`72`	`+ certBundle = NewCertificateBundle(nsname, "Secret", cert)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`r.resolvedSecrets[nsname] = &secretEntry{`