Added ota apply

Author: rjtokenring

TT/resources/binaries/0934dd1b-066a-470d-b4df-c05c0a82547e.bin

@@ -0,0 +1,70 @@
+#include <ArduinoIoTCloud.h>
+
+#include "thingProperties.h"
+
+void setup() {
+  // Initialize serial and wait for port to open:
+  Serial.begin(9600);
+  // This delay gives the chance to wait for a Serial Monitor without blocking if none is found
+  delay(1500); 
+
+  // Defined in thingProperties.h
+  initProperties();
+
+  // Connect to Arduino IoT Cloud
+  ArduinoCloud.begin(ArduinoIoTPreferredConnection, false, "mqtts-sa.iot.oniudra.cc");
+
+  setDebugMessageLevel(4);
+  ArduinoCloud.printDebugInfo();
+}
+
+unsigned long previousMillis = 0;
+const long interval = 5000; //ms
+bool increase = true;
+
+// the loop function runs over and over again forever
+void loop() {
+  ArduinoCloud.update();
+  
+  unsigned long currentMillis = millis();
+  if (currentMillis - previousMillis >= interval) {
+    previousMillis = currentMillis;
+    increase = !increase;
+
+    if(pressure < 2){
+      pressure = 8;
+    }
+    if(temperature < 2){
+      temperature = 25;
+    }
+
+    int randNumber = random(10.0, 70.0);
+    if(!increase){
+      randNumber = -randNumber;
+    }
+    float diff = (float)randNumber / 100.0;
+
+    pressure = pressure + diff;
+    temperature = temperature + diff;
+
+    Serial.println(AIOT_CONFIG_LIB_VERSION);
+    Serial.println("2.1");
+  }
+  
+}
+
+/*
+  Since Temperature is READ_WRITE variable, onTemperatureChange() is
+  executed every time a new value is received from IoT Cloud.
+*/
+void onTemperatureChange()  {
+  // Add your code here to act upon Temperature change
+}
+
+/*
+  Since Pressure is READ_WRITE variable, onPressureChange() is
+  executed every time a new value is received from IoT Cloud.
+*/
+void onPressureChange()  {
+  // Add your code here to act upon Pressure change
+}

TT/resources/sketches/ToSiteWise 3/ToSiteWise_3_may08a.ino

@@ -0,0 +1,18 @@
+{
+  "cpu": {
+    "fqbn": "arduino:mbed_nano:nanorp2040connect",
+    "name": "",
+    "type": "serial"
+  },
+  "secrets": [
+    {
+      "name": "SECRET_SSID",
+      "value": ""
+    },
+    {
+      "name": "SECRET_OPTIONAL_PASS",
+      "value": ""
+    }
+  ],
+  "included_libs": []
+}

TT/resources/sketches/ToSiteWise 3/sketch.json

@@ -0,0 +1,23 @@
+// Code generated by Arduino IoT Cloud, DO NOT EDIT.
+
+#include <ArduinoIoTCloud.h>
+#include <Arduino_ConnectionHandler.h>
+
+const char SSID[]     = SECRET_SSID;    // Network SSID (name)
+const char PASS[]     = SECRET_OPTIONAL_PASS;    // Network password (use for WPA, or use as key for WEP)
+
+void onPressureChange();
+void onTemperatureChange();
+
+float pressure;
+CloudTemperature temperature;
+
+void initProperties(){
+
+  ArduinoCloud.addProperty(pressure, READWRITE, 30 * SECONDS, onPressureChange);
+  ArduinoCloud.addProperty(temperature, READWRITE, 30 * SECONDS, onTemperatureChange);
+
+}
+
+WiFiConnectionHandler ArduinoIoTPreferredConnection(SSID, PASS);
+

TT/resources/sketches/ToSiteWise 3/thingProperties.h

@@ -0,0 +1,23 @@
+id: tositewise-3-2547e
+name: ToSiteWise 3
+sketch_template: ToSiteWise 3
+sketch_name: ToSiteWise_3_may08a
+timezone: ""
+tags:
+    - key: integration
+      value: sitewise
+variables:
+    - id: pressure
+      name: pressure
+      type: FLOAT
+      permission: READ_WRITE
+      update_parameter: 30
+      update_strategy: TIMED
+      variable_name: pressure
+    - id: temperature
+      name: temperature
+      type: TEMPERATURE
+      permission: READ_WRITE
+      update_parameter: 30
+      update_strategy: TIMED
+      variable_name: temperature

TT/resources/thing_1.yaml

@@ -0,0 +1 @@
+{"title":"OK - RP with binaries","name":"OK - RP with binaries","description":"\u003cp\u003eBIN CONTENT INCLUDED\u003c/p\u003e","template":{"things":["thing_1.yaml"],"dashboards":null,"triggers":null},"resources":{"things":1,"dashboards":0,"triggers":0,"max_variables":2},"compatible_boards":[{"fqbn":"arduino:mbed_nano:nanorp2040connect"}],"images":[],"assets":{"thing_template_names":["ToSiteWise 3"],"dashboard_template_names":[],"trigger_template_names":[]},"source_template_id":"af076825-c0d2-4a27-a1cd-042df3604bae"}

TT/template.json

@@ -34,6 +34,7 @@ type applyFlags struct {
 	templatePrefix string
 	deviceId       string
 	netCredentials string
+	applyOta       bool
 }
 
 func initTemplateApplyCommand() *cobra.Command {
@@ -54,6 +55,7 @@ func initTemplateApplyCommand() *cobra.Command {
 	applyCommand.Flags().StringVarP(&flags.templatePrefix, "prefix", "p", "", "Prefix to apply to the name of created resources")
 	applyCommand.Flags().StringVarP(&flags.deviceId, "device-id", "d", "", "Device ID")
 	applyCommand.Flags().StringVarP(&flags.netCredentials, "network-credentials", "n", "", "Network credentials")
+	applyCommand.Flags().BoolVarP(&flags.applyOta, "apply-ota", "o", false, "start ota with binary contained into template")
 
 	applyCommand.MarkFlagRequired("template-id")
 	applyCommand.MarkFlagRequired("prefix")
@@ -72,8 +74,8 @@ func runTemplateApplyCommand(flags *applyFlags) error {
 	if err != nil {
 		return fmt.Errorf("parsing network credentials: %w", err)
 	}
-	
-	return template.ApplyCustomTemplates(cred, flags.templateId, flags.deviceId, flags.templatePrefix, deviceNetCredentials)
+
+	return template.ApplyCustomTemplates(cred, flags.templateId, flags.deviceId, flags.templatePrefix, deviceNetCredentials, flags.applyOta)
 }
 
 func parseCredentials(credentials string) (map[string]string, error) {

TT/template_ok-rp-with-binaries.tino

@@ -18,11 +18,16 @@
 package template
 
 import (
+	"archive/zip"
 	"context"
+	"errors"
 	"fmt"
+	"io"
+	"os"
 	"strings"
 
 	"github.com/arduino/arduino-cli/cli/feedback"
+	"github.com/arduino/arduino-cloud-cli/command/ota"
 	"github.com/arduino/arduino-cloud-cli/config"
 	"github.com/arduino/arduino-cloud-cli/internal/iot"
 	storageapi "github.com/arduino/arduino-cloud-cli/internal/storage-api"
@@ -31,7 +36,9 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func ApplyCustomTemplates(cred *config.Credentials, templateId, deviceId, prefix string, networkCredentials map[string]string) error {
+var errNoBinaryFound = errors.New("no binary found in the template")
+
+func ApplyCustomTemplates(cred *config.Credentials, templateId, deviceId, prefix string, networkCredentials map[string]string, applyOta bool) error {
 
 	ctx := context.Background()
 
@@ -73,6 +80,17 @@ func ApplyCustomTemplates(cred *config.Credentials, templateId, deviceId, prefix
 	}
 	feedback.Printf("Template applied successfully to device %s", deviceId)
 
+	if applyOta {
+		// Now, start OTA with binary available in the template
+		done, err := runOTAForTemplate(ctx, cred, templateId, deviceId, apiclient)
+		if err != nil {
+			return err
+		}
+		if done {
+			feedback.Printf("OTA started successfully on device %s", deviceId)
+		}
+	}
+
 	return nil
 }
 
@@ -87,6 +105,11 @@ func resolveDeviceNetworkConfigurations(ctx context.Context, cl *iot.Client, dev
 	}
 	logrus.Infof("Device %s - type: %s - connection-type: %s", deviceId, device.Type, *device.ConnectionType)
 
+	// Check if device is linked to a thing. In such case, block the operation.
+	if device.Thing != nil && device.Thing.Id != "" {
+		return nil, fmt.Errorf("device %s is already linked to a thing (thing_id: %s)", deviceId, device.Thing.Id)
+	}
+
 	credentials, err := cl.DeviceNetworkCredentials(ctx, device.Type, *device.ConnectionType)
 	if err != nil {
 		return nil, err
@@ -123,3 +146,92 @@ func humanReadableCredentials(cred []iotclient.ArduinoCredentialsv1) string {
 	}
 	return buf.String()
 }
+
+func runOTAForTemplate(ctx context.Context, cred *config.Credentials, templateId, deviceId string, apiclient *storageapi.StorageApiClient) (bool, error) {
+	otaTempDir, err := os.MkdirTemp("cli-template-ota", "")
+	if err != nil {
+		return false, fmt.Errorf("%s: %w", "cannot create temporary folder", err)
+	}
+	defer func() {
+		err := os.RemoveAll(otaTempDir)
+		if err != nil {
+			logrus.Warnf("Failed to remove temp directory: %v", err)
+		}
+	}()
+
+	filecreaed, err := apiclient.ExportCustomTemplate(templateId, otaTempDir)
+	if err != nil {
+		return false, err
+	}
+
+	// open the file and be ready to send it to the device
+	otaFile, err := extractBinary(filecreaed, otaTempDir)
+	if err != nil {
+		return false, err
+	}
+	if otaFile == "" {
+		feedback.Printf("No binary OTA file found in the template")
+		return false, nil
+	}
+
+	// Upload the OTA file to the device
+	err = ota.Upload(ctx, &ota.UploadParams{
+		DeviceID: deviceId,
+		File:     otaFile,
+	}, cred)
+	if err != nil {
+		return false, err
+	}
+
+	return true, nil
+}
+
+func extractBinary(filepath *string, tempDir string) (string, error) {
+	zipFile, err := os.Open(*filepath)
+	if err != nil {
+		return "", err
+	}
+	defer zipFile.Close()
+
+	fileInfo, err := zipFile.Stat()
+	if err != nil {
+		return "", fmt.Errorf("failed to get file info: %w", err)
+	}
+
+	zipReader, err := zip.NewReader(zipFile, fileInfo.Size())
+	if err != nil {
+		return "", fmt.Errorf("failed to open archive reader: %w", err)
+	}
+
+	var binaryFile *zip.File
+	for _, file := range zipReader.File {
+		if strings.Contains(file.Name, "resources/binaries") {
+			logrus.Debugf("binary OTA file from template: %s", file.Name)
+			binaryFile = file
+			break
+		}
+	}
+
+	if binaryFile != nil {
+		// Extract content to a temporary file
+		tempFile, err := os.CreateTemp(tempDir, "tmpl_bin_*.bin")
+		if err != nil {
+			return "", fmt.Errorf("failed to create temporary file: %w", err)
+		}
+		defer tempFile.Close()
+		inputF, err := binaryFile.Open()
+		if err != nil {
+			return "", fmt.Errorf("failed to open file in archive: %w", err)
+		}
+		defer inputF.Close()
+
+		_, err = io.Copy(tempFile, inputF)
+		if err != nil {
+			return "", fmt.Errorf("failed to copy file content: %w", err)
+		}
+
+		return tempFile.Name(), nil
+	}
+
+	return "", errNoBinaryFound
+}

cli/template/apply.go

@@ -0,0 +1,15 @@
+package template
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTemplateLIsting(t *testing.T) {
+	tmpDir := t.TempDir()
+	path := ".testdata/template_ok-rp-with-binaries.tino"
+	file, err := extractBinary(&path, tmpDir)
+	assert.Nil(t, err)
+	assert.NotNil(t, file)
+}