add context.Context to all calls

harshpreet93 · Feb 23, 2017 · dc14e4b · dc14e4b
1 parent 19ceffc
commit dc14e4b
Show file tree

Hide file tree

Showing 42 changed files with 642 additions and 574 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: go
 
 go:
-  - 1.3
-  - 1.4
+  - 1.7
   - tip
diff --git a/account.go b/account.go
@@ -1,10 +1,12 @@
 package godo
 
+import "context"
+
 // AccountService is an interface for interfacing with the Account
 // endpoints of the DigitalOcean API
 // See: https://developers.digitalocean.com/documentation/v2/#account
 type AccountService interface {
-	Get() (*Account, *Response, error)
+	Get(context.Context) (*Account, *Response, error)
 }
 
 // AccountServiceOp handles communication with the Account related methods of
@@ -35,10 +37,11 @@ func (r Account) String() string {
 }
 
 // Get DigitalOcean account info
-func (s *AccountServiceOp) Get() (*Account, *Response, error) {
+func (s *AccountServiceOp) Get(ctx context.Context) (*Account, *Response, error) {
+
 	path := "v2/account"
 
-	req, err := s.client.NewRequest("GET", path, nil)
+	req, err := s.client.NewRequest(ctx, "GET", path, nil)
 	if err != nil {
 		return nil, nil, err
 	}

diff --git a/account_test.go b/account_test.go
@@ -27,7 +27,7 @@ func TestAccountGet(t *testing.T) {
 		fmt.Fprint(w, response)
 	})
 
-	acct, _, err := client.Account.Get()
+	acct, _, err := client.Account.Get(ctx)
 	if err != nil {
 		t.Errorf("Account.Get returned error: %v", err)
 	}

diff --git a/action.go b/action.go
@@ -1,6 +1,9 @@
 package godo
 
-import "fmt"
+import (
+	"context"
+	"fmt"
+)
 
 const (
 	actionsBasePath = "v2/actions"
@@ -15,8 +18,8 @@ const (
 // ActionsService handles communction with action related methods of the
 // DigitalOcean API: https://developers.digitalocean.com/documentation/v2#actions
 type ActionsService interface {
-	List(*ListOptions) ([]Action, *Response, error)
-	Get(int) (*Action, *Response, error)
+	List(context.Context, *ListOptions) ([]Action, *Response, error)
+	Get(context.Context, int) (*Action, *Response, error)
 }
 
 // ActionsServiceOp handles communition with the image action related methods of the
@@ -50,14 +53,14 @@ type Action struct {
 }
 
 // List all actions
-func (s *ActionsServiceOp) List(opt *ListOptions) ([]Action, *Response, error) {
+func (s *ActionsServiceOp) List(ctx context.Context, opt *ListOptions) ([]Action, *Response, error) {
 	path := actionsBasePath
 	path, err := addOptions(path, opt)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	req, err := s.client.NewRequest("GET", path, nil)
+	req, err := s.client.NewRequest(ctx, "GET", path, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -75,13 +78,13 @@ func (s *ActionsServiceOp) List(opt *ListOptions) ([]Action, *Response, error) {
 }
 
 // Get an action by ID.
-func (s *ActionsServiceOp) Get(id int) (*Action, *Response, error) {
+func (s *ActionsServiceOp) Get(ctx context.Context, id int) (*Action, *Response, error) {
 	if id < 1 {
 		return nil, nil, NewArgError("id", "cannot be less than 1")
 	}
 
 	path := fmt.Sprintf("%s/%d", actionsBasePath, id)
-	req, err := s.client.NewRequest("GET", path, nil)
+	req, err := s.client.NewRequest(ctx, "GET", path, nil)
 	if err != nil {
 		return nil, nil, err
 	}

diff --git a/action_test.go b/action_test.go
@@ -17,7 +17,7 @@ func TestAction_List(t *testing.T) {
 		testMethod(t, r, "GET")
 	})
 
-	actions, _, err := client.Actions.List(nil)
+	actions, _, err := client.Actions.List(ctx, nil)
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
 	}
@@ -37,7 +37,7 @@ func TestAction_ListActionMultiplePages(t *testing.T) {
 		testMethod(t, r, "GET")
 	})
 
-	_, resp, err := client.Actions.List(nil)
+	_, resp, err := client.Actions.List(ctx, nil)
 	if err != nil {
 		t.Fatal(nil)
 	}
@@ -68,7 +68,7 @@ func TestAction_RetrievePageByNumber(t *testing.T) {
 	})
 
 	opt := &ListOptions{Page: 2}
-	_, resp, err := client.Actions.List(opt)
+	_, resp, err := client.Actions.List(ctx, opt)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -85,7 +85,7 @@ func TestAction_Get(t *testing.T) {
 		testMethod(t, r, "GET")
 	})
 
-	action, _, err := client.Actions.Get(12345)
+	action, _, err := client.Actions.Get(ctx, 12345)
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
 	}

diff --git a/certificates.go b/certificates.go
@@ -1,16 +1,19 @@
 package godo
 
-import "path"
+import (
+	"context"
+	"path"
+)
 
 const certificatesBasePath = "/v2/certificates"
 
 // CertificatesService is an interface for managing certificates with the DigitalOcean API.
 // See: https://developers.digitalocean.com/documentation/v2/#certificates
 type CertificatesService interface {
-	Get(cID string) (*Certificate, *Response, error)
-	List(opt *ListOptions) ([]Certificate, *Response, error)
-	Create(cr *CertificateRequest) (*Certificate, *Response, error)
-	Delete(cID string) (*Response, error)
+	Get(context.Context, string) (*Certificate, *Response, error)
+	List(context.Context, *ListOptions) ([]Certificate, *Response, error)
+	Create(context.Context, *CertificateRequest) (*Certificate, *Response, error)
+	Delete(context.Context, string) (*Response, error)
 }
 
 // Certificate represents a DigitalOcean certificate configuration.
@@ -47,10 +50,10 @@ type CertificatesServiceOp struct {
 var _ CertificatesService = &CertificatesServiceOp{}
 
 // Get an existing certificate by its identifier.
-func (c *CertificatesServiceOp) Get(cID string) (*Certificate, *Response, error) {
+func (c *CertificatesServiceOp) Get(ctx context.Context, cID string) (*Certificate, *Response, error) {
 	urlStr := path.Join(certificatesBasePath, cID)
 
-	req, err := c.client.NewRequest("GET", urlStr, nil)
+	req, err := c.client.NewRequest(ctx, "GET", urlStr, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -65,13 +68,13 @@ func (c *CertificatesServiceOp) Get(cID string) (*Certificate, *Response, error)
 }
 
 // List all certificates.
-func (c *CertificatesServiceOp) List(opt *ListOptions) ([]Certificate, *Response, error) {
+func (c *CertificatesServiceOp) List(ctx context.Context, opt *ListOptions) ([]Certificate, *Response, error) {
 	urlStr, err := addOptions(certificatesBasePath, opt)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	req, err := c.client.NewRequest("GET", urlStr, nil)
+	req, err := c.client.NewRequest(ctx, "GET", urlStr, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -89,8 +92,8 @@ func (c *CertificatesServiceOp) List(opt *ListOptions) ([]Certificate, *Response
 }
 
 // Create a new certificate with provided configuration.
-func (c *CertificatesServiceOp) Create(cr *CertificateRequest) (*Certificate, *Response, error) {
-	req, err := c.client.NewRequest("POST", certificatesBasePath, cr)
+func (c *CertificatesServiceOp) Create(ctx context.Context, cr *CertificateRequest) (*Certificate, *Response, error) {
+	req, err := c.client.NewRequest(ctx, "POST", certificatesBasePath, cr)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -105,10 +108,10 @@ func (c *CertificatesServiceOp) Create(cr *CertificateRequest) (*Certificate, *R
 }
 
 // Delete a certificate by its identifier.
-func (c *CertificatesServiceOp) Delete(cID string) (*Response, error) {
+func (c *CertificatesServiceOp) Delete(ctx context.Context, cID string) (*Response, error) {
 	urlStr := path.Join(certificatesBasePath, cID)
 
-	req, err := c.client.NewRequest("DELETE", urlStr, nil)
+	req, err := c.client.NewRequest(ctx, "DELETE", urlStr, nil)
 	if err != nil {
 		return nil, err
 	}

diff --git a/certificates_test.go b/certificates_test.go
@@ -59,7 +59,7 @@ func TestCertificates_Get(t *testing.T) {
 		fmt.Fprint(w, certJSONResponse)
 	})
 
-	certificate, _, err := client.Certificates.Get(cID)
+	certificate, _, err := client.Certificates.Get(ctx, cID)
 	if err != nil {
 		t.Errorf("Certificates.Get returned error: %v", err)
 	}
@@ -85,7 +85,7 @@ func TestCertificates_List(t *testing.T) {
 		fmt.Fprint(w, certsJSONResponse)
 	})
 
-	certificates, _, err := client.Certificates.List(nil)
+	certificates, _, err := client.Certificates.List(ctx, nil)
 
 	if err != nil {
 		t.Errorf("Certificates.List returned error: %v", err)
@@ -136,7 +136,7 @@ func TestCertificates_Create(t *testing.T) {
 		fmt.Fprint(w, certJSONResponse)
 	})
 
-	certificate, _, err := client.Certificates.Create(createRequest)
+	certificate, _, err := client.Certificates.Create(ctx, createRequest)
 	if err != nil {
 		t.Errorf("Certificates.Create returned error: %v", err)
 	}
@@ -163,7 +163,7 @@ func TestCertificates_Delete(t *testing.T) {
 		testMethod(t, r, "DELETE")
 	})
 
-	_, err := client.Certificates.Delete(cID)
+	_, err := client.Certificates.Delete(ctx, cID)
 
 	if err != nil {
 		t.Errorf("Certificates.Delete returned error: %v", err)