From 811ee80f6303dac4682b077cc6a37e30493542db Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Wed, 15 Aug 2018 12:06:01 +0200 Subject: [PATCH] Auto Scale: filter out the `$tags` tag Prior to this change (with the acctest fix): ``` $ acctests azurerm TestAccAzureRMAutoScaleSetting_basic === RUN TestAccAzureRMAutoScaleSetting_basic --- FAIL: TestAccAzureRMAutoScaleSetting_basic (400.30s) testing.go:513: Step 0 error: Check failed: Check 7/7 error: azurerm_autoscale_setting.test: Attribute 'tags.$type' found when not expected FAIL FAIL github.com/terraform-providers/terraform-provider-azurerm/azurerm 400.721s ``` Now: ``` $ acctests azurerm TestAccAzureRMAutoScaleSetting_basic === RUN TestAccAzureRMAutoScaleSetting_basic --- PASS: TestAccAzureRMAutoScaleSetting_basic (399.98s) PASS ok github.com/terraform-providers/terraform-provider-azurerm/azurerm 400.321s ``` --- azurerm/resource_arm_autoscale_setting.go | 4 +++- azurerm/resource_arm_autoscale_setting_test.go | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/azurerm/resource_arm_autoscale_setting.go b/azurerm/resource_arm_autoscale_setting.go index af32ffd781f7..4e98e8964df3 100644 --- a/azurerm/resource_arm_autoscale_setting.go +++ b/azurerm/resource_arm_autoscale_setting.go @@ -432,7 +432,9 @@ func resourceArmAutoScaleSettingRead(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("Error setting `notification` of Autoscale Setting %q (resource group %q): %+v", name, resourceGroup, err) } - flattenAndSetTags(d, resp.Tags) + // Return a new tag map filtered by the specified tag names. + tagMap := filterTags(resp.Tags, "$type") + flattenAndSetTags(d, tagMap) return nil } diff --git a/azurerm/resource_arm_autoscale_setting_test.go b/azurerm/resource_arm_autoscale_setting_test.go index 79a7966c0956..352d28cc141d 100644 --- a/azurerm/resource_arm_autoscale_setting_test.go +++ b/azurerm/resource_arm_autoscale_setting_test.go @@ -31,6 +31,7 @@ func TestAccAzureRMAutoScaleSetting_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "profile.0.name", "metricRules"), resource.TestCheckResourceAttr(resourceName, "profile.0.rule.#", "1"), resource.TestCheckResourceAttr(resourceName, "notification.#", "0"), + resource.TestCheckNoResourceAttr(resourceName, "tags.$type"), ), }, },