[BUG] Type mismatch in team_id of emu_group_mapping (#3163)

deiga · web-flow · commit 64cb0304542e · 2026-02-09T08:45:41.000-06:00
* Fix `team_id` type to be `TypeInt` instead of `TypeString`

Signed-off-by: Timo Sand &lt;timo.sand@f-secure.com&gt;

* Ensure migration also uses correct type

Signed-off-by: Timo Sand &lt;timo.sand@f-secure.com&gt;

---------

Signed-off-by: Timo Sand &lt;timo.sand@f-secure.com&gt;
diff --git a/github/resource_github_emu_group_mapping.go b/github/resource_github_emu_group_mapping.go
@@ -24,7 +24,7 @@ func resourceGithubEMUGroupMapping() *schema.Resource {
 		Description:   "Manages the mapping of an external group to a GitHub team.",
 		Schema: map[string]*schema.Schema{
 			"team_id": {
-				Type:        schema.TypeString,
+				Type:        schema.TypeInt,
 				Computed:    true,
 				Description: "ID of the GitHub team.",
 			},
@@ -99,7 +99,7 @@ func resourceGithubEMUGroupMappingCreate(ctx context.Context, d *schema.Resource
 		return diag.FromErr(err)
 	}
 
-	if err := d.Set("team_id", teamID); err != nil {
+	if err := d.Set("team_id", int(teamID)); err != nil {
 		return diag.FromErr(err)
 	}
 
@@ -334,7 +334,7 @@ func resourceGithubEMUGroupMappingImport(ctx context.Context, d *schema.Resource
 		return nil, err
 	}
 
-	if err := d.Set("team_id", teamID); err != nil {
+	if err := d.Set("team_id", int(teamID)); err != nil {
 		return nil, err
 	}
 
diff --git a/github/resource_github_emu_group_mapping_migration.go b/github/resource_github_emu_group_mapping_migration.go
@@ -56,7 +56,7 @@ func resourceGithubEMUGroupMappingStateUpgradeV0(ctx context.Context, rawState m
 	if err != nil {
 		return nil, err
 	}
-	rawState["team_id"] = teamID
+	rawState["team_id"] = int(teamID)
 	resourceID, err := buildID(strconv.FormatInt(teamID, 10), teamSlug, strconv.FormatInt(group.GetGroupID(), 10))
 	if err != nil {
 		return nil, err
diff --git a/go.mod b/go.mod
@@ -4,7 +4,6 @@ go 1.24.4
 
 require (
 	github.com/go-jose/go-jose/v3 v3.0.4
-	github.com/google/go-cmp v0.7.0
 	github.com/google/go-github/v82 v82.0.0
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-cty v1.5.0
@@ -22,6 +21,7 @@ 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

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func resourceGithubEMUGroupMapping() *schema.Resource {`
`24`	`24`	`Description: "Manages the mapping of an external group to a GitHub team.",`
`25`	`25`	`Schema: map[string]*schema.Schema{`
`26`	`26`	`"team_id": {`
`27`		`- Type: schema.TypeString,`
	`27`	`+ Type: schema.TypeInt,`
`28`	`28`	`Computed: true,`
`29`	`29`	`Description: "ID of the GitHub team.",`
`30`	`30`	`},`
`@@ -99,7 +99,7 @@ func resourceGithubEMUGroupMappingCreate(ctx context.Context, d *schema.Resource`
`99`	`99`	`return diag.FromErr(err)`
`100`	`100`	`}`
`101`	`101`
`102`		`- if err := d.Set("team_id", teamID); err != nil {`
	`102`	`+ if err := d.Set("team_id", int(teamID)); err != nil {`
`103`	`103`	`return diag.FromErr(err)`
`104`	`104`	`}`
`105`	`105`
`@@ -334,7 +334,7 @@ func resourceGithubEMUGroupMappingImport(ctx context.Context, d *schema.Resource`
`334`	`334`	`return nil, err`
`335`	`335`	`}`
`336`	`336`
`337`		`- if err := d.Set("team_id", teamID); err != nil {`
	`337`	`+ if err := d.Set("team_id", int(teamID)); err != nil {`
`338`	`338`	`return nil, err`
`339`	`339`	`}`
`340`	`340`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func resourceGithubEMUGroupMappingStateUpgradeV0(ctx context.Context, rawState m`
`56`	`56`	`if err != nil {`
`57`	`57`	`return nil, err`
`58`	`58`	`}`
`59`		`- rawState["team_id"] = teamID`
	`59`	`+ rawState["team_id"] = int(teamID)`
`60`	`60`	`resourceID, err := buildID(strconv.FormatInt(teamID, 10), teamSlug, strconv.FormatInt(group.GetGroupID(), 10))`
`61`	`61`	`if err != nil {`
`62`	`62`	`return nil, err`