factor out init step for instance creation in updatecommands

umbynos · umbynos · commit 4428a46d8581 · 2021-11-19T12:32:49.000+01:00
diff --git a/cli/core/update_index.go b/cli/core/update_index.go
@@ -43,24 +43,7 @@ func initUpdateIndexCommand() *cobra.Command {
 
 func runUpdateIndexCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino core update-index`")
-	// We don't initialize any CoreInstance when updating indexes since we don't need to.
-	// Also meaningless errors might be returned when calling this command with --additional-urls
-	// since the CLI would be searching for a corresponding file for the additional urls set
-	// as argument but none would be obviously found.
-	inst, status := instance.Create()
-	if status != nil {
-		feedback.Errorf(tr("Error creating instance: %v"), status)
-		os.Exit(errorcodes.ErrGeneric)
-	}
-
-	// In case this is the first time the CLI is run we need to update indexes
-	// to make it work correctly, we must do this explicitly in this command since
-	// we must use instance.Create instead of instance.CreateAndInit for the
-	// reason stated above.
-	if err := instance.FirstUpdate(inst); err != nil {
-		feedback.Errorf(tr("Error updating indexes: %v"), status)
-		os.Exit(errorcodes.ErrGeneric)
-	}
+	inst := instance.CreateInstanceAndRunFirstUpdate()
 
 	_, err := commands.UpdateIndex(context.Background(), &rpc.UpdateIndexRequest{
 		Instance: inst,
diff --git a/cli/instance/instance.go b/cli/instance/instance.go
@@ -140,3 +140,27 @@ func FirstUpdate(instance *rpc.Instance) error {
 
 	return nil
 }
+
+// CreateInstanceAndRunFirstUpdate creates an instance and runs `FirstUpdate`.
+// It is mandatory for all `update-index` commands to call this
+func CreateInstanceAndRunFirstUpdate() *rpc.Instance {
+	// We don't initialize any CoreInstance when updating indexes since we don't need to.
+	// Also meaningless errors might be returned when calling this command with --additional-urls
+	// since the CLI would be searching for a corresponding file for the additional urls set
+	// as argument but none would be obviously found.
+	inst, status := Create()
+	if status != nil {
+		feedback.Errorf(tr("Error creating instance: %v"), status)
+		os.Exit(errorcodes.ErrGeneric)
+	}
+
+	// In case this is the first time the CLI is run we need to update indexes
+	// to make it work correctly, we must do this explicitly in this command since
+	// we must use instance.Create instead of instance.CreateAndInit for the
+	// reason stated above.
+	if err := FirstUpdate(inst); err != nil {
+		feedback.Errorf(tr("Error updating indexes: %v"), status)
+		os.Exit(errorcodes.ErrGeneric)
+	}
+	return inst
+}
diff --git a/cli/lib/update_index.go b/cli/lib/update_index.go
@@ -25,43 +25,31 @@ import (
 	"github.com/arduino/arduino-cli/cli/output"
 	"github.com/arduino/arduino-cli/commands"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
 func initUpdateIndexCommand() *cobra.Command {
-	return &cobra.Command{
+	updateIndexCommand := &cobra.Command{
 		Use:     "update-index",
 		Short:   tr("Updates the libraries index."),
 		Long:    tr("Updates the libraries index to the latest version."),
 		Example: "  " + os.Args[0] + " lib update-index",
 		Args:    cobra.NoArgs,
-		Run: func(cmd *cobra.Command, args []string) {
-			// We don't initialize any CoreInstance when updating indexes since we don't need to.
-			// Also meaningless errors might be returned when calling this command with --additional-urls
-			// since the CLI would be searching for a corresponding file for the additional urls set
-			// as argument but none would be obviously found.
-			inst, status := instance.Create()
-			if status != nil {
-				feedback.Errorf(tr("Error creating instance: %v"), status)
-				os.Exit(errorcodes.ErrGeneric)
-			}
+		Run:     runUpdateIndexCommand,
+	}
+	return updateIndexCommand
+}
 
-			// In case this is the first time the CLI is run we need to update indexes
-			// to make it work correctly, we must do this explicitly in this command since
-			// we must use instance.Create instead of instance.CreateAndInit for the
-			// reason stated above.
-			if err := instance.FirstUpdate(inst); err != nil {
-				feedback.Errorf(tr("Error updating indexes: %v"), status)
-				os.Exit(errorcodes.ErrGeneric)
-			}
+func runUpdateIndexCommand(cmd *cobra.Command, args []string) {
+	logrus.Info("Executing `arduino lib update-index`")
+	inst := instance.CreateInstanceAndRunFirstUpdate()
 
-			err := commands.UpdateLibrariesIndex(context.Background(), &rpc.UpdateLibrariesIndexRequest{
-				Instance: inst,
-			}, output.ProgressBar())
-			if err != nil {
-				feedback.Errorf(tr("Error updating library index: %v"), err)
-				os.Exit(errorcodes.ErrGeneric)
-			}
-		},
+	err := commands.UpdateLibrariesIndex(context.Background(), &rpc.UpdateLibrariesIndexRequest{
+		Instance: inst,
+	}, output.ProgressBar())
+	if err != nil {
+		feedback.Errorf(tr("Error updating library index: %v"), err)
+		os.Exit(errorcodes.ErrGeneric)
 	}
 }
diff --git a/cli/update/update.go b/cli/update/update.go
@@ -53,24 +53,7 @@ var updateFlags struct {
 
 func runUpdateCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino update`")
-	// We don't initialize any CoreInstance when updating indexes since we don't need to.
-	// Also meaningless errors might be returned when calling this command with --additional-urls
-	// since the CLI would be searching for a corresponding file for the additional urls set
-	// as argument but none would be obviously found.
-	inst, status := instance.Create()
-	if status != nil {
-		feedback.Errorf(tr("Error creating instance: %v"), status)
-		os.Exit(errorcodes.ErrGeneric)
-	}
-
-	// In case this is the first time the CLI is run we need to update indexes
-	// to make it work correctly, we must do this explicitly in this command since
-	// we must use instance.Create instead of instance.CreateAndInit for the
-	// reason stated above.
-	if err := instance.FirstUpdate(inst); err != nil {
-		feedback.Errorf(tr("Error updating indexes: %v"), status)
-		os.Exit(errorcodes.ErrGeneric)
-	}
+	inst := instance.CreateInstanceAndRunFirstUpdate()
 
 	err := commands.UpdateCoreLibrariesIndex(context.Background(), &rpc.UpdateCoreLibrariesIndexRequest{
 		Instance: inst,
