Remove support for Go 1.6 (digitalocean#166)

* Move DoRequest* to godo package with stdlib context * Use stdlib context package in place of godo context. * Remove Go 1.6 from TravisCI configuration. * Use stdlib context in util and tests instead of godo context. * Add in Go 1.8, 1.9, and 1.10 to TravisCI configuration. * Put 1.10 in quotes.
onlycodergod · May 8, 2018 · e6249e5 · e6249e5
1 parent 7a32b5c
commit e6249e5
Show file tree

Hide file tree

Showing 29 changed files with 46 additions and 230 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
 language: go
 
 go:
-  - 1.6.3
   - 1.7
+  - 1.8
+  - 1.9
+  - "1.10"
   - tip
diff --git a/account.go b/account.go
@@ -1,9 +1,8 @@
 package godo
 
 import (
+	"context"
 	"net/http"
-
-	"github.com/digitalocean/godo/context"
 )
 
 // AccountService is an interface for interfacing with the Account

diff --git a/action.go b/action.go
@@ -1,10 +1,9 @@
 package godo
 
 import (
+	"context"
 	"fmt"
 	"net/http"
-
-	"github.com/digitalocean/godo/context"
 )
 
 const (

diff --git a/certificates.go b/certificates.go
@@ -1,10 +1,9 @@
 package godo
 
 import (
+	"context"
 	"net/http"
 	"path"
-
-	"github.com/digitalocean/godo/context"
 )
 
 const certificatesBasePath = "/v2/certificates"

diff --git a/context/context.go b/context/context.go
diff --git a/context/context_go17.go b/context/context_go17.go
diff --git a/context/context_pre_go17.go b/context/context_pre_go17.go
diff --git a/domains.go b/domains.go
@@ -1,10 +1,9 @@
 package godo
 
 import (
+	"context"
 	"fmt"
 	"net/http"
-
-	"github.com/digitalocean/godo/context"
 )
 
 const domainsBasePath = "v2/domains"

diff --git a/droplet_actions.go b/droplet_actions.go
@@ -1,11 +1,10 @@
 package godo
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/url"
-
-	"github.com/digitalocean/godo/context"
 )
 
 // ActionRequest reprents DigitalOcean Action Request

diff --git a/droplets.go b/droplets.go
@@ -1,12 +1,11 @@
 package godo
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
-
-	"github.com/digitalocean/godo/context"
 )
 
 const dropletBasePath = "v2/droplets"

diff --git a/firewalls.go b/firewalls.go
@@ -1,11 +1,10 @@
 package godo
 
 import (
+	"context"
 	"net/http"
 	"path"
 	"strconv"
-
-	"github.com/digitalocean/godo/context"
 )
 
 const firewallsBasePath = "/v2/firewalls"

diff --git a/floating_ips.go b/floating_ips.go
@@ -1,10 +1,9 @@
 package godo
 
 import (
+	"context"
 	"fmt"
 	"net/http"
-
-	"github.com/digitalocean/godo/context"
 )
 
 const floatingBasePath = "v2/floating_ips"

diff --git a/floating_ips_actions.go b/floating_ips_actions.go
@@ -1,10 +1,9 @@
 package godo
 
 import (
+	"context"
 	"fmt"
 	"net/http"
-
-	"github.com/digitalocean/godo/context"
 )
 
 // FloatingIPActionsService is an interface for interfacing with the

diff --git a/godo.go b/godo.go
@@ -2,6 +2,7 @@ package godo
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -14,8 +15,6 @@ import (
 
 	"github.com/google/go-querystring/query"
 	headerLink "github.com/tent/http-link-go"
-
-	"github.com/digitalocean/godo/context"
 )
 
 const (
@@ -296,7 +295,7 @@ func (r *Response) populateRate() {
 // pointed to by v, or returned as an error if an API error has occurred. If v implements the io.Writer interface,
 // the raw response will be written to v, without attempting to decode it.
 func (c *Client) Do(ctx context.Context, req *http.Request, v interface{}) (*Response, error) {
-	resp, err := context.DoRequestWithClient(ctx, c.client, req)
+	resp, err := DoRequestWithClient(ctx, c.client, req)
 	if err != nil {
 		return nil, err
 	}
@@ -334,6 +333,21 @@ func (c *Client) Do(ctx context.Context, req *http.Request, v interface{}) (*Res
 
 	return response, err
 }
+
+// DoRequest submits an HTTP request.
+func DoRequest(ctx context.Context, req *http.Request) (*http.Response, error) {
+	return DoRequestWithClient(ctx, http.DefaultClient, req)
+}
+
+// DoRequestWithClient submits an HTTP request using the specified client.
+func DoRequestWithClient(
+	ctx context.Context,
+	client *http.Client,
+	req *http.Request) (*http.Response, error) {
+	req = req.WithContext(ctx)
+	return client.Do(req)
+}
+
 func (r *ErrorResponse) Error() string {
 	if r.RequestID != "" {
 		return fmt.Sprintf("%v %v: %d (request %q) %v",

diff --git a/godo_test.go b/godo_test.go
@@ -1,6 +1,7 @@
 package godo
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -11,8 +12,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"github.com/digitalocean/godo/context"
 )
 
 var (

diff --git a/image_actions.go b/image_actions.go
@@ -1,10 +1,9 @@
 package godo
 
 import (
+	"context"
 	"fmt"
 	"net/http"
-
-	"github.com/digitalocean/godo/context"
 )
 
 // ImageActionsService is an interface for interfacing with the image actions

diff --git a/images.go b/images.go
@@ -1,10 +1,9 @@
 package godo
 
 import (
+	"context"
 	"fmt"
 	"net/http"
-
-	"github.com/digitalocean/godo/context"
 )
 
 const imageBasePath = "v2/images"