Fix bindings not being saved to state.

rabbitmq/resource_binding.go

@@ -3,11 +3,11 @@ package rabbitmq
 import (
 	"fmt"
 	"log"
+	"net/url"
 	"strings"
 
-	"github.com/michaelklishin/rabbit-hole"
-
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/michaelklishin/rabbit-hole"
 )
 
 func resourceBinding() *schema.Resource {
@@ -46,8 +46,7 @@ func resourceBinding() *schema.Resource {
 
 			"properties_key": &schema.Schema{
 				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				Computed: true,
 			},
 
 			"routing_key": &schema.Schema{
@@ -74,14 +73,16 @@ func CreateBinding(d *schema.ResourceData, meta interface{}) error {
 		Destination:     d.Get("destination").(string),
 		DestinationType: d.Get("destination_type").(string),
 		RoutingKey:      d.Get("routing_key").(string),
-		PropertiesKey:   d.Get("properties_key").(string),
 		Arguments:       d.Get("arguments").(map[string]interface{}),
 	}
 
-	if err := declareBinding(rmqc, vhost, bindingInfo); err != nil {
+	propertiesKey, err := declareBinding(rmqc, vhost, bindingInfo)
+	if err != nil {
 		return err
 	}
 
+	log.Printf("[DEBUG] RabbitMQ: Binding properties key: %s", propertiesKey)
+	bindingInfo.PropertiesKey = propertiesKey
 	name := fmt.Sprintf("%s/%s/%s/%s/%s", vhost, bindingInfo.Source, bindingInfo.Destination, bindingInfo.DestinationType, bindingInfo.PropertiesKey)
 	d.SetId(name)
 
@@ -177,19 +178,26 @@ func DeleteBinding(d *schema.ResourceData, meta interface{}) error {
 	return nil
 }
 
-func declareBinding(rmqc *rabbithole.Client, vhost string, bindingInfo rabbithole.BindingInfo) error {
-	log.Printf("[DEBUG] RabbitMQ: Attempting to declare binding for %s/%s/%s/%s/%s",
-		vhost, bindingInfo.Source, bindingInfo.Destination, bindingInfo.DestinationType, bindingInfo.PropertiesKey)
+func declareBinding(rmqc *rabbithole.Client, vhost string, bindingInfo rabbithole.BindingInfo) (string, error) {
+	log.Printf("[DEBUG] RabbitMQ: Attempting to declare binding for %s/%s/%s/%s",
+		vhost, bindingInfo.Source, bindingInfo.Destination, bindingInfo.DestinationType)
 
 	resp, err := rmqc.DeclareBinding(vhost, bindingInfo)
 	log.Printf("[DEBUG] RabbitMQ: Binding declare response: %#v", resp)
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	if resp.StatusCode >= 400 {
-		return fmt.Errorf("Error declaring RabbitMQ binding: %s", resp.Status)
+		return "", fmt.Errorf("Error declaring RabbitMQ binding: %s", resp.Status)
 	}
 
-	return nil
+	location := strings.Split(resp.Header.Get("Location"), "/")
+	propertiesKey, err := url.PathUnescape(location[len(location)-1])
+
+	if err != nil {
+		return "", err
+	}
+
+	return propertiesKey, nil
 }

rabbitmq/resource_binding_test.go

@@ -134,7 +134,6 @@ resource "rabbitmq_binding" "test" {
     destination = "${rabbitmq_queue.test.name}"
     destination_type = "queue"
     routing_key = "#"
-    properties_key = "%23"
 }`
 
 const testAccBindingConfig_propertiesKey = `
@@ -177,6 +176,10 @@ resource "rabbitmq_binding" "test" {
     destination = "${rabbitmq_queue.test.name}"
     destination_type = "queue"
     routing_key = "ANYTHING.#"
-    properties_key = "ANYTHING.%23"
+    arguments = {
+      key1 = "value1"
+      key2 = "value2"
+      key3 = "value3"
+    }
 }
 `

website/docs/r/binding.html.markdown

@@ -56,7 +56,6 @@ resource "rabbitmq_binding" "test" {
   destination      = "${rabbitmq_queue.test.name}"
   destination_type = "queue"
   routing_key      = "#"
-  properties_key   = "%23"
 }
 ```
 
@@ -72,15 +71,15 @@ The following arguments are supported:
 
 * `destination_type` - (Required) The type of destination (queue or exchange).
 
-* `properties_key` - (Required) A unique key to refer to the binding.
-
 * `routing_key` - (Optional) A routing key for the binding.
 
 * `arguments` - (Optional) Additional key/value arguments for the binding.
 
 ## Attributes Reference
 
-No further attributes are exported.
+In addition to all arguments above, the following attributes are exported:
+
+* `properties_key` - A unique key to refer to the binding.
 
 ## Import