moved clone thing to iot-api implementation

Author: rjtokenring

command/thing/clone.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/arduino/arduino-cloud-cli/config"
 	"github.com/arduino/arduino-cloud-cli/internal/iot"
-	iotclient "github.com/arduino/iot-client-go"
 )
 
 // CloneParams contains the parameters needed to clone a thing.
@@ -39,16 +38,9 @@ func Clone(ctx context.Context, params *CloneParams, cred *config.Credentials) (
 		return nil, err
 	}
 
-	thing, err := retrieve(ctx, iotClient, params.CloneID)
+	newThing, err := iotClient.ThingClone(ctx, params.CloneID, params.Name)
 	if err != nil {
-		return nil, err
-	}
-
-	thing.Name = &params.Name
-	force := true
-	newThing, err := iotClient.ThingCreate(ctx, thing, force)
-	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("cloning thing %s: %w", params.CloneID, err)
 	}
 
 	t, err := getThingInfo(newThing)
@@ -57,30 +49,3 @@ func Clone(ctx context.Context, params *CloneParams, cred *config.Credentials) (
 	}
 	return t, nil
 }
-
-type thingFetcher interface {
-	ThingShow(ctx context.Context, id string) (*iotclient.ArduinoThing, error)
-}
-
-func retrieve(ctx context.Context, fetcher thingFetcher, thingID string) (*iotclient.ThingCreate, error) {
-	clone, err := fetcher.ThingShow(ctx, thingID)
-	if err != nil {
-		return nil, fmt.Errorf("%s: %w", "retrieving the thing to be cloned", err)
-	}
-
-	thing := &iotclient.ThingCreate{}
-
-	// Copy variables
-	for _, p := range clone.Properties {
-		thing.Properties = append(thing.Properties, iotclient.Property{
-			Name:            p.Name,
-			Permission:      p.Permission,
-			UpdateParameter: p.UpdateParameter,
-			UpdateStrategy:  p.UpdateStrategy,
-			Type:            p.Type,
-			VariableName:    p.VariableName,
-		})
-	}
-
-	return thing, nil
-}

internal/iot/client.go

@@ -363,6 +363,23 @@ func (cl *Client) ThingShow(ctx context.Context, id string) (*iotclient.ArduinoT
 	return thing, nil
 }
 
+// ThingClone allows to clone a specific thing, given its id from Arduino IoT Cloud.
+func (cl *Client) ThingClone(ctx context.Context, id, newName string) (*iotclient.ArduinoThing, error) {
+	ctx, err := ctxWithToken(ctx, cl.token)
+	if err != nil {
+		return nil, err
+	}
+
+	req := cl.api.ThingsV2Api.ThingsV2Clone(ctx, id)
+	includeTags := true
+	req = req.ThingClone(iotclient.ThingClone{Name: newName, IncludeTags: &includeTags})
+	thing, _, err := cl.api.ThingsV2Api.ThingsV2CloneExecute(req)
+	if err != nil {
+		return nil, fmt.Errorf("cloning thing thing, %w", errorDetail(err))
+	}
+	return thing, nil
+}
+
 // ThingList returns a list of things on Arduino IoT Cloud.
 func (cl *Client) ThingList(ctx context.Context, ids []string, device *string, props bool, tags map[string]string) ([]iotclient.ArduinoThing, error) {
 	ctx, err := ctxWithToken(ctx, cl.token)