linting

Emyrk · Emyrk · commit 4dc15a51870b · 2024-02-16T13:31:16.000-06:00
diff --git a/cli/cliui/table.go b/cli/cliui/table.go
@@ -233,6 +233,7 @@ func isStructOrStructPointer(t reflect.Type) bool {
 //
 // requireDefault is only needed for the root call. This is recursive, so nested
 // structs do not need the default sort name.
+// nolint:revive
 func typeToTableHeaders(t reflect.Type, requireDefault bool) ([]string, string, error) {
 	if !isStructOrStructPointer(t) {
 		return nil, "", xerrors.Errorf("typeToTableHeaders called with a non-struct or a non-pointer-to-a-struct type")
diff --git a/site/src/pages/TemplateSettingsPage/TemplatePermissionsPage/TemplatePermissionsPageView.tsx b/site/src/pages/TemplateSettingsPage/TemplatePermissionsPage/TemplatePermissionsPageView.tsx
@@ -12,6 +12,7 @@ import { type Interpolation, type Theme } from "@emotion/react";
 import { type FC, useState } from "react";
 import type {
   Group,
+  ReducedUser,
   TemplateACL,
   TemplateGroup,
   TemplateRole,
@@ -43,7 +44,11 @@ type AddTemplateUserOrGroupProps = {
   isLoading: boolean;
   templateACL: TemplateACL | undefined;
   onSubmit: (
-    userOrGroup: TemplateUser | TemplateGroup,
+    userOrGroup:
+      | TemplateUser
+      | TemplateGroup
+      // Reduce user is returned by the groups.
+      | ({ role: TemplateRole } & ReducedUser),
     role: TemplateRole,
     reset: () => void,
   ) => void;
