switch to using csv file

Author: psiphi5

tools/cosmovisor/cmd/cosmovisor/batch_upgrade.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/csv"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -11,7 +12,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"cosmossdk.io/tools/cosmovisor"
-	upgradetypes "cosmossdk.io/x/upgrade/types"
 )
 
 func NewBatchAddUpgradeCmd() *cobra.Command {
@@ -21,8 +21,8 @@ func NewBatchAddUpgradeCmd() *cobra.Command {
 		Long: `This command allows you to specify multiple upgrades at once at specific heights, copying or creating a batch upgrade file that's actively watched during 'cosmovisor run'.
 You can provide upgrades in two ways:
 
-1. Using --upgrade-file: Specify a path to a batch upgrade file ie. a JSON array of upgrade-info objects.
-   The file is validated before it's copied over to the upgrade directory.
+1. Using --upgrade-file: Specify a path to a headerless CSV batch upgrade file in the format:
+   upgrade-name,path-to-exec,upgrade-height
 
 2. Using --upgrade-list: Provide a comma-separated list of upgrades.
    Each upgrade is defined by three colon-separated values:
@@ -55,35 +55,31 @@ func addBatchUpgrade(cmd *cobra.Command, args []string) error {
 	}
 	upgradeFile, err := cmd.Flags().GetString("upgrade-file")
 	if err == nil && upgradeFile != "" {
-		info, err := os.Stat(upgradeFile)
-		if err != nil {
-			return fmt.Errorf("error getting reading upgrade file %s: %w", upgradeFile, err)
-		}
-		if info.IsDir() {
-			return fmt.Errorf("upgrade file %s is a directory", upgradeFile)
-		}
 		return processUpgradeFile(cfg, upgradeFile)
 	}
 	upgradeList, err := cmd.Flags().GetStringSlice("upgrade-list")
 	if err != nil || len(upgradeList) == 0 {
 		return fmt.Errorf("either --upgrade-file or --upgrade-list must be provided")
 	}
-	return processUpgradeList(cfg, upgradeList)
+	var splitUpgrades [][]string
+	for _, upgrade := range upgradeList {
+		splitUpgrades = append(splitUpgrades, strings.Split(upgrade, ":"))
+	}
+	return processUpgradeList(cfg, splitUpgrades)
 }
 
 // processUpgradeList takes in a list of upgrades and creates a batch upgrade file
-func processUpgradeList(cfg *cosmovisor.Config, upgradeList []string) error {
+func processUpgradeList(cfg *cosmovisor.Config, upgradeList [][]string) error {
 	upgradeInfoPaths := []string{}
-	for i, as := range upgradeList {
-		a := strings.Split(as, ":")
-		if len(a) != 3 {
-			return fmt.Errorf("argument at position %d (%s) is invalid", i, as)
+	for i, upgrade := range upgradeList {
+		if len(upgrade) != 3 {
+			return fmt.Errorf("argument at position %d (%s) is invalid", i, upgrade)
 		}
-		upgradeName := filepath.Base(a[0])
-		upgradePath := a[1]
-		upgradeHeight, err := strconv.ParseInt(a[2], 10, 64)
+		upgradeName := filepath.Base(upgrade[0])
+		upgradePath := upgrade[1]
+		upgradeHeight, err := strconv.ParseInt(upgrade[2], 10, 64)
 		if err != nil {
-			return fmt.Errorf("upgrade height at position %d (%s) is invalid", i, a[2])
+			return fmt.Errorf("upgrade height at position %d (%s) is invalid", i, upgrade[2])
 		}
 		upgradeInfoPath := cfg.UpgradeInfoFilePath() + "." + upgradeName
 		upgradeInfoPaths = append(upgradeInfoPaths, upgradeInfoPath)
@@ -124,15 +120,23 @@ func processUpgradeList(cfg *cosmovisor.Config, upgradeList []string) error {
 	return nil
 }
 
-// processUpgradeFile takes in a batch upgrade file, validates it and copies it to the upgrade directory
+// processUpgradeFile takes in a CSV batch upgrade file, parses it and calls processUpgradeList
 func processUpgradeFile(cfg *cosmovisor.Config, upgradeFile string) error {
-	b, err := os.ReadFile(upgradeFile)
+	file, err := os.Open(upgradeFile)
 	if err != nil {
-		return fmt.Errorf("error reading upgrade file %s: %w", upgradeFile, err)
+		return fmt.Errorf("error opening upgrade CSV file %s: %w", upgradeFile, err)
 	}
-	var batch []upgradetypes.Plan
-	if err := json.Unmarshal(b, &batch); err != nil {
-		return fmt.Errorf("error unmarshalling upgrade file %s: %w", upgradeFile, err)
+	defer file.Close()
+
+	r := csv.NewReader(file)
+	r.FieldsPerRecord = 3
+	r.TrimLeadingSpace = true
+	records, err := r.ReadAll()
+	if err != nil {
+		return fmt.Errorf("error parsing upgrade CSV file %s: %w", upgradeFile, err)
+	}
+	if err := processUpgradeList(cfg, records); err != nil {
+		return err
 	}
-	return copyFile(upgradeFile, cfg.UpgradeInfoBatchFilePath())
+	return nil
 }