Merge pull request #7 from dshafik/add-client

[WIP] Add edgegrid.Client

Author: njuettner

Godeps/_workspace/src/github.com/go-ini/ini/struct.go

@@ -0,0 +1,191 @@
+package edgegrid
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"runtime"
+	"strings"
+)
+
+const (
+	libraryVersion = "0.1.0"
+)
+
+type Client struct {
+	http.Client
+
+	// HTTP client used to communicate with the Akamai APIs.
+	//client *http.Client
+
+	// Base URL for API requests.
+	BaseURL *url.URL
+
+	// User agent for client
+	UserAgent string
+
+	Config Config
+}
+
+type Response http.Response
+type JsonBody map[string]interface{}
+
+func New(httpClient *http.Client, config Config) (*Client, error) {
+	c := NewClient(httpClient)
+	c.Config = config
+
+	baseUrl, err := url.Parse("https://" + config.Host)
+
+	if err != nil {
+		return nil, err
+	}
+
+	c.BaseURL = baseUrl
+	return c, nil
+}
+
+func NewClient(httpClient *http.Client) *Client {
+	if httpClient == nil {
+		httpClient = http.DefaultClient
+	}
+
+	client := &Client{
+		Client: *httpClient,
+		UserAgent: "Akamai-Open-Edgegrid-golang/" + libraryVersion +
+			" golang/" + strings.TrimPrefix(runtime.Version(), "go"),
+	}
+
+	return client
+}
+
+// NewRequest creates an API request. A relative URL can be provided in urlStr, which will be resolved to the
+// BaseURL of the Client. If specified, the value pointed to by body is JSON encoded and included in as the request body.
+func (c *Client) NewRequest(method, urlStr string, body interface{}) (*http.Request, error) {
+	var req *http.Request
+
+	urlStr = strings.TrimPrefix(urlStr, "/")
+
+	rel, err := url.Parse(urlStr)
+	if err != nil {
+		return nil, err
+	}
+
+	u := c.BaseURL.ResolveReference(rel)
+
+	req, err = http.NewRequest(method, u.String(), nil)
+
+	req.Header.Add("User-Agent", c.UserAgent)
+
+	return req, nil
+}
+
+func (c *Client) NewJsonRequest(method, urlStr string, body interface{}) (*http.Request, error) {
+	buf := new(bytes.Buffer)
+	err := json.NewEncoder(buf).Encode(body)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := c.NewRequest(method, urlStr, buf)
+	req.Header.Add("Content-Type", "application/json")
+	req.Header.Add("Accept", "application/json,*/*")
+
+	return req, err
+}
+
+func (c *Client) Do(req *http.Request) (*Response, error) {
+	req = c.Config.AddRequestHeader(req)
+	response, err := c.Client.Do(req)
+
+	if err != nil {
+		return nil, err
+	}
+
+	res := Response(*response)
+
+	return &res, err
+}
+
+func (c *Client) Get(url string) (resp *Response, err error) {
+	req, err := c.NewRequest("GET", url, nil)
+
+	if err != nil {
+		return nil, err
+	}
+
+	req = c.Config.AddRequestHeader(req)
+	response, err := c.Do(req)
+
+	if err != nil {
+		return nil, err
+	}
+
+	res := Response(*response)
+
+	return &res, err
+}
+
+func (c *Client) Post(url string, bodyType string, body interface{}) (resp *Response, err error) {
+	var req *http.Request
+
+	req, err = c.NewRequest("POST", url, body)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Set("Content-Type", bodyType)
+
+	req = c.Config.AddRequestHeader(req)
+	response, err := c.Do(req)
+
+	if err != nil {
+		return response, err
+	}
+
+	res := Response(*response)
+
+	return &res, err
+}
+
+func (c *Client) PostForm(url string, data url.Values) (resp *Response, err error) {
+	return c.Post(url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode()))
+}
+
+func (c *Client) PostJson(url string, data interface{}) (resp *Response, err error) {
+	buf := new(bytes.Buffer)
+	err = json.NewEncoder(buf).Encode(data)
+	if err != nil {
+		return nil, err
+	}
+
+	return c.Post(url, "application/json", buf)
+}
+
+func (c *Client) Head(url string) (resp *Response, err error) {
+	req, _ := c.NewRequest("HEAD", url, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	response, err := c.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	res := Response(*response)
+	return &res, err
+}
+
+func (r *Response) BodyJson(data interface{}) error {
+	if data == nil {
+		return errors.New("You must pass in an interface{}")
+	}
+
+	body, _ := ioutil.ReadAll(r.Body)
+	err := json.Unmarshal(body, &data)
+
+	return err
+}

Godeps/_workspace/src/github.com/pmezard/go-difflib/difflib/difflib.go

@@ -194,6 +194,10 @@ func (c *Config) createAuthHeader(req *http.Request, timestamp string, nonce str
 
 // AddRequestHeader sets the authorization header to use Akamai Open API
 func AddRequestHeader(c Config, req *http.Request) *http.Request {
+	return c.AddRequestHeader(req)
+}
+
+func (c Config) AddRequestHeader(req *http.Request) *http.Request {
 	if c.Debug {
 		log.SetLevel(log.DebugLevel)
 	}

Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go

@@ -0,0 +1,77 @@
+package main
+
+import (
+	"fmt"
+	"github.com/akamai-open/AkamaiOPEN-edgegrid-golang"
+	"log"
+	"math/rand"
+	"net/url"
+	"time"
+)
+
+func random(min int, max int) int {
+	rand.Seed(time.Now().UTC().UnixNano())
+	random := rand.Intn(max-min) + min
+
+	return random
+}
+
+type LocationsResponse struct {
+	Locations []string `json:locations`
+}
+
+type DigResponse struct {
+	Dig struct {
+		Hostname    string `json:hostname`
+		QueryType   string `json:queryType`
+		Result      string `json:result`
+		ErrorString string `json:errorString`
+	} `json:dig`
+}
+
+func main() {
+	config, err := edgegrid.Init("~/.edgerc", "default")
+	//config.Debug = true
+	if err == nil {
+		client, err := edgegrid.New(nil, config)
+		if err == nil {
+			fmt.Println("Requesting locations that support the diagnostic-tools API.")
+
+			res, err := client.Get("/diagnostic-tools/v1/locations")
+			if err != nil {
+				log.Fatal(err.Error())
+			}
+
+			locationsResponse := LocationsResponse{}
+			res.BodyJson(&locationsResponse)
+
+			if err != nil {
+				log.Fatal(err.Error())
+			}
+
+			fmt.Printf("There are %d locations that can run dig in the Akamai Network\n", len(locationsResponse.Locations))
+
+			if len(locationsResponse.Locations) == 0 {
+				log.Fatal("No locations found")
+			}
+
+			location := locationsResponse.Locations[random(0, len(locationsResponse.Locations))-1]
+
+			fmt.Println("We will make our call from " + location)
+
+			fmt.Println("Running dig from " + location)
+
+			client.Timeout = 5 * time.Minute
+			res, err = client.Get("/diagnostic-tools/v1/dig?hostname=developer.akamai.com&location=" + url.QueryEscape(location) + "&queryType=A")
+			if err != nil {
+				log.Fatal(err.Error())
+			}
+
+			digResponse := DigResponse{}
+			res.BodyJson(&digResponse)
+			fmt.Println(digResponse.Dig.Result)
+		} else {
+			log.Fatal(err.Error())
+		}
+	}
+}

Godeps/_workspace/src/golang.org/x/sys/unix/syscall_darwin.go

@@ -32,7 +32,7 @@ func main() {
 
 	if err == nil {
 		req, _ := http.NewRequest("GET", fmt.Sprintf("https://%s/diagnostic-tools/v1/locations", config.Host), nil)
-		req = edgegrid.AddRequestHeader(config, req)
+		req = config.AddRequestHeader(req)
 		resp, _ := client.Do(req)
 		byt, _ := ioutil.ReadAll(resp.Body)
 		fmt.Println(string(byt))

client.go

@@ -24,7 +24,7 @@ func main() {
 	}
 
 	req, _ := http.NewRequest("GET", fmt.Sprintf("https://%s/siteshield/v1/maps", config.Host), nil)
-	req = edgegrid.AddRequestHeader(config, req)
+	req = config.AddRequestHeader(req)
 	resp, _ := client.Do(req)
 	byt, _ := ioutil.ReadAll(resp.Body)
 	fmt.Println(string(byt))