weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

DataForCertificate: move certRef to test/unit/gen

Browse Source 
Signed-off-by: Maël Valais <mael@vls.dev>
This commit is contained in:
Maël Valais 2021-01-22 17:29:44 +01:00
parent ca72582897
commit 38919b7eb2
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/certificates/trigger/policies/BUILD.bazel
View File

@ -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",
],
)

35
pkg/controller/certificates/trigger/policies/gatherer_test.go
View File

@ -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"),
)
}

11
test/unit/gen/certificate.go
View File

@ -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"),
)
}