Skip to content

return more information when response code is unexpected #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danielkrainas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

return more information when response code is unexpected #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 32 additions & 28 deletions app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func (c *Client) GetApp(appID string) (*Response, error) {
return nil, err
}
if r.Code != 200 {
return nil, fmt.Errorf("request error")
return nil, newRemoteError(r.Code, fmt.Sprintf("unexpected response code %d", r.Code))
}
return r, nil
}
Expand All @@ -66,7 +66,7 @@ func (c *Client) GetAppVersion(appID string, version string) (*Response, error)
return nil, err
}
if r.Code != 200 {
return nil, fmt.Errorf("request error")
return nil, newRemoteError(r.Code, fmt.Sprintf("unexpected response code %d", r.Code))
}
return r, nil
}
Expand All @@ -80,12 +80,13 @@ func (c *Client) CreateApp(app *Application) (*Response, error) {
Method: "POST",
}
r, err := c.request(options)
if r != nil {
if r.Code == 201 {
return r, nil
}
if err != nil {
return nil, err
}
if r.Code != 201 {
return nil, newRemoteError(r.Code, fmt.Sprintf("unexpected response code %d", r.Code))
}
return nil, err
return r, nil
}

// UpdateApp update the app but thoses changes are made for the next running app and does
Expand All @@ -97,13 +98,13 @@ func (c *Client) UpdateApp(appID string, app *Application) (*Response, error) {
Method: "PUT",
}
r, err := c.request(options)
if r != nil {
if (r.Code == 204) || (r.Code == 200) {
return r, nil
}
if err != nil {
return nil, err
}
return nil, err

if r.Code != 204 && r.Code != 200 {
return nil, newRemoteError(r.Code, fmt.Sprintf("unexpected response code %d", r.Code))
}
return r, nil
}

// DeleteApp delete this app from the cluster
Expand All @@ -113,12 +114,13 @@ func (c *Client) DeleteApp(appID string) (*Response, error) {
Method: "DELETE",
}
r, err := c.request(options)
if r != nil {
if r.Code == 200 {
return r, nil
}
if err != nil {
return nil, err
}
return nil, err
if r.Code != 200 {
return nil, newRemoteError(r.Code, fmt.Sprintf("unexpected response code %d", r.Code))
}
return r, nil
}

func (c *Client) DeleteDeployment(deploymentID string) (*Response, error) {
Expand All @@ -127,12 +129,13 @@ func (c *Client) DeleteDeployment(deploymentID string) (*Response, error) {
Method: "DELETE",
}
r, err := c.request(options)
if r != nil {
if (r.Code == 200) || (r.Code == 202) {
return r, nil
}
if err != nil {
return nil, err
}
if r.Code != 200 && r.Code != 202 {
return nil, newRemoteError(r.Code, fmt.Sprintf("unexpected response code %d", r.Code))
}
return nil, err
return r, nil
}

func (c *Client) RestartApp(appID string) (*Response, error) {
Expand All @@ -141,10 +144,11 @@ func (c *Client) RestartApp(appID string) (*Response, error) {
Method: "POST",
}
r, err := c.request(options)
if r != nil {
if r.Code == 204 {
return r, nil
}
if err != nil {
return nil, err
}
return nil, err
if r.Code != 204 {
return nil, newRemoteError(r.Code, fmt.Sprintf("unexpected response code %d", r.Code))
}
return r, nil
}