Fixup error text and cleanup test instantiation

Signed-off-by: James Munnelly <james@munnelly.eu>

pkg/controller/expcertificates/issuing/issuing_controller.go

@@ -165,8 +165,6 @@ func (c *controller) ProcessItem(ctx context.Context, key string) error {
 		return nil
 	}
 
-	nextPrivateKeySecretName := *crt.Status.NextPrivateKeySecretName
-
 	// CertificateRequest revisions begin from 1. If no revision is set on the
 	// status then assume no revision yet set.
 	nextRevision := 1
@@ -200,7 +198,7 @@ func (c *controller) ProcessItem(ctx context.Context, key string) error {
 		// If the CertificateRequest is valid, verify its status and update
 		// accordingly.
 	case cmapi.CertificateRequestReasonIssued:
-		return c.issueCertificate(ctx, log, nextPrivateKeySecretName, nextRevision, crt, req)
+		return c.issueCertificate(ctx, log, nextRevision, crt, req)
 
 	// CertificateRequest is not in a final state so do nothing.
 	default:
@@ -220,7 +218,7 @@ func (c *controller) failIssueCertificate(ctx context.Context, log logr.Logger,
 	condition := apiutil.GetCertificateRequestCondition(req, cmapi.CertificateRequestConditionReady)
 
 	reason = condition.Reason
-	message = fmt.Sprintf("The certificate has failed to complete and will be retried: %s",
+	message = fmt.Sprintf("The certificate request has failed to complete and will be retried: %s",
 		condition.Message)
 
 	crt = crt.DeepCopy()
@@ -239,8 +237,7 @@ func (c *controller) failIssueCertificate(ctx context.Context, log logr.Logger,
 // issueCertificate will ensure the public key of the CSR matches the signed
 // certificate, and then store the certificate, CA and private key into the
 // Secret in the appropriate format type.
-func (c *controller) issueCertificate(ctx context.Context, log logr.Logger, nextPrivateKeySecretName string, nextRevision int,
-	crt *cmapi.Certificate, req *cmapi.CertificateRequest) error {
+func (c *controller) issueCertificate(ctx context.Context, log logr.Logger, nextRevision int, crt *cmapi.Certificate, req *cmapi.CertificateRequest) error {
 
 	csr, err := utilpki.DecodeX509CertificateRequestBytes(req.Spec.CSRPEM)
 	if err != nil {

pkg/controller/expcertificates/issuing/issuing_controller_test.go

@@ -31,7 +31,6 @@ import (
 
 	cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2"
 	cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
-	controllerpkg "github.com/jetstack/cert-manager/pkg/controller"
 	testpkg "github.com/jetstack/cert-manager/pkg/controller/test"
 	"github.com/jetstack/cert-manager/test/unit/gen"
 )
@@ -200,15 +199,15 @@ func TestIssuingController(t *testing.T) {
 								Type:               cmapi.CertificateConditionIssuing,
 								Status:             cmmeta.ConditionFalse,
 								Reason:             "Failed",
-								Message:            "The certificate has failed to complete and will be retried: The certificate request failed because of reasons",
+								Message:            "The certificate request has failed to complete and will be retried: The certificate request failed because of reasons",
 								LastTransitionTime: &metaFixedClockStart,
 							}),
 							gen.SetCertificateLastFailureTime(metaFixedClockStart),
 						),
 					)),
 				},
 				ExpectedEvents: []string{
-					"Warning Failed The certificate has failed to complete and will be retried: The certificate request failed because of reasons",
+					"Warning Failed The certificate request has failed to complete and will be retried: The certificate request failed because of reasons",
 				},
 			},
 			expectedErr: false,
@@ -456,24 +455,11 @@ func TestIssuingController(t *testing.T) {
 			test.builder.Init()
 			defer test.builder.Stop()
 
-			secretsLister := test.builder.KubeSharedInformerFactory.Core().V1().Secrets().Lister()
-
-			secretManager := newSecretsManager(
-				test.builder.Client,
-				secretsLister,
-				controllerpkg.CertificateOptions{},
-			)
-
-			testManager := &controller{
-				certificateLister:        test.builder.SharedInformerFactory.Certmanager().V1alpha2().Certificates().Lister(),
-				certificateRequestLister: test.builder.SharedInformerFactory.Certmanager().V1alpha2().CertificateRequests().Lister(),
-				secretLister:             secretsLister,
-				recorder:                 test.builder.Recorder,
-				clock:                    fixedClock,
-				client:                   test.builder.CMClient,
-				secretsManager:           secretManager,
-			}
+			// Instantiate/setup the controller
+			w := controllerWrapper{}
+			w.Register(test.builder.Context)
 
+			// Start the unit test builder
 			test.builder.Start()
 
 			key, err := cache.MetaNamespaceKeyFunc(test.certificate)
@@ -482,7 +468,7 @@ func TestIssuingController(t *testing.T) {
 				t.FailNow()
 			}
 
-			err = testManager.ProcessItem(context.Background(), key)
+			err = w.controller.ProcessItem(context.Background(), key)
 			if err != nil && !test.expectedErr {
 				t.Errorf("expected to not get an error, but got: %v", err)
 			}