Merge pull request #146 from scrapli/fix/ansipattern-once

fix: hide ansi pattern in utils behind a sync.Once like other regexps
scrapli · Jul 31, 2023 · f71219f · f71219f
2 parents bf53afb + 3a67da3
commit f71219f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/driver/netconf/driver.go b/driver/netconf/driver.go
@@ -191,7 +191,6 @@ type Driver struct {
 
 	serverCapabilities []string
 	sessionID          uint64
-	ServerEcho         *bool
 
 	messageID int
 

diff --git a/util/bytes.go b/util/bytes.go
@@ -3,17 +3,21 @@ package util
 import (
 	"bytes"
 	"regexp"
+	"sync"
 )
 
 const ansi = "[\u001B\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?" +
 	"\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))"
 
-var ansiPattern *regexp.Regexp //nolint: gochecknoglobals
+var (
+	ansiPattern     *regexp.Regexp //nolint: gochecknoglobals
+	ansiPatternOnce sync.Once      //nolint: gochecknoglobals
+)
 
 func getAnsiPattern() *regexp.Regexp {
-	if ansiPattern == nil {
+	ansiPatternOnce.Do(func() {
 		ansiPattern = regexp.MustCompile(ansi)
-	}
+	})
 
 	return ansiPattern
 }