fixup! fix: Stop repo collaborators drifting on owner

Author: stevehipwell

docs/resources/repository_collaborators.md

@@ -88,15 +88,14 @@ resource "github_repository_collaborators" "some_repo_collaborators" {
 - `repository_id` (Number) ID of the repository.
 
 <a id="nestedblock--ignore_team"></a>
-
 ### Nested Schema for `ignore_team`
 
 Required:
 
 - `team_id` (String) ID or slug of the team to ignore.
 
-<a id="nestedblock--team"></a>
 
+<a id="nestedblock--team"></a>
 ### Nested Schema for `team`
 
 Required:
@@ -107,8 +106,8 @@ Optional:
 
 - `permission` (String) Permission to grant to the team. Must be one of `pull`, `triage`, `push`, `maintain`, `admin` or the name of an existing [custom repository role](https://docs.github.com/en/enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization) within the organization. Defaults to `push`.
 
-<a id="nestedblock--user"></a>
 
+<a id="nestedblock--user"></a>
 ### Nested Schema for `user`
 
 Required:

github/resource_github_repository_collaborators.go

@@ -133,16 +133,32 @@ func resourceGithubRepositoryCollaborators() *schema.Resource {
 func resourceGithubRepositoryCollaboratorsDiff(ctx context.Context, d *schema.ResourceDiff, m any) error {
 	tflog.Debug(ctx, "Diffing collaborators")
 
-	meta := m.(*Owner)
+	meta, _ := m.(*Owner)
 
 	if d.HasChange("user") {
-		users := d.Get("user").(*schema.Set).List()
+		users, ok := d.Get("user").(*schema.Set)
+		if !ok {
+			return fmt.Errorf("error reading user config")
+		}
+
 		seen := make(map[string]any)
+		for _, u := range users.List() {
+			user, ok := u.(map[string]any)
+			if !ok {
+				return fmt.Errorf("error reading user config")
+			}
 
-		for _, u := range users {
-			user := u.(map[string]any)
-			username := strings.ToLower(user["username"].(string))
+			usernameVal, ok := user["username"]
+			if !ok {
+				return fmt.Errorf("error reading user config")
+			}
 
+			username, ok := usernameVal.(string)
+			if !ok {
+				return fmt.Errorf("error reading user config")
+			}
+
+			username = strings.ToLower(username)
 			if _, ok := seen[username]; ok {
 				return fmt.Errorf("duplicate username %s found in user collaborators", username)
 			}
@@ -188,30 +204,32 @@ func resourceGithubRepositoryCollaboratorsDiff(ctx context.Context, d *schema.Re
 		// the owner is included in the list of users.
 
 		ownerConfigured := false
-		owner := strings.ToLower(meta.name)
+		owner := meta.name
 
-		usersVal := d.Get("user")
-		if users, ok := usersVal.(*schema.Set); ok {
-			for _, u := range users.List() {
-				user, ok := u.(map[string]any)
-				if !ok {
-					continue
-				}
+		users, ok := d.Get("user").(*schema.Set)
+		if !ok {
+			return fmt.Errorf("error reading user config")
+		}
 
-				usernameVal, ok := user["username"]
-				if !ok {
-					continue
-				}
+		for _, u := range users.List() {
+			user, ok := u.(map[string]any)
+			if !ok {
+				return fmt.Errorf("error reading user config")
+			}
 
-				username, ok := usernameVal.(string)
-				if !ok {
-					continue
-				}
+			usernameVal, ok := user["username"]
+			if !ok {
+				return fmt.Errorf("error reading user config")
+			}
 
-				if strings.ToLower(username) == owner {
-					ownerConfigured = true
-					break
-				}
+			username, ok := usernameVal.(string)
+			if !ok {
+				return fmt.Errorf("error reading user config")
+			}
+
+			if strings.EqualFold(username, owner) {
+				ownerConfigured = true
+				break
 			}
 		}
 
@@ -276,6 +294,10 @@ func resourceGithubRepositoryCollaboratorsCreate(ctx context.Context, d *schema.
 			if !ownerConfigured {
 				inIgnoreUsers = append(inIgnoreUsers, strings.ToLower(owner))
 			}
+
+			if !ownerConfigured {
+				inIgnoreUsers = append(inIgnoreUsers, strings.ToLower(owner))
+			}
 		}
 	}
 
@@ -421,6 +443,10 @@ func resourceGithubRepositoryCollaboratorsUpdate(ctx context.Context, d *schema.
 			if !ownerConfigured {
 				inIgnoreUsers = append(inIgnoreUsers, strings.ToLower(owner))
 			}
+
+			if err := d.Set("owner_configured", ownerConfigured); err != nil {
+				return diag.FromErr(err)
+			}
 		}
 	}
 

github/resource_github_repository_collaborators_migration.go

@@ -207,7 +207,7 @@ func resourceGithubRepositoryCollaboratorsStateUpgradeV1(_ context.Context, rawS
 		// is included in the list of users.
 
 		ownerConfigured := false
-		owner := strings.ToLower(meta.name)
+		owner := meta.name
 
 		if usersVal, ok := rawState["user"]; ok {
 			if users, ok := usersVal.([]any); ok {
@@ -227,7 +227,7 @@ func resourceGithubRepositoryCollaboratorsStateUpgradeV1(_ context.Context, rawS
 						continue
 					}
 
-					if strings.ToLower(username) == owner {
+					if strings.EqualFold(username, owner) {
 						ownerConfigured = true
 						break
 					}