Skip to content

Commit

Permalink
fix jira_user variable
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Sotomski authored and Robert Sotomski committed Feb 19, 2019
1 parent 539548c commit 944d534
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 16 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ Atlassian's Jira REST API client written in Go for use with CI/CD tools to autom
## Install
### Linux
```bash
sudo curl -L "https://github.com/sotomskir/jira-cli/releases/download/0.1.0/jira-cli-$(uname -s)-$(uname -m)" -o /usr/local/bin/jira-cli
sudo curl -L "https://github.com/sotomskir/jira-cli/releases/download/0.3.0/jira-cli-$(uname -s)-$(uname -m)" -o /usr/local/bin/jira-cli
sudo chmod +x /usr/local/bin/jira-cli
```
### Other platforms
You can download pre-build binary here: https://github.com/sotomskir/jira-cli/releases
Expand Down
20 changes: 6 additions & 14 deletions cmd/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,22 @@ var loginCmd = &cobra.Command{
Aliases: []string{"l"},
Short: "Login to Atlassian Jira server",
Run: func(cmd *cobra.Command, args []string) {
server := viper.GetString("server_url")
server := viper.GetString("JIRA_SERVER_URL")
if server == "" {
server = getInput("JIRA server URL: ")
}
user := viper.GetString("user")
user := viper.GetString("JIRA_USER")
if user == "" {
user = getInput("Username: ")
}
password := viper.GetString("password")
password := viper.GetString("JIRA_PASSWORD")
if password == "" {
password = getPasswd()
}

loggedIn := login(server, user, password)

if loggedIn {
saveConfig(server, user, password)
logger.SuccessF("Success, Logged in to: %s as: %s\n", server, user)
}
},
Expand All @@ -73,9 +72,9 @@ func init() {
loginCmd.Flags().StringP("server", "s", "", "Jira server url. Also read from JIRA_SERVER_URL env variable")
loginCmd.Flags().StringP("user", "u", "", "Jira username. Also read from JIRA_USER env variable")
loginCmd.Flags().StringP("password", "p", "", "Jira password. Also read from JIRA_PASSWORD env variable")
viper.BindPFlag("server_url", loginCmd.Flags().Lookup("server"))
viper.BindPFlag("user", loginCmd.Flags().Lookup("user"))
viper.BindPFlag("password", loginCmd.Flags().Lookup("password"))
viper.BindPFlag("JIRA_SERVER_URL", loginCmd.Flags().Lookup("server"))
viper.BindPFlag("JIRA_USER", loginCmd.Flags().Lookup("user"))
viper.BindPFlag("JIRA_PASSWORD", loginCmd.Flags().Lookup("password"))
}

func getInput(prompt string) string {
Expand Down Expand Up @@ -137,10 +136,3 @@ func login(server string, user string, password string) bool {

return true
}

func saveConfig(server string, user string, password string) {
viper.Set("server_url", server)
viper.Set("user", user)
viper.Set("password", password)
viper.WriteConfig()
}
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,5 @@ func initConfig() {
}
viper.WriteConfigAs(path.Join(home, "/.jira-cli.yaml"))
}
jiraApi.Initialize(viper.GetString("server_url"), viper.GetString("user"), viper.GetString("password"))
jiraApi.Initialize(viper.GetString("JIRA_SERVER_URL"), viper.GetString("JIRA_USER"), viper.GetString("JIRA_PASSWORD"))
}

0 comments on commit 944d534

Please sign in to comment.