Merge pull request #389 from replicatedhq/laverya/simplify-text-analyze-code

simplify the text analyze code by combining with compareRegex code

Author: laverya

pkg/analyze/text_analyze.go

@@ -137,14 +137,6 @@ func analyzeRegexGroups(pattern string, collected []byte, outcomes []*troublesho
 	// allow fallthrough
 	for _, outcome := range outcomes {
 		if outcome.Fail != nil {
-			if outcome.Fail.When == "" {
-				result.IsFail = true
-				result.Message = outcome.Fail.Message
-				result.URI = outcome.Fail.URI
-
-				return result, nil
-			}
-
 			isMatch, err := compareRegex(outcome.Fail.When, foundMatches)
 			if err != nil {
 				return result, errors.Wrap(err, "failed to compare regex fail conditional")
@@ -158,14 +150,6 @@ func analyzeRegexGroups(pattern string, collected []byte, outcomes []*troublesho
 				return result, nil
 			}
 		} else if outcome.Warn != nil {
-			if outcome.Warn.When == "" {
-				result.IsWarn = true
-				result.Message = outcome.Warn.Message
-				result.URI = outcome.Warn.URI
-
-				return result, nil
-			}
-
 			isMatch, err := compareRegex(outcome.Warn.When, foundMatches)
 			if err != nil {
 				return result, errors.Wrap(err, "failed to compare regex warn conditional")
@@ -179,14 +163,6 @@ func analyzeRegexGroups(pattern string, collected []byte, outcomes []*troublesho
 				return result, nil
 			}
 		} else if outcome.Pass != nil {
-			if outcome.Pass.When == "" {
-				result.IsPass = true
-				result.Message = outcome.Pass.Message
-				result.URI = outcome.Pass.URI
-
-				return result, nil
-			}
-
 			isMatch, err := compareRegex(outcome.Pass.When, foundMatches)
 			if err != nil {
 				return result, errors.Wrap(err, "failed to compare regex pass conditional")
@@ -206,6 +182,9 @@ func analyzeRegexGroups(pattern string, collected []byte, outcomes []*troublesho
 }
 
 func compareRegex(conditional string, foundMatches map[string]string) (bool, error) {
+	if conditional == "" {
+		return true, nil
+	}
 	parts := strings.Split(strings.TrimSpace(conditional), " ")
 
 	if len(parts) != 3 {

pkg/analyze/text_analyze_test.go

@@ -7,7 +7,6 @@ import (
 	"testing"
 
 	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -371,6 +370,77 @@ func Test_textAnalyze(t *testing.T) {
 				"text-collector-1/cfile-1.txt": []byte("Yes it all SUCCEEDED"),
 			},
 		},
+
+		{
+			name: "compare group with integer",
+			analyzer: troubleshootv1beta2.TextAnalyze{
+				Outcomes: []*troubleshootv1beta2.Outcome{
+					{
+						Pass: &troubleshootv1beta2.SingleOutcome{
+							When:    "val > 10",
+							Message: "val is greater than 10",
+						},
+					},
+					{
+						Fail: &troubleshootv1beta2.SingleOutcome{
+							Message: "val is not greater than 10",
+						},
+					},
+				},
+				CollectorName: "text-collector-1",
+				FileName:      "cfile-1.txt",
+				RegexGroups:   `value: (?P<val>\d+)`,
+			},
+			expectResult: []AnalyzeResult{
+				{
+					IsPass:  true,
+					IsWarn:  false,
+					IsFail:  false,
+					Title:   "text-collector-1",
+					Message: "val is greater than 10",
+					IconKey: "kubernetes_text_analyze",
+					IconURI: "https://troubleshoot.sh/images/analyzer-icons/text-analyze.svg?w=13&h=16",
+				},
+			},
+			files: map[string][]byte{
+				"text-collector-1/cfile-1.txt": []byte("value: 15\nother: 10"),
+			},
+		},
+		{
+			name: "compare group with integer (failure)",
+			analyzer: troubleshootv1beta2.TextAnalyze{
+				Outcomes: []*troubleshootv1beta2.Outcome{
+					{
+						Pass: &troubleshootv1beta2.SingleOutcome{
+							When:    "val > 10",
+							Message: "val is greater than 10",
+						},
+					},
+					{
+						Fail: &troubleshootv1beta2.SingleOutcome{
+							Message: "val is not greater than 10",
+						},
+					},
+				},
+				CollectorName: "text-collector-1",
+				FileName:      "cfile-1.txt",
+				RegexGroups:   `value: (?P<val>\d+)`,
+			},
+			expectResult: []AnalyzeResult{
+				{
+					IsPass:  false,
+					IsWarn:  false,
+					IsFail:  true,
+					Title:   "text-collector-1",
+					Message: "val is not greater than 10",
+					IconKey: "kubernetes_text_analyze",
+					IconURI: "https://troubleshoot.sh/images/analyzer-icons/text-analyze.svg?w=13&h=16",
+				},
+			},
+			files: map[string][]byte{
+				"text-collector-1/cfile-1.txt": []byte("value: 2\nother: 10"),
+			},
+		},
 	}
 
 	for _, test := range tests {
@@ -404,7 +474,7 @@ func Test_textAnalyze(t *testing.T) {
 			for _, v := range actual {
 				unPointered = append(unPointered, *v)
 			}
-			assert.ElementsMatch(t, test.expectResult, unPointered)
+			req.ElementsMatch(test.expectResult, unPointered)
 		})
 	}
 }
@@ -444,6 +514,12 @@ func Test_compareRegex(t *testing.T) {
 			},
 			expected: true,
 		},
+		{
+			name:         "empty conditional",
+			conditional:  "",
+			foundMatches: map[string]string{},
+			expected:     true,
+		},
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
@@ -452,7 +528,7 @@ func Test_compareRegex(t *testing.T) {
 			actual, err := compareRegex(test.conditional, test.foundMatches)
 			req.NoError(err)
 
-			assert.Equal(t, test.expected, actual)
+			req.Equal(test.expected, actual)
 		})
 	}
 }