Started refactoring to move to client v2

rjtokenring · rjtokenring · commit a78ee2609666 · 2024-06-14T17:28:31.000+02:00
diff --git a/command/dashboard/create.go b/command/dashboard/create.go
@@ -47,10 +47,10 @@ func Create(ctx context.Context, params *CreateParams, cred *config.Credentials)
 
 	// Name passed as parameter has priority over name from template
 	if params.Name != nil {
-		dashboard.Name = *params.Name
+		dashboard.Name = params.Name
 	}
 	// If name is not specified in the template, it should be passed as parameter
-	if dashboard.Name == "" {
+	if dashboard.Name == nil || *dashboard.Name == "" {
 		return nil, errors.New("dashboard name not specified")
 	}
 
diff --git a/command/dashboard/dashboard.go b/command/dashboard/dashboard.go
@@ -33,7 +33,9 @@ type DashboardInfo struct {
 func getDashboardInfo(dashboard *iotclient.ArduinoDashboardv2) *DashboardInfo {
 	var widgets []string
 	for _, w := range dashboard.Widgets {
-		widgets = append(widgets, w.Name)
+		if w.Name != nil {
+			widgets = append(widgets, *w.Name)
+		}
 	}
 	info := &DashboardInfo{
 		Name:      dashboard.Name,
diff --git a/command/device/create.go b/command/device/create.go
@@ -100,7 +100,14 @@ func Create(ctx context.Context, params *CreateParams, cred *config.Credentials)
 		ID:     dev.Id,
 		Board:  dev.Type,
 		Serial: dev.Serial,
-		FQBN:   dev.Fqbn,
+		FQBN:   dereferenceString(dev.Fqbn),
 	}
 	return devInfo, nil
 }
+
+func dereferenceString(s *string) string {
+	if s == nil {
+		return ""
+	}
+	return *s
+}
diff --git a/command/device/creategeneric.go b/command/device/creategeneric.go
@@ -75,9 +75,9 @@ func CreateGeneric(ctx context.Context, params *CreateGenericParams, cred *confi
 			ID:     dev.Id,
 			Board:  dev.Type,
 			Serial: dev.Serial,
-			FQBN:   dev.Fqbn,
+			FQBN:   dereferenceString(dev.Fqbn),
 		},
-		Password: pass.SuggestedPassword,
+		Password: dereferenceString(pass.SuggestedPassword),
 	}
 	return devInfo, nil
 }
diff --git a/command/device/createlora.go b/command/device/createlora.go
@@ -181,7 +181,7 @@ func getDeviceLoraInfo(ctx context.Context, iotClient *iot.Client, loraDev *iotc
 			ID:     dev.Id,
 			Board:  dev.Type,
 			Serial: dev.Serial,
-			FQBN:   dev.Fqbn,
+			FQBN:   dereferenceString(dev.Fqbn),
 		},
 		AppEUI: loraDev.AppEui,
 		AppKey: loraDev.AppKey,
diff --git a/command/device/device.go b/command/device/device.go
@@ -45,7 +45,7 @@ func getDeviceInfo(device *iotclient.ArduinoDevicev2) (*DeviceInfo, error) {
 		ID:     device.Id,
 		Board:  device.Type,
 		Serial: device.Serial,
-		FQBN:   device.Fqbn,
+		FQBN:   dereferenceString(device.Fqbn),
 		Tags:   tags,
 	}
 	return dev, nil
diff --git a/command/device/provision.go b/command/device/provision.go
@@ -185,7 +185,7 @@ func (p provision) configBoard(ctx context.Context) error {
 	}
 
 	logrus.Info("Sending certificate authority key")
-	b, err = hex.DecodeString(cert.AuthorityKeyIdentifier)
+	b, err = hex.DecodeString(dereferenceString(cert.AuthorityKeyIdentifier))
 	if err != nil {
 		return fmt.Errorf("decoding certificate authority key id: %w", err)
 	}
diff --git a/command/ota/generate.go b/command/ota/generate.go
@@ -68,3 +68,10 @@ func Generate(binFile string, outFile string, fqbn string) error {
 
 	return nil
 }
+
+func dereferenceString(s *string) string {
+	if s == nil {
+		return ""
+	}
+	return *s
+}
diff --git a/command/ota/massupload.go b/command/ota/massupload.go
@@ -21,10 +21,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/sirupsen/logrus"
 	"os"
 	"path/filepath"
 
+	"github.com/sirupsen/logrus"
+
 	"github.com/arduino/arduino-cloud-cli/config"
 	"github.com/arduino/arduino-cloud-cli/internal/iot"
 	"github.com/arduino/arduino-cloud-cli/internal/ota"
@@ -179,8 +180,8 @@ func validateDevices(ctx context.Context, lister deviceLister, ids []string, fqb
 			continue
 		}
 		// Device FQBN doesn't match the passed one
-		if found.Fqbn != fqbn {
-			inv := Result{ID: id, Err: fmt.Errorf("has FQBN '%s' instead of '%s'", found.Fqbn, fqbn)}
+		if dereferenceString(found.Fqbn) != fqbn {
+			inv := Result{ID: id, Err: fmt.Errorf("has FQBN '%s' instead of '%s'", dereferenceString(found.Fqbn), fqbn)}
 			invalid = append(invalid, inv)
 			continue
 		}
diff --git a/command/ota/massupload_test.go b/command/ota/massupload_test.go
@@ -96,9 +96,9 @@ func TestValidateDevices(t *testing.T) {
 
 	mockDeviceList := deviceListerTest{
 		list: []iotclient.ArduinoDevicev2{
-			{Id: idCorrect1, Fqbn: correctFQBN},
-			{Id: idCorrect2, Fqbn: correctFQBN},
-			{Id: idNotValid, Fqbn: wrongFQBN},
+			{Id: idCorrect1, Fqbn: &correctFQBN},
+			{Id: idCorrect2, Fqbn: &correctFQBN},
+			{Id: idNotValid, Fqbn: &wrongFQBN},
 		},
 	}
 
diff --git a/command/ota/upload.go b/command/ota/upload.go
@@ -85,7 +85,7 @@ func Upload(ctx context.Context, params *UploadParams, cred *config.Credentials)
 		otaFile = filepath.Join(otaDir, "temp.ota")
 		defer os.RemoveAll(otaDir)
 
-		err = Generate(params.File, otaFile, dev.Fqbn)
+		err = Generate(params.File, otaFile, dereferenceString(dev.Fqbn))
 		if err != nil {
 			return fmt.Errorf("%s: %w", "cannot generate .ota file", err)
 		}
diff --git a/command/thing/bind.go b/command/thing/bind.go
@@ -42,7 +42,7 @@ func Bind(ctx context.Context, params *BindParams, cred *config.Credentials) err
 	}
 
 	thing := &iotclient.ThingUpdate{
-		DeviceId: params.DeviceID,
+		DeviceId: &params.DeviceID,
 	}
 
 	err = iotClient.ThingUpdate(ctx, params.ID, thing, true)
@@ -52,3 +52,10 @@ func Bind(ctx context.Context, params *BindParams, cred *config.Credentials) err
 
 	return nil
 }
+
+func dereferenceString(s *string) string {
+	if s == nil {
+		return ""
+	}
+	return *s
+}
diff --git a/command/thing/clone.go b/command/thing/clone.go
@@ -44,7 +44,7 @@ func Clone(ctx context.Context, params *CloneParams, cred *config.Credentials) (
 		return nil, err
 	}
 
-	thing.Name = params.Name
+	thing.Name = &params.Name
 	force := true
 	newThing, err := iotClient.ThingCreate(ctx, thing, force)
 	if err != nil {
diff --git a/command/thing/create.go b/command/thing/create.go
@@ -47,10 +47,10 @@ func Create(ctx context.Context, params *CreateParams, cred *config.Credentials)
 
 	// Name passed as parameter has priority over name from template
 	if params.Name != nil {
-		thing.Name = *params.Name
+		thing.Name = params.Name
 	}
 	// If name is not specified in the template, it should be passed as parameter
-	if thing.Name == "" {
+	if dereferenceString(thing.Name) == "" {
 		return nil, errors.New("thing name not specified")
 	}
 
diff --git a/command/thing/thing.go b/command/thing/thing.go
@@ -47,7 +47,7 @@ func getThingInfo(thing *iotclient.ArduinoThing) (*ThingInfo, error) {
 	info := &ThingInfo{
 		Name:      thing.Name,
 		ID:        thing.Id,
-		DeviceID:  thing.DeviceId,
+		DeviceID:  dereferenceString(thing.DeviceId),
 		Variables: vars,
 		Tags:      tags,
 	}
diff --git a/go.mod b/go.mod
@@ -7,10 +7,11 @@ require (
 	github.com/arduino/arduino-cli v0.0.0-20221116144942-76251df9241a
 	github.com/arduino/go-paths-helper v1.7.0
 	github.com/arduino/go-win32-utils v1.0.0
-	github.com/arduino/iot-client-go v1.4.4
+	github.com/arduino/iot-client-go v1.4.5-0.20240416140423-fb8fda8a47af
 	github.com/gofrs/uuid v4.2.0+incompatible
 	github.com/google/go-cmp v0.6.0
 	github.com/howeyc/crc16 v0.0.0-20171223171357-2b2a61e366a6
+	github.com/icza/bitio v1.1.0
 	github.com/manifoldco/promptui v0.9.0
 	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/cobra v1.3.0
@@ -43,7 +44,6 @@ require (
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/h2non/filetype v1.1.3 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/icza/bitio v1.1.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
diff --git a/go.sum b/go.sum
@@ -75,8 +75,8 @@ github.com/arduino/go-properties-orderedmap v1.7.1 h1:HQ9Pn/mk3+XyfrE39EEvaZwJkr
 github.com/arduino/go-properties-orderedmap v1.7.1/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
 github.com/arduino/go-win32-utils v1.0.0 h1:/cXB86sOJxOsCHP7sQmXGLkdValwJt56mIwOHYxgQjQ=
 github.com/arduino/go-win32-utils v1.0.0/go.mod h1:0jqM7doGEAs6DaJCxxhLBUDS5OawrqF48HqXkcEie/Q=
-github.com/arduino/iot-client-go v1.4.4 h1:FICCXD5uCZ0scGG6RioOlpZamDqgSD1l/fQlFwKR284=
-github.com/arduino/iot-client-go v1.4.4/go.mod h1:gYvpMt7Qw+OSScTLyIlCnpbvy9y96ey/2zhB4w6FoK0=
+github.com/arduino/iot-client-go v1.4.5-0.20240416140423-fb8fda8a47af h1:/dbu5I3q09kOePrWbBVMrKEPDM8KKUIGATQpwWc/wWo=
+github.com/arduino/iot-client-go v1.4.5-0.20240416140423-fb8fda8a47af/go.mod h1:aKaQRceeYIeMpyFyEUGJj4/5WFETZD1CrarYGn4v5Nc=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
@@ -287,6 +287,7 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/icza/bitio v1.1.0 h1:ysX4vtldjdi3Ygai5m1cWy4oLkhWTAi+SyO6HC8L9T0=
 github.com/icza/bitio v1.1.0/go.mod h1:0jGnlLAx8MKMr9VGnn/4YrvZiprkvBelsVIbA9Jjr9A=
+github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6 h1:8UsGZ2rr2ksmEru6lToqnXgA8Mz1DP11X4zSJ159C3k=
 github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6/go.mod h1:xQig96I1VNBDIWGCdTt54nHt6EeI639SmHycLYL7FkA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
diff --git a/internal/iot/client.go b/internal/iot/client.go
@@ -48,6 +48,10 @@ func NewClient(cred *config.Credentials) (*Client, error) {
 	return cl, nil
 }
 
+func toStringPointer(s string) *string {
+	return &s
+}
+
 // DeviceCreate allows to create a new device on Arduino IoT Cloud.
 // It returns the newly created device, and an error.
 func (cl *Client) DeviceCreate(ctx context.Context, fqbn, name, serial, dType string, cType *string) (*iotclient.ArduinoDevicev2, error) {
@@ -57,22 +61,24 @@ func (cl *Client) DeviceCreate(ctx context.Context, fqbn, name, serial, dType st
 	}
 
 	payload := iotclient.CreateDevicesV2Payload{
-		Fqbn:   fqbn,
-		Name:   name,
-		Serial: serial,
+		Fqbn:   toStringPointer(fqbn),
+		Name:   toStringPointer(name),
+		Serial: toStringPointer(serial),
 		Type:   dType,
 	}
 
 	if cType != nil {
-		payload.ConnectionType = *cType
+		payload.ConnectionType = cType
 	}
 
-	dev, _, err := cl.api.DevicesV2Api.DevicesV2Create(ctx, payload, nil)
+	req := cl.api.DevicesV2Api.DevicesV2Create(ctx)
+	req = req.CreateDevicesV2Payload(payload)
+	dev, _, err := cl.api.DevicesV2Api.DevicesV2CreateExecute(req)
 	if err != nil {
 		err = fmt.Errorf("creating device, %w", errorDetail(err))
 		return nil, err
 	}
-	return &dev, nil
+	return dev, nil
 }
 
 // DeviceLoraCreate allows to create a new LoRa device on Arduino IoT Cloud.
@@ -88,17 +94,19 @@ func (cl *Client) DeviceLoraCreate(ctx context.Context, name, serial, devType, e
 		Eui:           eui,
 		FrequencyPlan: freq,
 		Name:          name,
-		Serial:        serial,
+		Serial:        toStringPointer(serial),
 		Type:          devType,
 		UserId:        "me",
 	}
 
-	dev, _, err := cl.api.LoraDevicesV1Api.LoraDevicesV1Create(ctx, payload, nil)
+	req := cl.api.LoraDevicesV1Api.LoraDevicesV1Create(ctx)
+	req = req.CreateLoraDevicesV1Payload(payload)
+	dev, _, err := cl.api.LoraDevicesV1Api.LoraDevicesV1CreateExecute(req)
 	if err != nil {
 		err = fmt.Errorf("creating lora device: %w", errorDetail(err))
 		return nil, err
 	}
-	return &dev, nil
+	return dev, nil
 }
 
 // DevicePassSet sets the device password to the one suggested by Arduino IoT Cloud.
@@ -135,7 +143,8 @@ func (cl *Client) DeviceDelete(ctx context.Context, id string) error {
 		return err
 	}
 
-	_, err = cl.api.DevicesV2Api.DevicesV2Delete(ctx, id, nil)
+	req := cl.api.DevicesV2Api.DevicesV2Delete(ctx, id)
+	_, err = cl.api.DevicesV2Api.DevicesV2DeleteExecute(req)
 	if err != nil {
 		err = fmt.Errorf("deleting device: %w", errorDetail(err))
 		return err
diff --git a/internal/template/dashboard.go b/internal/template/dashboard.go
@@ -76,10 +76,17 @@ func getVariableID(ctx context.Context, thingID string, variableName string, fet
 	}
 
 	for _, v := range thing.Properties {
-		if v.VariableName == variableName {
+		if v.VariableName == &variableName {
 			return v.Id, nil
 		}
 	}
 
 	return "", fmt.Errorf("thing with id %s doesn't have variable with name %s : %w", thingID, variableName, err)
 }
+
+func dereferenceString(s *string) string {
+	if s == nil {
+		return ""
+	}
+	return *s
+}
diff --git a/internal/template/extract.go b/internal/template/extract.go
@@ -67,7 +67,7 @@ func FromDashboard(dashboard *iotclient.ArduinoDashboardv2) map[string]interface
 		widget["x"] = w.X
 		widget["y"] = w.Y
 
-		if w.WidthMobile != 0 && w.HeightMobile != 0 {
+		if w.WidthMobile != nil && w.HeightMobile != nil && *w.WidthMobile != 0 && *w.HeightMobile != 0 {
 			widget["width_mobile"] = w.WidthMobile
 			widget["height_mobile"] = w.HeightMobile
 			widget["x_mobile"] = w.XMobile
diff --git a/internal/template/load_test.go b/internal/template/load_test.go

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,10 @@ func Create(ctx context.Context, params CreateParams, cred config.Credentials)`
`47`	`47`
`48`	`48`	`// Name passed as parameter has priority over name from template`
`49`	`49`	`if params.Name != nil {`
`50`		`- dashboard.Name = *params.Name`
	`50`	`+ dashboard.Name = params.Name`
`51`	`51`	`}`
`52`	`52`	`// If name is not specified in the template, it should be passed as parameter`
`53`		`- if dashboard.Name == "" {`
	`53`	`+ if dashboard.Name == nil \|\| *dashboard.Name == "" {`
`54`	`54`	`return nil, errors.New("dashboard name not specified")`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,9 @@ func CreateGeneric(ctx context.Context, params CreateGenericParams, cred confi`
`75`	`75`	`ID: dev.Id,`
`76`	`76`	`Board: dev.Type,`
`77`	`77`	`Serial: dev.Serial,`
`78`		`- FQBN: dev.Fqbn,`
	`78`	`+ FQBN: dereferenceString(dev.Fqbn),`
`79`	`79`	`},`
`80`		`- Password: pass.SuggestedPassword,`
	`80`	`+ Password: dereferenceString(pass.SuggestedPassword),`
`81`	`81`	`}`
`82`	`82`	`return devInfo, nil`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func getDeviceInfo(device iotclient.ArduinoDevicev2) (DeviceInfo, error) {`
`45`	`45`	`ID: device.Id,`
`46`	`46`	`Board: device.Type,`
`47`	`47`	`Serial: device.Serial,`
`48`		`- FQBN: device.Fqbn,`
	`48`	`+ FQBN: dereferenceString(device.Fqbn),`
`49`	`49`	`Tags: tags,`
`50`	`50`	`}`
`51`	`51`	`return dev, nil`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ func (p provision) configBoard(ctx context.Context) error {`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`logrus.Info("Sending certificate authority key")`
`188`		`- b, err = hex.DecodeString(cert.AuthorityKeyIdentifier)`
	`188`	`+ b, err = hex.DecodeString(dereferenceString(cert.AuthorityKeyIdentifier))`
`189`	`189`	`if err != nil {`
`190`	`190`	`return fmt.Errorf("decoding certificate authority key id: %w", err)`
`191`	`191`	`}`