change prefix default

Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com>
grafana · Aug 30, 2023 · 56af61e · 56af61e
1 parent c85cf96
commit 56af61e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scanner/identifier.go b/scanner/identifier.go
@@ -26,7 +26,7 @@ type SanitizeIdentifierOptions struct {
 
 func sanitizeIdentifierOptionsDefault() *SanitizeIdentifierOptions {
 	return &SanitizeIdentifierOptions{
-		Prefix:      "id_",
+		Prefix:      "_",
 		Replacement: "_",
 	}
 }

diff --git a/scanner/identifier_test.go b/scanner/identifier_test.go
@@ -38,10 +38,10 @@ func TestSanitizeIdentifierOptions(t *testing.T) {
 		opts             *scanner.SanitizeIdentifierOptions
 	}{
 		{"empty", "", "", "cannot generate a new identifier for an empty string", nil},
-		{"start_number", "0identifier_1", "id_0identifier_1", "", nil},
+		{"start_number", "0identifier_1", "_0identifier_1", "", nil},
 		{"start_char", "identifier_1", "identifier_1", "", nil},
 		{"start_underscore", "_identifier_1", "_identifier_1", "", nil},
-		{"special_chars", "!@#$%^&*()", "id___________", "", nil},
+		{"special_chars", "!@#$%^&*()", "___________", "", nil},
 		{"special_char", "identifier_1!", "identifier_1_", "", nil},
 		{"spaces", "identifier _ 1", "identifier___1", "", nil},
 		{"bad prefix", "", "", "prefix `\"123\"` is not a valid river identifier", &scanner.SanitizeIdentifierOptions{Prefix: "123", Replacement: ""}},