Skip to content

Commit 4010e5b

Browse files
alokgoswami-agShilpa-Gokul
authored andcommitted
Addressed PR feedback: move regex outside the function
1 parent 1f207b3 commit 4010e5b

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

test/extended/util/client.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,18 +1040,10 @@ func (c *CLI) start(stdOutBuff, stdErrBuff *bytes.Buffer) (*exec.Cmd, error) {
10401040
return cmd, err
10411041
}
10421042

1043-
var (
1044-
reAuthorizationBearer = regexp.MustCompile(`Authorization:\s+Bearer.*\s+`)
1045-
reBearerToken = regexp.MustCompile(`BearerToken:\s*\"[^\"]+\"`)
1046-
)
1043+
var reToken = regexp.MustCompile(`(?i)(Authorization:\s*Bearer\s+)[^\s"]+|((BearerToken:\s*")[^"]+)`)
10471044

10481045
func RedactBearerToken(args string) string {
1049-
if strings.Contains(args, "Authorization: Bearer") {
1050-
args = reAuthorizationBearer.ReplaceAllString(args, "Authorization: Bearer <redacted> ")
1051-
} else if strings.Contains(args, "BearerToken") {
1052-
args = reBearerToken.ReplaceAllString(args, "BearerToken: <redacted> ")
1053-
}
1054-
return args
1046+
return reToken.ReplaceAllString(args, `${1}${3}<redacted>`)
10551047
}
10561048

10571049
// getStartingIndexForLastN calculates a byte offset in a byte slice such that when using

0 commit comments

Comments
 (0)