Feedbacks

Signed-off-by: Ashmita Bohara <[email protected]>

pkg/config/tlscfg/options_unix.go → pkg/config/tlscfg/certpool_unix.go

@@ -18,13 +18,8 @@ package tlscfg
 
 import (
 	"crypto/x509"
-	"fmt"
 )
 
-func createCertPool() (*x509.CertPool, error) {
-	certPool, err := systemCertPool()
-	if err != nil {
-		return nil, fmt.Errorf("failed to load SystemCertPool: %w", err)
-	}
-	return certPool, nil
+func loadSystemCertPool() (*x509.CertPool, error) {
+	return systemCertPool()
 }

pkg/config/tlscfg/options_windows.go → pkg/config/tlscfg/certpool_windows.go

@@ -18,7 +18,6 @@ package tlscfg
 
 import (
 	"crypto/x509"
-	"fmt"
 	"syscall"
 	"unsafe"
 )
@@ -62,17 +61,13 @@ func appendCerts(rootCAs *x509.CertPool) (*x509.CertPool, error) {
 	return rootCAs, nil
 }
 
-func createCertPool() (*x509.CertPool, error) {
+func loadSystemCertPool() (*x509.CertPool, error) {
 	certPool, err := systemCertPool()
 	if err != nil {
-		return nil, fmt.Errorf("failed to load SystemCertPool: %w", err)
+		return nil, err
 	}
 	if certPool == nil {
 		certPool = x509.NewCertPool()
 	}
-	certPool, err = appendCerts(certPool)
-	if err != nil {
-		return nil, fmt.Errorf("failed to append SystemCertPool: %w", err)
-	}
-	return certPool, nil
+	return appendCerts(certPool)
 }

pkg/config/tlscfg/options.go

@@ -86,9 +86,9 @@ func (p *Options) Config(logger *zap.Logger) (*tls.Config, error) {
 
 func (p Options) loadCertPool() (*x509.CertPool, error) {
 	if len(p.CAPath) == 0 { // no truststore given, use SystemCertPool
-		certPool, err := createCertPool()
+		certPool, err := loadSystemCertPool()
 		if err != nil {
-			return nil, fmt.Errorf("failed to create CertPool: %w", err)
+			return nil, fmt.Errorf("failed to load SystemCertPool: %w", err)
 		}
 		return certPool, nil
 	}