azurerm_automation_software_update_configuration - fix nil tag in t…

…agsSetting causes create error (#19516) * fix software update configurat bug in tags filter * update basic test for tag in az query
hashicorp · Dec 2, 2022 · a98359d · a98359d
1 parent 4bf58db
commit a98359d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/internal/services/automation/automation_software_update_configuration.go b/internal/services/automation/automation_software_update_configuration.go
@@ -49,10 +49,11 @@ func (a *AzureQuery) LoadSDKTags(tags map[string][]string) {
 	}
 }
 func (a *AzureQuery) ToSDKTags() map[string][]string {
+	m := map[string][]string{}
 	if len(a.Tags) == 0 {
-		return nil
+		// return an empty map instead of nil until issue fixed: https://github.com/Azure/azure-rest-api-specs/issues/21719
+		return m
 	}
-	m := map[string][]string{}
 	for _, tag := range a.Tags {
 		m[tag.Tag] = tag.Values
 	}
@@ -355,7 +356,11 @@ func (s *SoftwareUpdateConfigurationModel) ToSDKModel() automation.SoftwareUpdat
 			}
 			tag := automation.TagSettingsProperties{}
 			tag.Tags = az.ToSDKTags()
-			tag.FilterOperator = automation.TagOperators(az.TagFilter)
+			// always set filterOperator until issue fixed: https://github.com/Azure/azure-rest-api-specs/issues/21719
+			tag.FilterOperator = automation.TagOperatorsAll
+			if az.TagFilter != "" {
+				tag.FilterOperator = automation.TagOperators(az.TagFilter)
+			}
 			q.TagSettings = &tag
 			azureQueries = append(azureQueries, q)
 		}
@@ -666,6 +671,7 @@ func (m SoftwareUpdateConfigurationResource) Arguments() map[string]*pluginsdk.S
 								"tag_filter": {
 									Type:     pluginsdk.TypeString,
 									Optional: true,
+									Computed: true,
 									ValidateFunc: validation.StringInSlice([]string{
 										string(automation.TagOperatorsAny),
 										string(automation.TagOperatorsAll),

diff --git a/internal/services/automation/automation_software_update_configuration_test.go b/internal/services/automation/automation_software_update_configuration_test.go
@@ -121,11 +121,6 @@ resource "azurerm_automation_software_update_configuration" "test" {
     azure_query {
       scope     = [azurerm_resource_group.test.id]
       locations = [azurerm_resource_group.test.location]
-      tags {
-        tag    = "foo"
-        values = ["barbar2"]
-      }
-      tag_filter = "Any"
     }
 
     non_azure_query {