Show thing tags in list command

Author: polldo

cli/thing/list.go

@@ -93,14 +93,15 @@ func (r result) String() string {
 	}
 	t := table.New()
 
-	h := []interface{}{"Name", "ID", "Device"}
+	h := []interface{}{"Name", "ID", "Device", "Tags"}
 	if listFlags.variables {
 		h = append(h, "Variables")
 	}
 	t.SetHeader(h...)
 
 	for _, thing := range r.things {
 		r := []interface{}{thing.Name, thing.ID, thing.DeviceID}
+		r = append(r, strings.Join(thing.Tags, ", "))
 		if listFlags.variables {
 			r = append(r, strings.Join(thing.Variables, ", "))
 		}

command/thing/clone.go

@@ -54,7 +54,11 @@ func Clone(params *CloneParams) (*ThingInfo, error) {
 		return nil, err
 	}
 
-	return getThingInfo(newThing), nil
+	t, err := getThingInfo(newThing)
+	if err != nil {
+		return nil, fmt.Errorf("parsing thing %s from cloud: %w", newThing.Id, err)
+	}
+	return t, nil
 }
 
 func retrieve(client iot.Client, thingID string) (*iotclient.Thing, error) {

command/thing/create.go

@@ -19,6 +19,7 @@ package thing
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/arduino/arduino-cloud-cli/internal/config"
 	"github.com/arduino/arduino-cloud-cli/internal/iot"
@@ -62,5 +63,9 @@ func Create(params *CreateParams) (*ThingInfo, error) {
 		return nil, err
 	}
 
-	return getThingInfo(newThing), nil
+	t, err := getThingInfo(newThing)
+	if err != nil {
+		return nil, fmt.Errorf("getting the new thing %s from cloud: %w", newThing.Id, err)
+	}
+	return t, nil
 }

command/thing/list.go

@@ -18,6 +18,8 @@
 package thing
 
 import (
+	"fmt"
+
 	"github.com/arduino/arduino-cloud-cli/internal/config"
 	"github.com/arduino/arduino-cloud-cli/internal/iot"
 )
@@ -50,7 +52,10 @@ func List(params *ListParams) ([]ThingInfo, error) {
 
 	var things []ThingInfo
 	for _, foundThing := range foundThings {
-		info := getThingInfo(&foundThing)
+		info, err := getThingInfo(&foundThing)
+		if err != nil {
+			return nil, fmt.Errorf("getting thing %s from cloud: %w", foundThing.Id, err)
+		}
 		things = append(things, *info)
 	}
 

command/thing/thing.go

@@ -17,7 +17,11 @@
 
 package thing
 
-import iotclient "github.com/arduino/iot-client-go"
+import (
+	"fmt"
+
+	iotclient "github.com/arduino/iot-client-go"
+)
 
 // ThingInfo contains the main parameters of
 // an Arduino IoT Cloud thing.
@@ -26,18 +30,31 @@ type ThingInfo struct {
 	ID        string   `json:"id"`
 	DeviceID  string   `json:"device-id"`
 	Variables []string `json:"variables"`
+	Tags      []string `json:"tags,omitempty"`
 }
 
-func getThingInfo(thing *iotclient.ArduinoThing) *ThingInfo {
+func getThingInfo(thing *iotclient.ArduinoThing) (*ThingInfo, error) {
+	// Retrieve thing variables
 	var vars []string
 	for _, p := range thing.Properties {
 		vars = append(vars, p.Name)
 	}
+	// Retrieve thing tags
+	var tags []string
+	for key, value := range thing.Tags {
+		if valStr, ok := value.(string); ok {
+			tags = append(tags, key+": "+valStr)
+		} else {
+			return nil, fmt.Errorf("value of tag `%s` should be of type `string` but is of type `%T`", key, value)
+		}
+	}
+
 	info := &ThingInfo{
 		Name:      thing.Name,
 		ID:        thing.Id,
 		DeviceID:  thing.DeviceId,
 		Variables: vars,
+		Tags:      tags,
 	}
-	return info
+	return info, nil
 }

command/thing/thing_test.go

@@ -0,0 +1,33 @@
+package thing
+
+import (
+	"fmt"
+	"testing"
+
+	iotclient "github.com/arduino/iot-client-go"
+)
+
+func TestGetThingInfo(t *testing.T) {
+	thingTagsValid := &iotclient.ArduinoThing{Tags: map[string]interface{}{
+		"location": "rome",
+		"room":     "101",
+	}}
+	thingTagsNotValid := &iotclient.ArduinoThing{Tags: map[string]interface{}{
+		"location": "rome",
+		"room":     101,
+	}}
+
+	thing, err := getThingInfo(thingTagsValid)
+	if err != nil {
+		t.Error("unexpected error")
+	}
+	if len(thing.Tags) != 2 {
+		fmt.Println(len(thing.Tags))
+		t.Error("expected two tags")
+	}
+
+	_, err = getThingInfo(thingTagsNotValid)
+	if err == nil {
+		t.Error("an error was expected because tags are not valid")
+	}
+}