diff --git a/issues/jira.go b/issues/jira.go index f732baf..3efc6e0 100644 --- a/issues/jira.go +++ b/issues/jira.go @@ -45,11 +45,10 @@ type UserSearchResp struct { func getUserAccountID(instance, user string) (string, error) { req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("https://%s/rest/api/3/user/search?query=%s", instance, user), nil) -fmt.Println(user) if err != nil { return "", fmt.Errorf("error building jira user search request: %w", err) } - req.SetBasicAuth(user, os.Getenv("JIRA_TOKEN")) + req.SetBasicAuth(os.Getenv("JIRA_USER"), os.Getenv("JIRA_TOKEN")) req.Header.Add("Accept", "application/json") resp, err := jcl.Do(req) if err != nil { @@ -90,7 +89,7 @@ func GetIssues(instance, user, from, to string) ([]Issue, error) { q.Add("jql", fmt.Sprintf("assignee was %s and resolved >= %s and resolved <= %s", accountID, from, to)) q.Add("fields", "*all") req.URL.RawQuery = q.Encode() - req.SetBasicAuth(user, os.Getenv("JIRA_TOKEN")) + req.SetBasicAuth(os.Getenv("JIRA_USER"), os.Getenv("JIRA_TOKEN")) req.Header.Add("Accept", "application/json") resp, err := jcl.Do(req) if err != nil { @@ -112,14 +111,11 @@ func GetIssues(instance, user, from, to string) ([]Issue, error) { out := []Issue{} for _, i := range jsr.Issues { - fmt.Println(i) iss := Issue{} if s, ok := i.Fields["summary"]; ok { - fmt.Println(s) iss.Summary, _ = s.(string) } if d, ok := i.Fields["description"]; ok { - fmt.Println(d) iss.Description, _ = d.(string) } if comms, ok := i.Fields["comment"].([]map[string]any); ok && len(comms) > 0 {