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).
This commit is contained in:
Lukas Runge
2026-08-30 14:38:58 +02:00
committed by Kristoffer Dalby
parent f790af27be
commit beecdf0dbf
+11 -3
View File
@@ -24,18 +24,23 @@ func filterUsersServer(t *testing.T, users []clientv1.User) *httptest.Server {
if name := query.Get("name"); name != "" && user.Name != name { if name := query.Get("name"); name != "" && user.Name != name {
continue continue
} }
if id := query.Get("id"); id != "" && user.Id != id { if id := query.Get("id"); id != "" && user.Id != id {
continue continue
} }
if email := query.Get("email"); email != "" && user.Email != email { if email := query.Get("email"); email != "" && user.Email != email {
continue continue
} }
filtered = append(filtered, user) filtered = append(filtered, user)
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
if err := json.NewEncoder(w).Encode(clientv1.ListUsersOutputBody{Users: filtered}); err != nil {
err := json.NewEncoder(w).Encode(clientv1.ListUsersOutputBody{Users: filtered})
if err != nil {
t.Errorf("encoding response: %v", err) t.Errorf("encoding response: %v", err)
} }
})) }))
@@ -48,13 +53,15 @@ func commandWithUserFlags(t *testing.T, identifier, name string) *cobra.Command
usernameAndIDFlag(cmd) usernameAndIDFlag(cmd)
if identifier != "" { if identifier != "" {
if err := cmd.Flags().Set("identifier", identifier); err != nil { err := cmd.Flags().Set("identifier", identifier)
if err != nil {
t.Fatalf("setting identifier flag: %v", err) t.Fatalf("setting identifier flag: %v", err)
} }
} }
if name != "" { if name != "" {
if err := cmd.Flags().Set("name", name); err != nil { err := cmd.Flags().Set("name", name)
if err != nil {
t.Fatalf("setting name flag: %v", err) t.Fatalf("setting name flag: %v", err)
} }
} }
@@ -121,6 +128,7 @@ func TestResolveSingleUser(t *testing.T) {
if err == nil { if err == nil {
t.Fatalf("resolveSingleUser() error = nil, want error") t.Fatalf("resolveSingleUser() error = nil, want error")
} }
return return
} }