From 92bf3c59a0575bd9a2c08d980996ab68bbda4066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Valais?= Date: Fri, 22 Jan 2021 10:13:46 +0100 Subject: [PATCH] DataForCertificate: fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maël Valais --- .../certificates/trigger/policies/gatherer.go | 42 ++++++++++--------- .../trigger/policies/gatherer_test.go | 42 +++++++++---------- 2 files changed, 43 insertions(+), 41 deletions(-) diff --git a/pkg/controller/certificates/trigger/policies/gatherer.go b/pkg/controller/certificates/trigger/policies/gatherer.go index af0428830..9e206386c 100644 --- a/pkg/controller/certificates/trigger/policies/gatherer.go +++ b/pkg/controller/certificates/trigger/policies/gatherer.go @@ -75,33 +75,35 @@ func (g *Gatherer) DataForCertificate(ctx context.Context, crt *cmapi.Certificat // that the certificate's revision field stays nil until the first // certificate request (revision "1") has become ready. if crt.Status.Revision == nil { - return Input{Secret: secret, Certificate: crt}, nil + return Input{ + Certificate: crt, + Secret: secret, + }, nil } - // Attempt to fetch the CertificateRequest resource for the current 'status.revision'. + // Attempt to fetch the CertificateRequest resource for the current + // 'status.revision'. var req *cmapi.CertificateRequest - if crt.Status.Revision != nil { - reqs, err := certificates.ListCertificateRequestsMatchingPredicates(g.CertificateRequestLister.CertificateRequests(crt.Namespace), - labels.Everything(), - predicate.ResourceOwnedBy(crt), - predicate.CertificateRequestRevision(*crt.Status.Revision), - ) - if err != nil { - return Input{}, err - } - switch { - case len(reqs) > 1: - return Input{}, fmt.Errorf("multiple CertificateRequest resources exist for the current revision, not triggering new issuance until requests have been cleaned up") - case len(reqs) == 1: - req = reqs[0] - case len(reqs) == 0: - log.V(logf.DebugLevel).Info("Found no CertificateRequest resources owned by this Certificate for the current revision", "revision", *crt.Status.Revision) - } + reqs, err := certificates.ListCertificateRequestsMatchingPredicates(g.CertificateRequestLister.CertificateRequests(crt.Namespace), + labels.Everything(), + predicate.ResourceOwnedBy(crt), + predicate.CertificateRequestRevision(*crt.Status.Revision), + ) + if err != nil { + return Input{}, err + } + switch { + case len(reqs) > 1: + return Input{}, fmt.Errorf("multiple CertificateRequest resources exist for the current revision, not triggering new issuance until requests have been cleaned up") + case len(reqs) == 1: + req = reqs[0] + case len(reqs) == 0: + log.V(logf.DebugLevel).Info("Found no CertificateRequest resources owned by this Certificate for the current revision", "revision", *crt.Status.Revision) } return Input{ Certificate: crt, - CurrentRevisionRequest: req, Secret: secret, + CurrentRevisionRequest: req, }, nil } diff --git a/pkg/controller/certificates/trigger/policies/gatherer_test.go b/pkg/controller/certificates/trigger/policies/gatherer_test.go index 895b0d379..a0717b7e1 100644 --- a/pkg/controller/certificates/trigger/policies/gatherer_test.go +++ b/pkg/controller/certificates/trigger/policies/gatherer_test.go @@ -35,14 +35,14 @@ import ( func TestDataForCertificate(t *testing.T) { tests := map[string]struct { - name string - mockSecretLister *listers.FakeSecretLister - mockRequestsLister func(*listers.CertificateRequestListerMock) - givenCert *cmapi.Certificate + name string + mockSecretLister *listers.FakeSecretLister + givenCert *cmapi.Certificate - wantRequest *cmapi.CertificateRequest - wantSecret *corev1.Secret - wantErr string + wantRequestsListerCall func(*listers.CertificateRequestListerMock) + wantRequest *cmapi.CertificateRequest + wantSecret *corev1.Secret + wantErr string }{ "the returned secret should stay nil when it is not found": { givenCert: gen.Certificate("cert-1", @@ -52,8 +52,8 @@ func TestDataForCertificate(t *testing.T) { mockSecretLister: listers.FakeSecretListerFrom(listers.NewFakeSecretLister(), listers.SetFakeSecretNamespaceListerGet(nil, apierrors.NewNotFound(cmapi.Resource("Secret"), "secret-1")), ), - mockRequestsLister: func(mock *listers.CertificateRequestListerMock) {}, - wantSecret: nil, + wantRequestsListerCall: func(mock *listers.CertificateRequestListerMock) {}, + wantSecret: nil, }, "should return an error when getsecret returns an unexpect error that isnt not_found": { givenCert: gen.Certificate("cert-1", @@ -63,8 +63,8 @@ func TestDataForCertificate(t *testing.T) { mockSecretLister: listers.FakeSecretListerFrom(listers.NewFakeSecretLister(), listers.SetFakeSecretNamespaceListerGet(nil, fmt.Errorf("error that is not a not_found error")), ), - mockRequestsLister: func(mock *listers.CertificateRequestListerMock) {}, - wantErr: "error that is not a not_found error", + wantRequestsListerCall: func(mock *listers.CertificateRequestListerMock) {}, + wantErr: "error that is not a not_found error", }, "the returned certificaterequest should stay nil when the list function returns nothing": { givenCert: gen.Certificate("cert-1", @@ -74,8 +74,8 @@ func TestDataForCertificate(t *testing.T) { mockSecretLister: listers.FakeSecretListerFrom(listers.NewFakeSecretLister(), listers.SetFakeSecretNamespaceListerGet(nil, nil), ), - mockRequestsLister: func(mock *listers.CertificateRequestListerMock) {}, - wantRequest: nil, + wantRequestsListerCall: func(mock *listers.CertificateRequestListerMock) {}, + wantRequest: nil, }, "should find the certificaterequest that matches revision and owner": { givenCert: gen.Certificate("cert-1", @@ -86,7 +86,7 @@ func TestDataForCertificate(t *testing.T) { mockSecretLister: listers.FakeSecretListerFrom(listers.NewFakeSecretLister(), listers.SetFakeSecretNamespaceListerGet(nil, nil), ), - mockRequestsLister: func(mock *listers.CertificateRequestListerMock) { + wantRequestsListerCall: func(mock *listers.CertificateRequestListerMock) { mock. CallCertificateRequests("default-unit-test-ns"). CallList(""). @@ -124,7 +124,7 @@ func TestDataForCertificate(t *testing.T) { mockSecretLister: listers.FakeSecretListerFrom(listers.NewFakeSecretLister(), listers.SetFakeSecretNamespaceListerGet(nil, nil), ), - mockRequestsLister: func(mock *listers.CertificateRequestListerMock) { + wantRequestsListerCall: func(mock *listers.CertificateRequestListerMock) { mock. CallCertificateRequests("default-unit-test-ns"). CallList(""). @@ -155,8 +155,8 @@ func TestDataForCertificate(t *testing.T) { mockSecretLister: listers.FakeSecretListerFrom(listers.NewFakeSecretLister(), listers.SetFakeSecretNamespaceListerGet(nil, nil), ), - mockRequestsLister: func(mock *listers.CertificateRequestListerMock) {}, - wantRequest: nil, + wantRequestsListerCall: func(mock *listers.CertificateRequestListerMock) {}, + wantRequest: nil, }, "should return the certificaterequest and secret and both found": { givenCert: gen.Certificate("cert-1", @@ -166,7 +166,7 @@ func TestDataForCertificate(t *testing.T) { mockSecretLister: listers.FakeSecretListerFrom(listers.NewFakeSecretLister(), listers.SetFakeSecretNamespaceListerGet(&corev1.Secret{ObjectMeta: metav1.ObjectMeta{Name: "secret-1"}}, nil), ), - mockRequestsLister: func(mock *listers.CertificateRequestListerMock) { + wantRequestsListerCall: func(mock *listers.CertificateRequestListerMock) { mock. CallCertificateRequests("default-unit-test-ns"). CallList(""). @@ -196,7 +196,7 @@ func TestDataForCertificate(t *testing.T) { mockSecretLister: listers.FakeSecretListerFrom(listers.NewFakeSecretLister(), listers.SetFakeSecretNamespaceListerGet(nil, nil), ), - mockRequestsLister: func(mock *listers.CertificateRequestListerMock) { + wantRequestsListerCall: func(mock *listers.CertificateRequestListerMock) { mock. CallCertificateRequests("default-unit-test-ns"). CallList(""). @@ -225,7 +225,7 @@ func TestDataForCertificate(t *testing.T) { mockSecretLister: listers.FakeSecretListerFrom(listers.NewFakeSecretLister(), listers.SetFakeSecretNamespaceListerGet(&corev1.Secret{}, nil), ), - mockRequestsLister: func(mock *listers.CertificateRequestListerMock) { + wantRequestsListerCall: func(mock *listers.CertificateRequestListerMock) { mock. CallCertificateRequests("default-unit-test-ns"). CallList(""). @@ -237,7 +237,7 @@ func TestDataForCertificate(t *testing.T) { for name, test := range tests { t.Run(name, func(t *testing.T) { mockLister := listers.MockCertificateRequestLister(t) - test.mockRequestsLister(mockLister) + test.wantRequestsListerCall(mockLister) g := &Gatherer{ CertificateRequestLister: mockLister,