Add testing values, add cleanup function.

Author: RicePatrick

internal/provider/data_source_gitlab_current_user_test.go

@@ -13,24 +13,30 @@ import (
 func TestAccDataSourceGitlabCurrentUser_basic(t *testing.T) {
 	//The root user has no public email by default, set the public email so it shows up properly.
 	_, _, _ = testGitlabClient.Users.ModifyUser(1, &gitlab.ModifyUserOptions{
-		Email: gitlab.String("[email protected]"),
 		// The public email MUST match an email on record for the user, or it gets a bad request.
 		PublicEmail: gitlab.String("[email protected]"),
 	})
 
+	t.Cleanup(func() {
+		_, _, _ = testGitlabClient.Users.ModifyUser(1, &gitlab.ModifyUserOptions{
+			//Set back to the empty state on test completion.
+			PublicEmail: gitlab.String(""),
+		})
+	})
+
 	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: `data "gitlab_current_user" "this" {}`,
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttrSet("data.gitlab_current_user.this", "id"),
-					resource.TestCheckResourceAttrSet("data.gitlab_current_user.this", "name"),
-					resource.TestCheckResourceAttrSet("data.gitlab_current_user.this", "username"),
-					resource.TestCheckResourceAttrSet("data.gitlab_current_user.this", "bot"),
-					resource.TestCheckResourceAttrSet("data.gitlab_current_user.this", "group_count"),
-					resource.TestCheckResourceAttrSet("data.gitlab_current_user.this", "namespace_id"),
-					resource.TestCheckResourceAttrSet("data.gitlab_current_user.this", "public_email"),
+					resource.TestCheckResourceAttr("data.gitlab_current_user.this", "id", "gid://gitlab/User/1"),
+					resource.TestCheckResourceAttr("data.gitlab_current_user.this", "name", "Administrator"),
+					resource.TestCheckResourceAttr("data.gitlab_current_user.this", "username", "root"),
+					resource.TestCheckResourceAttr("data.gitlab_current_user.this", "bot", "false"),
+					resource.TestCheckResourceAttr("data.gitlab_current_user.this", "group_count", "2"),
+					resource.TestCheckResourceAttr("data.gitlab_current_user.this", "namespace_id", "gid://gitlab/Namespaces::UserNamespace/1"),
+					resource.TestCheckResourceAttr("data.gitlab_current_user.this", "public_email", "[email protected]"),
 				),
 			},
 		},

internal/provider/graphql_helper_test.go

@@ -12,7 +12,7 @@ import (
 func TestAcc_GraphQL_basic(t *testing.T) {
 
 	query := GraphQLQuery{
-		`query {currentUser {name, bot, gitpodEnabled, groupCount, id, namespace{id} publicEmail, username}}`,
+		`query {currentUser {name, bot, gitpodEnabled, groupCount, id, namespace{id}, publicEmail, username}}`,
 	}
 
 	var response CurrentUserResponse