Skip to content

fix CNS client #1920

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

Merged
merged 7 commits into from
Apr 18, 2023
Merged

fix CNS client #1920

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
62d9873
case insensitive fix
paulyufan Apr 17, 2023
04e2783
Merge branch 'master' of https://github.com/Azure/azure-container-net…
paulyufan2 Apr 17, 2023
acb0505
cnsclientfix Do()
paulyufan2 Apr 18, 2023
fad3806
fix conflicts
paulyufan2 Apr 18, 2023
60d3a83
fix conflicts
paulyufan2 Apr 18, 2023
4a6f2d1
fix conflicts
paulyufan2 Apr 18, 2023
1956b7b
Merge branch 'cnsclientfixs' of https://github.com/Azure/azure-contai…
paulyufan2 Apr 18, 2023
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
28 changes: 15 additions & 13 deletions cns/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ var clientPaths = []string{
cns.GetHomeAz,
}

var ErrAPINotFound error = errors.New("api not found")

type do interface {
Do(*http.Request) (*http.Response, error)
}
Expand Down Expand Up @@ -403,16 +401,18 @@ func (c *Client) RequestIPs(ctx context.Context, ipconfig cns.IPConfigsRequest)
req.Header.Set(headerContentType, contentTypeJSON)
res, err := c.client.Do(req)

// if we get a 404 error
if res.StatusCode == http.StatusNotFound {
return nil, fmt.Errorf("cannot find API RequestIPs %w: %v", ErrAPINotFound, err) //nolint:errorlint // multiple %w not supported in 1.19
}

if err != nil {
return nil, errors.Wrap(err, "http request failed")
}
defer res.Body.Close()

if res.StatusCode == http.StatusNotFound {
return nil, &CNSClientError{
Code: types.UnsupportedAPI,
Err: errors.Errorf("Unsupported API"),
Copy link
Collaborator

@rbtr rbtr Apr 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • this error should be a typed error, not an anonymous error, so that it can be compared to with errors.Is/As
  • error strings should not be sentence-case ("unsupported API") because they are embedded within other strings

}
}

if res.StatusCode != http.StatusOK {
return nil, errors.Errorf("http response %d", res.StatusCode)
}
Expand Down Expand Up @@ -445,17 +445,19 @@ func (c *Client) ReleaseIPs(ctx context.Context, ipconfig cns.IPConfigsRequest)
}
req.Header.Set(headerContentType, contentTypeJSON)
res, err := c.client.Do(req)

// if we get a 404 error
if res.StatusCode == http.StatusNotFound {
return fmt.Errorf("cannot find API ReleaseIPs %w: %v", ErrAPINotFound, err) //nolint:errorlint // multiple %w not supported in 1.19
}

if err != nil {
return errors.Wrap(err, "http request failed")
}
defer res.Body.Close()

// if we get a 404 error
if res.StatusCode == http.StatusNotFound {
return &CNSClientError{
Code: types.UnsupportedAPI,
Err: errors.Errorf("Unsupported API"),
}
}

if res.StatusCode != http.StatusOK {
return errors.Errorf("http response %d", res.StatusCode)
}
Expand Down