Adde template call

Author: rjtokenring

cli/template/apply.go

@@ -68,17 +68,26 @@ func runTemplateApplyCommand(flags *applyFlags) error {
 		return fmt.Errorf("retrieving credentials: %w", err)
 	}
 
-	deviceNetCredentials := make(map[string]string)
-	if flags.netCredentials != "" {
-		configNetArray := strings.Split(strings.Trim(flags.netCredentials, " "), ",")
-		for _, netConfig := range configNetArray {
-			netConfigArray := strings.Split(netConfig, "=")
-			if len(netConfigArray) != 2 {
-				return fmt.Errorf("invalid network configuration: %s", netConfig)
-			}
-			deviceNetCredentials[netConfigArray[0]] = netConfigArray[1]
-		}
+	deviceNetCredentials, err := parseCredentials(flags.netCredentials)
+	if err != nil {
+		return fmt.Errorf("parsing network credentials: %w", err)
 	}
-
+	
 	return template.ApplyCustomTemplates(cred, flags.templateId, flags.deviceId, flags.templatePrefix, deviceNetCredentials)
 }
+
+func parseCredentials(credentials string) (map[string]string, error) {
+	credentialsMap := make(map[string]string)
+	if credentials == "" {
+		return credentialsMap, nil
+	}
+	credentialsArray := strings.Split(credentials, ",")
+	for _, credential := range credentialsArray {
+		credentialArray := strings.Split(credential, "=")
+		if len(credentialArray) != 2 {
+			return nil, fmt.Errorf("invalid network credential: %s", credential)
+		}
+		credentialsMap[credentialArray[0]] = credentialArray[1]
+	}
+	return credentialsMap, nil
+}

command/template/apply.go

@@ -57,17 +57,22 @@ func ApplyCustomTemplates(cred *config.Credentials, templateId, deviceId, prefix
 	if len(cstTemplate.ThingTemplates) <= 0 {
 		return fmt.Errorf("template %s has no thing template", templateId)
 	}
-	mainThing := cstTemplate.ThingTemplates[0]
-	logrus.Debug("Main thing template - id: ", mainThing.Id)
+	thingTemplateIdentifier := cstTemplate.ThingTemplates[0]
+	logrus.Debug("Main thing template - id: ", thingTemplateIdentifier.Id)
 
 	// Get device and check its connectivity
 	secrets, err := resolveDeviceNetworkConfigurations(ctx, iotClient, deviceId, networkCredentials)
 	if err != nil {
 		return err
 	}
-	for key, value := range secrets {
-		logrus.Info(fmt.Sprintf("Secret %s: %s", key, value))
+
+	// Apply the template
+	_, err = iotClient.TemplateApply(ctx, templateId, thingTemplateIdentifier.Id, prefix, deviceId, secrets)
+	if err != nil {
+		return err
 	}
+	feedback.Printf("Template applied successfully to device %s", deviceId)
+
 	return nil
 }
 

internal/iot/client.go

@@ -534,18 +534,22 @@ func (cl *Client) DashboardDelete(ctx context.Context, id string) error {
 }
 
 // TemplateApply apply a given template, creating associated resources like things and dashboards.
-func (cl *Client) TemplateApply(ctx context.Context, id, thingId, prefix string, credentials map[string]string) (*iotclient.ArduinoTemplate, error) {
+func (cl *Client) TemplateApply(ctx context.Context, id, thingId, prefix, deviceId string, credentials map[string]string) (*iotclient.ArduinoTemplate, error) {
 	ctx, err := ctxWithToken(ctx, cl.token)
 	if err != nil {
 		return nil, err
 	}
 
+	thingOption := make(map[string]any)
+	thingOption["device_id"] = deviceId
+	thingOption["secrets"] = credentials
+
 	req := cl.api.TemplatesApi.TemplatesApply(ctx)
 	req = req.Template(iotclient.Template{
 		PrefixName:       toStringPointer(prefix),
 		CustomTemplateId: toStringPointer(id),
 		ThingsOptions: map[string]interface{}{
-			thingId: credentials,
+			thingId: thingOption,
 		},
 	})
 	dev, _, err := cl.api.TemplatesApi.TemplatesApplyExecute(req)