Support importing by team token ID

Author: mkam

internal/provider/resource_tfe_team_token.go

@@ -21,6 +21,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 	"github.com/hashicorp/terraform-plugin-framework/types"
+	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 )
 
@@ -268,7 +269,39 @@ func (r *resourceTFETeamToken) Delete(ctx context.Context, req resource.DeleteRe
 }
 
 func (r *resourceTFETeamToken) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
-	resource.ImportStatePassthroughID(ctx, path.Root("team_id"), req, resp)
+	if !isTokenID(req.ID) {
+		// Set the team ID field
+		resource.ImportStatePassthroughID(ctx, path.Root("team_id"), req, resp)
+		return
+	}
+
+	// Fetch token by ID to set attributes
+	token, err := r.config.Client.TeamTokens.ReadByID(ctx, req.ID)
+	if err != nil {
+		resp.Diagnostics.AddError("Error importing team token", err.Error())
+		return
+	}
+	if token.Team == nil {
+		resp.Diagnostics.AddError("Error importing team token", "token did not return associated team")
+		return
+	}
+
+	var expiredAt types.String
+	if !token.ExpiredAt.IsZero() {
+		expiredAt = types.StringValue(token.ExpiredAt.Format(time.RFC3339))
+	} else {
+		expiredAt = types.StringNull()
+	}
+
+	var description types.String
+	if token.Description != nil {
+		description = types.StringValue(*token.Description)
+	} else {
+		description = types.StringNull()
+	}
+
+	result := modelFromTFEToken(types.StringValue(token.Team.ID), types.StringValue(token.ID), types.StringValue(token.Token), basetypes.NewBoolNull(), expiredAt, description)
+	resp.Diagnostics.Append(resp.State.Set(ctx, &result)...)
 }
 
 // Determines whether the ID of the resource is the ID of the authentication token

internal/provider/resource_tfe_team_token_test.go

@@ -214,6 +214,40 @@ func TestAccTFETeamToken_import(t *testing.T) {
 	})
 }
 
+func TestAccTFETeamToken_importByTokenID(t *testing.T) {
+	skipUnlessBeta(t)
+	rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV5ProviderFactories: testAccMuxedProviders,
+		CheckDestroy:             testAccCheckTFETeamTokenDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccTFETeamToken_withMultipleTokens(rInt),
+			},
+			{
+				ResourceName:            "tfe_team_token.multi_token_1",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"token"},
+			},
+			{
+				ResourceName:            "tfe_team_token.multi_token_2",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"token"},
+			},
+			{
+				ResourceName:            "tfe_team_token.legacy",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"token"},
+			},
+		},
+	})
+}
+
 func testAccCheckTFETeamTokenExists(
 	n string, token *tfe.TeamToken) resource.TestCheckFunc {
 	return func(s *terraform.State) error {