fix: handle errors returned by Close() in write paths (#1581)

Signed-off-by: Xiaoxuan Wang <[email protected]>
oras-project · Dec 11, 2024 · 0844004 · 0844004
1 parent 4b55afe
commit 0844004
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/cmd/oras/internal/display/content/manifest_fetch.go b/cmd/oras/internal/display/content/manifest_fetch.go
@@ -31,14 +31,18 @@ type manifestFetch struct {
 	outputPath string
 }
 
-func (h *manifestFetch) OnContentFetched(desc ocispec.Descriptor, manifest []byte) error {
+func (h *manifestFetch) OnContentFetched(desc ocispec.Descriptor, manifest []byte) (eventErr error) {
 	out := h.stdout
 	if h.outputPath != "-" && h.outputPath != "" {
 		f, err := os.Create(h.outputPath)
 		if err != nil {
 			return fmt.Errorf("failed to open %q: %w", h.outputPath, err)
 		}
-		defer f.Close()
+		defer func() {
+			if err := f.Close(); eventErr == nil {
+				eventErr = err
+			}
+		}()
 		out = f
 	}
 	return output.PrintJSON(out, manifest, h.pretty)

diff --git a/cmd/oras/internal/display/content/manifest_index.go b/cmd/oras/internal/display/content/manifest_index.go
@@ -44,14 +44,18 @@ func NewManifestIndexCreateHandler(out io.Writer, pretty bool, outputPath string
 }
 
 // OnContentCreated is called after index content is created.
-func (h *manifestIndexCreate) OnContentCreated(manifest []byte) error {
+func (h *manifestIndexCreate) OnContentCreated(manifest []byte) (eventErr error) {
 	out := h.stdout
 	if h.outputPath != "" && h.outputPath != "-" {
 		f, err := os.Create(h.outputPath)
 		if err != nil {
 			return fmt.Errorf("failed to open %q: %w", h.outputPath, err)
 		}
-		defer f.Close()
+		defer func() {
+			if err := f.Close(); eventErr == nil {
+				eventErr = err
+			}
+		}()
 		out = f
 	}
 	return output.PrintJSON(out, manifest, h.pretty)

diff --git a/cmd/oras/root/pull.go b/cmd/oras/root/pull.go
@@ -121,7 +121,7 @@ Example - Pull artifact files from an OCI layout archive 'layout.tar':
 	return oerrors.Command(cmd, &opts.Target)
 }
 
-func runPull(cmd *cobra.Command, opts *pullOptions) error {
+func runPull(cmd *cobra.Command, opts *pullOptions) (pullError error) {
 	ctx, logger := command.GetLogger(cmd, &opts.Common)
 	statusHandler, metadataHandler, err := display.NewPullHandler(opts.Printer, opts.Format, opts.Path, opts.TTY)
 	if err != nil {
@@ -148,7 +148,11 @@ func runPull(cmd *cobra.Command, opts *pullOptions) error {
 	if err != nil {
 		return err
 	}
-	defer dst.Close()
+	defer func() {
+		if err := dst.Close(); pullError == nil {
+			pullError = err
+		}
+	}()
 	dst.AllowPathTraversalOnWrite = opts.PathTraversal
 	dst.DisableOverwrite = opts.KeepOldFiles