Skip to content
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

Deploy - 2022/7/11 #158

Merged
merged 5 commits into from
Jul 12, 2022
Merged

Deploy - 2022/7/11 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c23e61
chore: is case of API timeout, we provide a clarifying message
PatrickMenoti Jul 6, 2022
f3959b2
fix: correct timeout in domains SDK
PatrickMenoti Jul 6, 2022
d429098
Merge pull request #156 from aziontech/timeout
PatrickMenoti Jul 6, 2022
dab78ed
chore: add new error message to other APIs
PatrickMenoti Jul 8, 2022
2f2078e
Merge pull request #157 from aziontech/more_errors
PatrickMenoti Jul 11, 2022
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
17 changes: 11 additions & 6 deletions pkg/api/domains/domains.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import (
"fmt"
"io/ioutil"
"net/http"
"time"

"github.com/aziontech/azion-cli/pkg/cmd/version"
"github.com/aziontech/azion-cli/utils"
sdk "github.com/aziontech/azionapi-go-sdk/domains"
)

Expand Down Expand Up @@ -37,6 +39,7 @@ func NewClient(c *http.Client, url string, token string) *Client {
conf.Servers = sdk.ServerConfigurations{
{URL: url},
}
conf.HTTPClient.Timeout = 10 * time.Second

return &Client{
apiClient: sdk.NewAPIClient(conf),
Expand All @@ -47,12 +50,13 @@ func (c *Client) Create(ctx context.Context, req *CreateRequest) (DomainResponse

request := c.apiClient.DomainsApi.CreateDomain(ctx).CreateDomainRequest(req.CreateDomainRequest)

domainsResponse, httpRes, err := request.Execute()
domainsResponse, httpResp, err := request.Execute()
if err != nil {
if httpRes == nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return nil, err
}
responseBody, _ := ioutil.ReadAll(httpRes.Body)
responseBody, _ := ioutil.ReadAll(httpResp.Body)
return nil, fmt.Errorf("%w: %s", err, responseBody)
}

Expand All @@ -63,12 +67,13 @@ func (c *Client) Update(ctx context.Context, req *UpdateRequest) (DomainResponse

request := c.apiClient.DomainsApi.UpdateDomain(ctx, req.DomainId).UpdateDomainRequest(req.UpdateDomainRequest)

domainsResponse, httpRes, err := request.Execute()
domainsResponse, httpResp, err := request.Execute()
if err != nil {
if httpRes == nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return nil, err
}
responseBody, _ := ioutil.ReadAll(httpRes.Body)
responseBody, _ := ioutil.ReadAll(httpResp.Body)
return nil, fmt.Errorf("%w: %s", err, responseBody)
}

Expand Down
45 changes: 27 additions & 18 deletions pkg/api/edge_applications/edge_applications.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import (
"fmt"
"io/ioutil"
"net/http"
"time"

"github.com/aziontech/azion-cli/pkg/cmd/version"
"github.com/aziontech/azion-cli/utils"
sdk "github.com/aziontech/azionapi-go-sdk/edgeapplications"
)

Expand Down Expand Up @@ -54,6 +56,7 @@ func NewClient(c *http.Client, url string, token string) *Client {
conf.Servers = sdk.ServerConfigurations{
{URL: url},
}
conf.HTTPClient.Timeout = 10 * time.Second

return &Client{
apiClient: sdk.NewAPIClient(conf),
Expand All @@ -64,12 +67,13 @@ func (c *Client) Create(ctx context.Context, req *CreateRequest) (EdgeApplicatio

request := c.apiClient.EdgeApplicationsMainSettingsApi.EdgeApplicationsPost(ctx).CreateApplicationRequest(req.CreateApplicationRequest)

edgeApplicationsResponse, httpRes, err := request.Execute()
edgeApplicationsResponse, httpResp, err := request.Execute()
if err != nil {
if httpRes == nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return nil, err
}
responseBody, _ := ioutil.ReadAll(httpRes.Body)
responseBody, _ := ioutil.ReadAll(httpResp.Body)
return nil, fmt.Errorf("%w: %s", err, responseBody)
}

Expand All @@ -79,12 +83,13 @@ func (c *Client) Create(ctx context.Context, req *CreateRequest) (EdgeApplicatio
func (c *Client) Update(ctx context.Context, req *UpdateRequest) (EdgeApplicationsResponse, error) {
request := c.apiClient.EdgeApplicationsMainSettingsApi.EdgeApplicationsIdPatch(ctx, req.Id).ApplicationUpdateRequest(req.ApplicationUpdateRequest)

edgeApplicationsResponse, httpRes, err := request.Execute()
edgeApplicationsResponse, httpResp, err := request.Execute()
if err != nil {
if httpRes == nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return nil, err
}
responseBody, _ := ioutil.ReadAll(httpRes.Body)
responseBody, _ := ioutil.ReadAll(httpResp.Body)
return nil, fmt.Errorf("%w: %s", err, responseBody)
}

Expand All @@ -97,12 +102,13 @@ func (c *Client) UpdateInstance(ctx context.Context, req *UpdateInstanceRequest)
req.ApplicationUpdateInstanceRequest.SetName("justfortests2")
req.SetEdgeFunctionId(req.FunctionId)

edgeApplicationsResponse, httpRes, err := request.Execute()
edgeApplicationsResponse, httpResp, err := request.Execute()
if err != nil {
if httpRes == nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return nil, err
}
responseBody, _ := ioutil.ReadAll(httpRes.Body)
responseBody, _ := ioutil.ReadAll(httpResp.Body)
return nil, fmt.Errorf("%w: %s", err, responseBody)
}

Expand All @@ -116,12 +122,13 @@ func (c *Client) CreateInstance(ctx context.Context, req *CreateInstanceRequest)

request := c.apiClient.EdgeApplicationsEdgeFunctionsInstancesApi.EdgeApplicationsEdgeApplicationIdFunctionsInstancesPost(ctx, req.ApplicationId).ApplicationCreateInstanceRequest(req.ApplicationCreateInstanceRequest)

edgeApplicationsResponse, httpRes, err := request.Execute()
edgeApplicationsResponse, httpResp, err := request.Execute()
if err != nil {
if httpRes == nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return nil, err
}
responseBody, _ := ioutil.ReadAll(httpRes.Body)
responseBody, _ := ioutil.ReadAll(httpResp.Body)
return nil, fmt.Errorf("%w: %s", err, responseBody)
}

Expand All @@ -132,12 +139,13 @@ func (c *Client) UpdateRulesEngine(ctx context.Context, req *UpdateRulesEngineRe

request := c.apiClient.EdgeApplicationsRulesEngineApi.EdgeApplicationsEdgeApplicationIdRulesEnginePhaseRulesGet(ctx, req.IdApplication, "request")

edgeApplicationRules, httpRes, err := request.Execute()
edgeApplicationRules, httpResp, err := request.Execute()
if err != nil {
if httpRes == nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return nil, err
}
responseBody, _ := ioutil.ReadAll(httpRes.Body)
responseBody, _ := ioutil.ReadAll(httpResp.Body)
return nil, fmt.Errorf("%w: %s", err, responseBody)
}

Expand All @@ -150,12 +158,13 @@ func (c *Client) UpdateRulesEngine(ctx context.Context, req *UpdateRulesEngineRe

requestUpdate := c.apiClient.EdgeApplicationsRulesEngineApi.EdgeApplicationsEdgeApplicationIdRulesEnginePhaseRulesRuleIdPatch(ctx, req.IdApplication, "request", idRule).PatchRulesEngineRequest(req.PatchRulesEngineRequest)

edgeApplicationsResponse, httpRes, err := requestUpdate.Execute()
edgeApplicationsResponse, httpResp, err := requestUpdate.Execute()
if err != nil {
if httpRes == nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return nil, err
}
responseBody, _ := ioutil.ReadAll(httpRes.Body)
responseBody, _ := ioutil.ReadAll(httpResp.Body)
return nil, fmt.Errorf("%w: %s", err, responseBody)
}

Expand Down
32 changes: 23 additions & 9 deletions pkg/api/edge_functions/edge_functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import (
"fmt"
"io/ioutil"
"net/http"
"time"

"github.com/aziontech/azion-cli/pkg/cmd/version"
"github.com/aziontech/azion-cli/pkg/contracts"
"github.com/aziontech/azion-cli/utils"
sdk "github.com/aziontech/azionapi-go-sdk/edgefunctions"
)

Expand Down Expand Up @@ -40,6 +42,7 @@ func NewClient(c *http.Client, url string, token string) *Client {
conf.Servers = sdk.ServerConfigurations{
{URL: url},
}
conf.HTTPClient.Timeout = 10 * time.Second

return &Client{
apiClient: sdk.NewAPIClient(conf),
Expand All @@ -49,9 +52,13 @@ func NewClient(c *http.Client, url string, token string) *Client {
func (c *Client) Get(ctx context.Context, id int64) (EdgeFunctionResponse, error) {
req := c.apiClient.EdgeFunctionsApi.EdgeFunctionsIdGet(ctx, id)

res, _, err := req.Execute()
res, httpResp, err := req.Execute()

if err != nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return nil, err
}
return nil, err
}

Expand All @@ -61,9 +68,13 @@ func (c *Client) Get(ctx context.Context, id int64) (EdgeFunctionResponse, error
func (c *Client) Delete(ctx context.Context, id int64) error {
req := c.apiClient.EdgeFunctionsApi.EdgeFunctionsIdDelete(ctx, id)

_, err := req.Execute()
httpResp, err := req.Execute()

if err != nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return err
}
return err
}

Expand All @@ -85,12 +96,13 @@ func (c *Client) Create(ctx context.Context, req *CreateRequest) (EdgeFunctionRe

request := c.apiClient.EdgeFunctionsApi.EdgeFunctionsPost(ctx).CreateEdgeFunctionRequest(req.CreateEdgeFunctionRequest)

edgeFuncResponse, httpRes, err := request.Execute()
edgeFuncResponse, httpResp, err := request.Execute()
if err != nil {
if httpRes == nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return nil, err
}
responseBody, _ := ioutil.ReadAll(httpRes.Body)
responseBody, _ := ioutil.ReadAll(httpResp.Body)
return nil, fmt.Errorf("%w: %s", err, responseBody)
}

Expand All @@ -109,12 +121,13 @@ func NewUpdateRequest(id int64) *UpdateRequest {
func (c *Client) Update(ctx context.Context, req *UpdateRequest) (EdgeFunctionResponse, error) {
request := c.apiClient.EdgeFunctionsApi.EdgeFunctionsIdPatch(ctx, req.Id).PatchEdgeFunctionRequest(req.PatchEdgeFunctionRequest)

edgeFuncResponse, httpRes, err := request.Execute()
edgeFuncResponse, httpResp, err := request.Execute()
if err != nil {
if httpRes == nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return nil, err
}
responseBody, _ := ioutil.ReadAll(httpRes.Body)
responseBody, _ := ioutil.ReadAll(httpResp.Body)
return nil, fmt.Errorf("%w: %s", err, responseBody)
}

Expand All @@ -130,7 +143,8 @@ func (c *Client) List(ctx context.Context, opts *contracts.ListOptions) ([]EdgeF
Execute()

if err != nil {
if httpResp == nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return nil, err
}
responseBody, _ := ioutil.ReadAll(httpResp.Body)
Expand Down
15 changes: 11 additions & 4 deletions pkg/api/realtime_purge/realtime_purge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import (
"fmt"
"io/ioutil"
"net/http"
"time"

"github.com/aziontech/azion-cli/pkg/cmd/version"
"github.com/aziontech/azion-cli/utils"
sdk "github.com/aziontech/azionapi-go-sdk/realtimepurge"
)

Expand All @@ -23,6 +25,7 @@ func NewClient(c *http.Client, url string, token string) *Client {
conf.Servers = sdk.ServerConfigurations{
{URL: url},
}
conf.HTTPClient.Timeout = 10 * time.Second

return &Client{
apiClient: sdk.NewAPIClient(conf),
Expand All @@ -35,14 +38,18 @@ func (c *Client) Purge(ctx context.Context, urlToPurge []string) error {
purg.SetMethod("delete")
request := c.apiClient.RealTimePurgeApi.PurgeUrl(ctx).PurgeUrlRequest(purg)

httpRes, err := c.apiClient.RealTimePurgeApi.PurgeUrlExecute(request)
httpResp, err := c.apiClient.RealTimePurgeApi.PurgeUrlExecute(request)
if err != nil {
responseBody, _ := ioutil.ReadAll(httpRes.Body)
if httpResp == nil || httpResp.StatusCode >= 500 {
err := utils.CheckStatusCode500Error(err)
return err
}
responseBody, _ := ioutil.ReadAll(httpResp.Body)
return fmt.Errorf("%w: %s", err, responseBody)
}

if httpRes.StatusCode != 201 {
return fmt.Errorf("%w: %s", err, httpRes.Status)
if httpResp.StatusCode != 201 {
return fmt.Errorf("%w: %s", err, httpResp.Status)
}

return nil
Expand Down
3 changes: 2 additions & 1 deletion pkg/cmd/edge_services/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ func createNewService(client *sdk.APIClient, out io.Writer, request sdk.CreateSe
resp, httpResp, err := api.NewService(c).CreateServiceRequest(request).Execute()
if err != nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
return utils.ErrorInternalServerError
err := utils.CheckStatusCode500Error(err)
return err
}
body, err := ioutil.ReadAll(httpResp.Body)
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion pkg/cmd/edge_services/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ func deleteService(client *sdk.APIClient, out io.Writer, service_id int64) error

if err != nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
return utils.ErrorInternalServerError
err := utils.CheckStatusCode500Error(err)
return err
}
body, err := ioutil.ReadAll(httpResp.Body)
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion pkg/cmd/edge_services/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ func describeService(client *sdk.APIClient, service_id int64, withVariables bool
resp, httpResp, err := api.GetService(c, service_id).WithVars(withVariables).Execute()
if err != nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
return nil, utils.ErrorInternalServerError
err := utils.CheckStatusCode500Error(err)
return nil, err
}
body, err := ioutil.ReadAll(httpResp.Body)
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion pkg/cmd/edge_services/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ func listAllServices(client *sdk.APIClient, out io.Writer, opts *contracts.ListO

if err != nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
return utils.ErrorInternalServerError
err := utils.CheckStatusCode500Error(err)
return err
}
body, err := ioutil.ReadAll(httpResp.Body)
if err != nil {
Expand Down
3 changes: 3 additions & 0 deletions pkg/cmd/edge_services/requests/request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package requests

import (
"time"

"github.com/aziontech/azion-cli/pkg/cmd/version"
"github.com/aziontech/azion-cli/pkg/cmdutil"
sdk "github.com/aziontech/azionapi-go-sdk/edgeservices"
Expand All @@ -16,6 +18,7 @@ func CreateClient(f *cmdutil.Factory) (*sdk.APIClient, error) {
URL: f.Config.GetString("api_url"),
},
}
conf.HTTPClient.Timeout = 10 * time.Second

return sdk.NewAPIClient(conf), nil
}
3 changes: 2 additions & 1 deletion pkg/cmd/edge_services/resources/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ func createNewResource(client *sdk.APIClient, out io.Writer, service_id int64, r
resp, httpResp, err := api.PostResource(c, service_id).CreateResourceRequest(request).Execute()
if err != nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
return utils.ErrorInternalServerError
err := utils.CheckStatusCode500Error(err)
return err
}
body, err := ioutil.ReadAll(httpResp.Body)
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion pkg/cmd/edge_services/resources/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ func deleteResource(client *sdk.APIClient, out io.Writer, service_id int64, reso
httpResp, err := api.DeleteResource(c, service_id, resource_id).Execute()
if err != nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
return utils.ErrorInternalServerError
err := utils.CheckStatusCode500Error(err)
return err
}
body, err := ioutil.ReadAll(httpResp.Body)
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion pkg/cmd/edge_services/resources/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ func describeResource(client *sdk.APIClient, out io.Writer, service_id int64, re
resp, httpResp, err := api.GetResource(c, service_id, resource_id).Execute()
if err != nil {
if httpResp == nil || httpResp.StatusCode >= 500 {
return nil, utils.ErrorInternalServerError
err := utils.CheckStatusCode500Error(err)
return nil, err
}
body, err := ioutil.ReadAll(httpResp.Body)
if err != nil {
Expand Down
Loading