put some remarks from PR discussion

Signed-off-by: Oleksandr Krutko <alexander.krutko@gmail.com>
cert-manager · Jul 10, 2024 · 979221b · 979221b
1 parent 4cb0887
commit 979221b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/pkg/bundle/source.go b/pkg/bundle/source.go
@@ -63,7 +63,7 @@ type bundleData struct {
 // is each bundle is concatenated together with a new line character.
 func (b *bundle) buildSourceBundle(ctx context.Context, sources []trustapi.BundleSource, formats *trustapi.AdditionalFormats) (bundleData, error) {
 	var resolvedBundle bundleData
-	var certPool = util.NewCertPool(util.WithFilteredExpiredCerts(b.FilterExpiredCerts))
+	certPool := util.NewCertPool(util.WithFilteredExpiredCerts(b.FilterExpiredCerts))
 
 	for _, source := range sources {
 		var (

diff --git a/pkg/fspkg/package.go b/pkg/fspkg/package.go
@@ -65,7 +65,7 @@ func (p *Package) Validate() error {
 	// Ignore the sanitized bundle here and preserve the bundle as-is.
 	// We'll sanitize later, when building a bundle on a reconcile.
 
-	var certPool = util.NewCertPool(util.WithFilteredExpiredCerts(false))
+	certPool := util.NewCertPool(util.WithFilteredExpiredCerts(false))
 
 	err := util.ValidateAndSplitPEMBundle(certPool, []byte(p.Bundle))
 	if err != nil {

diff --git a/pkg/util/cert_pool.go b/pkg/util/cert_pool.go
@@ -41,7 +41,7 @@ func WithFilteredExpiredCerts(filterExpired bool) Option {
 
 // newCertPool returns a new, empty CertPool.
 func NewCertPool(options ...Option) *CertPool {
-	var certPool = &CertPool{
+	certPool := &CertPool{
 		certificates:       make([]*x509.Certificate, 0),
 		certificatesHashes: make(map[[32]byte]struct{}),
 	}

diff --git a/test/env/data.go b/test/env/data.go
@@ -217,11 +217,9 @@ func CheckBundleSyncedStartsWith(ctx context.Context, cl client.Client, name str
 			return fmt.Errorf("received data didn't start with expected data")
 		}
 
-		var certPool = util.NewCertPool(util.WithFilteredExpiredCerts(false))
-
 		remaining := strings.TrimPrefix(got, startingData)
 
-		// check that there are a nonzero number of valid certs remaining
+		certPool := util.NewCertPool(util.WithFilteredExpiredCerts(false))
 
 		err := util.ValidateAndSplitPEMBundle(certPool, []byte(remaining))
 		if err != nil {
@@ -337,7 +335,7 @@ func CheckJKSFileSynced(jksData []byte, expectedPassword string, expectedCertPEM
 	// that the count is the same
 
 	aliasCount := len(ks.Aliases())
-	expectedPEMCount := len(util.AsSplitPEMBundle(certPool))
+	expectedPEMCount := util.GetCertificatesQuantity(certPool)
 
 	if aliasCount != expectedPEMCount {
 		return fmt.Errorf("expected %d certificates in JKS but found %d", expectedPEMCount, aliasCount)