1
0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00

Fix JSON parsing

Issue #600 points out Jenkins module panics occasionally
I noticed that a number of places panic because of JSON parsing
Centralize JSON parsing, have it return an error, and have widgets
report the error
This commit is contained in:
Sean Smith
2019-09-07 15:10:37 -04:00
parent 32884e5de4
commit 36fbad54d8
8 changed files with 73 additions and 162 deletions

View File

@@ -1,15 +1,13 @@
package jira
import (
"bytes"
"crypto/tls"
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"strings"
"github.com/wtfutil/wtf/utils"
)
func (widget *Widget) IssuesFor(username string, projects []string, jql string) (*SearchResult, error) {
@@ -40,7 +38,10 @@ func (widget *Widget) IssuesFor(username string, projects []string, jql string)
}
searchResult := &SearchResult{}
parseJson(searchResult, resp.Body)
err = utils.ParseJson(searchResult, resp.Body)
if err != nil {
return nil, err
}
return searchResult, nil
}
@@ -79,23 +80,6 @@ func (widget *Widget) jiraRequest(path string) (*http.Response, error) {
return resp, nil
}
func parseJson(obj interface{}, text io.Reader) {
jsonStream, err := ioutil.ReadAll(text)
if err != nil {
panic(err)
}
decoder := json.NewDecoder(bytes.NewReader(jsonStream))
for {
if err := decoder.Decode(obj); err == io.EOF {
break
} else if err != nil {
panic(err)
}
}
}
func getProjectQuery(projects []string) string {
singleEmptyProject := len(projects) == 1 && len(projects[0]) == 0
if len(projects) == 0 || singleEmptyProject {