Merge branch 'variable_methods'

Author: DRuggeri

README.md

@@ -28,6 +28,10 @@ Have a look at the [examples directory](examples) for some use cases
 - `headers` (hash of strings, optional): A map of header names and values to set on all outbound requests. This is useful if you want to use a script via the 'external' provider or provide a pre-approved token or change Content-Type from `application/json`. If `username` and `password` are set and Authorization is one of the headers defined here, the BASIC auth credentials take precedence.
 - `timeout` (integer, optional): When set, will cause requests taking longer than this time (in seconds) to be aborted. Default is `0` which means no timeout is set.
 - `id_attribute` (string, optional): Defaults to `id`. When set, this key will be used to operate on REST objects. For example, if the ID is set to 'name', changes to the API object will be to http://foo.com/bar/VALUE_OF_NAME. This value may also be a '/'-delimeted path to the id attribute if it is multple levels deep in the data (such as `attributes/id` in the case of an object `{ \"attributes\": { \"id\": 1234 }, \"config\": { \"name\": \"foo\", \"something\": \"bar\"}}`. Lists are also supported, f.e. `attributes/items/0/id` in case of an object `{ \"attributes\": { \"items\": [{"id": 1234}] } }`.
+- `create_method` (string, optional): Defaults to `POST`. The HTTP method used to CREATE objects of this type on the API server.
+- `read_method` (string, optional): Defaults to `GET`. The HTTP method used to READ objects of this type on the API server.
+- `update_method` (string, optional): Defaults to `PUT`. The HTTP method used to UPDATE objects of this type on the API server.
+- `delete_method` (string, optional): Defaults to `DELETE`. The HTTP method used to DELETE objects of this type on the API server.
 - `copy_keys` (array of strings, optional): When set, any `PUT` to the API for an object will copy these keys from the data the provider has gathered about the object. This is useful if internal API information must also be provided with updates, such as the revision of the object.
 - `write_returns_object` (boolean, optional): Set this when the API returns the object created on all write operations (`POST`, `PUT`). This is used by the provider to refresh internal data structures.
 - `create_returns_object` (boolean, optional): Set this when the API returns the object created only on creation operations (`POST`). This is used by the provider to refresh internal data structures.

restapi/api_client.go

@@ -22,6 +22,10 @@ type apiClientOpt struct {
 	use_cookie            bool
 	timeout               int
 	id_attribute          string
+	create_method         string
+	read_method           string
+	update_method         string
+	destroy_method        string
 	copy_keys             []string
 	write_returns_object  bool
 	create_returns_object bool
@@ -41,6 +45,10 @@ type api_client struct {
 	use_cookie            bool
 	timeout               int
 	id_attribute          string
+	create_method         string
+	read_method           string
+	update_method         string
+	destroy_method        string
 	copy_keys             []string
 	write_returns_object  bool
 	create_returns_object bool
@@ -69,6 +77,19 @@ func NewAPIClient(opt *apiClientOpt) (*api_client, error) {
 		opt.uri = opt.uri[:len(opt.uri)-1]
 	}
 
+	if opt.create_method == "" {
+		opt.create_method = "POST"
+	}
+	if opt.read_method == "" {
+		opt.read_method = "GET"
+	}
+	if opt.update_method == "" {
+		opt.create_method = "PUT"
+	}
+	if opt.destroy_method == "" {
+		opt.destroy_method = "DELETE"
+	}
+
 	/* Disable TLS verification if requested */
 	tr := &http.Transport{
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: opt.insecure},
@@ -92,6 +113,10 @@ func NewAPIClient(opt *apiClientOpt) (*api_client, error) {
 		password:              opt.password,
 		headers:               opt.headers,
 		id_attribute:          opt.id_attribute,
+		create_method:         opt.create_method,
+		read_method:           opt.read_method,
+		update_method:         opt.update_method,
+		destroy_method:        opt.destroy_method,
 		copy_keys:             opt.copy_keys,
 		write_returns_object:  opt.write_returns_object,
 		create_returns_object: opt.create_returns_object,

restapi/api_client_test.go

@@ -34,7 +34,7 @@ func TestAPIClient(t *testing.T) {
 	client, _ := NewAPIClient(opt)
 
 	var res string
-        var err error
+	var err error
 
 	if debug {
 		log.Printf("api_client_test.go: Testing standard OK request\n")

restapi/api_object.go

@@ -192,7 +192,7 @@ func (obj *api_object) create_object() error {
 	}
 
 	b, _ := json.Marshal(obj.data)
-	res_str, err := obj.api_client.send_request("POST", strings.Replace(obj.post_path, "{id}", obj.id, -1), string(b))
+	res_str, err := obj.api_client.send_request(obj.api_client.create_method, strings.Replace(obj.post_path, "{id}", obj.id, -1), string(b))
 	if err != nil {
 		return err
 	}
@@ -224,7 +224,7 @@ func (obj *api_object) read_object() error {
 		return errors.New("Cannot read an object unless the ID has been set.")
 	}
 
-	res_str, err := obj.api_client.send_request("GET", strings.Replace(obj.get_path, "{id}", obj.id, -1), "")
+	res_str, err := obj.api_client.send_request(obj.api_client.read_method, strings.Replace(obj.get_path, "{id}", obj.id, -1), "")
 	if err != nil {
 		return err
 	}
@@ -239,7 +239,7 @@ func (obj *api_object) update_object() error {
 	}
 
 	b, _ := json.Marshal(obj.data)
-	res_str, err := obj.api_client.send_request("PUT", strings.Replace(obj.put_path, "{id}", obj.id, -1), string(b))
+	res_str, err := obj.api_client.send_request(obj.api_client.update_method, strings.Replace(obj.put_path, "{id}", obj.id, -1), string(b))
 	if err != nil {
 		return err
 	}
@@ -264,7 +264,7 @@ func (obj *api_object) delete_object() error {
 		return nil
 	}
 
-	_, err := obj.api_client.send_request("DELETE", strings.Replace(obj.delete_path, "{id}", obj.id, -1), "")
+	_, err := obj.api_client.send_request(obj.api_client.destroy_method, strings.Replace(obj.delete_path, "{id}", obj.id, -1), "")
 	if err != nil {
 		return err
 	}
@@ -290,7 +290,7 @@ func (obj *api_object) find_object(query_string string, search_key string, searc
 	if obj.debug {
 		log.Printf("datasource_api_object.go: Calling API on path '%s'", search_path)
 	}
-	res_str, err := obj.api_client.send_request("GET", search_path, "")
+	res_str, err := obj.api_client.send_request(obj.api_client.read_method, search_path, "")
 	if err != nil {
 		return err
 	}

restapi/provider.go

@@ -56,6 +56,26 @@ func Provider() terraform.ResourceProvider {
 				DefaultFunc: schema.EnvDefaultFunc("REST_API_ID_ATTRIBUTE", nil),
 				Description: "When set, this key will be used to operate on REST objects. For example, if the ID is set to 'name', changes to the API object will be to http://foo.com/bar/VALUE_OF_NAME. This value may also be a '/'-delimeted path to the id attribute if it is multple levels deep in the data (such as `attributes/id` in the case of an object `{ \"attributes\": { \"id\": 1234 }, \"config\": { \"name\": \"foo\", \"something\": \"bar\"}}`",
 			},
+			"create_method": &schema.Schema{
+				Type:        schema.TypeString,
+				Description: "Defaults to `POST`. The HTTP method used to CREATE objects of this type on the API server.",
+				Optional:    true,
+			},
+			"read_method": &schema.Schema{
+				Type:        schema.TypeString,
+				Description: "Defaults to `GET`. The HTTP method used to READ objects of this type on the API server.",
+				Optional:    true,
+			},
+			"update_method": &schema.Schema{
+				Type:        schema.TypeString,
+				Description: "Defaults to `PUT`. The HTTP method used to UPDATE objects of this type on the API server.",
+				Optional:    true,
+			},
+			"destroy_method": &schema.Schema{
+				Type:        schema.TypeString,
+				Description: "Defaults to `DELETE`. The HTTP method used to DELETE objects of this type on the API server.",
+				Optional:    true,
+			},
 			"copy_keys": &schema.Schema{
 				Type:        schema.TypeList,
 				Elem:        &schema.Schema{Type: schema.TypeString},
@@ -135,6 +155,19 @@ func configureProvider(d *schema.ResourceData) (interface{}, error) {
 		debug:                 d.Get("debug").(bool),
 	}
 
+	if v, ok := d.GetOk("create_method"); ok {
+		opt.create_method = v.(string)
+	}
+	if v, ok := d.GetOk("read_method"); ok {
+		opt.read_method = v.(string)
+	}
+	if v, ok := d.GetOk("update_method"); ok {
+		opt.update_method = v.(string)
+	}
+	if v, ok := d.GetOk("destroy_method"); ok {
+		opt.destroy_method = v.(string)
+	}
+
 	client, err := NewAPIClient(opt)
 	return client, err
 }