fix tests and lints

Signed-off-by: Sean Teeling <[email protected]>

Author: steeling

pkg/certificate/manager.go

@@ -1,7 +1,6 @@
 package certificate
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/pkg/errors"
@@ -116,7 +115,6 @@ func (m *Manager) IssueCertificate(cn CommonName, validityPeriod time.Duration)
 
 	start := time.Now()
 	if cert == nil || cert.keyIssuerID != keyIssuer.ID || cert.pubIssuerID != pubIssuer.ID {
-		fmt.Println("issuing!")
 		cert, err = keyIssuer.IssueCertificate(cn, validityPeriod)
 		if err != nil {
 			return nil, err
@@ -132,7 +130,6 @@ func (m *Manager) IssueCertificate(cn CommonName, validityPeriod time.Duration)
 
 		cert.keyIssuerID = keyIssuer.ID
 		cert.pubIssuerID = pubIssuer.ID
-		fmt.Println("issued!", cert.keyIssuerID, keyIssuer.ID)
 	}
 
 	m.cache.Store(cn, cert)

pkg/certificate/manager_test.go

@@ -273,7 +273,7 @@ func TestIssueCertificate(t *testing.T) {
 		assert.NotNil(cert1)
 		assert.Equal(cert1.keyIssuerID, "id1")
 		assert.Equal(cert1.pubIssuerID, "id2")
-		assert.Equal(cert1.GetIssuingCA(), pem.RootCertificate("idid2"))
+		assert.Equal(cert1.GetIssuingCA(), pem.RootCertificate("id1id2"))
 
 		// cached
 		cert2, err := cm.IssueCertificate(cn, time.Minute)
@@ -296,7 +296,7 @@ func TestIssueCertificate(t *testing.T) {
 		assert.NotEqual(cert3, cert4)
 		assert.Equal(cert4.keyIssuerID, "id2")
 		assert.Equal(cert4.pubIssuerID, "id1")
-		assert.Equal(cert4.GetIssuingCA(), pem.RootCertificate("idid1"))
+		assert.Equal(cert4.GetIssuingCA(), pem.RootCertificate("id2id1"))
 
 		// cached, but pubIssuer is old
 		cm.pubIssuer = &issuer{ID: "id3", Issuer: &fakeIssuer{id: "id3"}}
@@ -305,7 +305,7 @@ func TestIssueCertificate(t *testing.T) {
 		assert.NotEqual(cert4, cert5)
 		assert.Equal(cert5.keyIssuerID, "id2")
 		assert.Equal(cert5.pubIssuerID, "id3")
-		assert.Equal(cert5.GetIssuingCA(), pem.RootCertificate("idid3"))
+		assert.Equal(cert5.GetIssuingCA(), pem.RootCertificate("id2id3"))
 	})
 
 	t.Run("bad issuers", func(t *testing.T) {
@@ -337,6 +337,5 @@ func TestIssueCertificate(t *testing.T) {
 		cert, err = cm.IssueCertificate(cn, time.Minute)
 		assert.EqualError(err, "id1 failed")
 		assert.Nil(cert)
-
 	})
 }