jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unify sanitizing of filenames

mine
groselt 2020-05-30 18:09:41 +01:00
parent 0fc2bb13a7
commit 7d2eb83f15
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/view/log.go
View File

@ -306,7 +306,7 @@ func saveData(cluster, name, data string) (string, error) {
} }
now := time.Now().UnixNano() now := time.Now().UnixNano()
fName := fmt.Sprintf("%s-%d.log", strings.Replace(name, "/", "-", -1), now) fName := fmt.Sprintf("%s-%d.log", SanitizeFilename(name), now)
path := filepath.Join(dir, fName) path := filepath.Join(dir, fName)
mod := os.O_CREATE | os.O_WRONLY mod := os.O_CREATE | os.O_WRONLY

4
internal/view/table_helper.go
View File

@ -18,12 +18,12 @@ import (
func computeFilename(cluster, ns, title, path string) (string, error) { func computeFilename(cluster, ns, title, path string) (string, error) {
now := time.Now().UnixNano() now := time.Now().UnixNano()
dir := filepath.Join(config.K9sDumpDir, cluster) dir := filepath.Join(config.K9sDumpDir, SanitizeFilename(cluster))
if err := ensureDir(dir); err != nil { if err := ensureDir(dir); err != nil {
return "", err return "", err
} }
name := title + "-" + strings.Replace(path, "/", "-", -1) name := title + "-" + SanitizeFilename(path)
if path == "" { if path == "" {
name = title name = title
} }

4
internal/view/yaml.go
View File

@ -61,13 +61,13 @@ func enableRegion(str string) string {
} }
func saveYAML(cluster, name, data string) (string, error) { func saveYAML(cluster, name, data string) (string, error) {
dir := filepath.Join(config.K9sDumpDir, cluster) dir := filepath.Join(config.K9sDumpDir, SanitizeFilename(cluster))
if err := ensureDir(dir); err != nil { if err := ensureDir(dir); err != nil {
return "", err return "", err
} }
now := time.Now().UnixNano() now := time.Now().UnixNano()
fName := fmt.Sprintf("%s-%d.yml", strings.Replace(name, "/", "-", -1), now) fName := fmt.Sprintf("%s-%d.yml", SanitizeFilename(name), now)
path := filepath.Join(dir, fName) path := filepath.Join(dir, fName)
mod := os.O_CREATE | os.O_WRONLY mod := os.O_CREATE | os.O_WRONLY