Address review nits: rune-count fleet names, drop dead validators, rename constant

RachelElysia · RachelElysia · commit d89f53dc48a2 · 2026-07-14T09:53:22.000-07:00
- Switch fleet-name length checks in ee/server/service/teams.go to
  utf8.RuneCountInString so multibyte names within the character cap are
  accepted (previously len() over-counted bytes and could reject valid names).
- Drop the no-op description validator from both Label form helpers.
- Rename MAX_ENTITY_NAME_LENGTH to MAX_ENTITY_CHAR_LENGTH and broaden the
  docstring to cover description fields too.
diff --git a/ee/server/service/teams.go b/ee/server/service/teams.go
@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"net/url"
 	"strings"
+	"unicode/utf8"
 
 	"golang.org/x/text/unicode/norm"
 
@@ -89,7 +90,7 @@ func (svc *Service) NewTeam(ctx context.Context, p fleet.TeamPayload) (*fleet.Te
 	if *p.Name == "" {
 		return nil, fleet.NewInvalidArgumentError("name", "may not be empty")
 	}
-	if len(*p.Name) > fleet.MaxTeamNameLength {
+	if utf8.RuneCountInString(*p.Name) > fleet.MaxTeamNameLength {
 		return nil, fleet.NewInvalidArgumentError("name", fmt.Sprintf("may not exceed %d characters", fleet.MaxTeamNameLength))
 	}
 	if fleet.IsReservedTeamName(*p.Name) {
@@ -168,7 +169,7 @@ func (svc *Service) ModifyTeam(ctx context.Context, teamID uint, payload fleet.T
 		if *payload.Name == "" {
 			return nil, fleet.NewInvalidArgumentError("name", "may not be empty")
 		}
-		if len(*payload.Name) > fleet.MaxTeamNameLength {
+		if utf8.RuneCountInString(*payload.Name) > fleet.MaxTeamNameLength {
 			return nil, fleet.NewInvalidArgumentError("name", fmt.Sprintf("may not exceed %d characters", fleet.MaxTeamNameLength))
 		}
 		if fleet.IsReservedTeamName(*payload.Name) {
@@ -1270,7 +1271,7 @@ func (svc *Service) ApplyTeamSpecs(ctx context.Context, specs []*fleet.TeamSpec,
 		if spec.Name == "" {
 			return nil, fleet.NewInvalidArgumentError("name", "name may not be empty")
 		}
-		if len(spec.Name) > fleet.MaxTeamNameLength {
+		if utf8.RuneCountInString(spec.Name) > fleet.MaxTeamNameLength {
 			return nil, fleet.NewInvalidArgumentError("name", fmt.Sprintf("may not exceed %d characters", fleet.MaxTeamNameLength))
 		}
 		if fleet.IsReservedTeamName(spec.Name) {
diff --git a/ee/server/service/teams_test.go b/ee/server/service/teams_test.go
@@ -145,6 +145,13 @@ func TestNewTeamNameValidation(t *testing.T) {
 			teamName: new(strings.Repeat("a", fleet.MaxTeamNameLength+1)),
 			wantErr:  fmt.Sprintf("may not exceed %d characters", fleet.MaxTeamNameLength),
 		},
+		{
+			// Guards against regressing to byte-based length checks, which
+			// would reject multibyte names that fit within the character cap.
+			name:     "multibyte name at max character length is accepted",
+			teamName: new(strings.Repeat("日", fleet.MaxTeamNameLength)),
+			wantName: strings.Repeat("日", fleet.MaxTeamNameLength),
+		},
 	}
 
 	for _, tc := range testCases {
@@ -278,6 +285,11 @@ func TestModifyTeamNameValidation(t *testing.T) {
 			teamName: new(strings.Repeat("a", fleet.MaxTeamNameLength+1)),
 			wantErr:  fmt.Sprintf("may not exceed %d characters", fleet.MaxTeamNameLength),
 		},
+		{
+			name:     "multibyte name at max character length is accepted",
+			teamName: new(strings.Repeat("日", fleet.MaxTeamNameLength)),
+			wantName: strings.Repeat("日", fleet.MaxTeamNameLength),
+		},
 	}
 
 	for _, tc := range testCases {
@@ -398,6 +410,11 @@ func TestApplyTeamSpecsNameValidation(t *testing.T) {
 			teamName: strings.Repeat("a", fleet.MaxTeamNameLength+1),
 			wantErr:  fmt.Sprintf("may not exceed %d characters", fleet.MaxTeamNameLength),
 		},
+		{
+			name:     "multibyte name at max character length is accepted",
+			teamName: strings.Repeat("日", fleet.MaxTeamNameLength),
+			wantName: strings.Repeat("日", fleet.MaxTeamNameLength),
+		},
 	}
 
 	for _, tc := range testCases {
diff --git a/frontend/components/forms/packs/EditPackForm/EditPackForm.tsx b/frontend/components/forms/packs/EditPackForm/EditPackForm.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import useDeepEffect from "hooks/useDeepEffect";
 
-import { MAX_ENTITY_NAME_LENGTH } from "utilities/constants";
+import { MAX_ENTITY_CHAR_LENGTH } from "utilities/constants";
 import Button from "components/buttons/Button";
 
 import { IQuery } from "interfaces/query";
@@ -112,7 +112,7 @@ const EditPackForm = ({
         name="name"
         error={errors.name}
         inputWrapperClass={`${baseClass}__pack-title`}
-        inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+        inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
       />
       <InputField
         onChange={onChangePackDescription}
@@ -122,7 +122,7 @@ const EditPackForm = ({
         name="description"
         placeholder="Add a description of your pack"
         type="textarea"
-        inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+        inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
       />
       <SelectTargetsDropdown
         label="Select pack targets"
diff --git a/frontend/components/forms/packs/NewPackForm/NewPackForm.tsx b/frontend/components/forms/packs/NewPackForm/NewPackForm.tsx
@@ -6,7 +6,7 @@ import { IQuery } from "interfaces/query";
 import { ITarget, ITargetsAPIResponse } from "interfaces/target";
 import { IEditPackFormData } from "interfaces/pack";
 import PATHS from "router/paths";
-import { MAX_ENTITY_NAME_LENGTH } from "utilities/constants";
+import { MAX_ENTITY_CHAR_LENGTH } from "utilities/constants";
 
 import InputField from "components/forms/fields/InputField";
 import BackButton from "components/BackButton";
@@ -94,7 +94,7 @@ const NewPackForm = ({
           error={errors.name}
           inputWrapperClass={`${baseClass}__pack-title`}
           autofocus
-          inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+          inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
         />
         <InputField
           onChange={onChangePackDescription}
@@ -104,7 +104,7 @@ const NewPackForm = ({
           name="description"
           placeholder="Add a description of your pack"
           type="textarea"
-          inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+          inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
         />
         <SelectTargetsDropdown
           label="Select pack targets"
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tsx
@@ -4,7 +4,7 @@ import { SingleValue } from "react-select-5";
 
 import {
   DEFAULT_USE_QUERY_OPTIONS,
-  MAX_ENTITY_NAME_LENGTH,
+  MAX_ENTITY_CHAR_LENGTH,
 } from "utilities/constants";
 
 import paths from "router/paths";
@@ -206,7 +206,7 @@ const AddCertModal = ({
           helpText="Letters, numbers, spaces, dashes, and underscores only. Name can be used as certificate alias to reference in configuration profiles."
           parseTarget
           placeholder="VPN certificate"
-          inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+          inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
         />
         <InputField
           name="subjectName"
diff --git a/frontend/pages/ManageControlsPage/Variables/components/AddCustomVariableModal/AddCustomVariableModal.tsx b/frontend/pages/ManageControlsPage/Variables/components/AddCustomVariableModal/AddCustomVariableModal.tsx
@@ -6,7 +6,7 @@ import { hasStatusKey, getErrorReason } from "interfaces/errors";
 import variablesAPI from "services/entities/variables";
 import {
   LEARN_MORE_ABOUT_BASE_LINK,
-  MAX_ENTITY_NAME_LENGTH,
+  MAX_ENTITY_CHAR_LENGTH,
 } from "utilities/constants";
 import { notify } from "components/ToastNotification";
 import CustomLink from "components/CustomLink";
@@ -120,7 +120,7 @@ const AddCustomVariableModal = ({
             </span>
           }
           error={formValidation.name?.message}
-          inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+          inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
         />
         <InputField
           onChange={onInputChange}
diff --git a/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/AddCategoryModal/AddCategoryModal.tsx b/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/AddCategoryModal/AddCategoryModal.tsx
@@ -2,7 +2,7 @@ import React, { useState } from "react";
 
 import selfServiceCategoriesAPI from "services/entities/self_service_categories";
 import { hasStatusKey } from "interfaces/errors";
-import { MAX_ENTITY_NAME_LENGTH } from "utilities/constants";
+import { MAX_ENTITY_CHAR_LENGTH } from "utilities/constants";
 
 import Button from "components/buttons/Button";
 import InputField from "components/forms/fields/InputField";
@@ -72,7 +72,7 @@ const AddCategoryModal = ({
           error={error}
           autofocus
           ignore1password
-          inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+          inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
         />
         <div className="modal-cta-wrap">
           <Button type="submit" disabled={isDisabled} isLoading={isSubmitting}>
diff --git a/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/EditCategoryModal/EditCategoryModal.tsx b/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/EditCategoryModal/EditCategoryModal.tsx
@@ -3,7 +3,7 @@ import React, { useState } from "react";
 import selfServiceCategoriesAPI from "services/entities/self_service_categories";
 import { hasStatusKey } from "interfaces/errors";
 import { ISelfServiceCategory } from "interfaces/self_service_category";
-import { MAX_ENTITY_NAME_LENGTH } from "utilities/constants";
+import { MAX_ENTITY_CHAR_LENGTH } from "utilities/constants";
 
 import Button from "components/buttons/Button";
 import InputField from "components/forms/fields/InputField";
@@ -73,7 +73,7 @@ const EditCategoryModal = ({
           error={error}
           autofocus
           ignore1password
-          inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+          inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
         />
         <div className="modal-cta-wrap">
           <Button type="submit" disabled={isDisabled} isLoading={isSubmitting}>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomESTForm/CustomESTForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomESTForm/CustomESTForm.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo } from "react";
 
 import { ICertificateAuthorityPartial } from "interfaces/certificates";
-import { MAX_ENTITY_NAME_LENGTH } from "utilities/constants";
+import { MAX_ENTITY_CHAR_LENGTH } from "utilities/constants";
 
 import InputField from "components/forms/fields/InputField";
 import Button from "components/buttons/Button";
@@ -64,7 +64,7 @@ const CustomESTForm = ({
         parseTarget
         placeholder="WIFI_CERTIFICATE"
         helpText="Letters, numbers, and underscores only."
-        inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+        inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
       />
       <InputField
         label="URL"
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomSCEPForm/CustomSCEPForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomSCEPForm/CustomSCEPForm.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo, useState } from "react";
 
 import { ICertificateAuthorityPartial } from "interfaces/certificates";
-import { MAX_ENTITY_NAME_LENGTH } from "utilities/constants";
+import { MAX_ENTITY_CHAR_LENGTH } from "utilities/constants";
 
 import InputField from "components/forms/fields/InputField";
 import Button from "components/buttons/Button";
@@ -81,7 +81,7 @@ const CustomSCEPForm = ({
         parseTarget
         placeholder="WIFI_CERTIFICATE"
         helpText="Letters, numbers, and underscores only. Fleet will create configuration profile variables with the name as suffix (e.g. $FLEET_VAR_CUSTOM_SCEP_CHALLENGE_WIFI_CERTIFICATE)."
-        inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+        inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
       />
       <InputField
         label="SCEP URL"
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DigicertForm/DigicertForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DigicertForm/DigicertForm.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo, useState } from "react";
 
 import { ICertificateAuthorityPartial } from "interfaces/certificates";
-import { MAX_ENTITY_NAME_LENGTH } from "utilities/constants";
+import { MAX_ENTITY_CHAR_LENGTH } from "utilities/constants";
 
 import InputField from "components/forms/fields/InputField";
 import Button from "components/buttons/Button";
@@ -93,7 +93,7 @@ const DigicertForm = ({
         helpText="Letters, numbers, and underscores only. Fleet will create configuration profile variables with the name as suffix (e.g. $FLEET_VAR_DIGICERT_DATA_WIFI_CERTIFICATE)."
         parseTarget
         placeholder="WIFI_CERTIFICATE"
-        inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+        inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
       />
       <InputField
         name="url"
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/HydrantForm/HydrantForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/HydrantForm/HydrantForm.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo, useState } from "react";
 
 import { ICertificateAuthorityPartial } from "interfaces/certificates";
-import { MAX_ENTITY_NAME_LENGTH } from "utilities/constants";
+import { MAX_ENTITY_CHAR_LENGTH } from "utilities/constants";
 
 import InputField from "components/forms/fields/InputField";
 import Button from "components/buttons/Button";
@@ -81,7 +81,7 @@ const HydrantForm = ({
         helpText="Letters, numbers, and underscores only. Fleet will create configuration profile variables with the name as suffix (e.g. $FLEET_VAR_HYDRANT_DATA_WIFI_CERTIFICATE)."
         parseTarget
         placeholder="WIFI_CERTIFICATE"
-        inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+        inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
       />
       <InputField
         name="url"
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/SmallstepForm/SmallstepForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/SmallstepForm/SmallstepForm.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo } from "react";
 
 import { ICertificateAuthorityPartial } from "interfaces/certificates";
-import { MAX_ENTITY_NAME_LENGTH } from "utilities/constants";
+import { MAX_ENTITY_CHAR_LENGTH } from "utilities/constants";
 
 import InputField from "components/forms/fields/InputField";
 import Button from "components/buttons/Button";
@@ -66,7 +66,7 @@ const SmallstepForm = ({
         parseTarget
         placeholder="WIFI_CERTIFICATE"
         helpText="Letters, numbers, and underscores only. Fleet will create configuration profile variables with the name as suffix (e.g. $FLEET_VAR_SMALLSTEP_DATA_WIFI_CERTIFICATE)."
-        inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+        inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
       />
       <InputField
         label="SCEP URL"
diff --git a/frontend/pages/admin/ManageFleetsPage/components/CreateFleetModal/CreateFleetModal.tsx b/frontend/pages/admin/ManageFleetsPage/components/CreateFleetModal/CreateFleetModal.tsx
@@ -2,7 +2,7 @@ import React, { useState, useCallback, useEffect } from "react";
 
 import { ITeamFormData as IFleetFormData } from "services/entities/teams";
 
-import { MAX_ENTITY_NAME_LENGTH } from "utilities/constants";
+import { MAX_ENTITY_CHAR_LENGTH } from "utilities/constants";
 import Modal from "components/Modal";
 import Button from "components/buttons/Button";
 
@@ -68,7 +68,7 @@ const CreateFleetModal = ({
           placeholder="Workstations"
           value={name}
           error={errors.name}
-          inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+          inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
         />
         <div className="modal-cta-wrap">
           <Button
diff --git a/frontend/pages/admin/ManageFleetsPage/components/RenameFleetModal/RenameFleetModal.tsx b/frontend/pages/admin/ManageFleetsPage/components/RenameFleetModal/RenameFleetModal.tsx
@@ -2,7 +2,7 @@ import React, { useState, useCallback, useEffect } from "react";
 
 import { ITeamFormData as IFleetFormData } from "services/entities/teams";
 
-import { MAX_ENTITY_NAME_LENGTH } from "utilities/constants";
+import { MAX_ENTITY_CHAR_LENGTH } from "utilities/constants";
 import Modal from "components/Modal";
 import InputField from "components/forms/fields/InputField";
 import Button from "components/buttons/Button";
@@ -64,7 +64,7 @@ const RenameFleetModal = ({
           placeholder="Fleet name"
           value={name}
           error={errors.name}
-          inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+          inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
         />
         <div className="modal-cta-wrap">
           <Button
diff --git a/frontend/pages/admin/ManageUsersPage/components/ApiUserForm/ApiUserForm.tsx b/frontend/pages/admin/ManageUsersPage/components/ApiUserForm/ApiUserForm.tsx
@@ -3,7 +3,7 @@ import React, { FormEvent, useState } from "react";
 import { IApiEndpointRef } from "interfaces/api_endpoint";
 import { ITeam } from "interfaces/team";
 import { IUserFormErrors, UserRole } from "interfaces/user";
-import { MAX_ENTITY_NAME_LENGTH } from "utilities/constants";
+import { MAX_ENTITY_CHAR_LENGTH } from "utilities/constants";
 
 import { SingleValue } from "react-select-5";
 import Button from "components/buttons/Button";
@@ -244,7 +244,7 @@ const ApiUserForm = ({
             onBlur={onInputBlur}
             error={formErrors.name}
             autofocus
-            inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+            inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
           />
           {isPremiumTier ? renderPermissions() : renderGlobalRoleForm()}
           {isPremiumTier && (
diff --git a/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx b/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx
@@ -13,7 +13,7 @@ import labelsAPI from "services/entities/labels";
 
 import {
   DEFAULT_USE_QUERY_OPTIONS,
-  MAX_ENTITY_NAME_LENGTH,
+  MAX_ENTITY_CHAR_LENGTH,
 } from "utilities/constants";
 // TODO - move this table config near here once expanded this logic to encompass editing and
 // therefore not longer needed anywhere else
@@ -549,7 +549,7 @@ const NewLabelPage = ({
         label="Name"
         placeholder="Label name"
         parseTarget
-        inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+        inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
       />
       <InputField
         error={formErrors.description?.message}
@@ -562,7 +562,7 @@ const NewLabelPage = ({
         type="textarea"
         placeholder="Label description (optional)"
         parseTarget
-        inputOptions={{ maxLength: MAX_ENTITY_NAME_LENGTH }}
+        inputOptions={{ maxLength: MAX_ENTITY_CHAR_LENGTH }}
       />
       <div className="form-field type-field">
         <div className="form-field__label">Type</div>
diff --git a/frontend/pages/labels/NewLabelPage/helpers.ts b/frontend/pages/labels/NewLabelPage/helpers.ts
diff --git a/frontend/pages/labels/components/LabelForm/LabelForm.tsx b/frontend/pages/labels/components/LabelForm/LabelForm.tsx
diff --git a/frontend/pages/labels/components/LabelForm/helpers.ts b/frontend/pages/labels/components/LabelForm/helpers.ts
diff --git a/frontend/pages/policies/edit/components/PolicyForm/PolicyForm.tsx b/frontend/pages/policies/edit/components/PolicyForm/PolicyForm.tsx
diff --git a/frontend/pages/policies/edit/components/SaveNewPolicyModal/SaveNewPolicyModal.tsx b/frontend/pages/policies/edit/components/SaveNewPolicyModal/SaveNewPolicyModal.tsx
diff --git a/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx b/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx
diff --git a/frontend/pages/queries/edit/components/SaveNewQueryModal/SaveNewQueryModal.tsx b/frontend/pages/queries/edit/components/SaveNewQueryModal/SaveNewQueryModal.tsx
diff --git a/frontend/utilities/constants.tsx b/frontend/utilities/constants.tsx

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`	`"net/http"`
`11`	`11`	`"net/url"`
`12`	`12`	`"strings"`
	`13`	`+ "unicode/utf8"`
`13`	`14`
`14`	`15`	`"golang.org/x/text/unicode/norm"`
`15`	`16`
`@@ -89,7 +90,7 @@ func (svc Service) NewTeam(ctx context.Context, p fleet.TeamPayload) (fleet.Te`
`89`	`90`	`if *p.Name == "" {`
`90`	`91`	`return nil, fleet.NewInvalidArgumentError("name", "may not be empty")`
`91`	`92`	`}`
`92`		`- if len(*p.Name) > fleet.MaxTeamNameLength {`
	`93`	`+ if utf8.RuneCountInString(*p.Name) > fleet.MaxTeamNameLength {`
`93`	`94`	`return nil, fleet.NewInvalidArgumentError("name", fmt.Sprintf("may not exceed %d characters", fleet.MaxTeamNameLength))`
`94`	`95`	`}`
`95`	`96`	`if fleet.IsReservedTeamName(*p.Name) {`
`@@ -168,7 +169,7 @@ func (svc *Service) ModifyTeam(ctx context.Context, teamID uint, payload fleet.T`
`168`	`169`	`if *payload.Name == "" {`
`169`	`170`	`return nil, fleet.NewInvalidArgumentError("name", "may not be empty")`
`170`	`171`	`}`
`171`		`- if len(*payload.Name) > fleet.MaxTeamNameLength {`
	`172`	`+ if utf8.RuneCountInString(*payload.Name) > fleet.MaxTeamNameLength {`
`172`	`173`	`return nil, fleet.NewInvalidArgumentError("name", fmt.Sprintf("may not exceed %d characters", fleet.MaxTeamNameLength))`
`173`	`174`	`}`
`174`	`175`	`if fleet.IsReservedTeamName(*payload.Name) {`
`@@ -1270,7 +1271,7 @@ func (svc Service) ApplyTeamSpecs(ctx context.Context, specs []fleet.TeamSpec,`
`1270`	`1271`	`if spec.Name == "" {`
`1271`	`1272`	`return nil, fleet.NewInvalidArgumentError("name", "name may not be empty")`
`1272`	`1273`	`}`
`1273`		`- if len(spec.Name) > fleet.MaxTeamNameLength {`
	`1274`	`+ if utf8.RuneCountInString(spec.Name) > fleet.MaxTeamNameLength {`
`1274`	`1275`	`return nil, fleet.NewInvalidArgumentError("name", fmt.Sprintf("may not exceed %d characters", fleet.MaxTeamNameLength))`
`1275`	`1276`	`}`
`1276`	`1277`	`if fleet.IsReservedTeamName(spec.Name) {`