github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-04-15 07:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow memory writers

Browse Source
This commit is contained in:
divolgin
2021-09-30 18:24:52 +00:00
parent 06750d478e
commit ca51e92878
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/collect/copy.go
View File

@@ -138,6 +138,8 @@ func copyFilesFromPod(ctx context.Context, dstPath string, clientConfig *restcli
if err != nil {
return nil, nil, errors.Wrap(err, "failed to craete dest file")
}
defer result.CloseWriter(dstPath, filepath.Base(containerPath)+".tar", w)
stdoutWriter = w
}

2
pkg/collect/copy_from_host.go
View File

@@ -315,6 +315,8 @@ func copyFilesFromHost(ctx context.Context, dstPath string, clientConfig *restcl
if err != nil {
return nil, nil, errors.Wrap(err, "failed to craete dest file")
}
defer result.CloseWriter(dstPath, "archive.tar", w)
stdoutWriter = w
}

4
pkg/collect/logs.go
View File

@@ -125,7 +125,7 @@ func savePodLogs(ctx context.Context, bundlePath string, client *kubernetes.Clie
if err != nil {
return nil, errors.Wrap(err, "failed to get log writer")
}
defer logWriter.Close()
defer result.CloseWriter(bundlePath, fileKey+".log", logWriter)
_, err = io.Copy(logWriter, podLogs)
if err != nil {
@@ -145,7 +145,7 @@ func savePodLogs(ctx context.Context, bundlePath string, client *kubernetes.Clie
if err != nil {
return nil, errors.Wrap(err, "failed to get previous log writer")
}
defer logWriter.Close()
defer result.CloseWriter(bundlePath, fileKey+"-previous.log", logWriter)
_, err = io.Copy(prevLogWriter, podLogs)
if err != nil {

24
pkg/collect/result.go
View File

@@ -89,6 +89,10 @@ func (r CollectorResult) GetReader(bundlePath string, relativePath string) (io.R
return 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)
if err != nil {
@@ -98,9 +102,10 @@ func (r CollectorResult) GetReader(bundlePath string, relativePath string) (io.R
return f, nil
}
func (r CollectorResult) GetWriter(bundlePath string, relativePath string) (io.WriteCloser, error) {
if r[relativePath] != nil {
return nil, errors.New("writing to memory is not implemented")
func (r CollectorResult) GetWriter(bundlePath string, relativePath string) (io.Writer, error) {
if bundlePath == "" {
var b bytes.Buffer
return &b, nil
}
fileDir, _ := filepath.Split(relativePath)
@@ -120,6 +125,19 @@ func (r CollectorResult) GetWriter(bundlePath string, relativePath string) (io.W
return f, nil
}
func (r CollectorResult) CloseWriter(bundlePath string, relativePath string, writer interface{}) error {
if c, ok := writer.(io.Closer); ok {
return errors.Wrap(c.Close(), "failed to close writer")
}
if b, ok := writer.(*bytes.Buffer); ok {
r[relativePath] = b.Bytes()
return nil
}
return errors.Errorf("cannot close writer of type %T", writer)
}
func TarSupportBundleDir(bundlePath string, input CollectorResult, outputFilename string) error {
fileWriter, err := os.Create(outputFilename)
if err != nil {