use ForceNew on just about all catalog entry attributes; struggle in the hell of 'diffs mismatch'

builtin/providers/consul/resource_consul_catalog_entry.go

@@ -3,6 +3,8 @@ package consul
 import (
 	"bytes"
 	"fmt"
+	"sort"
+	"strings"
 
 	consulapi "github.com/hashicorp/consul/api"
 	"github.com/hashicorp/terraform/helper/hashcode"
@@ -20,6 +22,7 @@ func resourceConsulCatalogEntry() *schema.Resource {
 			"address": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
+				ForceNew: true,
 			},
 
 			"datacenter": &schema.Schema{
@@ -32,37 +35,44 @@ func resourceConsulCatalogEntry() *schema.Resource {
 			"node": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
+				ForceNew: true,
 			},
 
 			"service": &schema.Schema{
 				Type:     schema.TypeSet,
 				Optional: true,
+				ForceNew: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"address": &schema.Schema{
 							Type:     schema.TypeString,
 							Optional: true,
+							ForceNew: true,
 						},
 
 						"id": &schema.Schema{
 							Type:     schema.TypeString,
 							Optional: true,
 							Computed: true,
+							ForceNew: true,
 						},
 
 						"name": &schema.Schema{
 							Type:     schema.TypeString,
 							Required: true,
+							ForceNew: true,
 						},
 
 						"port": &schema.Schema{
 							Type:     schema.TypeInt,
 							Optional: true,
+							ForceNew: true,
 						},
 
 						"tags": &schema.Schema{
 							Type:     schema.TypeList,
 							Optional: true,
+							ForceNew: true,
 							Elem:     &schema.Schema{Type: schema.TypeString},
 						},
 					},
@@ -82,6 +92,21 @@ func resourceConsulCatalogEntryServicesHash(v interface{}) int {
 	var buf bytes.Buffer
 	m := v.(map[string]interface{})
 	buf.WriteString(fmt.Sprintf("%s-", m["id"].(string)))
+	buf.WriteString(fmt.Sprintf("%s-", m["name"].(string)))
+	buf.WriteString(fmt.Sprintf("%s-", m["address"].(string)))
+	buf.WriteString(fmt.Sprintf("%d-", m["port"].(int)))
+	if v, ok := m["tags"]; ok {
+		vs := v.([]interface{})
+		s := make([]string, len(vs))
+		for i, raw := range vs {
+			s[i] = raw.(string)
+		}
+		sort.Strings(s)
+
+		for _, v := range s {
+			buf.WriteString(fmt.Sprintf("%s-", v))
+		}
+	}
 	return hashcode.String(buf.String())
 }
 
@@ -110,42 +135,50 @@ func resourceConsulCatalogEntryCreate(d *schema.ResourceData, meta interface{})
 	address := d.Get("address").(string)
 	node := d.Get("node").(string)
 
-	if services, ok := d.GetOk("service"); ok {
-		for _, rawService := range services.(*schema.Set).List() {
+	var serviceIDs []string
+	if service, ok := d.GetOk("service"); ok {
+		serviceList := service.(*schema.Set).List()
+		serviceIDs = make([]string, len(serviceList))
+		for i, rawService := range serviceList {
 			serviceData := rawService.(map[string]interface{})
 
-			rawTags := serviceData["tags"].([]interface{})
-			tags := make([]string, len(rawTags))
-			for i, v := range rawTags {
-				tags[i] = v.(string)
+			serviceID := serviceData["id"].(string)
+			serviceIDs[i] = serviceID
+
+			var tags []string
+			if v := serviceData["tags"].([]interface{}); len(v) > 0 {
+				tags = make([]string, len(v))
+				for i, raw := range v {
+					tags[i] = raw.(string)
+				}
 			}
 
-			registration := consulapi.CatalogRegistration{
+			registration := &consulapi.CatalogRegistration{
 				Address:    address,
 				Datacenter: dc,
 				Node:       node,
 				Service: &consulapi.AgentService{
 					Address: serviceData["address"].(string),
-					ID:      serviceData["id"].(string),
+					ID:      serviceID,
 					Service: serviceData["name"].(string),
 					Port:    serviceData["port"].(int),
 					Tags:    tags,
 				},
 			}
 
-			if _, err := catalog.Register(&registration, &wOpts); err != nil {
+			if _, err := catalog.Register(registration, &wOpts); err != nil {
 				return fmt.Errorf("Failed to register Consul catalog entry with node '%s' at address '%s' in %s: %v",
 					node, address, dc, err)
 			}
 		}
 	} else {
-		registration := consulapi.CatalogRegistration{
+		registration := &consulapi.CatalogRegistration{
 			Address:    address,
 			Datacenter: dc,
 			Node:       node,
 		}
 
-		if _, err := catalog.Register(&registration, &wOpts); err != nil {
+		if _, err := catalog.Register(registration, &wOpts); err != nil {
 			return fmt.Errorf("Failed to register Consul catalog entry with node '%s' at address '%s' in %s: %v",
 				node, address, dc, err)
 		}
@@ -159,7 +192,12 @@ func resourceConsulCatalogEntryCreate(d *schema.ResourceData, meta interface{})
 	} else {
 		d.Set("datacenter", dc)
 	}
-	d.SetId(fmt.Sprintf("consul-catalog-node-%s-%s", node, address))
+
+	sort.Strings(serviceIDs)
+	serviceIDsJoined := strings.Join(serviceIDs, ",")
+
+	d.SetId(fmt.Sprintf("%s-%s-[%s]", node, address, serviceIDsJoined))
+
 	return nil
 }
 
@@ -189,10 +227,14 @@ func resourceConsulCatalogEntryDelete(d *schema.ResourceData, meta interface{})
 	client := meta.(*consulapi.Client)
 	catalog := client.Catalog()
 
-	// Get the DC, error if not available.
 	var dc string
 	if v, ok := d.GetOk("datacenter"); ok {
 		dc = v.(string)
+	} else {
+		var err error
+		if dc, err = getDC(client); err != nil {
+			return err
+		}
 	}
 
 	var token string
@@ -207,7 +249,9 @@ func resourceConsulCatalogEntryDelete(d *schema.ResourceData, meta interface{})
 	node := d.Get("node").(string)
 
 	deregistration := consulapi.CatalogDeregistration{
-		Node: node, Address: address, Datacenter: dc,
+		Address:    address,
+		Datacenter: dc,
+		Node:       node,
 	}
 
 	if _, err := catalog.Deregister(&deregistration, &wOpts); err != nil {