return ReadCloser

Author: emosbaugh

pkg/collect/ceph.go

@@ -3,7 +3,6 @@ package collect
 import (
 	"context"
 	"fmt"
-	"io"
 	"os"
 	"path"
 	"strings"
@@ -203,10 +202,7 @@ func copyResult(srcResult CollectorResult, dstResult CollectorResult, bundlePath
 		}
 		return errors.Wrap(err, "failed to get reader")
 	}
-
-	if reader, ok := reader.(io.ReadCloser); ok {
-		defer reader.Close()
-	}
+	defer reader.Close()
 
 	err = dstResult.SaveResult(bundlePath, dstKey, reader)
 	if err != nil {

pkg/collect/redact.go

@@ -26,9 +26,7 @@ func redactResult(bundlePath string, input CollectorResult, additionalRedactors
 				}
 				return errors.Wrap(err, "failed to get reader")
 			}
-			if r, ok := r.(io.ReadCloser); ok {
-				defer r.Close()
-			}
+			defer r.Close()
 
 			reader = r
 		} else {

pkg/collect/result.go

@@ -85,17 +85,17 @@ func (r CollectorResult) ReplaceResult(bundlePath string, relativePath string, r
 	return nil
 }
 
-func (r CollectorResult) GetReader(bundlePath string, relativePath string) (io.Reader, error) {
+func (r CollectorResult) GetReader(bundlePath string, relativePath string) (io.ReadCloser, error) {
 	if r[relativePath] != nil {
-		return bytes.NewReader(r[relativePath]), nil
+		return ioutil.NopCloser(bytes.NewReader(r[relativePath])), nil
 	}
 
 	if bundlePath == "" {
 		return nil, errors.New("cannot create reader, bundle path is empty")
 	}
 
 	filename := filepath.Join(bundlePath, relativePath)
-	f, err := os.Open(filename) // does this ever close?
+	f, err := os.Open(filename)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to open file")
 	}