Merge branch 'main' into PORT-16658-sort-rules

Author: gilmor-port

port/team/resource.go

@@ -2,6 +2,7 @@ package team
 
 import (
 	"context"
+
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -104,13 +105,21 @@ func (r *TeamResource) Update(ctx context.Context, req resource.UpdateRequest, r
 		return
 	}
 
+	var currentState *TeamModel
+	resp.Diagnostics.Append(req.State.Get(ctx, &currentState)...)
+
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
 	t, err := TeamResourceToPortBody(ctx, state)
 	if err != nil {
 		resp.Diagnostics.AddError("failed to convert team resource to body", err.Error())
 		return
 	}
 
-	tp, err := r.portClient.UpdateTeam(ctx, t.Name, &t.PortTeam)
+	oldTeamName := currentState.Name.ValueString()
+	tp, err := r.portClient.UpdateTeam(ctx, oldTeamName, &t.PortTeam)
 	if err != nil {
 		resp.Diagnostics.AddError("failed to update the team", err.Error())
 		return

port/team/resource_test.go

@@ -2,10 +2,11 @@ package team_test
 
 import (
 	"fmt"
-	"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
 	"os"
 	"testing"
 
+	"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
+
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/port-labs/terraform-provider-port-labs/v2/internal/acctest"
 )
@@ -115,6 +116,47 @@ func TestAccPortTeamEmptyDescription(t *testing.T) {
 	})
 }
 
+func TestAccPortTeamNameUpdate(t *testing.T) {
+	initialTeamName := utils.GenID()
+	updatedTeamName := utils.GenID()
+	var testAccTeamConfigCreate = fmt.Sprintf(`
+	resource "port_team" "team" {
+		name = "%s"
+		description = "Test description"
+		users = []
+	}`, initialTeamName)
+
+	var testAccTeamConfigUpdate = fmt.Sprintf(`
+	resource "port_team" "team" {
+		name = "%s"
+		description = "Test description"
+		users = []
+	}`, updatedTeamName)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { acctest.TestAccPreCheck(t) },
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: acctest.ProviderConfig + testAccTeamConfigCreate,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("port_team.team", "name", initialTeamName),
+					resource.TestCheckResourceAttr("port_team.team", "description", "Test description"),
+					resource.TestCheckResourceAttr("port_team.team", "users.#", "0"),
+				),
+			},
+			{
+				Config: acctest.ProviderConfig + testAccTeamConfigUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("port_team.team", "name", updatedTeamName),
+					resource.TestCheckResourceAttr("port_team.team", "description", "Test description"),
+					resource.TestCheckResourceAttr("port_team.team", "users.#", "0"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccPortTeamImport(t *testing.T) {
 	teamName := utils.GenID()
 	userName := os.Getenv("CI_USER_NAME")