Move Create before Read

Signed-off-by: Timo Sand <[email protected]>

Author: deiga

github/resource_github_emu_group_mapping.go

@@ -63,6 +63,77 @@ func resourceGithubEMUGroupMapping() *schema.Resource {
 	}
 }
 
+func resourceGithubEMUGroupMappingCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+	resourceID := d.Id()
+	tflog.Trace(ctx, "Creating EMU group mapping", map[string]any{
+		"resource_id": resourceID,
+	})
+
+	err := checkOrganization(meta)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	client := meta.(*Owner).v3client
+	orgName := meta.(*Owner).name
+	tflog.SetField(ctx, "org_name", orgName)
+
+	teamSlug := d.Get("team_slug").(string)
+	tflog.SetField(ctx, "team_slug", teamSlug)
+
+	groupID := toInt64(d.Get("group_id"))
+	tflog.SetField(ctx, "group_id", groupID)
+	eg := &github.ExternalGroup{
+		GroupID: github.Ptr(groupID),
+	}
+
+	tflog.Debug(ctx, "Connecting external group to team via GitHub API")
+
+	group, resp, err := client.Teams.UpdateConnectedExternalGroup(ctx, orgName, teamSlug, eg)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	tflog.Debug(ctx, "Successfully updated connected external group")
+
+	teamID, err := matchTeamID(ctx, meta, teamSlug, group.Teams)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	err = d.Set("team_id", teamID)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	newResourceID, err := buildID(strconv.FormatInt(teamID, 10), teamSlug, strconv.FormatInt(groupID, 10))
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	tflog.Trace(ctx, "Setting resource ID", map[string]any{
+		"resource_id": newResourceID,
+	})
+	d.SetId(newResourceID)
+
+	etag := resp.Header.Get("ETag")
+	tflog.Trace(ctx, "Setting state attribute: etag", map[string]any{
+		"etag": etag,
+	})
+	if err = d.Set("etag", etag); err != nil {
+		return diag.FromErr(err)
+	}
+
+	if err = d.Set("group_name", group.GetGroupName()); err != nil {
+		return diag.FromErr(err)
+	}
+
+	tflog.Trace(ctx, "Resource created or updated successfully", map[string]any{
+		"resource_id": d.Id(),
+	})
+
+	return nil
+}
+
 func resourceGithubEMUGroupMappingRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	tflog.Trace(ctx, "Reading EMU group mapping", map[string]any{
 		"resource_id": d.Id(),
@@ -151,77 +222,6 @@ func resourceGithubEMUGroupMappingRead(ctx context.Context, d *schema.ResourceDa
 	return nil
 }
 
-func resourceGithubEMUGroupMappingCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
-	resourceID := d.Id()
-	tflog.Trace(ctx, "Creating EMU group mapping", map[string]any{
-		"resource_id": resourceID,
-	})
-
-	err := checkOrganization(meta)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-	client := meta.(*Owner).v3client
-	orgName := meta.(*Owner).name
-	tflog.SetField(ctx, "org_name", orgName)
-
-	teamSlug := d.Get("team_slug").(string)
-	tflog.SetField(ctx, "team_slug", teamSlug)
-
-	groupID := toInt64(d.Get("group_id"))
-	tflog.SetField(ctx, "group_id", groupID)
-	eg := &github.ExternalGroup{
-		GroupID: github.Ptr(groupID),
-	}
-
-	tflog.Debug(ctx, "Connecting external group to team via GitHub API")
-
-	group, resp, err := client.Teams.UpdateConnectedExternalGroup(ctx, orgName, teamSlug, eg)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	tflog.Debug(ctx, "Successfully updated connected external group")
-
-	teamID, err := matchTeamID(ctx, meta, teamSlug, group.Teams)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	err = d.Set("team_id", teamID)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	newResourceID, err := buildID(strconv.FormatInt(teamID, 10), teamSlug, strconv.FormatInt(groupID, 10))
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	tflog.Trace(ctx, "Setting resource ID", map[string]any{
-		"resource_id": newResourceID,
-	})
-	d.SetId(newResourceID)
-
-	etag := resp.Header.Get("ETag")
-	tflog.Trace(ctx, "Setting state attribute: etag", map[string]any{
-		"etag": etag,
-	})
-	if err = d.Set("etag", etag); err != nil {
-		return diag.FromErr(err)
-	}
-
-	if err = d.Set("group_name", group.GetGroupName()); err != nil {
-		return diag.FromErr(err)
-	}
-
-	tflog.Trace(ctx, "Resource created or updated successfully", map[string]any{
-		"resource_id": d.Id(),
-	})
-
-	return nil
-}
-
 func resourceGithubEMUGroupMappingUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	resourceID := d.Id()
 	tflog.Trace(ctx, "Updating EMU group mapping", map[string]any{