Merge pull request #104 from renproject/release/3.1.3

tok-kkk · web-flow · commit 8ca5a4ae4ebe · 2022-02-10T15:53:23.000+11:00
Release 3.1.3
diff --git a/cmd/provider/provider.go b/cmd/provider/provider.go
@@ -152,7 +152,7 @@ func initNode(ctx *cli.Context) error {
 	var conf darknode.Config
 	if configFile != "" {
 		var err error
-		conf, err = darknode.NewConfigFromJSONFile(path)
+		conf, err = darknode.NewConfigFromJSONFile(configFile)
 		if err != nil {
 			return errors.New("invalid config file")
 		}
diff --git a/util/node.go b/util/node.go
@@ -90,10 +90,11 @@ func IP(name string) (string, error) {
 
 	cmd := fmt.Sprintf("cd %v && terraform output ip", NodePath(name))
 	ip, err := CommandOutput(cmd)
+	ip = strings.TrimSpace(ip)
 	if strings.HasPrefix(ip, "\"") {
 		ip = strings.Trim(ip, "\"")
 	}
-	return strings.TrimSpace(ip), err
+	return ip, err
 }
 
 // Version gets the version of the software the darknode currently is running.

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ func initNode(ctx *cli.Context) error {`
`152`	`152`	`var conf darknode.Config`
`153`	`153`	`if configFile != "" {`
`154`	`154`	`var err error`
`155`		`- conf, err = darknode.NewConfigFromJSONFile(path)`
	`155`	`+ conf, err = darknode.NewConfigFromJSONFile(configFile)`
`156`	`156`	`if err != nil {`
`157`	`157`	`return errors.New("invalid config file")`
`158`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,10 +90,11 @@ func IP(name string) (string, error) {`
`90`	`90`
`91`	`91`	`cmd := fmt.Sprintf("cd %v && terraform output ip", NodePath(name))`
`92`	`92`	`ip, err := CommandOutput(cmd)`
	`93`	`+ ip = strings.TrimSpace(ip)`
`93`	`94`	`if strings.HasPrefix(ip, "\"") {`
`94`	`95`	`ip = strings.Trim(ip, "\"")`
`95`	`96`	`}`
`96`		`- return strings.TrimSpace(ip), err`
	`97`	`+ return ip, err`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`// Version gets the version of the software the darknode currently is running.`