Skip to content

Fix error wrapping to preserve network error types #665

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
maelvls wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −14
Open

Fix error wrapping to preserve network error types #665

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions pkg/venafi/cloud/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ func (c *Connector) request(method string, url string, data interface{}, authNot

r, err := http.NewRequest(method, url, payload)
if err != nil {
err = fmt.Errorf("%w: %v", verror.VcertError, err)
err = fmt.Errorf("%w: %w", verror.VcertError, err)
return
}

Expand All @@ -366,7 +366,7 @@ func (c *Connector) request(method string, url string, data interface{}, authNot

res, err := httpClient.Do(r)
if err != nil {
err = fmt.Errorf("%w: %v", verror.ServerUnavailableError, err)
err = fmt.Errorf("%w: %w", verror.ServerUnavailableError, err)
return
}
statusCode = res.StatusCode
Expand All @@ -375,7 +375,7 @@ func (c *Connector) request(method string, url string, data interface{}, authNot
defer res.Body.Close()
body, err = io.ReadAll(res.Body)
if err != nil {
err = fmt.Errorf("%w: %v", verror.ServerError, err)
err = fmt.Errorf("%w: %w", verror.ServerError, err)
}

if c.verbose {
Expand Down
8 changes: 4 additions & 4 deletions pkg/venafi/cloud/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ func (c *Connector) ImportCertificate(req *certificate.ImportRequest) (*certific
url := c.getURL(urlResourceCertificates)
statusCode, status, body, err := c.request("POST", url, request)
if err != nil {
return nil, fmt.Errorf("%w: %v", verror.ServerTemporaryUnavailableError, err)
return nil, fmt.Errorf("%w: %w", verror.ServerTemporaryUnavailableError, err)
}
var r importResponse
switch statusCode {
Expand Down Expand Up @@ -1001,7 +1001,7 @@ func (c *Connector) GetAccessToken(auth *endpoint.Authentication) (*TLSPCAccessT

r, err := http.NewRequest(http.MethodPost, url, strings.NewReader(body.Encode()))
if err != nil {
err = fmt.Errorf("%w: %v", verror.VcertError, err)
err = fmt.Errorf("%w: %w", verror.VcertError, err)
return nil, err
}
r.Header.Set(headers.UserAgent, c.userAgent)
Expand All @@ -1010,7 +1010,7 @@ func (c *Connector) GetAccessToken(auth *endpoint.Authentication) (*TLSPCAccessT
httpClient := c.getHTTPClient()
resp, err := httpClient.Do(r)
if err != nil {
err = fmt.Errorf("%w: %v", verror.ServerUnavailableError, err)
err = fmt.Errorf("%w: %w", verror.ServerUnavailableError, err)
return nil, err
}

Expand All @@ -1020,7 +1020,7 @@ func (c *Connector) GetAccessToken(auth *endpoint.Authentication) (*TLSPCAccessT
defer resp.Body.Close()
respBody, err := io.ReadAll(resp.Body)
if err != nil {
err = fmt.Errorf("%w: %v", verror.ServerError, err)
err = fmt.Errorf("%w: %w", verror.ServerError, err)
return nil, err
}

Expand Down
6 changes: 3 additions & 3 deletions pkg/venafi/ngts/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ func (c *Connector) request(method string, url string, data interface{}, authNot

r, err := http.NewRequest(method, url, payload)
if err != nil {
err = fmt.Errorf("%w: %v", verror.VcertError, err)
err = fmt.Errorf("%w: %w", verror.VcertError, err)
return
}

Expand All @@ -371,7 +371,7 @@ func (c *Connector) request(method string, url string, data interface{}, authNot

res, err := httpClient.Do(r)
if err != nil {
err = fmt.Errorf("%w: %v", verror.ServerUnavailableError, err)
err = fmt.Errorf("%w: %w", verror.ServerUnavailableError, err)
return
}
statusCode = res.StatusCode
Expand All @@ -380,7 +380,7 @@ func (c *Connector) request(method string, url string, data interface{}, authNot
defer res.Body.Close()
body, err = io.ReadAll(res.Body)
if err != nil {
err = fmt.Errorf("%w: %v", verror.ServerError, err)
err = fmt.Errorf("%w: %w", verror.ServerError, err)
}

if c.verbose {
Expand Down
8 changes: 4 additions & 4 deletions pkg/venafi/ngts/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ func (c *Connector) ImportCertificate(req *certificate.ImportRequest) (*certific
url := c.getURL(urlResourceCertificates)
statusCode, status, body, err := c.request("POST", url, request)
if err != nil {
return nil, fmt.Errorf("%w: %v", verror.ServerTemporaryUnavailableError, err)
return nil, fmt.Errorf("%w: %w", verror.ServerTemporaryUnavailableError, err)
}
var r importResponse
switch statusCode {
Expand Down Expand Up @@ -1135,7 +1135,7 @@ func (c *Connector) GetAccessToken(auth *endpoint.Authentication) (*AccessTokenR

r, err := http.NewRequest(http.MethodPost, url, strings.NewReader(body.Encode()))
if err != nil {
err = fmt.Errorf("%w: %v", verror.VcertError, err)
err = fmt.Errorf("%w: %w", verror.VcertError, err)
return nil, err
}
r.Header.Set(headers.UserAgent, c.userAgent)
Expand All @@ -1145,7 +1145,7 @@ func (c *Connector) GetAccessToken(auth *endpoint.Authentication) (*AccessTokenR
httpClient := c.getHTTPClient()
resp, err := httpClient.Do(r)
if err != nil {
err = fmt.Errorf("%w: %v", verror.ServerUnavailableError, err)
err = fmt.Errorf("%w: %w", verror.ServerUnavailableError, err)
return nil, err
}

Expand All @@ -1155,7 +1155,7 @@ func (c *Connector) GetAccessToken(auth *endpoint.Authentication) (*AccessTokenR
defer resp.Body.Close()
respBody, err := io.ReadAll(resp.Body)
if err != nil {
err = fmt.Errorf("%w: %v", verror.ServerError, err)
err = fmt.Errorf("%w: %w", verror.ServerError, err)
return nil, err
}

Expand Down