Fixed command run

Author: rjtokenring

cli/cli.go

@@ -29,6 +29,7 @@ import (
 	"github.com/arduino/arduino-cloud-cli/cli/dashboard"
 	"github.com/arduino/arduino-cloud-cli/cli/device"
 	"github.com/arduino/arduino-cloud-cli/cli/ota"
+	"github.com/arduino/arduino-cloud-cli/cli/template"
 	"github.com/arduino/arduino-cloud-cli/cli/thing"
 	"github.com/arduino/arduino-cloud-cli/cli/version"
 	"github.com/sirupsen/logrus"
@@ -65,6 +66,7 @@ func Execute() {
 	cli.AddCommand(thing.NewCommand())
 	cli.AddCommand(dashboard.NewCommand())
 	cli.AddCommand(ota.NewCommand())
+	cli.AddCommand(template.NewCommand())
 
 	if err := cli.Execute(); err != nil {
 		fmt.Fprintln(os.Stderr, err)

cli/template/export.go

@@ -46,7 +46,9 @@ func initTemplateExportCommand() *cobra.Command {
 		},
 	}
 
-	uploadCommand.Flags().StringVarP(&flags.templateId, "id", "t", "", "Template file id")
+	uploadCommand.Flags().StringVarP(&flags.templateId, "template-id", "t", "", "Template file id")
+
+	uploadCommand.MarkFlagRequired("template-id")
 
 	return uploadCommand
 }

cli/template/import.go

@@ -34,7 +34,7 @@ type importFlags struct {
 
 func initTemplateImportCommand() *cobra.Command {
 	flags := &importFlags{}
-	uploadCommand := &cobra.Command{
+	downloadCommand := &cobra.Command{
 		Use:   "import",
 		Short: "Import template",
 		Long:  "Import a template from a file",
@@ -46,9 +46,11 @@ func initTemplateImportCommand() *cobra.Command {
 		},
 	}
 
-	uploadCommand.Flags().StringVarP(&flags.templateFile, "file", "f", "", "Template file to import")
+	downloadCommand.Flags().StringVarP(&flags.templateFile, "file", "f", "", "Template file to import")
 
-	return uploadCommand
+	downloadCommand.MarkFlagRequired("file")
+
+	return downloadCommand
 }
 
 func runTemplateImportCommand(flags *importFlags) error {

cli/template/template.go

@@ -29,6 +29,7 @@ func NewCommand() *cobra.Command {
 	}
 
 	templateCommand.AddCommand(initTemplateImportCommand())
+	templateCommand.AddCommand(initTemplateExportCommand())
 
 	return templateCommand
 }

internal/storage-api/client.go

@@ -42,9 +42,18 @@ type StorageApiClient struct {
 	organization string
 }
 
+func getArduinoAPIBaseURL() string {
+	baseURL := "https://api-media.arduino.cc"
+	if url := os.Getenv("IOT_API_MEDIA_URL"); url != "" {
+		baseURL = url
+	}
+	return baseURL
+}
+
 func NewClient(credentials *config.Credentials) *StorageApiClient {
-	host := iot.GetArduinoAPIBaseURL()
-	tokenSource := iot.NewUserTokenSource(credentials.Client, credentials.Secret, host)
+	host := getArduinoAPIBaseURL()
+	iothost := iot.GetArduinoAPIBaseURL()
+	tokenSource := iot.NewUserTokenSource(credentials.Client, credentials.Secret, iothost)
 	return &StorageApiClient{
 		client:       &http.Client{},
 		src:          tokenSource,