[ignore] Fix minor issues in netflow resources

Author: samiib

mso/datasource_mso_tenant_policies_netflow_record_test.go

@@ -20,8 +20,8 @@ func TestAccMSOTenantPoliciesNetflowRecordDataSource(t *testing.T) {
 					resource.TestCheckResourceAttr("data.mso_tenant_policies_netflow_record.netflow_record", "description", "Updated NetFlow Record"),
 					resource.TestCheckResourceAttrSet("data.mso_tenant_policies_netflow_record.netflow_record", "uuid"),
 					resource.TestCheckResourceAttr("data.mso_tenant_policies_netflow_record.netflow_record", "match_parameters.#", "2"),
-					testCheckTypeSetStringElemAttr("data.mso_tenant_policies_netflow_record.netflow_record", "match_parameters", "ethertype"),
-					testCheckTypeSetStringElemAttr("data.mso_tenant_policies_netflow_record.netflow_record", "match_parameters", "destination_mac"),
+					resource.TestCheckResourceAttr("data.mso_tenant_policies_netflow_record.netflow_record", "match_parameters.0", "ethertype"),
+					resource.TestCheckResourceAttr("data.mso_tenant_policies_netflow_record.netflow_record", "match_parameters.1", "destination_mac"),
 				),
 			},
 		},

mso/resource_mso_tenant_policies_netflow_exporter.go

@@ -54,7 +54,10 @@ func setNetflowExporterData(d *schema.ResourceData, response *container.Containe
 
 func resourceMSONetflowExporterImport(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
 	log.Printf("[DEBUG] MSO NetFlow Exporter Resource - Beginning Import: %v", d.Id())
-	resourceMSONetflowExporterRead(d, m)
+	err := resourceMSONetflowExporterRead(d, m)
+	if err != nil {
+		return nil, err
+	}
 	log.Printf("[DEBUG] MSO NetFlow Exporter Resource - Import Complete: %v", d.Id())
 	return []*schema.ResourceData{d}, nil
 }

mso/resource_mso_tenant_policies_netflow_monitor.go

@@ -73,7 +73,9 @@ func setNetflowMonitorData(d *schema.ResourceData, response *container.Container
 	d.SetId(fmt.Sprintf("templateId/%s/NetflowMonitor/%s", templateId, models.StripQuotes(response.S("name").String())))
 	d.Set("template_id", templateId)
 	d.Set("name", models.StripQuotes(response.S("name").String()))
-	d.Set("description", models.StripQuotes(response.S("description").String()))
+	if response.Exists("description") {
+		d.Set("description", models.StripQuotes(response.S("description").String()))
+	}
 	d.Set("uuid", models.StripQuotes(response.S("uuid").String()))
 	if response.Exists("recordRef") {
 		d.Set("netflow_record_uuid", models.StripQuotes(response.S("recordRef").String()))

mso/resource_mso_tenant_policies_netflow_monitor_test.go

@@ -34,7 +34,7 @@ func TestAccMSOTenantPoliciesNetflowMonitorResource(t *testing.T) {
 					resource.TestCheckResourceAttr("mso_tenant_policies_netflow_monitor.netflow_monitor", "netflow_exporter_uuids.#", "2"),
 				),
 			},
-            {
+			{
 				PreConfig: func() { fmt.Println("Test: Update NetFlow Remove Description and Record UUID") },
 				Config:    testAccMSOTenantPoliciesNetflowMonitorConfigRemoveOptionals(),
 				Check: resource.ComposeTestCheckFunc(
@@ -57,7 +57,7 @@ func TestAccMSOTenantPoliciesNetflowMonitorResource(t *testing.T) {
 }
 
 func testAccNeflowMonitorBaseConfig(extra_exporter bool) string {
-    base := fmt.Sprintf(`%s
+	base := fmt.Sprintf(`%s
     resource "mso_tenant_policies_netflow_exporter" "netflow_exporter" {
         template_id = mso_template.template_tenant.id
         name        = "test_netflow_exporter"
@@ -67,17 +67,17 @@ func testAccNeflowMonitorBaseConfig(extra_exporter bool) string {
         name        = "test_netflow_record"
     }`, testAccMSOTemplateResourceTenantConfig())
 
-    if extra_exporter {
-        return fmt.Sprintf(`%s
+	if extra_exporter {
+		return fmt.Sprintf(`%s
         resource "mso_tenant_policies_netflow_exporter" "netflow_exporter_2" {
             template_id = mso_template.template_tenant.id
             name        = "test_netflow_exporter_2"
             // This is to ensure the exporters are deleted in order.
             depends_on = [mso_tenant_policies_netflow_exporter.netflow_exporter]
         }`, base)
-    }
+	}
 
-    return base
+	return base
 }
 
 func testAccMSOTenantPoliciesNetflowMonitorConfigCreate() string {

mso/resource_mso_tenant_policies_netflow_record.go

@@ -88,7 +88,9 @@ func setNetflowRecordData(d *schema.ResourceData, response *container.Container,
 	d.Set("template_id", templateId)
 	d.Set("name", name)
 	d.Set("uuid", models.StripQuotes(response.S("uuid").String()))
-	d.Set("description", models.StripQuotes(response.S("description").String()))
+	if response.Exists("description") {
+		d.Set("description", models.StripQuotes(response.S("description").String()))
+	}
 
 	if response.Exists("match") {
 		matchCount, _ := response.ArrayCount("match")