Code review changes.

certificates.go

@@ -1,7 +1,7 @@
 package godo
 
 import (
-	"fmt"
+	"path"
 )
 
 const certificatesBasePath = "/v2/certificates"
@@ -50,9 +50,9 @@ var _ CertificatesService = &CertificatesServiceOp{}
 
 // Get an existing certificate by its identifier.
 func (c *CertificatesServiceOp) Get(cID string) (*Certificate, *Response, error) {
-	path := fmt.Sprintf("%s/%s", certificatesBasePath, cID)
+	urlStr := path.Join(certificatesBasePath, cID)
 
-	req, err := c.client.NewRequest("GET", path, nil)
+	req, err := c.client.NewRequest("GET", urlStr, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -68,12 +68,12 @@ func (c *CertificatesServiceOp) Get(cID string) (*Certificate, *Response, error)
 
 // List all certificates.
 func (c *CertificatesServiceOp) List(opt *ListOptions) ([]Certificate, *Response, error) {
-	path, err := addOptions(certificatesBasePath, opt)
+	urlStr, err := addOptions(certificatesBasePath, opt)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	req, err := c.client.NewRequest("GET", path, nil)
+	req, err := c.client.NewRequest("GET", urlStr, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -108,9 +108,9 @@ func (c *CertificatesServiceOp) Create(cr *CertificateRequest) (*Certificate, *R
 
 // Delete a certificate by its identifier.
 func (c *CertificatesServiceOp) Delete(cID string) (*Response, error) {
-	path := fmt.Sprintf("%s/%s", certificatesBasePath, cID)
+	urlStr := path.Join(certificatesBasePath, cID)
 
-	req, err := c.client.NewRequest("DELETE", path, nil)
+	req, err := c.client.NewRequest("DELETE", urlStr, nil)
 	if err != nil {
 		return nil, err
 	}

certificates_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"path"
 )
 
 var certJSONResponse = `
@@ -50,10 +51,10 @@ func TestCertificates_Get(t *testing.T) {
 	setup()
 	defer teardown()
 
-	path := "/v2/certificates"
+	urlStr := "/v2/certificates"
 	cID := "892071a0-bb95-49bc-8021-3afd67a210bf"
-	path = fmt.Sprintf("%s/%s", path, cID)
-	mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
+	urlStr = path.Join(urlStr, cID)
+	mux.HandleFunc(urlStr, func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "GET")
 		fmt.Fprint(w, certJSONResponse)
 	})
@@ -78,8 +79,8 @@ func TestCertificates_List(t *testing.T) {
 	setup()
 	defer teardown()
 
-	path := "/v2/certificates"
-	mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
+	urlStr := "/v2/certificates"
+	mux.HandleFunc(urlStr, func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "GET")
 		fmt.Fprint(w, certsJSONResponse)
 	})
@@ -121,8 +122,8 @@ func TestCertificates_Create(t *testing.T) {
 		CertificateChain: "-----BEGIN CERTIFICATE-----",
 	}
 
-	path := "/v2/certificates"
-	mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
+	urlStr := "/v2/certificates"
+	mux.HandleFunc(urlStr, func(w http.ResponseWriter, r *http.Request) {
 		v := new(CertificateRequest)
 		err := json.NewDecoder(r.Body).Decode(v)
 		if err != nil {
@@ -156,9 +157,9 @@ func TestCertificates_Delete(t *testing.T) {
 	defer teardown()
 
 	cID := "892071a0-bb95-49bc-8021-3afd67a210bf"
-	path := "/v2/certificates"
-	path = fmt.Sprintf("%s/%s", path, cID)
-	mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
+	urlStr := "/v2/certificates"
+	urlStr = path.Join(urlStr, cID)
+	mux.HandleFunc(urlStr, func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "DELETE")
 	})