Repurpose wrong datasource UID feature flag (#89363)

pkg/util/shortid_generator.go

@@ -32,7 +32,6 @@ var mtx sync.Mutex
 // Legacy UID pattern
 var validUIDCharPattern = `a-zA-Z0-9\-\_`
 var validUIDPattern = regexp.MustCompile(`^[` + validUIDCharPattern + `]*$`).MatchString
-var validUIDReplacer = regexp.MustCompile(`[^` + validUIDCharPattern + `]`).ReplaceAllString
 
 // IsValidShortUID checks if short unique identifier contains valid characters
 // NOTE: future Grafana UIDs will need conform to https://github.com/kubernetes/apimachinery/blob/master/pkg/util/validation/validation.go#L43
@@ -93,13 +92,3 @@ func ValidateUID(uid string) error {
 	}
 	return nil
 }
-
-func AutofixUID(uid string) string {
-	if IsShortUIDTooLong(uid) {
-		return uid[:MaxUIDLength]
-	}
-	if !IsValidShortUID(uid) {
-		uid = validUIDReplacer(uid, "-")
-	}
-	return uid
-}

pkg/util/shortid_generator_test.go

@@ -143,32 +143,3 @@ func TestValidateUID(t *testing.T) {
 		})
 	}
 }
-
-func TestAutofixUID(t *testing.T) {
-	var tests = []struct {
-		name     string
-		uid      string
-		expected string
-	}{
-		{
-			name:     "return input when input is valid",
-			uid:      "f8cc010c-ee72-4681-89d2-d46e1bd47d33",
-			expected: "f8cc010c-ee72-4681-89d2-d46e1bd47d33",
-		},
-		{
-			name:     "generate new uid when input is too long",
-			uid:      strings.Repeat("1", MaxUIDLength+1),
-			expected: strings.Repeat("1", MaxUIDLength),
-		},
-		{
-			name:     "generate new uid when input has invalid characters",
-			uid:      "f8cc010c.ee72.4681;89d2+d46e1bd47d33",
-			expected: "f8cc010c-ee72-4681-89d2-d46e1bd47d33",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			require.Equal(t, tt.expected, AutofixUID(tt.uid))
-		})
-	}
-}