combine multiline and single line regex

Author: laverya

pkg/apis/troubleshoot/v1beta1/redact_shared.go

@@ -1,6 +1,6 @@
 package v1beta1
 
-type MultiLine struct {
+type Regex struct {
 	Selector string `json:"selector,omitempty" yaml:"selector,omitempty"`
 	Redactor string `json:"redactor,omitempty" yaml:"redactor,omitempty"`
 }
@@ -11,10 +11,9 @@ type FileSelector struct {
 }
 
 type Removals struct {
-	Values    []string    `json:"values,omitempty" yaml:"values,omitempty"`
-	Regex     []string    `json:"regex,omitempty" yaml:"regex,omitempty"`
-	MultiLine []MultiLine `json:"multiLine,omitempty" yaml:"multiLine,omitempty"`
-	Yaml      []string    `json:"yaml,omitempty" yaml:"yaml,omitempty"`
+	Values []string `json:"values,omitempty" yaml:"values,omitempty"`
+	Regex  []Regex  `json:"regex,omitempty" yaml:"regex,omitempty"`
+	Yaml   []string `json:"yaml,omitempty" yaml:"yaml,omitempty"`
 }
 
 type Redact struct {

pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go

@@ -35,9 +35,9 @@ pwd=somethinggoeshere;`,
 					Name: "",
 					Removals: troubleshootv1beta1.Removals{
 						Values: nil,
-						Regex: []string{
-							`abc`,
-							`(another)(?P<mask>.*)(here)`,
+						Regex: []troubleshootv1beta1.Regex{
+							{Redactor: `abc`},
+							{Redactor: `(another)(?P<mask>.*)(here)`},
 						},
 					},
 				},
@@ -71,8 +71,8 @@ pwd=somethinggoeshere;`,
 					},
 					Removals: troubleshootv1beta1.Removals{
 						Values: nil,
-						Regex: []string{
-							`(another)(?P<mask>.*)(here)`,
+						Regex: []troubleshootv1beta1.Regex{
+							{Redactor: `(another)(?P<mask>.*)(here)`},
 						},
 					},
 				},
@@ -106,8 +106,8 @@ pwd=somethinggoeshere;`,
 					},
 					Removals: troubleshootv1beta1.Removals{
 						Values: nil,
-						Regex: []string{
-							`(another)(?P<mask>.*)(here)`,
+						Regex: []troubleshootv1beta1.Regex{
+							{Redactor: `(another)(?P<mask>.*)(here)`},
 						},
 					},
 				},
@@ -144,8 +144,8 @@ pwd=somethinggoeshere;`,
 					},
 					Removals: troubleshootv1beta1.Removals{
 						Values: nil,
-						Regex: []string{
-							`(another)(?P<mask>.*)(here)`,
+						Regex: []troubleshootv1beta1.Regex{
+							{Redactor: `(another)(?P<mask>.*)(here)`},
 						},
 					},
 				},
@@ -242,7 +242,7 @@ abc`,
 			Redactors: []*troubleshootv1beta1.Redact{
 				{
 					Removals: troubleshootv1beta1.Removals{
-						MultiLine: []troubleshootv1beta1.MultiLine{
+						Regex: []troubleshootv1beta1.Regex{
 							{
 								Selector: "abc",
 								Redactor: "xyz(123)",
@@ -310,9 +310,9 @@ pwd=somethinggoeshere;`,
 					Name: "",
 					Removals: troubleshootv1beta1.Removals{
 						Values: nil,
-						Regex: []string{
-							`abc`,
-							`(another)(?P<mask>.*)(here)`,
+						Regex: []troubleshootv1beta1.Regex{
+							{Redactor: `abc`},
+							{Redactor: `(another)(?P<mask>.*)(here)`},
 						},
 					},
 				},

pkg/collect/collector_test.go

@@ -104,24 +104,24 @@ func buildAdditionalRedactors(path string, redacts []*troubleshootv1beta1.Redact
 			continue
 		}
 
-		for j, re := range redact.Removals.Regex {
-			r, err := NewSingleLineRedactor(re, MASK_TEXT, path, redactorName(i, j, redact.Name, "regex"), false)
-			if err != nil {
-				return nil, errors.Wrapf(err, "redactor %q", re)
-			}
-			additionalRedactors = append(additionalRedactors, r)
-		}
-
 		for j, literal := range redact.Removals.Values {
 			additionalRedactors = append(additionalRedactors, literalString(literal, path, redactorName(i, j, redact.Name, "literal")))
 		}
 
-		for j, re := range redact.Removals.MultiLine {
-			r, err := NewMultiLineRedactor(re.Selector, re.Redactor, MASK_TEXT, path, redactorName(i, j, redact.Name, "multiLine"), false)
-			if err != nil {
-				return nil, errors.Wrapf(err, "multiline redactor %+v", re)
+		for j, re := range redact.Removals.Regex {
+			var newRedactor Redactor
+			if re.Selector != "" {
+				newRedactor, err = NewMultiLineRedactor(re.Selector, re.Redactor, MASK_TEXT, path, redactorName(i, j, redact.Name, "multiLine"), false)
+				if err != nil {
+					return nil, errors.Wrapf(err, "multiline redactor %+v", re)
+				}
+			} else {
+				newRedactor, err = NewSingleLineRedactor(re.Redactor, MASK_TEXT, path, redactorName(i, j, redact.Name, "regex"), false)
+				if err != nil {
+					return nil, errors.Wrapf(err, "redactor %q", re)
+				}
 			}
-			additionalRedactors = append(additionalRedactors, r)
+			additionalRedactors = append(additionalRedactors, newRedactor)
 		}
 
 		for j, yaml := range redact.Removals.Yaml {