Skip to content

Commit a7ccb2e

Browse files
committed
cli: fix lint findings in the users rename test
Address golangci-lint findings in users_test.go: replace inline "if err := ...; err != nil" statements with plain assignments (noinlineerr) and add blank lines between statements in the fake server's filter loop and before an early return (wsl_v5).
1 parent 76e1469 commit a7ccb2e

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

cmd/headscale/cli/users_test.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,23 @@ func filterUsersServer(t *testing.T, users []clientv1.User) *httptest.Server {
2424
if name := query.Get("name"); name != "" && user.Name != name {
2525
continue
2626
}
27+
2728
if id := query.Get("id"); id != "" && user.Id != id {
2829
continue
2930
}
31+
3032
if email := query.Get("email"); email != "" && user.Email != email {
3133
continue
3234
}
35+
3336
filtered = append(filtered, user)
3437
}
3538

3639
w.Header().Set("Content-Type", "application/json")
3740
w.WriteHeader(http.StatusOK)
38-
if err := json.NewEncoder(w).Encode(clientv1.ListUsersOutputBody{Users: filtered}); err != nil {
41+
42+
err := json.NewEncoder(w).Encode(clientv1.ListUsersOutputBody{Users: filtered})
43+
if err != nil {
3944
t.Errorf("encoding response: %v", err)
4045
}
4146
}))
@@ -48,13 +53,15 @@ func commandWithUserFlags(t *testing.T, identifier, name string) *cobra.Command
4853
usernameAndIDFlag(cmd)
4954

5055
if identifier != "" {
51-
if err := cmd.Flags().Set("identifier", identifier); err != nil {
56+
err := cmd.Flags().Set("identifier", identifier)
57+
if err != nil {
5258
t.Fatalf("setting identifier flag: %v", err)
5359
}
5460
}
5561

5662
if name != "" {
57-
if err := cmd.Flags().Set("name", name); err != nil {
63+
err := cmd.Flags().Set("name", name)
64+
if err != nil {
5865
t.Fatalf("setting name flag: %v", err)
5966
}
6067
}
@@ -121,6 +128,7 @@ func TestResolveSingleUser(t *testing.T) {
121128
if err == nil {
122129
t.Fatalf("resolveSingleUser() error = nil, want error")
123130
}
131+
124132
return
125133
}
126134

0 commit comments

Comments
 (0)