Update import function to support a single ID and a two part ID

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

Author: deiga

github/resource_github_emu_group_mapping.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"strconv"
+	"strings"
 
 	"github.com/google/go-github/v67/github"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -17,28 +18,11 @@ func resourceGithubEMUGroupMapping() *schema.Resource {
 		Delete: resourceGithubEMUGroupMappingDelete,
 		Importer: &schema.ResourceImporter{
 			State: func(d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
-				id, err := strconv.Atoi(d.Id())
-				if err != nil {
-					return nil, err
+				isTwoPartID := strings.Contains(d.Id(), ":")
+				if isTwoPartID {
+					return importWithTwoPartID(d, meta)
 				}
-				if err := d.Set("group_id", id); err != nil {
-					return nil, err
-				}
-				ctx := context.WithValue(context.Background(), ctxId, d.Id())
-				client := meta.(*Owner).v3client
-				orgName := meta.(*Owner).name
-				group, _, err := client.Teams.GetExternalGroup(ctx, orgName, int64(id))
-				if err != nil {
-					return nil, err
-				}
-				if len(group.Teams) != 1 {
-					return nil, fmt.Errorf("could not get team_slug from %v number of teams", len(group.Teams))
-				}
-				if err := d.Set("team_slug", group.Teams[0].TeamName); err != nil {
-					return nil, err
-				}
-				d.SetId(fmt.Sprintf("teams/%s/external-groups", *group.Teams[0].TeamName))
-				return []*schema.ResourceData{d}, nil
+				return importWithIntegerID(d, meta)
 			},
 		},
 		Schema: map[string]*schema.Schema{
@@ -185,3 +169,47 @@ func getInt64FromInterface(val any) (int64, error) {
 	}
 	return id64, nil
 }
+
+func importWithTwoPartID(d *schema.ResourceData, _ any) ([]*schema.ResourceData, error) {
+	groupIDString, teamSlug, err := parseTwoPartID(d.Id(), "group_id", "team_slug")
+	if err != nil {
+		return nil, err
+	}
+	groupID, err := strconv.Atoi(groupIDString)
+	if err != nil {
+		return nil, err
+	}
+	if err := d.Set("group_id", groupID); err != nil {
+		return nil, err
+	}
+	if err := d.Set("team_slug", teamSlug); err != nil {
+		return nil, err
+	}
+	d.SetId(fmt.Sprintf("teams/%s/external-groups", teamSlug))
+	return []*schema.ResourceData{d}, nil
+}
+
+func importWithIntegerID(d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) {
+	groupID, err := strconv.Atoi(d.Id())
+	if err != nil {
+		return nil, err
+	}
+	if err := d.Set("group_id", groupID); err != nil {
+		return nil, err
+	}
+	ctx := context.WithValue(context.Background(), ctxId, d.Id())
+	client := meta.(*Owner).v3client
+	orgName := meta.(*Owner).name
+	group, _, err := client.Teams.GetExternalGroup(ctx, orgName, int64(groupID))
+	if err != nil {
+		return nil, err
+	}
+	if len(group.Teams) != 1 {
+		return nil, fmt.Errorf("could not get team_slug from %v number of teams", len(group.Teams))
+	}
+	if err := d.Set("team_slug", group.Teams[0].TeamName); err != nil {
+		return nil, err
+	}
+	d.SetId(fmt.Sprintf("teams/%s/external-groups", *group.Teams[0].TeamName))
+	return []*schema.ResourceData{d}, nil
+}

github/resource_github_emu_group_mapping_test.go

@@ -167,7 +167,7 @@ func testAccGithubEMUGroupMappingImportStateIdFunc(resourceName string) resource
 		if !ok {
 			return "", fmt.Errorf("not found: %s", resourceName)
 		}
-		return rs.Primary.Attributes["group_id"], nil
+		return buildTwoPartID(rs.Primary.Attributes["group_id"], rs.Primary.Attributes["team_slug"]), nil
 	}
 }
 

website/docs/r/emu_group_mapping.html.markdown

@@ -7,7 +7,7 @@ description: |-
 
 # github_emu_group_mapping
 
-This resource manages mappings between external groups for enterprise managed users and GitHub teams. It wraps the API detailed [here](https://docs.github.com/en/rest/reference/teams#external-groups). Note that this is a distinct resource from `github_team_sync_group_mapping`. `github_emu_group_mapping` is special to the Enterprise Managed User (EMU) external group feature, whereas `github_team_sync_group_mapping` is specific to Identity Provider Groups.
+This resource manages mappings between external groups for enterprise managed users and GitHub teams. It wraps the [Teams#ExternalGroups API](https://docs.github.com/en/rest/reference/teams#external-groups). Note that this is a distinct resource from `github_team_sync_group_mapping`. `github_emu_group_mapping` is special to the Enterprise Managed User (EMU) external group feature, whereas `github_team_sync_group_mapping` is specific to Identity Provider Groups.
 
 ## Example Usage
 
@@ -16,20 +16,25 @@ resource "github_emu_group_mapping" "example_emu_group_mapping" {
   team_slug = "emu-test-team" # The GitHub team name to modify
   group_id = 28836 # The group ID of the external group to link
 }
-
-# Note that here GITHUB_OWNER and GITHUB_TOKEN have been set in the environment.
 ```
 
 ## Argument Reference
 
 The following arguments are supported:
+
 * `team_slug` - (Required) Slug of the GitHub team
 * `group_id`  - (Required) Integer corresponding to the external group ID to be linked
 
 ## Import
 
-GitHub EMU External Group Mappings can be imported using the external `group_id`, e.g.
+GitHub EMU External Group Mappings can be imported using the external `group_id`, when it maps to a single team, or the `group_id` and `team_slug` separated by a colon, when it maps to multiple teams, e.g.
 
-```
+```sh
+# IdP Group with a single team
 $ terraform import github_emu_group_mapping.example_emu_group_mapping 28836
 ```
+
+```sh
+# IdP Group with multiple teams
+$ terraform import github_emu_group_mapping.example_emu_group_mapping 28836:emu-test-team
+```