v2: added support for DevicesResource #90
Conversation
| for _, pathElement := range pathElements { | ||
| elem = append(elem, fmt.Sprint(pathElement)) | ||
| } | ||
| return c.BaseURL.JoinPath(elem...) |
There was a problem hiding this comment.
Does JoinPath handle URL encoding / escaping the strings under the hood? e.g, if we end up with an /tailnet/mario@example.com/ URL does the @ get properly escaped?
There was a problem hiding this comment.
Yes, that was my reason for using it.
v2/devices.go
Outdated
|
|
||
| // List lists the devices in a tailnet. | ||
| func (dr *DevicesResource) List(ctx context.Context) ([]Device, error) { | ||
| req, err := dr.buildRequest(ctx, http.MethodGet, dr.buildURL("api", "v2", "tailnet", dr.Tailnet, "devices")) |
There was a problem hiding this comment.
Nit: could maybe have a buildV2URL helper or something similar that prefixes with /api/v2?
There was a problem hiding this comment.
Oh yeah, I can just make that part of buildURL, as I suspect all of our URLs will be api/v2
v2/devices.go
Outdated
| return nil, err | ||
| } | ||
|
|
||
| return &device, nil |
There was a problem hiding this comment.
Have also seen us do something more similar to the following format:
var device Device
return &device, dr.performRequest(req, &device)Not sure if we have a preference between the two.
There was a problem hiding this comment.
Oh, we can do even better, hang on ...
There was a problem hiding this comment.
How do you like it now?
v2/devices_test.go
Outdated
| assert.Equal(t, server.ResponseBody, routes) | ||
| } | ||
|
|
||
| func TestClient_AuthorizeDevice(t *testing.T) { |
There was a problem hiding this comment.
Think we can likely drop this test since it looks like we've removed AuthorizeDevice?
oxtoacart
force-pushed
the
percy/v2_devices
branch
5 times, most recently
from
554f9f4 to
cd64779
Compare
v2/client.go
Outdated
| @@ -224,12 +236,13 @@ func (c *Client) performRequest(req *http.Request, out interface{}) error { | |||
| } | |||
| } | |||
|
|
|||
| return json.Unmarshal(body, out) | |||
| err = json.Unmarshal(body, out) | |||
| return err | |||
There was a problem hiding this comment.
Nit:
| return err | |
| return json.Unmarshal(body, out) |
| } | ||
|
|
||
| if res.StatusCode != http.StatusOK && res.StatusCode != http.StatusCreated { | ||
| var apiErr APIError | ||
| if err = json.Unmarshal(body, &apiErr); err != nil { | ||
| if err := json.Unmarshal(body, &apiErr); err != nil { |
There was a problem hiding this comment.
Nit x 2 if the above is accepted to bring it back to how it was:
| if err := json.Unmarshal(body, &apiErr); err != nil { | |
| if err = json.Unmarshal(body, &apiErr); err != nil { |
Updates tailscale/corp#21867 Signed-off-by: Percy Wegmann <percy@tailscale.com>
oxtoacart
force-pushed
the
percy/v2_devices
branch
from
cd64779 to
2f341f3
Compare
Updates tailscale/corp#21867
Depends on #89