Merge pull request #102 from yangchenyun/bug/trim

tok-kkk · web-flow · commit 56c4c7f9ba1c · 2022-02-07T16:46:45.000+11:00
Trim space before trim '"' in terraform output.
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
`@@ -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.`