fix subdirectory missing in support bundle issue (#308)

Salah Aldeen Al Saleh · web-flow · commit b05eb6bf75f8 · 2020-12-08T12:52:29.000-08:00
diff --git a/cmd/troubleshoot/cli/run.go b/cmd/troubleshoot/cli/run.go
@@ -691,7 +691,8 @@ func tarSupportBundleDir(inputDir, outputFilename string) error {
 			return nil
 		}
 
-		nameInArchive, err := filepath.Rel(inputDir, filename)
+		parentDirName := filepath.Dir(inputDir) // this is to have the files inside a subdirectory
+		nameInArchive, err := filepath.Rel(parentDirName, filename)
 		if err != nil {
 			return errors.Wrap(err, "failed to create relative file name")
 		}

Original file line number	Diff line number	Diff line change
`@@ -691,7 +691,8 @@ func tarSupportBundleDir(inputDir, outputFilename string) error {`
`691`	`691`	`return nil`
`692`	`692`	`}`
`693`	`693`
`694`		`- nameInArchive, err := filepath.Rel(inputDir, filename)`
	`694`	`+ parentDirName := filepath.Dir(inputDir) // this is to have the files inside a subdirectory`
	`695`	`+ nameInArchive, err := filepath.Rel(parentDirName, filename)`
`695`	`696`	`if err != nil {`
`696`	`697`	`return errors.Wrap(err, "failed to create relative file name")`
`697`	`698`	`}`