More bytes

replicatedhq · Sep 13, 2023 · a53acb4 · a53acb4
1 parent 9957fab
commit a53acb4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/pkg/redact/literal.go b/pkg/redact/literal.go
@@ -8,17 +8,17 @@ import (
 )
 
 type literalRedactor struct {
-	matchString string
-	filePath    string
-	redactName  string
-	isDefault   bool
+	match      []byte
+	filePath   string
+	redactName string
+	isDefault  bool
 }
 
-func literalString(matchString, path, name string) Redactor {
+func literalString(match []byte, path, name string) Redactor {
 	return literalRedactor{
-		matchString: matchString,
-		filePath:    path,
-		redactName:  name,
+		match:      match,
+		filePath:   path,
+		redactName: name,
 	}
 }
 
@@ -35,9 +35,7 @@ func (r literalRedactor) Redact(input io.Reader, path string) io.Reader {
 			}
 		}()
 
-		// TODO: Convert to bytes at source
 		mask := []byte(MASK_TEXT)
-		match := []byte(r.matchString)
 
 		reader := bufio.NewReader(input)
 		lineNum := 0
@@ -49,7 +47,7 @@ func (r literalRedactor) Redact(input io.Reader, path string) io.Reader {
 				return
 			}
 
-			clean := bytes.ReplaceAll(line, match, mask)
+			clean := bytes.ReplaceAll(line, r.match, mask)
 
 			// io.WriteString would be nicer, but scanner strips new lines
 			fmt.Fprintf(writer, "%s\n", clean)

diff --git a/pkg/redact/multi_line_test.go b/pkg/redact/multi_line_test.go
@@ -2,7 +2,7 @@ package redact
 
 import (
 	"bytes"
-	"io/ioutil"
+	"io"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -101,7 +101,7 @@ func Test_NewMultiLineRedactorr(t *testing.T) {
 			req.NoError(err)
 			outReader := reRunner.Redact(bytes.NewReader([]byte(tt.inputString)), "")
 
-			gotBytes, err := ioutil.ReadAll(outReader)
+			gotBytes, err := io.ReadAll(outReader)
 			req.NoError(err)
 			req.Equal(tt.wantString, string(gotBytes))
 			GetRedactionList()

diff --git a/pkg/redact/redact.go b/pkg/redact/redact.go
@@ -128,7 +128,7 @@ func buildAdditionalRedactors(path string, redacts []*troubleshootv1beta2.Redact
 		}
 
 		for j, literal := range redact.Removals.Values {
-			additionalRedactors = append(additionalRedactors, literalString(literal, path, redactorName(i, j, redact.Name, "literal")))
+			additionalRedactors = append(additionalRedactors, literalString([]byte(literal), path, redactorName(i, j, redact.Name, "literal")))
 		}
 
 		for j, re := range redact.Removals.Regex {