implementing changes recommended by owner for a new PR

implementing changes recommended by owner for a new PR

implementing changes recommended by owner for a new PR

Author: raikakhodadad

cmd/jiralert/main.go

@@ -9,11 +9,12 @@ import (
 	"runtime"
 	"strconv"
 
+	_ "net/http/pprof"
+
 	"github.com/free/jiralert"
 	"github.com/free/jiralert/alertmanager"
 	log "github.com/golang/glog"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	_ "net/http/pprof"
 )
 
 const (

config.go

@@ -5,7 +5,10 @@ import (
 	"io/ioutil"
 	"net/url"
 	"path/filepath"
+	"regexp"
+	"strconv"
 	"strings"
+	"time"
 
 	log "github.com/golang/glog"
 	"github.com/trivago/tgo/tcontainer"
@@ -93,7 +96,7 @@ type ReceiverConfig struct {
 	WontFixResolution string                 `yaml:"wont_fix_resolution" json:"wont_fix_resolution"`
 	Fields            map[string]interface{} `yaml:"fields" json:"fields"`
 	Components        []string               `yaml:"components" json:"components"`
-	ReopenDuration    string                 `yaml:"reopen_duration" json:"reopen_duration"`
+	ReopenDuration    *Duration              `yaml:"reopen_duration" json:"reopen_duration"`
 
 	// Label copy settings
 	AddGroupLabels bool `yaml:"add_group_labels" json:"add_group_labels"`
@@ -199,6 +202,12 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
 			}
 			rc.ReopenState = c.Defaults.ReopenState
 		}
+		if rc.ReopenDuration == nil {
+			if c.Defaults.ReopenDuration == nil {
+				return fmt.Errorf("missing reopen_duration in receiver %q", rc.Name)
+			}
+			rc.ReopenDuration = c.Defaults.ReopenDuration
+		}
 
 		// Populate optional issue fields, where necessary
 		if rc.Priority == "" && c.Defaults.Priority != "" {
@@ -250,3 +259,91 @@ func checkOverflow(m map[string]interface{}, ctx string) error {
 	}
 	return nil
 }
+
+type Duration time.Duration
+
+var durationRE = regexp.MustCompile("^([0-9]+)(y|w|d|h|m|s|ms)$")
+
+// ParseDuration parses a string into a time.Duration, assuming that a year
+// always has 365d, a week always has 7d, and a day always has 24h.
+func ParseDuration(durationStr string) (Duration, error) {
+	matches := durationRE.FindStringSubmatch(durationStr)
+	if len(matches) != 3 {
+		return 0, fmt.Errorf("not a valid duration string: %q", durationStr)
+	}
+	var (
+		n, _ = strconv.Atoi(matches[1])
+		dur  = time.Duration(n) * time.Millisecond
+	)
+	switch unit := matches[2]; unit {
+	case "y":
+		dur *= 1000 * 60 * 60 * 24 * 365
+	case "w":
+		dur *= 1000 * 60 * 60 * 24 * 7
+	case "d":
+		dur *= 1000 * 60 * 60 * 24
+	case "h":
+		dur *= 1000 * 60 * 60
+	case "m":
+		dur *= 1000 * 60
+	case "s":
+		dur *= 1000
+	case "ms":
+		// Value already correct
+	default:
+		return 0, fmt.Errorf("invalid time unit in duration string: %q", unit)
+	}
+	return Duration(dur), nil
+}
+
+func (d Duration) String() string {
+	var (
+		ms   = int64(time.Duration(d) / time.Millisecond)
+		unit = "ms"
+	)
+	if ms == 0 {
+		return "0s"
+	}
+	factors := map[string]int64{
+		"y":  1000 * 60 * 60 * 24 * 365,
+		"w":  1000 * 60 * 60 * 24 * 7,
+		"d":  1000 * 60 * 60 * 24,
+		"h":  1000 * 60 * 60,
+		"m":  1000 * 60,
+		"s":  1000,
+		"ms": 1,
+	}
+
+	switch int64(0) {
+	case ms % factors["y"]:
+		unit = "y"
+	case ms % factors["w"]:
+		unit = "w"
+	case ms % factors["d"]:
+		unit = "d"
+	case ms % factors["h"]:
+		unit = "h"
+	case ms % factors["m"]:
+		unit = "m"
+	case ms % factors["s"]:
+		unit = "s"
+	}
+	return fmt.Sprintf("%v%v", ms/factors[unit], unit)
+}
+
+func (d Duration) MarshalYAML() (interface{}, error) {
+	return d.String(), nil
+}
+
+func (d *Duration) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	var s string
+	if err := unmarshal(&s); err != nil {
+		return err
+	}
+	dur, err := ParseDuration(s)
+	if err != nil {
+		return err
+	}
+	*d = Duration(dur)
+	return nil
+}

notify.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"io/ioutil"
-	"net/http"
 	"reflect"
 	"strings"
 	"time"
@@ -24,11 +23,14 @@ type Receiver struct {
 
 // NewReceiver creates a Receiver using the provided configuration and template.
 func NewReceiver(c *ReceiverConfig, t *Template) (*Receiver, error) {
-	client, err := jira.NewClient(http.DefaultClient, c.APIURL)
+	tp := jira.BasicAuthTransport{
+		Username: c.User,
+		Password: string(c.Password),
+	}
+	client, err := jira.NewClient(tp.Client(), c.APIURL)
 	if err != nil {
 		return nil, err
 	}
-	client.Authentication.SetBasicAuth(c.User, string(c.Password))
 
 	return &Receiver{conf: c, tmpl: t, client: client}, nil
 }
@@ -62,14 +64,8 @@ func (r *Receiver) Notify(data *alertmanager.Data) (bool, error) {
 			return false, nil
 		}
 
-		reopenDuration, err := time.ParseDuration(r.conf.ReopenDuration)
-		if err != nil {
-			log.Errorf("Unable to parse reopen duration: %v", err)
-			return false, err
-		}
-
 		resolutionTime := time.Time(issue.Fields.Resolutiondate)
-		if resolutionTime.Add(reopenDuration).After(time.Now()) {
+		if resolutionTime.Add(time.Duration(*r.conf.ReopenDuration)).After(time.Now()) {
 			log.Infof("Issue %s for %s was resolved on %s, reopening", issue.Key, issueLabel, resolutionTime.Format(time.UnixDate))
 			return r.reopen(issue.Key)
 		}
@@ -96,7 +92,7 @@ func (r *Receiver) Notify(data *alertmanager.Data) (bool, error) {
 	if len(r.conf.Components) > 0 {
 		issue.Fields.Components = make([]*jira.Component, 0, len(r.conf.Components))
 		for _, component := range r.conf.Components {
-			issue.Fields.Components = append(issue.Fields.Components, &jira.Component{Name: component})
+			issue.Fields.Components = append(issue.Fields.Components, &jira.Component{Name: r.tmpl.Execute(component, data)})
 		}
 	}
 
@@ -178,7 +174,7 @@ func (r *Receiver) search(project, issueLabel string) (*jira.Issue, bool, error)
 	query := fmt.Sprintf("project=\"%s\" and labels=%q order by key", project, issueLabel)
 	options := &jira.SearchOptions{
 		Fields:     []string{"summary", "status", "resolution", "resolutiondate"},
-		MaxResults: 50,
+		MaxResults: 2,
 	}
 	log.V(1).Infof("search: query=%v options=%+v", query, options)
 	issues, resp, err := r.client.Issue.Search(query, options)
@@ -188,13 +184,12 @@ func (r *Receiver) search(project, issueLabel string) (*jira.Issue, bool, error)
 	}
 	if len(issues) > 0 {
 		if len(issues) > 1 {
-			// Swallow it, but log an error.
+			// Swallow it, but log a message.
 			log.Infof("More than one issue matched %s, will only update last issue: %+v", query, issues)
 		}
 
-		lastIndex := len(issues) - 1
-		log.V(1).Infof("  found: %+v", issues[lastIndex])
-		return &issues[lastIndex], false, nil
+		log.V(1).Infof("  found: %+v", issues[0])
+		return &issues[0], false, nil
 	}
 	log.V(1).Infof("  no results")
 	return nil, false, nil
@@ -221,10 +216,11 @@ func (r *Receiver) reopen(issueKey string) (bool, error) {
 
 func (r *Receiver) create(issue *jira.Issue) (bool, error) {
 	log.V(1).Infof("create: issue=%v", *issue)
-	issue, resp, err := r.client.Issue.Create(issue)
+	newIssue, resp, err := r.client.Issue.Create(issue)
 	if err != nil {
 		return handleJiraError("Issue.Create", resp, err)
 	}
+	*issue = *newIssue
 
 	log.V(1).Infof("  done: key=%s ID=%s", issue.Key, issue.ID)
 	return false, nil