Merge pull request #320 from hypnoglow/270/verbose

Add verbose output; print chart name on reindex error

cmd/helm-s3/options.go

@@ -9,12 +9,14 @@ import (
 type options struct {
 	timeout time.Duration
 	acl     string
+	verbose bool
 }
 
 // newDefaultOptions returns default options.
 func newDefaultOptions() *options {
 	return &options{
 		timeout: 5 * time.Minute,
 		acl:     os.Getenv("S3_ACL"),
+		verbose: false,
 	}
 }

cmd/helm-s3/reindex.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -23,6 +24,7 @@ func newReindexCommand(opts *options) *cobra.Command {
 	act := &reindexAction{
 		printer:  nil,
 		acl:      "",
+		verbose:  false,
 		repoName: "",
 		relative: false,
 	}
@@ -40,6 +42,7 @@ func newReindexCommand(opts *options) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			act.printer = cmd
 			act.acl = opts.acl
+			act.verbose = opts.verbose
 			act.repoName = args[0]
 			return act.run(cmd.Context())
 		},
@@ -56,7 +59,8 @@ type reindexAction struct {
 
 	// global flags
 
-	acl string
+	acl     string
+	verbose bool
 
 	// args
 
@@ -90,6 +94,10 @@ func (act *reindexAction) run(ctx context.Context) error {
 				baseURL = ""
 			}
 
+			if act.verbose {
+				act.printer.Printf("[DEBUG] Adding %s to index.\n", item.Filename)
+			}
+
 			filename := escapeIfRelative(item.Filename, act.relative)
 
 			if err := idx.Add(item.Meta.Value(), filename, baseURL, item.Hash); err != nil {
@@ -102,7 +110,7 @@ func (act *reindexAction) run(ctx context.Context) error {
 	}()
 
 	for err = range errs {
-		return errors.Wrap(err, "traverse the chart repository")
+		return fmt.Errorf("traverse the chart repository: %v", err)
 	}
 
 	idx := <-builtIndex

cmd/helm-s3/root.go

@@ -40,6 +40,10 @@ The default timeout for all commands is 5 minutes. If you don't use MFA, it may
 be reasonable to lower the timeout for the most commands, e.g. to 10 seconds.
 In contrast, in cases where you want to reindex big repository with thousands of
 charts, you definitely want to increase the timeout.
+
+[Verbose output]
+
+You can enable verbose output with '--verbose' flag.
 `
 
 func newRootCmd() *cobra.Command {
@@ -72,6 +76,7 @@ func newRootCmd() *cobra.Command {
 	flags := cmd.PersistentFlags()
 	flags.StringVar(&opts.acl, "acl", opts.acl, "S3 Object ACL to use for charts and indexes. Can be sourced from S3_ACL environment variable.")
 	flags.DurationVar(&opts.timeout, "timeout", opts.timeout, "Timeout for the whole operation to complete.")
+	flags.BoolVar(&opts.verbose, "verbose", opts.verbose, "Enable verbose output.")
 
 	cmd.SetFlagErrorFunc(func(command *cobra.Command, err error) error {
 		return newBadUsageError(err)

internal/awss3/storage.go

@@ -115,7 +115,7 @@ func (s *Storage) traverse(ctx context.Context, repoURI string, items chan<- Cha
 				Key:    obj.Key,
 			})
 			if err != nil {
-				errs <- errors.Wrap(err, "head s3 object")
+				errs <- fmt.Errorf("head s3 object %q: %s", key, err)
 				return
 			}
 
@@ -139,7 +139,7 @@ func (s *Storage) traverse(ctx context.Context, repoURI string, items chan<- Cha
 					Key:    obj.Key,
 				})
 				if err != nil {
-					errs <- errors.Wrap(err, "get s3 object")
+					errs <- fmt.Errorf("get s3 object %q: %s", key, err)
 					return
 				}
 
@@ -149,13 +149,13 @@ func (s *Storage) traverse(ctx context.Context, repoURI string, items chan<- Cha
 				ch, err := helmutil.LoadArchive(tr)
 				objectOut.Body.Close()
 				if err != nil {
-					errs <- errors.Wrap(err, "load archive from s3 object")
+					errs <- fmt.Errorf("load archive from s3 object %q: %s", key, err)
 					return
 				}
 
 				digest, err := helmutil.Digest(buf)
 				if err != nil {
-					errs <- errors.WithMessage(err, "get chart hash")
+					errs <- fmt.Errorf("get chart hash for %q: %s", key, err)
 					return
 				}
 
@@ -164,7 +164,7 @@ func (s *Storage) traverse(ctx context.Context, repoURI string, items chan<- Cha
 			} else {
 				meta := helmutil.NewChartMetadata()
 				if err := meta.UnmarshalJSON([]byte(*serializedChartMeta)); err != nil {
-					errs <- errors.Wrap(err, "unserialize chart meta")
+					errs <- fmt.Errorf("unserialize chart meta for %q: %s", key, err)
 					return
 				}