Correct syncCmd.version, sync.Version.

stephenwithav · stephenwithav · commit 54cecb24a578 · 2020-07-01T20:19:08.000-04:00
Passing `s.ReadLine` to `strings.Split` was a mistake since it returns
three values.

Having access to `wsep` helped the compiler find the bugs.
diff --git a/cmd/coder/sync.go b/cmd/coder/sync.go
@@ -55,7 +55,12 @@ func (s *syncCmd) version() string {
 		log.Fatal(err)
 	}
 
-	versionString := strings.Split(r.ReadLine(), "protocol version ")
+	firstLine, err := r.ReadString('\n')
+	if err != nil {
+		return ""
+	}
+
+	versionString := strings.Split(firstLine, "protocol version ")
 
 	return versionString[1]
 }
@@ -103,8 +108,8 @@ func (cmd *syncCmd) Run(fl *pflag.FlagSet) {
 		Client:    entClient,
 	}
 
-	localVersion := s.version()
-	remoteVersion, rsyncErr := sync.Version()
+	localVersion := cmd.version()
+	remoteVersion, rsyncErr := s.Version()
 
 	if rsyncErr != nil {
 		flog.Info("Unable to determine remote rsync version.  Proceeding cautiously.")
diff --git a/internal/sync/sync.go b/internal/sync/sync.go
@@ -287,13 +287,18 @@ func (s Sync) Version() (string, error) {
 
 	err = process.Wait()
 	if code, ok := err.(wsep.ExitError); ok {
-		return "", err
+		return "", fmt.Errorf("Version heck exit status: %v", code)
+	}
+	if err != nil {
+		return "", fmt.Errorf("Server version mismatch")
 	}
+
+	firstLine, err := r.ReadString('\n')
 	if err != nil {
 		return "", err
 	}
 
-	versionString := strings.Split(r.ReadLine(), "protocol version ")
+	versionString := strings.Split(firstLine, "protocol version ")
 
 	return versionString[1], nil
 }

Original file line number	Diff line number	Diff line change
`@@ -287,13 +287,18 @@ func (s Sync) Version() (string, error) {`
`287`	`287`
`288`	`288`	`err = process.Wait()`
`289`	`289`	`if code, ok := err.(wsep.ExitError); ok {`
`290`		`- return "", err`
	`290`	`+ return "", fmt.Errorf("Version heck exit status: %v", code)`
	`291`	`+ }`
	`292`	`+ if err != nil {`
	`293`	`+ return "", fmt.Errorf("Server version mismatch")`
`291`	`294`	`}`
	`295`	`+`
	`296`	`+ firstLine, err := r.ReadString('\n')`
`292`	`297`	`if err != nil {`
`293`	`298`	`return "", err`
`294`	`299`	`}`
`295`	`300`
`296`		`- versionString := strings.Split(r.ReadLine(), "protocol version ")`
	`301`	`+ versionString := strings.Split(firstLine, "protocol version ")`
`297`	`302`
`298`	`303`	`return versionString[1], nil`
`299`	`304`	`}`