Update Read to combine Invites and Collaborator users

This is to prevent drift when external users have not accepted invites yet.

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Author: deiga

github/resource_github_repository_collaborators.go

@@ -255,10 +255,6 @@ func resourceGithubRepositoryCollaboratorsRead(ctx context.Context, d *schema.Re
 		return diag.FromErr(err)
 	}
 
-	if err := d.Set("user", ghUsers.flatten()); err != nil {
-		return diag.FromErr(err)
-	}
-
 	if isOrg {
 		ghTeams, err := listTeamCollaborators(ctx, client, owner, repoName, inTeams, inIgnoreTeams)
 		if err != nil {
@@ -280,6 +276,11 @@ func resourceGithubRepositoryCollaboratorsRead(ctx context.Context, d *schema.Re
 		return diag.FromErr(err)
 	}
 
+	combinedUsersAndInvitations := slices.Concat(ghUsers, ghInvitations)
+	if err := d.Set("user", combinedUsersAndInvitations.flatten()); err != nil {
+		return diag.FromErr(err)
+	}
+
 	if err = d.Set("invitation_ids", ghInvitations.flattenInvitations()); err != nil {
 		return diag.FromErr(err)
 	}

github/resource_github_repository_collaborators_test.go

@@ -57,7 +57,7 @@ resource "github_repository_collaborators" "test" {
 }
 `, repoName, teamName0, teamName1, collaboratorUser)
 
-		resource.Test(t, resource.TestCase{
+		resource.ParallelTest(t, resource.TestCase{
 			PreCheck:          func() { skipUnlessHasOrgs(t) },
 			ProviderFactories: providerFactories,
 			Steps: []resource.TestStep{
@@ -118,14 +118,14 @@ resource "github_repository_collaborators" "test" {
 }
 `, repoName, testAccConf.testExternalUser)
 
-		resource.Test(t, resource.TestCase{
+		resource.ParallelTest(t, resource.TestCase{
 			PreCheck:          func() { skipUnauthenticated(t) },
 			ProviderFactories: providerFactories,
 			Steps: []resource.TestStep{
 				{
 					Config: config,
 					ConfigStateChecks: []statecheck.StateCheck{
-						statecheck.ExpectKnownValue("github_repository_collaborators.test", tfjsonpath.New("user"), knownvalue.SetSizeExact(0)),
+						statecheck.ExpectKnownValue("github_repository_collaborators.test", tfjsonpath.New("user"), knownvalue.SetSizeExact(1)),
 						statecheck.ExpectKnownValue("github_repository_collaborators.test", tfjsonpath.New("team"), knownvalue.SetSizeExact(0)),
 						statecheck.ExpectKnownValue("github_repository_collaborators.test", tfjsonpath.New("invitation_ids"), knownvalue.MapSizeExact(1)),
 					},
@@ -196,7 +196,7 @@ resource "github_repository_collaborators" "test" {
 }
 `, configPre)
 
-		resource.Test(t, resource.TestCase{
+		resource.ParallelTest(t, resource.TestCase{
 			PreCheck:          func() { skipUnlessHasOrgs(t) },
 			ProviderFactories: providerFactories,
 			Steps: []resource.TestStep{
@@ -270,7 +270,7 @@ resource "github_repository_collaborators" "test" {
 }
 `, configPre)
 
-		resource.Test(t, resource.TestCase{
+		resource.ParallelTest(t, resource.TestCase{
 			PreCheck:          func() { skipUnauthenticated(t) },
 			ProviderFactories: providerFactories,
 			Steps: []resource.TestStep{
@@ -336,7 +336,7 @@ resource "github_repository_collaborators" "test" {
 }
 `, configPre)
 
-		resource.Test(t, resource.TestCase{
+		resource.ParallelTest(t, resource.TestCase{
 			PreCheck:          func() { skipUnlessHasOrgs(t) },
 			ProviderFactories: providerFactories,
 			Steps: []resource.TestStep{
@@ -397,7 +397,7 @@ resource "github_repository_collaborators" "test" {
 }
 `, configPre)
 
-		resource.Test(t, resource.TestCase{
+		resource.ParallelTest(t, resource.TestCase{
 			PreCheck:          func() { skipUnlessHasOrgs(t) },
 			ProviderFactories: providerFactories,
 			Steps: []resource.TestStep{
@@ -451,7 +451,7 @@ resource "github_repository_collaborators" "test" {
 }
 `, repoName, teamName)
 
-		resource.Test(t, resource.TestCase{
+		resource.ParallelTest(t, resource.TestCase{
 			PreCheck:          func() { skipUnlessHasOrgs(t) },
 			ProviderFactories: providerFactories,
 			Steps: []resource.TestStep{

github/util_user.go

@@ -21,10 +21,6 @@ func (u userCollaborator) flatten() any {
 		"permission": u.permission,
 	}
 
-	if u.invitationID != nil {
-		m["invitation_id"] = *u.invitationID
-	}
-
 	return m
 }