Better logs

Author: rjtokenring

cli/template/apply.go

@@ -54,7 +54,7 @@ func initTemplateApplyCommand() *cobra.Command {
 	applyCommand.Flags().StringVarP(&flags.templateId, "template-id", "t", "", "Template ID")
 	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 used to configure device (e.g. WiFi credentials). Supported values: SECRET_SSID | SECRET_OPTIONAL_PASS | SECRET_DEVICE_KEY")
+	applyCommand.Flags().StringVarP(&flags.netCredentials, "network-credentials", "n", "", "Comma separated network credentials used to configure device with format <key>=<value>. Supported values: SECRET_SSID | SECRET_OPTIONAL_PASS | SECRET_DEVICE_KEY")
 
 	applyCommand.MarkFlagRequired("template-id")
 	applyCommand.MarkFlagRequired("prefix")

cli/template/export.go

@@ -41,7 +41,7 @@ func initTemplateExportCommand() *cobra.Command {
 		Long:  "Export template to a file",
 		Run: func(cmd *cobra.Command, args []string) {
 			if err := runTemplateExportCommand(flags); err != nil {
-				feedback.Errorf("Error during template export status: %v", err)
+				feedback.Errorf("Error during template export: %v", err)
 				os.Exit(errorcodes.ErrGeneric)
 			}
 		},

cli/template/import.go

@@ -40,7 +40,7 @@ func initTemplateImportCommand() *cobra.Command {
 		Long:  "Import a template from a file",
 		Run: func(cmd *cobra.Command, args []string) {
 			if err := runTemplateImportCommand(flags); err != nil {
-				feedback.Errorf("Error during template status: %v", err)
+				feedback.Errorf("Error during template import: %v", err)
 				os.Exit(errorcodes.ErrGeneric)
 			}
 		},

cli/template/template.go

@@ -24,7 +24,7 @@ import (
 func NewCommand() *cobra.Command {
 	templateCommand := &cobra.Command{
 		Use:   "template",
-		Short: "Custom templates",
+		Short: "Custom templates.",
 		Long:  "Commands to manage custom templates lifecycle, like import, export and apply.",
 	}
 

internal/storage-api/client.go

@@ -148,6 +148,9 @@ func (c *StorageApiClient) ImportCustomTemplate(templateFile string) (*ImportCus
 	if templateFile == "" {
 		return nil, fmt.Errorf("invalid template: no file provided")
 	}
+	if !strings.HasSuffix(templateFile, TemplateFileExtension) {
+		return nil, fmt.Errorf("invalid template: file must have extension %s", TemplateFileExtension)
+	}
 
 	userRequestToken, err := c.src.Token()
 	if err != nil {