correcting typos

elastic · Mar 14, 2024 · dac26f6 · dac26f6
1 parent 4c20caf
commit dac26f6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/utils/hints.go b/utils/hints.go
@@ -271,7 +271,6 @@ func GenerateHints(annotations mapstr.M, container, prefix string, allSupportedH
 								if err != nil {
 									continue
 								}
-
 							}
 						}
 					}
@@ -348,6 +347,7 @@ func checkSupportedHints(actualannotation string, allSupportedHints []string, st
 	return found
 }
 
+// checkSupportedHintsSets gest the data_streams or metricset lists that are defined. Searches inside specific hints of those lists and returns the unsupported list of hints found
 func checkSupportedHintsSets(annotations mapstr.M, key, prefix, actualannotation string, streamlist, allSupportedHints, incorrecthints []string) []string {
 	found := false
 	for _, streams := range streamlist {

diff --git a/utils/hints_test.go b/utils/hints_test.go
@@ -51,11 +51,7 @@ func TestGetProcessors(t *testing.T) {
 
 func TestGenerateHints(t *testing.T) {
 
-<<<<<<< HEAD
 	var allSupportedHints = []string{"enabled", "package", "module", "integration", "data_streams", "metricsets", "host", "period", "timeout", "metrics_path", "username", "password", "stream", "processors", "multiline", "json", "disable"}
-=======
-	var allSupportedHints = []string{"enabled", "module", "integration", "datas_treams", "host", "period", "timeout", "metrics_path", "username", "password", "stream", "processors", "multiline", "json", "disable"}
->>>>>>> 7490558445cb8d3248462255edc8ac64bc18b8eb
 
 	tests := []struct {
 		name                   string