Merge pull request digitalocean#8 from digitalocean/userdata

Update Go API client to be closer to API spec
eguevara · Oct 16, 2014 · 5478aae · 5478aae
2 parents 1c064ed + e1fc58d
commit 5478aae
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/droplets.go b/droplets.go
@@ -57,11 +57,15 @@ type dropletsRoot struct {
 
 // DropletCreateRequest represents a request to create a droplet.
 type DropletCreateRequest struct {
-	Name    string        `json:"name"`
-	Region  string        `json:"region"`
-	Size    string        `json:"size"`
-	Image   string        `json:"image"`
-	SSHKeys []interface{} `json:"ssh_keys"`
+	Name              string        `json:"name"`
+	Region            string        `json:"region"`
+	Size              string        `json:"size"`
+	Image             string        `json:"image"`
+	SSHKeys           []interface{} `json:"ssh_keys"`
+	Backups           bool          `json:"backups"`
+	IPv6              bool          `json:"ipv6"`
+	PrivateNetworking bool          `json:"private_networking"`
+	UserData          string        `json:"user_data"`
 }
 
 func (d DropletCreateRequest) String() string {

diff --git a/godo_test.go b/godo_test.go
@@ -78,7 +78,10 @@ func TestNewRequest(t *testing.T) {
 	c := NewClient(nil)
 
 	inURL, outURL := "/foo", defaultBaseURL+"foo"
-	inBody, outBody := &DropletCreateRequest{Name: "l"}, `{"name":"l","region":"","size":"","image":"","ssh_keys":null}`+"\n"
+	inBody, outBody := &DropletCreateRequest{Name: "l"},
+		`{"name":"l","region":"","size":"","image":"",`+
+			`"ssh_keys":null,"backups":false,"ipv6":false,`+
+			`"private_networking":false,"user_data":""}`+"\n"
 	req, _ := c.NewRequest("GET", inURL, inBody)
 
 	// test relative URL was expanded

diff --git a/links.go b/links.go
@@ -51,7 +51,7 @@ func (p *Pages) current() (int, error) {
 
 // IsLastPage returns true if the current page is the last
 func (l *Links) IsLastPage() bool {
-	if l == nil {
+	if l.Pages == nil {
 		return true
 	}
 	return l.Pages.isLast()

diff --git a/regions.go b/regions.go
@@ -19,6 +19,7 @@ type Region struct {
 	Name      string   `json:"name,omitempty"`
 	Sizes     []string `json:"sizes,omitempty"`
 	Available bool     `json:"available,omitempty`
+	Features  []string `json:"features,omitempty`
 }
 
 type regionsRoot struct {