Fix broken user datasource test

Author: Luke Peterson

gitlab/data_source_gitlab_user.go

@@ -2,19 +2,17 @@ package gitlab
 
 import (
 	"fmt"
-	"strconv"
+	"log"
 	"strings"
 
 	"github.com/hashicorp/terraform/helper/schema"
 	gitlab "github.com/xanzy/go-gitlab"
 )
 
-// Search by email required
 func dataSourceGitlabUser() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourceGitlabUserRead,
 		Schema: map[string]*schema.Schema{
-			//Search option
 			"email": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -23,34 +21,34 @@ func dataSourceGitlabUser() *schema.Resource {
 	}
 }
 
-// Performs the lookup
 func dataSourceGitlabUserRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*gitlab.Client)
-	// Create the query, grab the email for the query and set it for use
-	var query *gitlab.ListUsersOptions
-	email := strings.ToLower(d.Get("email").(string))
-	*query.Search = email
-	// Query to find the email. Returns a list
+
+	log.Printf("[INFO] Reading Gitlab user")
+
+	searchEmail := strings.ToLower(d.Get("email").(string))
+	query := &gitlab.ListUsersOptions{
+		Search: &searchEmail,
+	}
 	users, _, err := client.Users.ListUsers(query)
 	if err != nil {
 		return err
 	}
 
-	// Create a user to save userdata to
-	var user *gitlab.User
-	// Grab User data out of list
-	for _, a := range users {
-		if a.Email == email {
-			user = a
+	var found *gitlab.User
+
+	for _, user := range users {
+		if strings.ToLower(user.Email) == searchEmail {
+			found = user
 			break
 		}
 	}
-	if user == nil {
-		return fmt.Errorf("The email '%s' does not match any user email", email)
+	if found == nil {
+		return fmt.Errorf("The email '%s' does not match any user email", searchEmail)
 	}
-	d.SetId(strconv.Itoa(user.ID))
-	d.Set("name", user.Name)
-	d.Set("username", user.Username)
-	d.Set("email", user.Email)
+	d.SetId(fmt.Sprintf("%d", found.ID))
+	d.Set("name", found.Name)
+	d.Set("username", found.Username)
+	d.Set("email", found.Email)
 	return nil
 }

gitlab/data_source_gitlab_user_test.go

@@ -29,21 +29,21 @@ func TestAccDataGitlabUser_basic(t *testing.T) {
 func testAccDataSourceGitlabUser(src, n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 
-		srcR := s.RootModule().Resources[src]
-		srcA := srcR.Primary.Attributes
+		user := s.RootModule().Resources[src]
+		userResource := user.Primary.Attributes
 
-		r := s.RootModule().Resources[n]
-		a := r.Primary.Attributes
+		search := s.RootModule().Resources[n]
+		searchResource := search.Primary.Attributes
 
-		if a["id"] == "" {
-			return fmt.Errorf("Expected to get a user email from Gitlab")
+		if searchResource["email"] == "" {
+			return fmt.Errorf("Expected to get user email from Gitlab")
 		}
 
-		testAtts := []string{"id", "email"}
+		testAttributes := []string{"email"}
 
-		for _, att := range testAtts {
-			if a[att] != srcA[att] {
-				return fmt.Errorf("Expected the user %s to be: %s, but got: %s", att, srcA[att], a[att])
+		for _, attribute := range testAttributes {
+			if searchResource[attribute] != userResource[attribute] {
+				return fmt.Errorf("Expected the user %s to be: %s, but got: %s", attribute, userResource[attribute], searchResource[attribute])
 			}
 		}
 		return nil
@@ -52,12 +52,15 @@ func testAccDataSourceGitlabUser(src, n string) resource.TestCheckFunc {
 
 func testAccDataGitlabUserConfig(userEmail string) string {
 	return fmt.Sprintf(`
-resource "gitlab_user" "foo"{
-	email = "%s"
+resource "gitlab_user" "foo" {
+  name             = "foo %s"
+  username         = "listest%s"
+  password         = "test%stt"
+  email            = "listest%[email protected]"
 }
 
 data "gitlab_user" "foo" {
-	name = "${gitlab_user.foo.email}"
+	email = "${gitlab_user.foo.email}"
 }
-	`, userEmail)
+	`, userEmail, userEmail, userEmail, userEmail)
 }