Fix CleanResourceName for IDs starting with a - characted

README.md

@@ -46,7 +46,7 @@ provider_installation {
 Acceptance tests require a running instance of Grafana. You can either handle
 running an instance of Grafana yourself or use `docker-compose`.
 
-If you choose `docker-compose`, run `make testacc-docker`. This is the simplest
+If you choose `docker-compose`, run `make testacc-oss-docker`. This is the simplest
 option, but often not the quickest.
 
 Alternatively you can use the `testacc` target which will use your local `go`

pkg/generate/postprocessing/preferred_resource_name.go

@@ -68,5 +68,8 @@ func CleanResourceName(name string) string {
 	if cleaned[0] >= '0' && cleaned[0] <= '9' {
 		cleaned = "_" + cleaned
 	}
+	if cleaned[0] == '-' {
+		cleaned = "_" + cleaned
+	}
 	return cleaned
 }

pkg/generate/postprocessing/preferred_resource_name_test.go

@@ -1,6 +1,9 @@
 package postprocessing
 
-import "testing"
+import (
+	"fmt"
+	"testing"
+)
 
 func TestUsePreferredResourceNames(t *testing.T) {
 	for _, testFile := range []string{
@@ -11,3 +14,24 @@ func TestUsePreferredResourceNames(t *testing.T) {
 		})
 	}
 }
+
+func TestCleanResourceName(t *testing.T) {
+	var tests = []struct {
+		before, after string
+	}{
+		{"qwerty", "qwerty"},
+		{"123", "_123"},
+		{"-foo", "_-foo"},
+		{"_bar", "_bar"},
+	}
+
+	for _, tt := range tests {
+		testname := fmt.Sprintf("%s,%s", tt.before, tt.after)
+		t.Run(testname, func(t *testing.T) {
+			cleaned := CleanResourceName(tt.before)
+			if cleaned != tt.after {
+				t.Errorf(`Resource name %q was clean as %q and not %q as expected`, tt.before, cleaned, tt.after)
+			}
+		})
+	}
+}