From e0e54b11a1aa602b0c49526552b7a2e04a96b7f1 Mon Sep 17 00:00:00 2001 From: batphonghan Date: Wed, 1 Nov 2023 10:03:03 +0700 Subject: [PATCH] Refactor --- stader-cli/service/migration.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/stader-cli/service/migration.go b/stader-cli/service/migration.go index 11a898c87..e685cff86 100644 --- a/stader-cli/service/migration.go +++ b/stader-cli/service/migration.go @@ -22,8 +22,7 @@ type ConfigUpgrader struct { var guardian []byte func migrate(c *cli.Context) ([]ConfigUpgrader, []ConfigUpgrader, error) { - - v0, err := parseVersion("1.0.0") + v0, _ := parseVersion("1.0.0") // Create versions v130, err := parseVersion("1.3.0") @@ -85,7 +84,9 @@ func migrate(c *cli.Context) ([]ConfigUpgrader, []ConfigUpgrader, error) { // Find the index of the provided config's version var runBeforeUpgrades []ConfigUpgrader + var rundAfterUpgrades []ConfigUpgrader + var needInstall bool for _, upgrader := range upgraders { @@ -98,6 +99,7 @@ func migrate(c *cli.Context) ([]ConfigUpgrader, []ConfigUpgrader, error) { } else { runBeforeUpgrades = append(runBeforeUpgrades, upgrader) } + needInstall = needInstall || upgrader.needInstall } } @@ -138,8 +140,8 @@ func upgradeFuncV140(c *cli.Context) error { if err != nil { return fmt.Errorf("error NewClientFromCtx: %w", err) } - err = staderClient.UpdateGuardianConfiguration(guardian) + err = staderClient.UpdateGuardianConfiguration(guardian) if err != nil { return fmt.Errorf("error NewClientFromCtx: %w", err) } @@ -163,7 +165,10 @@ func install(c *cli.Context) error { return fmt.Errorf("error LoadConfig: %w", err) } - dataPath := cfg.StaderNode.DataPath.Value.(string) + dataPath, ok := cfg.StaderNode.DataPath.Value.(string) + if !ok { + return fmt.Errorf("error path: %s", cfg.StaderNode.DataPath.Value) + } dataPath, err = homedir.Expand(dataPath) if err != nil {