chore: don't use logrus as logger

Signed-off-by: Lorenzo Susini <[email protected]>

Author: loresuso

go.mod

@@ -12,7 +12,6 @@ require (
 	github.com/onsi/gomega v1.20.0
 	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
 	github.com/pterm/pterm v0.12.45
-	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/cobra v1.5.0
 	github.com/spf13/pflag v1.0.5
 	gopkg.in/yaml.v3 v3.0.1
@@ -97,6 +96,7 @@ require (
 	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/russross/blackfriday v1.5.2 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
 	github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect

pkg/install/tls/generator.go

@@ -27,8 +27,6 @@ import (
 	"os"
 	"path/filepath"
 	"time"
-
-	logger "github.com/sirupsen/logrus"
 )
 
 // DefaultRSABits is the default bit size to generate an RSA keypair
@@ -208,7 +206,6 @@ func (g *GRPCTLS) FlushToDisk(path string) error {
 
 	for _, name := range certsFilenames {
 		f := filepath.Join(path, name)
-		logger.Infof("Writing: %s", f)
 		if err := ioutil.WriteFile(f, g.certs[name].Bytes(), 0600); err != nil {
 			return fmt.Errorf(`unable to write "%s": %v`, name, err)
 		}

pkg/oci/authn/credentialstore.go

@@ -25,7 +25,6 @@ import (
 	"github.com/docker/cli/cli/config/configfile"
 	"github.com/docker/cli/cli/config/credentials"
 	"github.com/docker/cli/cli/config/types"
-	logger "github.com/sirupsen/logrus"
 	"oras.land/oras-go/v2/registry/remote/auth"
 )
 
@@ -66,9 +65,8 @@ func NewStore(configPaths ...string) (*Store, error) {
 }
 
 // loadConfigFile reads the credential-related configurationfrom the given path.
-func loadConfigFile(path string) (*configfile.ConfigFile, error) {
-	var cfg *configfile.ConfigFile
-	if _, err := os.Stat(path); err != nil {
+func loadConfigFile(path string) (cfg *configfile.ConfigFile, err error) {
+	if _, err = os.Stat(path); err != nil {
 		if os.IsNotExist(err) {
 			cfg = configfile.New(path)
 		} else {
@@ -80,12 +78,13 @@ func loadConfigFile(path string) (*configfile.ConfigFile, error) {
 			return nil, err
 		}
 		defer func() {
-			if err := file.Close(); err != nil {
-				logger.Printf("Error closing file: %s\n", err)
+			if err != nil {
+				return
 			}
+			err = file.Close()
 		}()
 		cfg = configfile.New(path)
-		if err := cfg.LoadFromReader(file); err != nil {
+		if err = cfg.LoadFromReader(file); err != nil {
 			return nil, err
 		}
 	}

pkg/oci/pusher/pusher.go

@@ -25,7 +25,6 @@ import (
 
 	"github.com/opencontainers/image-spec/specs-go"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
-	logger "github.com/sirupsen/logrus"
 	"oras.land/oras-go/v2"
 	"oras.land/oras-go/v2/content/file"
 	"oras.land/oras-go/v2/registry/remote"
@@ -251,7 +250,7 @@ func (p *Pusher) storeArtifactsIndex(ctx context.Context, fileStore *file.Store,
 	return p.toFileStore(ctx, fileStore, index.MediaType, ArtifactsIndexName, index)
 }
 
-func (p *Pusher) toFileStore(ctx context.Context, fileStore *file.Store, mediaType, name string, data interface{}) (*v1.Descriptor, error) {
+func (p *Pusher) toFileStore(ctx context.Context, fileStore *file.Store, mediaType, name string, data interface{}) (desc *v1.Descriptor, err error) {
 	dataBytes, err := json.Marshal(data)
 	if err != nil {
 		return nil, fmt.Errorf("unable to marshal data of media type %q: %w", mediaType, err)
@@ -263,20 +262,22 @@ func (p *Pusher) toFileStore(ctx context.Context, fileStore *file.Store, mediaTy
 		return nil, err
 	}
 	defer func() {
-		if err := configFile.Close(); err != nil {
-			logger.Printf("Error closing file: %s\n", err)
+		if err != nil {
+			return
 		}
+		err = configFile.Close()
 	}()
 
 	if _, err := configFile.Write(dataBytes); err != nil {
 		return nil, fmt.Errorf("unable to write data of media type %q to temporary file %s: %w", mediaType, configFile.Name(), err)
 	}
 
-	desc, err := fileStore.Add(ctx, name, mediaType, filepath.Clean(configFile.Name()))
+	d, err := fileStore.Add(ctx, name, mediaType, filepath.Clean(configFile.Name()))
 	if err != nil {
 		return nil, fmt.Errorf("unable to store data of media type %q in the file store: %w", mediaType, err)
 	}
-	return &desc, nil
+	desc = &d
+	return
 }
 
 func (p *Pusher) packManifest(ctx context.Context, fileStore *file.Store,