iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builder/digitalocean: display friendler API error messages 

Fixes #85
This commit is contained in:
Jack Pearkes 2013-07-01 09:29:45 +02:00
parent 666a8e11cb
commit d9ab4e210d
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builder/digitalocean/api.go
View File

@ -189,28 +189,25 @@ func NewRequest(d DigitalOceanClient, path string, params string) (map[string]in
return decodedResponse, err return decodedResponse, err
} }
log.Printf("response from digitalocean: %s", body)
err = json.Unmarshal(body, &decodedResponse) err = json.Unmarshal(body, &decodedResponse)
log.Printf("response from digitalocean: %v", decodedResponse) // Check for bad JSON
// Catch all non-200 status and return an error
if resp.StatusCode != 200 {
err = errors.New(fmt.Sprintf("Received non-200 HTTP status from DigitalOcean: %v", resp.StatusCode))
return decodedResponse, err
}
if err != nil { if err != nil {
err = errors.New(fmt.Sprintf("Failed to decode JSON response (HTTP %v) from DigitalOcean: %s",
resp.StatusCode, body))
return decodedResponse, err return decodedResponse, err
} }
// Catch all non-OK statuses from DO and return an error // Check for errors sent by digitalocean
status := decodedResponse["status"] status := decodedResponse["status"]
if status != "OK" { if status != "OK" {
// Get the actual error message if there is one // Get the actual error message if there is one
if status == "ERROR" { if status == "ERROR" {
status = decodedResponse["error_message"] status = decodedResponse["error_message"]
} }
err = errors.New(fmt.Sprintf("Received bad status from DigitalOcean: %v", status)) err = errors.New(fmt.Sprintf("Received bad response (HTTP %v) from DigitalOcean: %s", resp.StatusCode, status))
return decodedResponse, err return decodedResponse, err
} }