Refactoring: renaming to be bit more generic

elastic · Jan 17, 2020 · fbd3122 · fbd3122
1 parent 3501706
commit fbd3122
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/libbeat/common/config.go b/libbeat/common/config.go
@@ -357,7 +357,7 @@ func DebugString(c *Config, filterPrivate bool) string {
 			return fmt.Sprintf("<config error> %v", err)
 		}
 		if filterPrivate {
-			filterDebugObject(content)
+			applyLoggingMask(content)
 		}
 		j, _ := json.MarshalIndent(content, "", "  ")
 		bufs = append(bufs, string(j))
@@ -368,7 +368,7 @@ func DebugString(c *Config, filterPrivate bool) string {
 			return fmt.Sprintf("<config error> %v", err)
 		}
 		if filterPrivate {
-			filterDebugObject(content)
+			applyLoggingMask(content)
 		}
 		j, _ := json.MarshalIndent(content, "", "  ")
 		bufs = append(bufs, string(j))

diff --git a/libbeat/common/logging.go b/libbeat/common/logging.go
@@ -1,6 +1,6 @@
 package common
 
-var debugMasklist = MakeStringSet(
+var maskList = MakeStringSet(
 	"password",
 	"passphrase",
 	"key_passphrase",
@@ -12,11 +12,11 @@ var debugMasklist = MakeStringSet(
 	"hosts",
 )
 
-func filterDebugObject(c interface{}) {
+func applyLoggingMask(c interface{}) {
 	switch cfg := c.(type) {
 	case map[string]interface{}:
 		for k, v := range cfg {
-			if debugMasklist.Has(k) {
+			if maskList.Has(k) {
 				if arr, ok := v.([]interface{}); ok {
 					for i := range arr {
 						arr[i] = "xxxxx"
@@ -25,13 +25,13 @@ func filterDebugObject(c interface{}) {
 					cfg[k] = "xxxxx"
 				}
 			} else {
-				filterDebugObject(v)
+				applyLoggingMask(v)
 			}
 		}
 
 	case []interface{}:
 		for _, elem := range cfg {
-			filterDebugObject(elem)
+			applyLoggingMask(elem)
 		}
 	}
 }
diff --git a/libbeat/common/mapstr.go b/libbeat/common/mapstr.go
@@ -220,7 +220,7 @@ func (m MapStr) MarshalLogObject(enc zapcore.ObjectEncoder) error {
 	}
 
 	debugM := m.Clone()
-	filterDebugObject(map[string]interface{}(debugM))
+	applyLoggingMask(map[string]interface{}(debugM))
 
 	keys := make([]string, 0, len(debugM))
 	for k := range debugM {
@@ -246,7 +246,7 @@ func (m MapStr) Format(f fmt.State, c rune) {
 	}
 
 	debugM := m.Clone()
-	filterDebugObject(map[string]interface{}(debugM))
+	applyLoggingMask(map[string]interface{}(debugM))
 
 	io.WriteString(f, debugM.String())
 }