chore: add tagsToMap function

Author: fabiomatavelli

cloudstack/data_source_cloudstack_instance.go

@@ -155,11 +155,7 @@ func instanceDescriptionAttributes(d *schema.ResourceData, instance *cloudstack.
 	d.Set("zone_id", instance.Zoneid)
 	d.Set("nic", []interface{}{map[string]string{"ip_address": instance.Nic[0].Ipaddress}})
 
-	tags := make(map[string]interface{})
-	for _, tag := range instance.Tags {
-		tags[tag.Key] = tag.Value
-	}
-	d.Set("tags", tags)
+	d.Set("tags", tagsToMap(instance.Tags))
 
 	return nil
 }

cloudstack/data_source_cloudstack_ipaddress.go

@@ -124,7 +124,7 @@ func ipAddressDescriptionAttributes(d *schema.ResourceData, publicIpAddress *clo
 	d.Set("project", publicIpAddress.Project)
 	d.Set("ip_address", publicIpAddress.Ipaddress)
 	d.Set("is_source_nat", publicIpAddress.Issourcenat)
-	d.Set("tags", publicIpAddress.Tags)
+	d.Set("tags", tagsToMap(publicIpAddress.Tags))
 
 	return nil
 }

cloudstack/data_source_cloudstack_vpc.go

@@ -123,7 +123,7 @@ func vpcDescriptionAttributes(d *schema.ResourceData, vpc *cloudstack.VPC) error
 	d.Set("network_domain", vpc.Networkdomain)
 	d.Set("project", vpc.Project)
 	d.Set("zone_name", vpc.Zonename)
-	d.Set("tags", vpc.Tags)
+	d.Set("tags", tagsToMap(vpc.Tags))
 
 	return nil
 }

cloudstack/resource_cloudstack_instance.go

@@ -482,11 +482,7 @@ func resourceCloudStackInstanceRead(d *schema.ResourceData, meta interface{}) er
 		d.Set("security_group_names", groups)
 	}
 
-	tags := make(map[string]interface{})
-	for _, tag := range vm.Tags {
-		tags[tag.Key] = tag.Value
-	}
-	d.Set("tags", tags)
+	d.Set("tags", tagsToMap(vm.Tags))
 
 	setValueOrID(d, "service_offering", vm.Serviceofferingname, vm.Serviceofferingid)
 	setValueOrID(d, "template", vm.Templatename, vm.Templateid)

cloudstack/tags.go

@@ -111,3 +111,11 @@ func tagsFromSchema(m map[string]interface{}) map[string]string {
 	}
 	return result
 }
+
+func tagsToMap(tags []cloudstack.Tags) map[string]string {
+	result := make(map[string]string, len(tags))
+	for _, tag := range tags {
+		result[tag.Key] = tag.Value
+	}
+	return result
+}