diff options
| -rw-r--r-- | bridge/github/config.go | 14 | ||||
| -rw-r--r-- | bridge/gitlab/config.go | 10 | ||||
| -rw-r--r-- | commands/bridge_configure.go | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/bridge/github/config.go b/bridge/github/config.go index 0fbbd5aa..f0403062 100644 --- a/bridge/github/config.go +++ b/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) { diff --git a/bridge/gitlab/config.go b/bridge/gitlab/config.go index 88ba7db8..5c6ccb0e 100644 --- a/bridge/gitlab/config.go +++ b/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 diff --git a/commands/bridge_configure.go b/commands/bridge_configure.go index 6f314135..6c24568c 100644 --- a/commands/bridge_configure.go +++ b/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 == "" { |