From 38919b7eb2cf73c0af6930702aac515b6b4c4b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Valais?= Date: Fri, 22 Jan 2021 17:29:44 +0100 Subject: [PATCH] DataForCertificate: move certRef to test/unit/gen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maël Valais --- .../certificates/trigger/policies/BUILD.bazel | 1 - .../trigger/policies/gatherer_test.go | 35 ++++++------------- test/unit/gen/certificate.go | 11 ++++++ 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/pkg/controller/certificates/trigger/policies/BUILD.bazel b/pkg/controller/certificates/trigger/policies/BUILD.bazel index fc168fdb6..9f0d1a35e 100644 --- a/pkg/controller/certificates/trigger/policies/BUILD.bazel +++ b/pkg/controller/certificates/trigger/policies/BUILD.bazel @@ -42,7 +42,6 @@ go_test( "@io_k8s_api//core/v1:go_default_library", "@io_k8s_apimachinery//pkg/api/errors:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", - "@io_k8s_apimachinery//pkg/types:go_default_library", "@io_k8s_utils//clock/testing:go_default_library", ], ) diff --git a/pkg/controller/certificates/trigger/policies/gatherer_test.go b/pkg/controller/certificates/trigger/policies/gatherer_test.go index a0717b7e1..69cb02df6 100644 --- a/pkg/controller/certificates/trigger/policies/gatherer_test.go +++ b/pkg/controller/certificates/trigger/policies/gatherer_test.go @@ -26,7 +26,6 @@ import ( corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" "github.com/jetstack/cert-manager/test/unit/gen" @@ -92,24 +91,24 @@ func TestDataForCertificate(t *testing.T) { CallList(""). ReturnList([]*cmapi.CertificateRequest{ gen.CertificateRequest("cr-4", - gen.AddCertificateRequestOwnerReferences(certRef("cert-1", "uid-4")), + gen.AddCertificateRequestOwnerReferences(gen.CertificateRef("cert-1", "uid-4")), gen.AddCertificateRequestAnnotations(map[string]string{ "cert-manager.io/certificate-revision": "4", }), ), gen.CertificateRequest("cr-7", - gen.AddCertificateRequestOwnerReferences(certRef("cert-1", "uid-7")), + gen.AddCertificateRequestOwnerReferences(gen.CertificateRef("cert-1", "uid-7")), gen.AddCertificateRequestAnnotations(map[string]string{ "cert-manager.io/certificate-revision": "7", }), ), gen.CertificateRequest("cr-9", - gen.AddCertificateRequestOwnerReferences(certRef("cert-1", "uid-9")), + gen.AddCertificateRequestOwnerReferences(gen.CertificateRef("cert-1", "uid-9")), ), }, nil) }, wantRequest: gen.CertificateRequest("cr-7", - gen.AddCertificateRequestOwnerReferences(certRef("cert-1", "uid-7")), + gen.AddCertificateRequestOwnerReferences(gen.CertificateRef("cert-1", "uid-7")), gen.AddCertificateRequestAnnotations(map[string]string{ "cert-manager.io/certificate-revision": "7", }), @@ -130,16 +129,16 @@ func TestDataForCertificate(t *testing.T) { CallList(""). ReturnList([]*cmapi.CertificateRequest{ gen.CertificateRequest("cr-1", - gen.AddCertificateRequestOwnerReferences(certRef("cert-1", "uid-1")), + gen.AddCertificateRequestOwnerReferences(gen.CertificateRef("cert-1", "uid-1")), ), gen.CertificateRequest("cr-1", - gen.AddCertificateRequestOwnerReferences(certRef("cert-1", "uid-1")), + gen.AddCertificateRequestOwnerReferences(gen.CertificateRef("cert-1", "uid-1")), gen.AddCertificateRequestAnnotations(map[string]string{ "cert-manager.io/certificate-revision": "42", }), ), gen.CertificateRequest("cr-42", - gen.AddCertificateRequestOwnerReferences(certRef("cert-42", "uid-42")), + gen.AddCertificateRequestOwnerReferences(gen.CertificateRef("cert-42", "uid-42")), gen.AddCertificateRequestAnnotations(map[string]string{ "cert-manager.io/certificate-revision": "1", }), @@ -172,7 +171,7 @@ func TestDataForCertificate(t *testing.T) { CallList(""). ReturnList([]*cmapi.CertificateRequest{ gen.CertificateRequest("cr-1", - gen.AddCertificateRequestOwnerReferences(certRef("cert-1", "uid-1")), + gen.AddCertificateRequestOwnerReferences(gen.CertificateRef("cert-1", "uid-1")), gen.AddCertificateRequestAnnotations(map[string]string{ "cert-manager.io/certificate-revision": "1", }), @@ -180,7 +179,7 @@ func TestDataForCertificate(t *testing.T) { }, nil) }, wantRequest: gen.CertificateRequest("cr-1", - gen.AddCertificateRequestOwnerReferences(certRef("cert-1", "uid-1")), + gen.AddCertificateRequestOwnerReferences(gen.CertificateRef("cert-1", "uid-1")), gen.AddCertificateRequestAnnotations(map[string]string{ "cert-manager.io/certificate-revision": "1", }), @@ -202,13 +201,13 @@ func TestDataForCertificate(t *testing.T) { CallList(""). ReturnList([]*cmapi.CertificateRequest{ gen.CertificateRequest("cr-1", - gen.AddCertificateRequestOwnerReferences(certRef("cert-1", "uid-1")), + gen.AddCertificateRequestOwnerReferences(gen.CertificateRef("cert-1", "uid-1")), gen.AddCertificateRequestAnnotations(map[string]string{ "cert-manager.io/certificate-revision": "1", }), ), gen.CertificateRequest("cr-1", - gen.AddCertificateRequestOwnerReferences(certRef("cert-1", "uid-1")), + gen.AddCertificateRequestOwnerReferences(gen.CertificateRef("cert-1", "uid-1")), gen.AddCertificateRequestAnnotations(map[string]string{ "cert-manager.io/certificate-revision": "1", }), @@ -259,15 +258,3 @@ func TestDataForCertificate(t *testing.T) { }) } } - -// This ad-hoc func creates an owner reference for a certificate. The best -// practice would be to use metav1.NewControllerRef, but that would require -// us to duplicate the certificate... -func certRef(certName, ownedUID string) metav1.OwnerReference { - return *metav1.NewControllerRef( - gen.Certificate(certName, - gen.SetCertificateUID(types.UID(ownedUID)), - ), - cmapi.SchemeGroupVersion.WithKind("Certificate"), - ) -} diff --git a/test/unit/gen/certificate.go b/test/unit/gen/certificate.go index 76d73450a..1addd9c97 100644 --- a/test/unit/gen/certificate.go +++ b/test/unit/gen/certificate.go @@ -220,3 +220,14 @@ func AddCertificateLabels(labels map[string]string) CertificateModifier { } } } + +// CertificateRef creates an owner reference for a certificate without +// having to give the full certificate. +func CertificateRef(certName, ownedUID string) metav1.OwnerReference { + return *metav1.NewControllerRef( + Certificate(certName, + SetCertificateUID(types.UID(ownedUID)), + ), + v1.SchemeGroupVersion.WithKind("Certificate"), + ) +}