Update test so that it doesn't conflict

Author: julienduchesne

GNUmakefile

@@ -14,15 +14,15 @@ testacc-docker:
 		docker-compose \
 		-f ./docker-compose.yml \
 		run --rm grafana-provider \
-		make testacc
+		make testacc TESTARGS="$(TESTARGS)"
 
 testacc-docker-tls:
 	GRAFANA_VERSION=$(GRAFANA_VERSION) \
 		docker-compose \
 		-f ./docker-compose.yml \
 		-f ./docker-compose.tls.yml \
 		run --rm grafana-provider \
-		make testacc
+		make testacc TESTARGS="$(TESTARGS)"
 
 changelog:
 	@test $${RELEASE_VERSION?Please set environment variable RELEASE_VERSION}

examples/data-sources/grafana_user/data-source.tf

@@ -1,19 +1,19 @@
 resource "grafana_user" "test" {
-  email    = "staff.name@example.com"
-  name     = "Staff Name"
-  login    = "staff"
+  email    = "test.datasource@example.com"
+  name     = "Testing Datasource"
+  login    = "test-datasource"
   password = "my-password"
-  is_admin = false
+  is_admin = true
 }
 
 data "grafana_user" "from_id" {
-  email = grafana_user.test.id
+  user_id = grafana_user.test.user_id
 }
 
 data "grafana_user" "from_email" {
   email = grafana_user.test.email
 }
 
 data "grafana_user" "from_login" {
-  email = grafana_user.test.login
+  login = grafana_user.test.login
 }

grafana/data_source_user.go

@@ -20,7 +20,7 @@ does not currently work with API Tokens. You must use basic auth.
 `,
 		ReadContext: dataSourceUserRead,
 		Schema: map[string]*schema.Schema{
-			"id": {
+			"user_id": {
 				Type:     schema.TypeInt,
 				Optional: true,
 				Default:  -1,
@@ -56,20 +56,21 @@ func dataSourceUserRead(ctx context.Context, d *schema.ResourceData, meta interf
 
 	var user gapi.User
 	var err error
-	if id := d.Get("id").(int); id >= 0 {
+	if id := d.Get("user_id").(int); id >= 0 {
 		user, err = client.User(int64(id))
 	} else if email := d.Get("email").(string); email != "" {
 		user, err = client.UserByEmail(email)
 	} else if login := d.Get("login").(string); login != "" {
-		user, err = client.UserByEmail(email)
+		user, err = client.UserByEmail(login)
 	} else {
-		err = fmt.Errorf("must specify one of id, email, or login")
+		err = fmt.Errorf("must specify one of user_id, email, or login")
 	}
 
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
+	d.SetId(fmt.Sprintf("%d", user.ID))
 	d.Set("email", user.Email)
 	d.Set("name", user.Name)
 	d.Set("login", user.Login)

grafana/data_source_user_test.go

@@ -3,31 +3,36 @@ package grafana
 import (
 	"testing"
 
+	gapi "github.com/grafana/grafana-api-golang-client"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 func TestAccDatasourceUser(t *testing.T) {
-	checks := []resource.TestCheckFunc{}
+	var user gapi.User
+	checks := []resource.TestCheckFunc{
+		testAccUserCheckExists("grafana_user.test", &user),
+	}
 	for _, rName := range []string{"from_email", "from_login", "from_id"} {
 		checks = append(checks,
 			resource.TestCheckResourceAttr(
-				"data.grafana_user."+rName, "email", "staff.name@example.com",
+				"data.grafana_user."+rName, "email", "test.datasource@example.com",
 			),
 			resource.TestCheckResourceAttr(
-				"data.grafana_user."+rName, "name", "Staff Name",
+				"data.grafana_user."+rName, "name", "Testing Datasource",
 			),
 			resource.TestCheckResourceAttr(
-				"data.grafana_user."+rName, "login", "staff",
+				"data.grafana_user."+rName, "login", "test-datasource",
 			),
 			resource.TestCheckResourceAttr(
-				"data.grafana_user."+rName, "is_admin", "false",
+				"data.grafana_user."+rName, "is_admin", "true",
 			),
 		)
 	}
 
-	resource.UnitTest(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheckCloud(t) },
+	resource.Test(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
 		ProviderFactories: testAccProviderFactories,
+		CheckDestroy:      testAccUserCheckDestroy(&user),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccExample(t, "data-sources/grafana_user/data-source.tf"),

grafana/provider.go

@@ -98,7 +98,6 @@ func Provider(version string) func() *schema.Provider {
 			},
 
 			ResourcesMap: map[string]*schema.Resource{
-
 				// Grafana
 				"grafana_alert_notification":      ResourceAlertNotification(),
 				"grafana_builtin_role_assignment": ResourceBuiltInRoleAssignment(),
@@ -120,6 +119,8 @@ func Provider(version string) func() *schema.Provider {
 			},
 
 			DataSourcesMap: map[string]*schema.Resource{
+				// Grafana
+				"grafana_user": DatasourceUser(),
 
 				// Synthetic Monitoring
 				"grafana_synthetic_monitoring_probe":  dataSourceSyntheticMonitoringProbe(),

grafana/resource_user.go

@@ -29,7 +29,7 @@ does not currently work with API Tokens. You must use basic auth.
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
-			"id": {
+			"user_id": {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
@@ -96,7 +96,7 @@ func ReadUser(ctx context.Context, d *schema.ResourceData, meta interface{}) dia
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	d.Set("id", user.ID)
+	d.Set("user_id", user.ID)
 	d.Set("email", user.Email)
 	d.Set("name", user.Name)
 	d.Set("login", user.Login)