diff --git a/cmd/hauler/cli/store/add.go b/cmd/hauler/cli/store/add.go index aa45005..47ea378 100644 --- a/cmd/hauler/cli/store/add.go +++ b/cmd/hauler/cli/store/add.go @@ -41,7 +41,8 @@ func AddFileCmd(ctx context.Context, o *AddFileOpts, s *store.Layout, reference func storeFile(ctx context.Context, s *store.Layout, fi v1alpha1.File) error { l := log.FromContext(ctx) - + l.Infof("adding 'file' [%s] to the store", fi.Name) + copts := getter.ClientOptions{ NameOverride: fi.Name, } @@ -52,12 +53,13 @@ func storeFile(ctx context.Context, s *store.Layout, fi v1alpha1.File) error { return err } - desc, err := s.AddOCI(ctx, f, ref.Name()) + _, err = s.AddOCI(ctx, f, ref.Name()) if err != nil { return err } - l.Infof("added 'file' to store at [%s], with digest [%s]", ref.Name(), desc.Digest.String()) + l.Infof("successfully added 'file' [%s]", ref.Name()) + return nil } @@ -95,18 +97,19 @@ func AddImageCmd(ctx context.Context, o *AddImageOpts, s *store.Layout, referenc func storeImage(ctx context.Context, s *store.Layout, i v1alpha1.Image, platform string) error { l := log.FromContext(ctx) + l.Infof("adding 'image' [%s] to the store", i.Name) r, err := name.ParseReference(i.Name) if err != nil { return err } - + err = cosign.SaveImage(ctx, s, r.Name(), platform) if err != nil { return err } - l.Infof("added 'image' to store at [%s]", r.Name()) + l.Infof("successfully added 'image' [%s]", r.Name()) return nil } @@ -143,7 +146,8 @@ func AddChartCmd(ctx context.Context, o *AddChartOpts, s *store.Layout, chartNam func storeChart(ctx context.Context, s *store.Layout, cfg v1alpha1.Chart, opts *action.ChartPathOptions) error { l := log.FromContext(ctx) - + l.Infof("adding 'chart' [%s] to the store", cfg.Name) + // TODO: This shouldn't be necessary opts.RepoURL = cfg.RepoURL opts.Version = cfg.Version @@ -162,11 +166,11 @@ func storeChart(ctx context.Context, s *store.Layout, cfg v1alpha1.Chart, opts * if err != nil { return err } - desc, err := s.AddOCI(ctx, chrt, ref.Name()) + _, err = s.AddOCI(ctx, chrt, ref.Name()) if err != nil { return err } - l.Infof("added 'chart' to store at [%s], with digest [%s]", ref.Name(), desc.Digest.String()) + l.Infof("successfully added 'chart' [%s]", ref.Name()) return nil } diff --git a/cmd/hauler/cli/store/sync.go b/cmd/hauler/cli/store/sync.go index b3cc61e..8bf28cf 100644 --- a/cmd/hauler/cli/store/sync.go +++ b/cmd/hauler/cli/store/sync.go @@ -200,8 +200,7 @@ func processContent(ctx context.Context, fi *os.File, o *SyncOpts, s *store.Layo if i.Platform != "" { platform = i.Platform } - l.Debugf("platform for image [%s]", platform) - + err = storeImage(ctx, s, i, platform) if err != nil { return err diff --git a/pkg/log/log.go b/pkg/log/log.go index 029f9e0..b99e9a7 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -30,11 +30,13 @@ type Fields map[string]string // NewLogger returns a new Logger func NewLogger(out io.Writer) Logger { - output := zerolog.ConsoleWriter{Out: os.Stdout} - l := log.Output(output) - return &logger{ - zl: l.With().Timestamp().Logger(), - } + customTimeFormat := "2006-01-02 15:04:05" + zerolog.TimeFieldFormat = customTimeFormat + output := zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: customTimeFormat} + l := log.Output(output) + return &logger{ + zl: l.With().Timestamp().Logger(), + } } // FromContext returns a Logger from a context if it exists