From 869696e888657df9c24998ae455bfae822c938c0 Mon Sep 17 00:00:00 2001 From: xuzhang3 Date: Tue, 6 Dec 2022 15:32:08 +0800 Subject: [PATCH 1/2] fix issue 18677, update should not remove the tags --- ...l_desktop_workspace_application_group_association_resource.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/services/desktopvirtualization/virtual_desktop_workspace_application_group_association_resource.go b/internal/services/desktopvirtualization/virtual_desktop_workspace_application_group_association_resource.go index 450d7d875e11..71c81308008e 100644 --- a/internal/services/desktopvirtualization/virtual_desktop_workspace_application_group_association_resource.go +++ b/internal/services/desktopvirtualization/virtual_desktop_workspace_application_group_association_resource.go @@ -109,6 +109,7 @@ func resourceVirtualDesktopWorkspaceApplicationGroupAssociationCreate(d *plugins Properties: &workspace.WorkspacePatchProperties{ ApplicationGroupReferences: &applicationGroupAssociations, }, + Tags: model.Tags, } if _, err = client.Update(ctx, *workspaceId, payload); err != nil { return fmt.Errorf("creating association between %s and %s: %+v", *workspaceId, *applicationGroupId, err) From 36a84e5bf04614e7cf9139b0311189e546a9c1c4 Mon Sep 17 00:00:00 2001 From: xuzhang3 Date: Tue, 6 Dec 2022 18:11:10 +0800 Subject: [PATCH 2/2] update test cases --- ...ktop_workspace_application_group_association_resource.go | 1 + ...workspace_application_group_association_resource_test.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/internal/services/desktopvirtualization/virtual_desktop_workspace_application_group_association_resource.go b/internal/services/desktopvirtualization/virtual_desktop_workspace_application_group_association_resource.go index 71c81308008e..f3530a9e23e4 100644 --- a/internal/services/desktopvirtualization/virtual_desktop_workspace_application_group_association_resource.go +++ b/internal/services/desktopvirtualization/virtual_desktop_workspace_application_group_association_resource.go @@ -201,6 +201,7 @@ func resourceVirtualDesktopWorkspaceApplicationGroupAssociationDelete(d *plugins Properties: &workspace.WorkspacePatchProperties{ ApplicationGroupReferences: &applicationGroupReferences, }, + Tags: model.Tags, } if _, err = client.Update(ctx, id.Workspace, payload); err != nil { return fmt.Errorf("removing association between %s and %s: %+v", id.Workspace, id.ApplicationGroup, err) diff --git a/internal/services/desktopvirtualization/virtual_desktop_workspace_application_group_association_resource_test.go b/internal/services/desktopvirtualization/virtual_desktop_workspace_application_group_association_resource_test.go index ceae68aeb089..d79261d20f37 100644 --- a/internal/services/desktopvirtualization/virtual_desktop_workspace_application_group_association_resource_test.go +++ b/internal/services/desktopvirtualization/virtual_desktop_workspace_application_group_association_resource_test.go @@ -125,6 +125,9 @@ resource "azurerm_virtual_desktop_workspace" "test" { name = "acctestWS%d" location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name + tags = { + environment = "test" + } } resource "azurerm_virtual_desktop_host_pool" "test" { @@ -168,6 +171,9 @@ resource "azurerm_virtual_desktop_workspace" "test" { name = "acctestWS%d" location = azurerm_resource_group.test.location resource_group_name = azurerm_resource_group.test.name + tags = { + environment = "test" + } } resource "azurerm_virtual_desktop_host_pool" "test" {