Merge pull request #20 from atlassian/cwood/fixes-cleanup-updates

Go Mod, fixes for tests, new methods

Author: cwood

bulk_test.go

@@ -1,14 +1,10 @@
 package sentry
 
 import (
-	"fmt"
 	"testing"
-
-	"github.com/getsentry/raven-go"
 )
 
 func TestBulkResourceModifyDelete(t *testing.T) {
-	t.Parallel()
 
 	client := newTestClient(t)
 
@@ -23,19 +19,7 @@ func TestBulkResourceModifyDelete(t *testing.T) {
 	defer cleanupproj()
 	defer cleanup()
 
-	dsnkey, err := client.CreateClientKey(org, project, "testing key")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ravenClient, err := raven.New(dsnkey.DSN.Secret)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i <= 100; i++ {
-		ravenClient.CaptureMessageAndWait(fmt.Sprintf("Testing message %d", i), nil, nil)
-	}
+	createMessagesHelper(t, client, org, project, 10)
 
 	t.Run("Fetch all messages for project", func(t *testing.T) {
 		issues, link, err := client.GetIssues(org, project, nil, nil, nil)

events_test.go

@@ -1,15 +1,12 @@
 package sentry
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/atlassian/go-sentry-api/datatype"
-	"github.com/getsentry/raven-go"
 )
 
 func TestEventsResource(t *testing.T) {
-	t.Parallel()
 
 	client := newTestClient(t)
 
@@ -24,23 +21,7 @@ func TestEventsResource(t *testing.T) {
 	project, cleanupproj := createProjectHelper(t, team)
 	defer cleanupproj()
 
-	dsnkey, err := client.CreateClientKey(org, project, "testing key")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ravenClient, err := raven.New(dsnkey.DSN.Secret)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < 10; i++ {
-		ravenClient.CaptureMessageAndWait(fmt.Sprintf("Testing message %d", i), map[string]string{
-			"server": fmt.Sprintf("%d-app-node", i),
-		}, &raven.Message{
-			Message: fmt.Sprintf("Testing some stuff out Brah %d", i),
-		})
-	}
+	createMessagesHelper(t, client, org, project, 10)
 
 	issues, _, err := client.GetIssues(org, project, nil, nil, nil)
 	if err != nil {
@@ -55,6 +36,8 @@ func TestEventsResource(t *testing.T) {
 
 		for _, issue := range issues {
 
+			t.Logf("Issue: %s", *issue.ID)
+
 			_, err = client.GetLatestEvent(issue)
 			if err != nil {
 				t.Error(err)

file_test.go

@@ -71,12 +71,12 @@ func TestReleaseFileResource(t *testing.T) {
 		})
 		t.Run("Update name of release file", func(t *testing.T) {
 
-			file.Name = "Something else related"
+			file.Name = "Something/else/related"
 			err := client.UpdateReleaseFile(org, project, release, file)
 			if err != nil {
 				t.Error(err)
 			}
-			if file.Name != "Something else related" {
+			if file.Name != "Something/else/related" {
 				t.Error("File update did not change name")
 			}
 

glide.lock

@@ -0,0 +1,10 @@
+module github.com/atlassian/go-sentry-api
+
+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/sentry-go v0.4.0
+	github.com/pkg/errors v0.9.1 // indirect
+)

glide.yaml

@@ -4,36 +4,50 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/getsentry/raven-go"
+	raven "github.com/getsentry/sentry-go"
 )
 
-func TestIssueResource(t *testing.T) {
+func createMessagesHelper(t *testing.T, client *Client, org Organization, project Project, numOfMessages int) {
 
-	client := newTestClient(t)
-	org, err := client.GetOrganization(getDefaultOrg())
+	dsnkey, err := client.CreateClientKey(org, project, "testing key")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	team, cleanup := createTeamHelper(t)
-	defer cleanup()
+	scope := raven.NewScope()
+	scope.SetExtra("server", "app-node-01")
 
-	project, cleanupproj := createProjectHelper(t, team)
-	defer cleanupproj()
+	ravenClient, err := raven.NewClient(raven.ClientOptions{
+		Dsn:       dsnkey.DSN.Secret,
+		Transport: raven.NewHTTPSyncTransport(),
+	})
+
+	hub := raven.NewHub(ravenClient, scope)
 
-	dsnkey, err := client.CreateClientKey(org, project, "testing key")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	ravenClient, err := raven.New(dsnkey.DSN.Secret)
+	for i := 0; i <= numOfMessages; i++ {
+		hub.CaptureMessage(fmt.Sprintf("failed to execute on id %d", i))
+	}
+}
+
+func TestIssueResource(t *testing.T) {
+
+	client := newTestClient(t)
+	org, err := client.GetOrganization(getDefaultOrg())
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	for i := 0; i <= 10; i++ {
-		ravenClient.CaptureMessage(fmt.Sprintf("Testing message %d", i), nil, nil)
-	}
+	team, cleanup := createTeamHelper(t)
+	defer cleanup()
+
+	project, cleanupproj := createProjectHelper(t, team)
+	defer cleanupproj()
+
+	createMessagesHelper(t, client, org, project, 10)
 
 	t.Run("Get all issues with a query of resolved", func(t *testing.T) {
 		query := "is:resolved"
@@ -88,7 +102,7 @@ func TestIssueResource(t *testing.T) {
 				t.Error(err)
 			}
 			if len(events) == 0 {
-				t.Error("Should be at least more than 1 event")
+				t.Errorf("Should be at least more than 1 event %v", events)
 			}
 		})
 

go.mod

@@ -72,10 +72,17 @@ func (c *Client) UpdateProject(o Organization, p Project) error {
 }
 
 // GetProjects fetchs all projects in a sentry instance
-func (c *Client) GetProjects() ([]Project, error) {
+func (c *Client) GetProjects() ([]Project, *Link, error) {
 	var proj []Project
-	err := c.do("GET", "projects", &proj, nil)
-	return proj, err
+	link, err := c.doWithPagination("GET", "projects", &proj, nil)
+	return proj, link, err
+}
+
+// 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)
+	return proj, link, err
 }
 
 // DeleteProject will take your org, team, and proj and delete it from sentry.

go.sum

@@ -46,7 +46,7 @@ func TestProjectResource(t *testing.T) {
 	})
 
 	t.Run("Fetch all projects", func(t *testing.T) {
-		projects, err := client.GetProjects()
+		projects, _, err := client.GetProjects()
 		if err != nil {
 			t.Error(err)
 		}