Consistent uid and id regexes (#313)

Author: julienduchesne

grafana/data_source_folder_test.go

@@ -1,7 +1,6 @@
 package grafana
 
 import (
-	"regexp"
 	"testing"
 
 	gapi "github.com/grafana/grafana-api-golang-client"
@@ -18,10 +17,10 @@ func TestAccDatasourceFolder(t *testing.T) {
 			"data.grafana_folder.from_title", "title", "test-folder",
 		),
 		resource.TestMatchResourceAttr(
-			"data.grafana_folder.from_title", "id", regexp.MustCompile(`^\d+$`),
+			"data.grafana_folder.from_title", "id", idRegexp,
 		),
 		resource.TestMatchResourceAttr(
-			"data.grafana_folder.from_title", "uid", regexp.MustCompile(`^[a-zA-Z0-9-]+$`),
+			"data.grafana_folder.from_title", "uid", uidRegexp,
 		),
 	}
 

grafana/provider.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/url"
+	"regexp"
 	"strings"
 
 	"github.com/hashicorp/go-cleanhttp"
@@ -18,6 +19,11 @@ import (
 	smapi "github.com/grafana/synthetic-monitoring-api-go-client"
 )
 
+var (
+	idRegexp  = regexp.MustCompile(`^\d+$`)
+	uidRegexp = regexp.MustCompile(`^[a-zA-Z0-9-_]+$`)
+)
+
 func init() {
 	schema.DescriptionKind = schema.StringMarkdown
 	schema.SchemaDescriptionBuilder = func(s *schema.Schema) string {

grafana/resource_alert_notification_test.go

@@ -31,7 +31,7 @@ func TestAccAlertNotification_basic(t *testing.T) {
 						"grafana_alert_notification.test", "type", "email",
 					),
 					resource.TestMatchResourceAttr(
-						"grafana_alert_notification.test", "id", regexp.MustCompile(`\d+`),
+						"grafana_alert_notification.test", "id", idRegexp,
 					),
 					resource.TestCheckResourceAttr(
 						"grafana_alert_notification.test", "send_reminder", "true",
@@ -70,7 +70,7 @@ func TestAccAlertNotification_disableResolveMessage(t *testing.T) {
 						"grafana_alert_notification.test", "type", "email",
 					),
 					resource.TestMatchResourceAttr(
-						"grafana_alert_notification.test", "id", regexp.MustCompile(`\d+`),
+						"grafana_alert_notification.test", "id", idRegexp,
 					),
 					resource.TestCheckResourceAttr(
 						"grafana_alert_notification.test", "send_reminder", "true",

grafana/resource_dashboard_test.go

@@ -2,7 +2,6 @@ package grafana
 
 import (
 	"fmt"
-	"regexp"
 	"testing"
 
 	gapi "github.com/grafana/grafana-api-golang-client"
@@ -157,7 +156,7 @@ func TestAccDashboard_folder(t *testing.T) {
 					resource.TestCheckResourceAttr("grafana_dashboard.test_folder", "id", "folder"),
 					resource.TestCheckResourceAttr("grafana_dashboard.test_folder", "uid", "folder"),
 					resource.TestMatchResourceAttr(
-						"grafana_dashboard.test_folder", "folder", regexp.MustCompile(`\d+`),
+						"grafana_dashboard.test_folder", "folder", idRegexp,
 					),
 				),
 			},

grafana/resource_data_source_test.go

@@ -2,7 +2,6 @@ package grafana
 
 import (
 	"fmt"
-	"regexp"
 	"strconv"
 	"testing"
 
@@ -307,7 +306,7 @@ func TestAccDataSource_basic(t *testing.T) {
 			resource.TestMatchResourceAttr(
 				test.resource,
 				"id",
-				regexp.MustCompile(`\d+`),
+				idRegexp,
 			),
 		}
 

grafana/resource_folder_test.go

@@ -2,7 +2,6 @@ package grafana
 
 import (
 	"fmt"
-	"regexp"
 	"strconv"
 	"testing"
 
@@ -27,10 +26,10 @@ func TestAccFolder_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccFolderCheckExists("grafana_folder.test_folder", &folder),
 					resource.TestMatchResourceAttr(
-						"grafana_folder.test_folder", "id", regexp.MustCompile(`\d+`),
+						"grafana_folder.test_folder", "id", idRegexp,
 					),
 					resource.TestMatchResourceAttr(
-						"grafana_folder.test_folder", "uid", regexp.MustCompile(`\w+`),
+						"grafana_folder.test_folder", "uid", uidRegexp,
 					),
 				),
 			},

grafana/resource_organization_test.go

@@ -2,7 +2,6 @@ package grafana
 
 import (
 	"fmt"
-	"regexp"
 	"strconv"
 	"testing"
 
@@ -29,7 +28,7 @@ func TestAccOrganization_basic(t *testing.T) {
 						"grafana_organization.test", "name", "terraform-acc-test",
 					),
 					resource.TestMatchResourceAttr(
-						"grafana_organization.test", "id", regexp.MustCompile(`\d+`),
+						"grafana_organization.test", "id", idRegexp,
 					),
 				),
 			},

grafana/resource_team_test.go

@@ -2,7 +2,6 @@ package grafana
 
 import (
 	"fmt"
-	"regexp"
 	"strconv"
 	"testing"
 
@@ -32,7 +31,7 @@ func TestAccTeam_basic(t *testing.T) {
 						"grafana_team.test", "email", "[email protected]",
 					),
 					resource.TestMatchResourceAttr(
-						"grafana_team.test", "id", regexp.MustCompile(`\d+`),
+						"grafana_team.test", "id", idRegexp,
 					),
 				),
 			},

grafana/resource_user_test.go

@@ -2,7 +2,6 @@ package grafana
 
 import (
 	"fmt"
-	"regexp"
 	"strconv"
 	"testing"
 
@@ -38,7 +37,7 @@ func TestAccUser_basic(t *testing.T) {
 						"grafana_user.test", "password", "abc123",
 					),
 					resource.TestMatchResourceAttr(
-						"grafana_user.test", "id", regexp.MustCompile(`\d+`),
+						"grafana_user.test", "id", idRegexp,
 					),
 				),
 			},