scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-03 20:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix debug bundle panic on Windows (#14399)

Browse Source 
* Fix debug bundle panic on Windows

* Add changelog entry
This commit is contained in:
Dave May
2022-06-09 18:57:45 -04:00
committed by GitHub
parent e1a8454c5c
commit aa4768dbb6
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/14399.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
debug: Fix panic when capturing debug bundle on Windows
```

4
command/debug.go
View File

@@ -349,7 +349,7 @@ func (c *DebugCommand) generateIndex() error {
dir, file := filepath.Split(relPath) dir, file := filepath.Split(relPath)
if len(dir) != 0 { if len(dir) != 0 {
dir = strings.TrimSuffix(dir, "/") dir = filepath.Clean(dir)
filesArr := outputLayout[dir].(map[string]interface{})["files"] filesArr := outputLayout[dir].(map[string]interface{})["files"]
outputLayout[dir].(map[string]interface{})["files"] = append(filesArr.([]string), file) outputLayout[dir].(map[string]interface{})["files"] = append(filesArr.([]string), file)
} else { } else {
@@ -448,7 +448,7 @@ func (c *DebugCommand) preflight(rawArgs []string) (string, error) {
} }
// Strip trailing slash before proceeding // Strip trailing slash before proceeding
c.flagOutput = strings.TrimSuffix(c.flagOutput, "/") c.flagOutput = filepath.Clean(c.flagOutput)
// If compression is enabled, trim the extension so that the files are // If compression is enabled, trim the extension so that the files are
// written to a directory even if compression somehow fails. We ensure the // written to a directory even if compression somehow fails. We ensure the