From fc8167581ffc6626cbb5987e0e878fcc47d25699 Mon Sep 17 00:00:00 2001 From: Max Ehrlich Date: Wed, 5 Sep 2018 15:43:48 -0400 Subject: [PATCH] Update tests to support multiple orgs Signed-off-by: Max Ehrlich --- pkg/apis/certmanager/validation/certificate_for_issuer.go | 2 +- .../certmanager/validation/certificate_for_issuer_test.go | 4 ++-- pkg/apis/certmanager/validation/certificate_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/apis/certmanager/validation/certificate_for_issuer.go b/pkg/apis/certmanager/validation/certificate_for_issuer.go index b9473719a..20e98fde3 100644 --- a/pkg/apis/certmanager/validation/certificate_for_issuer.go +++ b/pkg/apis/certmanager/validation/certificate_for_issuer.go @@ -59,7 +59,7 @@ func ValidateCertificateForACMEIssuer(crt *v1alpha1.CertificateSpec, issuer *v1a el = append(el, field.Invalid(specPath.Child("isCA"), crt.KeyAlgorithm, "ACME does not support CA certificates")) } - if crt.Organization != "" { + if len(crt.Organization) != 0 { el = append(el, field.Invalid(specPath.Child("organization"), crt.Organization, "ACME does not support setting the organization name")) } diff --git a/pkg/apis/certmanager/validation/certificate_for_issuer_test.go b/pkg/apis/certmanager/validation/certificate_for_issuer_test.go index ba976c0a7..4e961d23b 100644 --- a/pkg/apis/certmanager/validation/certificate_for_issuer_test.go +++ b/pkg/apis/certmanager/validation/certificate_for_issuer_test.go @@ -136,7 +136,7 @@ func TestValidateCertificateForIssuer(t *testing.T) { "acme certificate with organization set": { crt: &v1alpha1.Certificate{ Spec: v1alpha1.CertificateSpec{ - Organization: "shouldfailorg", + Organization: []string{"shouldfailorg"}, IssuerRef: validIssuerRef, ACME: &v1alpha1.ACMECertificateConfig{ Config: []v1alpha1.DomainSolverConfig{ @@ -155,7 +155,7 @@ func TestValidateCertificateForIssuer(t *testing.T) { Namespace: defaultTestNamespace, }), errs: []*field.Error{ - field.Invalid(fldPath.Child("organization"), "shouldfailorg", "ACME does not support setting the organization name"), + field.Invalid(fldPath.Child("organization"), []string{"shouldfailorg"}, "ACME does not support setting the organization name"), }, }, "certificate with unspecified issuer type": { diff --git a/pkg/apis/certmanager/validation/certificate_test.go b/pkg/apis/certmanager/validation/certificate_test.go index 9b02c21a8..4c253b3c4 100644 --- a/pkg/apis/certmanager/validation/certificate_test.go +++ b/pkg/apis/certmanager/validation/certificate_test.go @@ -78,7 +78,7 @@ func TestValidateCertificate(t *testing.T) { Spec: v1alpha1.CertificateSpec{ CommonName: "testcn", SecretName: "abc", - Organization: "testorg", + Organization: []string{"testorg"}, IssuerRef: validIssuerRef, }, },