fix: Spaces in resource names (#102 - #104).

routeros/mikrotik_client_rest.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strings"
 )
 
 type RestClient struct {
@@ -52,7 +53,8 @@ func (c *RestClient) SendRequest(method crudMethod, url *URL, item MikrotikItem,
 	}
 
 	// https://mikrotik + /rest + /interface/vlan + ? + .id=*39
-	requestUrl := c.HostURL + "/rest" + url.GetRestURL()
+	// Escaping spaces!
+	requestUrl := c.HostURL + "/rest" + strings.Replace(url.GetRestURL(), " ", "%20", -1)
 	ColorizedDebug(c.ctx, restMethodName[method]+" request URL:  "+requestUrl)
 
 	req, err := http.NewRequest(restMethodName[method], requestUrl, data)
@@ -70,16 +72,20 @@ func (c *RestClient) SendRequest(method crudMethod, url *URL, item MikrotikItem,
 
 	defer func() { _ = res.Body.Close() }()
 
+	body, _ := io.ReadAll(res.Body)
+
 	if res.StatusCode < http.StatusOK || res.StatusCode >= http.StatusBadRequest {
 		var errRes errorResponse
-		if err = json.NewDecoder(res.Body).Decode(&errRes); err == nil {
-			return fmt.Errorf("%v %v returned response - %v: '%v' (%v)",
+
+		ColorizedDebug(c.ctx, fmt.Sprintf("error response body:\n%s", body))
+
+		if err = json.Unmarshal(body, &errRes); err != nil {
+			return fmt.Errorf("json.Unmarshal - %v", err)
+		} else {
+			return fmt.Errorf("%v '%v' returned response code: %v, message: '%v', details: '%v'",
 				restMethodName[method], requestUrl, res.StatusCode, errRes.Message, errRes.Detail)
 		}
-
-		return fmt.Errorf("unknown error, status code: %d", res.StatusCode)
 	}
-	body, _ := io.ReadAll(res.Body)
 
 	ColorizedDebug(c.ctx, "response body: "+string(body))
 

routeros/provider.go

@@ -5,10 +5,10 @@ import (
 )
 
 var (
-	ErrorMsgPut    = "An error was encountered while sending a PUT request to the API"
-	ErrorMsgGet    = "An error was encountered while sending a GET request to the API"
-	ErrorMsgPatch  = "An error was encountered while sending a PATCH request to the API"
-	ErrorMsgDelete = "An error was encountered while sending a DELETE request to the API"
+	ErrorMsgPut    = "An error was encountered while sending a PUT request to the API: %v"
+	ErrorMsgGet    = "An error was encountered while sending a GET request to the API: %v"
+	ErrorMsgPatch  = "An error was encountered while sending a PATCH request to the API: %v"
+	ErrorMsgDelete = "An error was encountered while sending a DELETE request to the API: %v"
 )
 
 func Provider() *schema.Provider {

routeros/resource_default_actions.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -39,7 +38,7 @@ func ResourceCreate(ctx context.Context, s map[string]*schema.Schema, d *schema.
 
 	res, err := CreateItem(item, metadata.Path, m.(Client))
 	if err != nil {
-		tflog.Error(ctx, ErrorMsgPut)
+		ColorizedDebug(ctx, fmt.Sprintf(ErrorMsgPut, err))
 		return diag.FromErr(err)
 	}
 
@@ -69,7 +68,7 @@ func ResourceCreate(ctx context.Context, s map[string]*schema.Schema, d *schema.
 	if m.(Client).GetTransport() == TransportAPI {
 		r, err := ReadItems(&ItemId{Id, res.GetID(Id)}, metadata.Path, m.(Client))
 		if err != nil {
-			tflog.Error(ctx, ErrorMsgPut)
+			ColorizedDebug(ctx, fmt.Sprintf(ErrorMsgPut, err))
 			return diag.FromErr(err)
 		}
 
@@ -96,7 +95,7 @@ func ResourceRead(ctx context.Context, s map[string]*schema.Schema, d *schema.Re
 
 	res, err := ReadItems(&ItemId{metadata.IdType, d.Id()}, metadata.Path, m.(Client))
 	if err != nil {
-		tflog.Error(ctx, ErrorMsgGet)
+		ColorizedDebug(ctx, fmt.Sprintf(ErrorMsgGet, err))
 		return diag.FromErr(err)
 	}
 
@@ -121,13 +120,13 @@ func ResourceUpdate(ctx context.Context, s map[string]*schema.Schema, d *schema.
 	if err != nil {
 		// There is nothing to update, because resource id not found
 		// or some other error.
-		tflog.Error(ctx, ErrorMsgPatch)
+		ColorizedDebug(ctx, fmt.Sprintf(ErrorMsgPatch, err))
 		return diag.FromErr(err)
 	}
 
 	res, err := UpdateItem(&ItemId{Id, id}, metadata.Path, item, m.(Client))
 	if err != nil {
-		tflog.Error(ctx, ErrorMsgPatch)
+		ColorizedDebug(ctx, fmt.Sprintf(ErrorMsgPatch, err))
 		return diag.FromErr(err)
 	}
 
@@ -141,7 +140,7 @@ func ResourceDelete(ctx context.Context, s map[string]*schema.Schema, d *schema.
 	id, err := dynamicIdLookup(metadata.IdType, metadata.Path, m.(Client), d)
 	if err != nil {
 		if err != errorNoLongerExists {
-			tflog.Error(ctx, ErrorMsgDelete)
+			ColorizedDebug(ctx, fmt.Sprintf(ErrorMsgDelete, err))
 			return diag.FromErr(err)
 		}
 
@@ -156,7 +155,7 @@ func ResourceDelete(ctx context.Context, s map[string]*schema.Schema, d *schema.
 	}
 
 	if err := DeleteItem(&ItemId{Id, id}, metadata.Path, m.(Client)); err != nil {
-		tflog.Error(ctx, ErrorMsgDelete)
+		ColorizedDebug(ctx, fmt.Sprintf(ErrorMsgDelete, err))
 		return diag.FromErr(err)
 	}