Merge pull request #262 from MichaelMure/bridge

Michael Muré created 6 years ago

bridge: trim inputs during bridge configuration

Change summary

bridge/github/config.go      | 14 +++++++-------
bridge/gitlab/config.go      | 10 +++++-----
commands/bridge_configure.go |  4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)

Detailed changes

bridge/github/config.go

@@ -101,7 +101,7 @@ func (g *Github) Configure(repo repository.RepoCommon, params core.BridgeParams)
 		if err != nil {
 			return nil, fmt.Errorf("reading from stdin: %v", err)
 		}
-		token = strings.TrimSuffix(token, "\n")
+		token = strings.TrimSpace(token)
 	} else if params.TokenId != "" {
 		tokenId = entity.Id(params.TokenId)
 	} else {
@@ -268,7 +268,7 @@ func promptTokenOptions(repo repository.RepoCommon, owner, project string) (*cor
 			return nil, err
 		}
 
-		line = strings.TrimRight(line, "\n")
+		line = strings.TrimSpace(line)
 
 		index, err := strconv.Atoi(line)
 		if err != nil || index < 1 || index > len(tokens)+2 {
@@ -320,7 +320,7 @@ func promptToken() (string, error) {
 			return "", err
 		}
 
-		token := strings.TrimRight(line, "\n")
+		token := strings.TrimSpace(line)
 		if re.MatchString(token) {
 			return token, nil
 		}
@@ -409,7 +409,7 @@ func promptUsername() (string, error) {
 			return "", err
 		}
 
-		line = strings.TrimRight(line, "\n")
+		line = strings.TrimSpace(line)
 
 		ok, err := validateUsername(line)
 		if err != nil {
@@ -442,7 +442,7 @@ func promptURL(remotes map[string]string) (string, string, error) {
 				return "", "", err
 			}
 
-			line = strings.TrimRight(line, "\n")
+			line = strings.TrimSpace(line)
 
 			index, err := strconv.Atoi(line)
 			if err != nil || index < 0 || index > len(validRemotes) {
@@ -470,7 +470,7 @@ func promptURL(remotes map[string]string) (string, string, error) {
 			return "", "", err
 		}
 
-		line = strings.TrimRight(line, "\n")
+		line = strings.TrimSpace(line)
 		if line == "" {
 			fmt.Println("URL is empty")
 			continue
@@ -643,7 +643,7 @@ func promptProjectVisibility() (bool, error) {
 			return false, err
 		}
 
-		line = strings.TrimRight(line, "\n")
+		line = strings.TrimSpace(line)
 
 		index, err := strconv.Atoi(line)
 		if err != nil || (index != 1 && index != 2) {

bridge/gitlab/config.go

@@ -67,7 +67,7 @@ func (g *Gitlab) Configure(repo repository.RepoCommon, params core.BridgeParams)
 		if err != nil {
 			return nil, fmt.Errorf("reading from stdin: %v", err)
 		}
-		token = strings.TrimSuffix(token, "\n")
+		token = strings.TrimSpace(token)
 	} else if params.TokenId != "" {
 		tokenId = entity.Id(params.TokenId)
 	} else {
@@ -154,7 +154,7 @@ func promptTokenOptions(repo repository.RepoCommon) (*core.Token, error) {
 			return nil, err
 		}
 
-		line = strings.TrimRight(line, "\n")
+		line = strings.TrimSpace(line)
 		index, err := strconv.Atoi(line)
 		if err != nil || index < 1 || index > len(tokens)+1 {
 			fmt.Println("invalid input")
@@ -196,7 +196,7 @@ func promptToken() (string, error) {
 			return "", err
 		}
 
-		token := strings.TrimRight(line, "\n")
+		token := strings.TrimSpace(line)
 		if re.MatchString(token) {
 			return token, nil
 		}
@@ -224,7 +224,7 @@ func promptURL(remotes map[string]string) (string, error) {
 				return "", err
 			}
 
-			line = strings.TrimRight(line, "\n")
+			line = strings.TrimSpace(line)
 
 			index, err := strconv.Atoi(line)
 			if err != nil || index < 0 || index > len(validRemotes) {
@@ -250,7 +250,7 @@ func promptURL(remotes map[string]string) (string, error) {
 			return "", err
 		}
 
-		url := strings.TrimRight(line, "\n")
+		url := strings.TrimSpace(line)
 		if line == "" {
 			fmt.Println("URL is empty")
 			continue

commands/bridge_configure.go

@@ -82,7 +82,7 @@ func promptTarget() (string, error) {
 			return "", err
 		}
 
-		line = strings.TrimRight(line, "\n")
+		line = strings.TrimSpace(line)
 
 		index, err := strconv.Atoi(line)
 		if err != nil || index <= 0 || index > len(targets) {
@@ -109,7 +109,7 @@ func promptName(repo repository.RepoCommon) (string, error) {
 			return "", err
 		}
 
-		line = strings.TrimRight(line, "\n")
+		line = strings.TrimSpace(line)
 
 		name := line
 		if defaultExist && name == "" {