refactor RunE

Author: lantoli

internal/cli/adv2new/adv2new.go

@@ -18,12 +18,7 @@ func Builder() *cobra.Command {
 		Long: "Convert a Terraform configuration from mongodbatlas_advanced_cluster in provider version 1.X.X (SDKv2)" +
 			" to version 2.X.X (TPF - Terraform Plugin Framework)",
 		Aliases: []string{"adv2new"},
-		RunE: func(_ *cobra.Command, _ []string) error {
-			if err := o.PreRun(); err != nil {
-				return err
-			}
-			return o.Run()
-		},
+		RunE:    o.RunE,
 	}
 	cli.SetupCommonFlags(cmd, o)
 	return cmd

internal/cli/clu2adv/clu2adv.go

@@ -26,12 +26,7 @@ func Builder() *cobra.Command {
 		Long: "Convert a Terraform configuration from mongodbatlas_cluster to " +
 			"mongodbatlas_advanced_cluster preview provider 2.0.0",
 		Aliases: []string{"clu2adv"},
-		RunE: func(_ *cobra.Command, _ []string) error {
-			if err := o.PreRun(); err != nil {
-				return err
-			}
-			return o.Run()
-		},
+		RunE:    o.RunE,
 	}
 	cli.SetupCommonFlags(cmd, o.BaseOpts)
 	cmd.Flags().BoolVarP(&o.includeMoved, flag.IncludeMoved, flag.IncludeMovedShort, false,

internal/cli/common.go

@@ -23,8 +23,16 @@ type BaseOpts struct {
 	Watch         bool
 }
 
-// PreRun validates the input and output files before running the command.
-func (o *BaseOpts) PreRun() error {
+// RunE is the entry point for the command.
+func (o *BaseOpts) RunE(cmd *cobra.Command, args []string) error {
+	if err := o.preRun(); err != nil {
+		return err
+	}
+	return o.run()
+}
+
+// preRun validates the input and output files before running the command.
+func (o *BaseOpts) preRun() error {
 	if err := file.MustExist(o.Fs, o.File); err != nil {
 		return err
 	}
@@ -34,8 +42,8 @@ func (o *BaseOpts) PreRun() error {
 	return nil
 }
 
-// Run executes the conversion and optionally watches for file changes.
-func (o *BaseOpts) Run() error {
+// run executes the conversion and optionally watches for file changes.
+func (o *BaseOpts) run() error {
 	if err := o.generateFile(false); err != nil {
 		return err
 	}