use filepath.Glob and filepath.Match

Author: laverya

go.mod

@@ -17,7 +17,6 @@ require (
 	github.com/go-openapi/spec v0.19.4 // indirect
 	github.com/go-redis/redis/v7 v7.2.0
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/gobwas/glob v0.2.3
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/gofuzz v1.1.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect

pkg/analyze/download.go

@@ -191,7 +191,17 @@ func (f fileContentProvider) getFileContents(fileName string) ([]byte, error) {
 }
 
 func (f fileContentProvider) getChildFileContents(dirName string) (map[string][]byte, error) {
-	// TODO: walk sub-dirs
-	// return nil, errors.New("not implemented")
-	return map[string][]byte{}, nil
+	files, err := filepath.Glob(filepath.Join(f.rootDir, dirName))
+	if err != nil {
+		return nil, errors.Wrapf(err, "invalid glob %q", dirName)
+	}
+	fileArr := map[string][]byte{}
+	for _, filePath := range files {
+		bytes, err := ioutil.ReadFile(filePath)
+		if err != nil {
+			return nil, errors.Wrapf(err, "read %q", filePath)
+		}
+		fileArr[filePath] = bytes
+	}
+	return fileArr, nil
 }

pkg/analyze/text_analyze_test.go

@@ -2,10 +2,10 @@ package analyzer
 
 import (
 	"fmt"
+	"path/filepath"
 	"strings"
 	"testing"
 
-	"github.com/gobwas/glob"
 	troubleshootv1beta1 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -314,13 +314,8 @@ func Test_textAnalyze(t *testing.T) {
 					}
 				}
 
-				g, err := glob.Compile(n)
-				if err != nil {
-					return nil, err
-				}
-
 				for k, v := range test.files {
-					if g.Match(k) {
+					if ok, _ := filepath.Match(n, k); ok {
 						matching[k] = v
 					}
 				}

pkg/preflight/analyze.go

@@ -2,9 +2,9 @@ package preflight
 
 import (
 	"fmt"
+	"path/filepath"
 	"strings"
 
-	"github.com/gobwas/glob"
 	analyze "github.com/replicatedhq/troubleshoot/pkg/analyze"
 )
 
@@ -26,14 +26,8 @@ func (c CollectResult) Analyze() []*analyze.AnalyzeResult {
 			}
 		}
 
-		g, err := glob.Compile(prefix)
-		// don't treat this as a true error as glob is a late addition
-		if err != nil {
-			return matching, nil
-		}
-
 		for k, v := range c.AllCollectedData {
-			if g.Match(k) {
+			if ok, _ := filepath.Match(prefix, k); ok {
 				matching[k] = v
 			}
 		}