azurerm_container_app_environment - fix update function for identity (hashicorp#30311)

[BUG] * `azurerm_container_app_environment` - fix an issue where `identity` was not set to the update request payload

Author: sreallymatt

internal/services/containerapps/azuresdkhacks/container_app_environment_update.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/systemdata"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/containerapps/2025-01-01/managedenvironments"
 	"github.com/hashicorp/go-azure-sdk/sdk/client"
@@ -79,14 +80,15 @@ func (c ManagedEnvironmentsClient) UpdateThenPoll(ctx context.Context, id manage
 }
 
 type ManagedEnvironment struct {
-	Id         *string                       `json:"id,omitempty"`
-	Kind       *string                       `json:"kind,omitempty"`
-	Location   string                        `json:"location"`
-	Name       *string                       `json:"name,omitempty"`
-	Properties *ManagedEnvironmentProperties `json:"properties,omitempty"`
-	SystemData *systemdata.SystemData        `json:"systemData,omitempty"`
-	Tags       *map[string]string            `json:"tags,omitempty"`
-	Type       *string                       `json:"type,omitempty"`
+	Id         *string                                  `json:"id,omitempty"`
+	Identity   *identity.LegacySystemAndUserAssignedMap `json:"identity,omitempty"`
+	Kind       *string                                  `json:"kind,omitempty"`
+	Location   string                                   `json:"location"`
+	Name       *string                                  `json:"name,omitempty"`
+	Properties *ManagedEnvironmentProperties            `json:"properties,omitempty"`
+	SystemData *systemdata.SystemData                   `json:"systemData,omitempty"`
+	Tags       *map[string]string                       `json:"tags,omitempty"`
+	Type       *string                                  `json:"type,omitempty"`
 }
 
 type ManagedEnvironmentProperties struct {

internal/services/containerapps/container_app_environment_resource.go

@@ -475,9 +475,9 @@ func (r ContainerAppEnvironmentResource) Update() sdk.ResourceFunc {
 			if metadata.ResourceData.HasChange("identity") {
 				ident, err := identity.ExpandLegacySystemAndUserAssignedMapFromModel(state.Identity)
 				if err != nil {
-					return fmt.Errorf("expanding identity: %+v", err)
+					return fmt.Errorf("expanding `identity`: %+v", err)
 				}
-				existing.Model.Identity = ident
+				payload.Identity = ident
 			}
 
 			if metadata.ResourceData.HasChange("workload_profile") {

internal/services/containerapps/container_app_environment_resource_test.go

@@ -61,6 +61,13 @@ func TestAccContainerAppEnvironment_updateIdentity(t *testing.T) {
 	r := ContainerAppEnvironmentResource{}
 
 	data.ResourceTest(t, r, []acceptance.TestStep{
+		{
+			Config: r.basic(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
 		{
 			Config: r.withUserIdentity(data),
 			Check: acceptance.ComposeTestCheckFunc(
@@ -75,6 +82,13 @@ func TestAccContainerAppEnvironment_updateIdentity(t *testing.T) {
 			),
 		},
 		data.ImportStep(),
+		{
+			Config: r.withSystemAssignedUserAssignedIdentity(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
 		{
 			Config: r.basic(data),
 			Check: acceptance.ComposeTestCheckFunc(
@@ -425,6 +439,33 @@ resource "azurerm_container_app_environment" "test" {
 `, r.template(data), data.RandomInteger)
 }
 
+func (r ContainerAppEnvironmentResource) withSystemAssignedUserAssignedIdentity(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+provider "azurerm" {
+  features {}
+}
+
+%[1]s
+
+resource "azurerm_user_assigned_identity" "test" {
+  name                = "acct-%[2]d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+}
+
+resource "azurerm_container_app_environment" "test" {
+  name                = "acctest-CAEnv%[2]d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+
+  identity {
+    type         = "SystemAssigned, UserAssigned"
+    identity_ids = [azurerm_user_assigned_identity.test.id]
+  }
+}
+`, r.template(data), data.RandomInteger)
+}
+
 func (r ContainerAppEnvironmentResource) basicNoProvider(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 %[1]s