feat: Refactor repository collaborators (#3233)

Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>

Author: stevehipwell

github/resource_github_emu_group_mapping.go

@@ -89,7 +89,7 @@ func resourceGithubEMUGroupMappingCreate(ctx context.Context, d *schema.Resource
 
 	tflog.Debug(ctx, "Successfully updated connected external group")
 
-	teamID, err := lookupTeamID(ctx, meta.(*Owner), teamSlug)
+	teamID, err := lookupTeamID(ctx, client, orgName, teamSlug)
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -306,7 +306,11 @@ func resourceGithubEMUGroupMappingDelete(ctx context.Context, d *schema.Resource
 	return nil
 }
 
-func resourceGithubEMUGroupMappingImport(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
+func resourceGithubEMUGroupMappingImport(ctx context.Context, d *schema.ResourceData, m any) ([]*schema.ResourceData, error) {
+	meta := m.(*Owner)
+	client := meta.v3client
+	orgName := meta.name
+
 	importID := d.Id()
 	tflog.Trace(ctx, "Importing EMU group mapping with two-part ID", map[string]any{
 		"import_id": importID,
@@ -329,7 +333,7 @@ func resourceGithubEMUGroupMappingImport(ctx context.Context, d *schema.Resource
 		"team_slug": teamSlug,
 	})
 
-	teamID, err := lookupTeamID(ctx, meta.(*Owner), teamSlug)
+	teamID, err := lookupTeamID(ctx, client, orgName, teamSlug)
 	if err != nil {
 		return nil, err
 	}

github/resource_github_emu_group_mapping_migration.go

@@ -31,11 +31,10 @@ func resourceGithubEMUGroupMappingV0() *schema.Resource {
 }
 
 func resourceGithubEMUGroupMappingStateUpgradeV0(ctx context.Context, rawState map[string]any, meta any) (map[string]any, error) {
+	client := meta.(*Owner).v3client
 	orgName := meta.(*Owner).name
 	tflog.Trace(ctx, "GitHub EMU Group Mapping State before migration", map[string]any{"state": rawState, "owner": orgName})
 
-	client := meta.(*Owner).v3client
-
 	teamSlug := rawState["team_slug"].(string)
 	// We need to bypass the etag because we need to get the latest group
 	ctx = context.WithValue(ctx, ctxEtag, nil)
@@ -52,7 +51,7 @@ func resourceGithubEMUGroupMappingStateUpgradeV0(ctx context.Context, rawState m
 	}
 
 	group := groupsList.Groups[0]
-	teamID, err := lookupTeamID(ctx, meta.(*Owner), teamSlug)
+	teamID, err := lookupTeamID(ctx, client, orgName, teamSlug)
 	if err != nil {
 		return nil, err
 	}