Skip to content

Commit 2d3105f

Browse files
feat: update log messages to follow slog syntax (#166)
## Description When pkg was first created we wanted to use slog because it was a standard many implement, however consumers of pkg like Zarf and uds-cli did not yet have proper sloggers. Now that both of these tools are using a proper slogger, we can update this pkg to properly format it's slog messages --------- Signed-off-by: Austin Abro <[email protected]>
1 parent 08ae248 commit 2d3105f

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

oci/copier.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ func Copy(ctx context.Context, src *OrasRemote, dst *OrasRemote,
3939
for idx, layer := range layers {
4040
b, err := json.MarshalIndent(layer, "", " ")
4141
if err != nil {
42-
src.log.Debug(fmt.Sprintf("ERROR marshalling json: %s", err.Error()))
42+
src.log.Debug("failed to marshal json", "error", err.Error())
4343
}
44-
src.log.Debug(fmt.Sprintf("Copying layer: %s", string(b)))
44+
src.log.Debug("Copying layer", "layer", string(b))
4545
if err := sem.Acquire(ctx, 1); err != nil {
4646
return err
4747
}
@@ -52,7 +52,7 @@ func Copy(ctx context.Context, src *OrasRemote, dst *OrasRemote,
5252
return err
5353
}
5454
if exists {
55-
src.log.Debug("Layer already exists in destination, skipping")
55+
src.log.Debug("layer already exists in destination, skipping")
5656
b := make([]byte, layer.Size)
5757
_, _ = progressBar.Write(b)
5858
progressBar.Updatef("[%d/%d] layers copied", idx+1, len(layers))
@@ -106,8 +106,7 @@ func Copy(ctx context.Context, src *OrasRemote, dst *OrasRemote,
106106
}
107107

108108
duration := time.Since(start)
109-
src.log.Debug(fmt.Sprintf("Copied %s to %s with a concurrency of %d and took %s",
110-
src.repo.Reference, dst.repo.Reference, concurrency, duration))
109+
src.log.Debug("copy successful", "source", src.repo.Reference, "destination", dst.repo.Reference, "concurrency", concurrency, "duration", duration)
111110

112111
return nil
113112
}

oci/progress.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ func (o *OrasRemote) printLayer(desc ocispec.Descriptor, suffix string) error {
2626
title := desc.Annotations[ocispec.AnnotationTitle]
2727
var layerInfo string
2828
if title != "" {
29-
layerInfo = fmt.Sprintf("%s %s", desc.Digest.Encoded()[:12], helpers.First30last30(title))
29+
layerInfo = fmt.Sprintf("%s %s", desc.Digest.Encoded()[:12], helpers.First30Last30(title))
3030
} else {
3131
layerInfo = fmt.Sprintf("%s [%s]", desc.Digest.Encoded()[:12], desc.MediaType)
3232
}
33-
o.log.Debug(fmt.Sprintf("%s (%s)", layerInfo, suffix))
33+
o.log.Debug("operation successful", "layer", layerInfo, "operation", suffix)
3434
return nil
3535
}

0 commit comments

Comments
 (0)