Merge remote-tracking branch 'upstream/master'

irisgve · irisgve · commit f58379a0e021 · 2021-02-01T16:09:10.000+11:00
diff --git a/client.go b/client.go
@@ -9,6 +9,7 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
+	"strings"
 	"time"
 )
 
@@ -124,7 +125,12 @@ func (c *Client) newRequest(method, endpoint string, in interface{}) (*http.Requ
 		bodyreader = newbodyreader
 	}
 
-	req, err := http.NewRequest(method, c.Endpoint+endpoint+"/", bodyreader)
+	finalEndpoint := c.Endpoint + endpoint
+	if !strings.HasSuffix(endpoint, "/") {
+		finalEndpoint = finalEndpoint + "/"
+	}
+
+	req, err := http.NewRequest(method, finalEndpoint, bodyreader)
 	if err != nil {
 		return nil, err
 	}
diff --git a/client_test.go b/client_test.go
@@ -62,3 +62,19 @@ func TestClientKnownGoodEndpoint(t *testing.T) {
 		t.Errorf("Endpoint is not https://sentry.io/api/0 got %s", bclient.Endpoint)
 	}
 }
+
+func TestNewRequestWillNotAddExtraTrailingSlashToEndpoint(t *testing.T) {
+	endpoint := "some-endpoint/"
+	bclient, berr := NewClient("testauthclient", nil, nil)
+	if berr != nil {
+		t.Error(berr)
+	}
+	req, err := bclient.newRequest("get", endpoint, nil)
+	if req == nil || err != nil {
+		t.Errorf("can't generate request: %v", err)
+	}
+
+	if req.URL.String() != "https://sentry.io/api/0/some-endpoint/" {
+		t.Errorf("Endpoint is not https://sentry.io/api/0/some-endpoint/ got %s", req.URL.String())
+	}
+}
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	github.com/certifi/gocertifi v0.0.0-20200104152315-a6d78f326758 // indirect
-	github.com/getsentry/raven-go v0.2.0
+	github.com/getsentry/raven-go v0.2.0 // indirect
 	github.com/getsentry/sentry-go v0.4.0
 	github.com/pkg/errors v0.9.1 // indirect
 )
diff --git a/issue.go b/issue.go
@@ -27,6 +27,7 @@ type Status string
 // IssueStats is the stats of a issue
 type IssueStats struct {
 	TwentyFourHour *[]Stat `json:"24h,omitempty"`
+	FourteenDays   *[]Stat `json:"14d,omitempty"`
 	ThirtyDays     *[]Stat `json:"30d,omitempty"`
 }
 
@@ -81,35 +82,35 @@ type Activity struct {
 
 // Issue returns a issue found in sentry
 type Issue struct {
-	Annotations         *[]string          `json:"annotations,omitempty"`
-	AssignedTo          *InternalUser      `json:"assignedTo,omitempty"`
-	Activity            *[]Activity        `json:"activity,omitempty"`
-	Count               *string            `json:"count,omitempty"`
-	Culprit             *string            `json:"culprit,omitempty"`
-	FirstSeen           *time.Time         `json:"firstSeen,omitempty"`
-	HasSeen             *bool              `json:"hasSeen,omitempty"`
-	ID                  *string            `json:"id,omitempty"`
-	IsBookmarked        *bool              `json:"isBookmarked,omitempty"`
-	IsPublic            *bool              `json:"isPublic,omitempty"`
-	IsSubscribed        *bool              `json:"isSubscribed,omitempty"`
-	LastSeen            *time.Time         `json:"lastSeen,omitempty"`
-	Level               *string            `json:"level,omitempty"`
-	Logger              *string            `json:"logger,omitempty"`
-	Metadata            *map[string]string `json:"metadata,omitempty"`
-	NumComments         *int               `json:"numComments,omitempty"`
-	Permalink           *string            `json:"permalink,omitempty"`
-	Project             *Project           `json:"project,omitempty"`
-	ShareID             *string            `json:"shareId,omitempty"`
-	ShortID             *string            `json:"shortId,omitempty"`
-	Stats               *IssueStats        `json:"stats,omitempty"`
-	Status              *Status            `json:"status,omitempty"`
-	StatusDetails       *map[string]string `json:"statusDetails,omitempty"`
-	SubscriptionDetails *map[string]string `json:"subscriptionDetails,omitempty"`
-	Tags                *[]IssueTag        `json:"tags,omitempty"`
-	Title               *string            `json:"title,omitempty"`
-	Type                *string            `json:"type,omitempty"`
-	UserCount           *int               `json:"userCount,omitempty"`
-	UserReportCount     *int               `json:"userReportCount,omitempty"`
+	Annotations         *[]string               `json:"annotations,omitempty"`
+	AssignedTo          *InternalUser           `json:"assignedTo,omitempty"`
+	Activity            *[]Activity             `json:"activity,omitempty"`
+	Count               *string                 `json:"count,omitempty"`
+	Culprit             *string                 `json:"culprit,omitempty"`
+	FirstSeen           *time.Time              `json:"firstSeen,omitempty"`
+	HasSeen             *bool                   `json:"hasSeen,omitempty"`
+	ID                  *string                 `json:"id,omitempty"`
+	IsBookmarked        *bool                   `json:"isBookmarked,omitempty"`
+	IsPublic            *bool                   `json:"isPublic,omitempty"`
+	IsSubscribed        *bool                   `json:"isSubscribed,omitempty"`
+	LastSeen            *time.Time              `json:"lastSeen,omitempty"`
+	Level               *string                 `json:"level,omitempty"`
+	Logger              *string                 `json:"logger,omitempty"`
+	Metadata            *map[string]string      `json:"metadata,omitempty"`
+	NumComments         *int                    `json:"numComments,omitempty"`
+	Permalink           *string                 `json:"permalink,omitempty"`
+	Project             *Project                `json:"project,omitempty"`
+	ShareID             *string                 `json:"shareId,omitempty"`
+	ShortID             *string                 `json:"shortId,omitempty"`
+	Stats               *IssueStats             `json:"stats,omitempty"`
+	Status              *Status                 `json:"status,omitempty"`
+	StatusDetails       *map[string]interface{} `json:"statusDetails,omitempty"`
+	SubscriptionDetails *map[string]string      `json:"subscriptionDetails,omitempty"`
+	Tags                *[]IssueTag             `json:"tags,omitempty"`
+	Title               *string                 `json:"title,omitempty"`
+	Type                *string                 `json:"type,omitempty"`
+	UserCount           *int                    `json:"userCount,omitempty"`
+	UserReportCount     *int                    `json:"userReportCount,omitempty"`
 }
 
 type issueQuery struct {
diff --git a/issue_test.go b/issue_test.go
@@ -72,6 +72,22 @@ func TestIssueResource(t *testing.T) {
 			t.Error("Should be no new results")
 		}
 
+		t.Run("Get issues with statsPeriod of 14 days", func(t *testing.T) {
+			period := "14d"
+			issues, _, err := client.GetIssues(org, project, &period, nil, nil)
+			if err != nil {
+				t.Error(err)
+			}
+			if len(issues) <= 0 {
+				t.Fatal("No issues found for this project")
+			}
+			for _, issue := range issues {
+				if issue.Stats.FourteenDays == nil {
+					t.Fatal("We should be able to get 14 days of stats for this issue but didn't")
+				}
+			}
+		})
+
 		t.Run("Get hashes for issue", func(t *testing.T) {
 			hashes, link, err := client.GetIssueHashes(issues[0])
 			if err != nil {
@@ -111,6 +127,9 @@ func TestIssueResource(t *testing.T) {
 
 			resolved := Resolved
 			firstIssue.Status = &resolved
+			firstIssue.StatusDetails = &map[string]interface{}{
+				"inNextRelease": true,
+			}
 
 			if err := client.UpdateIssue(firstIssue); err != nil {
 				t.Error(err)
@@ -120,6 +139,15 @@ func TestIssueResource(t *testing.T) {
 				t.Error("Status did not get updated")
 			}
 
+			details, ok := (*firstIssue.StatusDetails)["inNextRelease"].(bool)
+			if !ok {
+				t.Error("Status details did not get updated")
+			}
+
+			if !details {
+				t.Error("Status details did not get updated")
+			}
+
 			t.Run("Delete the first issue in this project", func(t *testing.T) {
 				err := client.DeleteIssue(firstIssue)
 				if err != nil {
diff --git a/makefile b/makefile
@@ -19,5 +19,5 @@ devenv:
 	docker run -d --name sentry-worker-1 -e SENTRY_SECRET_KEY='${STUPIDSECRET}' --link sentry-postgres:postgres --link sentry-redis:redis sentry:latest run worker
 
 devclean:
-	docker kill $$(docker ps -q)
-	docker rm $$(docker ps -a -q)
+	docker kill $$(docker ps -q -a --no-trunc --filter name=^sentry)
+	docker rm $$(docker ps -q -a --no-trunc --filter name=^sentry)
diff --git a/project.go b/project.go
@@ -81,7 +81,7 @@ func (c *Client) GetProjects() ([]Project, *Link, error) {
 // GetOrgProjects fetchs all projects belonging to a organization
 func (c *Client) GetOrgProjects(o Organization) ([]Project, *Link, error) {
 	var proj []Project
-	link, err := c.doWithPagination("GET", fmt.Sprintf("organizations/%s/projects/", *o.Slug), &proj, nil)
+	link, err := c.doWithPagination("GET", fmt.Sprintf("organizations/%s/projects", *o.Slug), &proj, nil)
 	return proj, link, err
 }
 
diff --git a/stat.go b/stat.go
@@ -27,11 +27,11 @@ func (o *statRequest) ToQueryString() string {
 	query.Add("stat", string(o.Stat))
 	query.Add("since", strconv.FormatInt(o.Since, 10))
 	query.Add("until", strconv.FormatInt(o.Until, 10))
-	
+
 	if o.Resolution != nil {
-	    query.Add("resolution", string(*o.Resolution))
+		query.Add("resolution", string(*o.Resolution))
 	}
-	
+
 	return query.Encode()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`	`"io"`
`10`	`10`	`"io/ioutil"`
`11`	`11`	`"net/http"`
	`12`	`+ "strings"`
`12`	`13`	`"time"`
`13`	`14`	`)`
`14`	`15`
`@@ -124,7 +125,12 @@ func (c Client) newRequest(method, endpoint string, in interface{}) (http.Requ`
`124`	`125`	`bodyreader = newbodyreader`
`125`	`126`	`}`
`126`	`127`
`127`		`- req, err := http.NewRequest(method, c.Endpoint+endpoint+"/", bodyreader)`
	`128`	`+ finalEndpoint := c.Endpoint + endpoint`
	`129`	`+ if !strings.HasSuffix(endpoint, "/") {`
	`130`	`+ finalEndpoint = finalEndpoint + "/"`
	`131`	`+ }`
	`132`	`+`
	`133`	`+ req, err := http.NewRequest(method, finalEndpoint, bodyreader)`
`128`	`134`	`if err != nil {`
`129`	`135`	`return nil, err`
`130`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.13`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/certifi/gocertifi v0.0.0-20200104152315-a6d78f326758 // indirect`
`7`		`- github.com/getsentry/raven-go v0.2.0`
	`7`	`+ github.com/getsentry/raven-go v0.2.0 // indirect`
`8`	`8`	`github.com/getsentry/sentry-go v0.4.0`
`9`	`9`	`github.com/pkg/errors v0.9.1 // indirect`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func (c Client) GetProjects() ([]Project, Link, error) {`
`81`	`81`	`// GetOrgProjects fetchs all projects belonging to a organization`
`82`	`82`	`func (c Client) GetOrgProjects(o Organization) ([]Project, Link, error) {`
`83`	`83`	`var proj []Project`
`84`		`- link, err := c.doWithPagination("GET", fmt.Sprintf("organizations/%s/projects/", *o.Slug), &proj, nil)`
	`84`	`+ link, err := c.doWithPagination("GET", fmt.Sprintf("organizations/%s/projects", *o.Slug), &proj, nil)`
`85`	`85`	`return proj, link, err`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ func (o *statRequest) ToQueryString() string {`
`27`	`27`	`query.Add("stat", string(o.Stat))`
`28`	`28`	`query.Add("since", strconv.FormatInt(o.Since, 10))`
`29`	`29`	`query.Add("until", strconv.FormatInt(o.Until, 10))`
`30`		`-`
	`30`	`+`
`31`	`31`	`if o.Resolution != nil {`
`32`		`- query.Add("resolution", string(*o.Resolution))`
	`32`	`+ query.Add("resolution", string(*o.Resolution))`
`33`	`33`	`}`
`34`		`-`
	`34`	`+`
`35`	`35`	`return query.Encode()`
`36`	`36`	`}`
`37`	`37`