Update resource ID to be <group-id>:<team-id>

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

Author: deiga

github/resource_github_emu_group_mapping.go

@@ -49,13 +49,18 @@ func resourceGithubEMUGroupMapping() *schema.Resource {
 				Computed: true,
 			},
 		},
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 		StateUpgraders: []schema.StateUpgrader{
 			{
 				Type:    resourceGithubEMUGroupMappingV0().CoreConfigSchema().ImpliedType(),
 				Upgrade: resourceGithubEMUGroupMappingStateUpgradeV0,
 				Version: 0,
 			},
+			{
+				Type:    resourceGithubEMUGroupMappingV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourceGithubEMUGroupMappingStateUpgradeV1,
+				Version: 1,
+			},
 		},
 	}
 }
@@ -94,7 +99,7 @@ func resourceGithubEMUGroupMappingCreate(ctx context.Context, d *schema.Resource
 		return diag.FromErr(err)
 	}
 
-	newResourceID, err := buildID(strconv.FormatInt(teamID, 10), teamSlug, strconv.FormatInt(groupID, 10))
+	newResourceID, err := buildID(strconv.FormatInt(groupID, 10), strconv.FormatInt(teamID, 10))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -226,7 +231,7 @@ func resourceGithubEMUGroupMappingUpdate(ctx context.Context, d *schema.Resource
 		GroupID: new(groupID),
 	}
 
-	if d.HasChanges("group_id", "team_slug") {
+	if d.HasChange("team_slug") {
 
 		tflog.Debug(ctx, "Updating connected external group via GitHub API")
 
@@ -248,18 +253,6 @@ func resourceGithubEMUGroupMappingUpdate(ctx context.Context, d *schema.Resource
 		if err := d.Set("group_name", group.GetGroupName()); err != nil {
 			return diag.FromErr(err)
 		}
-
-		teamID := toInt64(d.Get("team_id"))
-
-		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)
 	}
 
 	tflog.Trace(ctx, "Updated successfully", map[string]any{
@@ -350,7 +343,7 @@ func resourceGithubEMUGroupMappingImport(ctx context.Context, d *schema.Resource
 		return nil, err
 	}
 
-	resourceID, err := buildID(strconv.FormatInt(teamID, 10), teamSlug, groupIDString)
+	resourceID, err := buildID(groupIDString, strconv.FormatInt(teamID, 10))
 	if err != nil {
 		return nil, err
 	}

github/resource_github_emu_group_mapping_migration.go

@@ -2,6 +2,7 @@ package github
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"strconv"
 
@@ -65,3 +66,56 @@ func resourceGithubEMUGroupMappingStateUpgradeV0(ctx context.Context, rawState m
 	tflog.Trace(ctx, "GitHub EMU Group Mapping State after migration", map[string]any{"state": rawState})
 	return rawState, nil
 }
+
+func resourceGithubEMUGroupMappingV1() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"team_id": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "ID of the GitHub team.",
+			},
+			"team_slug": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "Slug of the GitHub team.",
+			},
+			"group_id": {
+				Type:        schema.TypeInt,
+				Required:    true,
+				ForceNew:    true,
+				Description: "Integer corresponding to the external group ID to be linked.",
+			},
+			"group_name": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Name of the external group.",
+			},
+			"etag": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func resourceGithubEMUGroupMappingStateUpgradeV1(ctx context.Context, rawState map[string]any, meta any) (map[string]any, error) {
+	tflog.Trace(ctx, "GitHub EMU Group Mapping State before migration v1 => v2", map[string]any{"state": rawState})
+
+	oldResourceID, ok := rawState["id"].(string)
+	if !ok {
+		return nil, fmt.Errorf("id is not a string")
+	}
+	teamID, _, groupID, err := parseID3(oldResourceID)
+	if err != nil {
+		return nil, fmt.Errorf("could not parse ID: %w", err)
+	}
+	resourceID, err := buildID(groupID, teamID)
+	if err != nil {
+		return nil, fmt.Errorf("could not build ID: %w", err)
+	}
+	rawState["id"] = resourceID
+
+	tflog.Trace(ctx, "GitHub EMU Group Mapping State after migration", map[string]any{"state": rawState})
+	return rawState, nil
+}

github/resource_github_emu_group_mapping_migration_test.go

@@ -0,0 +1,42 @@
+package github
+
+import (
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+)
+
+func Test_resourceGithubEMUGroupMappingStateUpgradeV1(t *testing.T) {
+	t.Parallel()
+
+	for _, d := range []struct {
+		testName    string
+		rawState    map[string]any
+		want        map[string]any
+		shouldError bool
+	}{
+		{
+			testName: "migrates v1 to v2",
+			rawState: map[string]any{
+				"id": "123456:test-team:7765543",
+			},
+			want: map[string]any{
+				"id": "7765543:123456",
+			},
+			shouldError: false,
+		},
+	} {
+		t.Run(d.testName, func(t *testing.T) {
+			t.Parallel()
+
+			got, err := resourceGithubEMUGroupMappingStateUpgradeV1(t.Context(), d.rawState, nil)
+			if (err != nil) != d.shouldError {
+				t.Fatalf("unexpected error state")
+			}
+
+			if diff := cmp.Diff(got, d.want); !d.shouldError && diff != "" {
+				t.Fatalf("got %+v, want %+v: %s", got, d.want, diff)
+			}
+		})
+	}
+}

go.mod

@@ -4,6 +4,7 @@ go 1.26
 
 require (
 	github.com/go-jose/go-jose/v3 v3.0.4
+	github.com/google/go-cmp v0.7.0
 	github.com/google/go-github/v84 v84.0.0
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-cty v1.5.0
@@ -22,7 +23,6 @@ require (
 	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/go-querystring v1.2.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect