Migrates some 'm365group' commands to zod. Closes #6849 #6845

martinlingstuyl · 2025-08-14T14:10:24Z

Migrates some 'm365group' commands to zod. Closes #6849

MartinM85 · 2025-11-26T07:10:53Z

Hi @martinlingstuyl, could you please check and resolve conflicts?

MartinM85

Amazing work @martinlingstuyl . Just a few minor suggestions from my side.

In some commands you have replaced single quotes with double quotes for import, sinon.stub and test names. I think we prefer single quotes in this case. I would suggest reverting these changes.

MartinM85 · 2025-12-06T17:41:18Z

src/m365/entra/commands/m365group/m365group-user-add.ts

+const options = globalOptionsZod
+  .extend({
+    ids: zod.alias('ids', z.string().optional()),
+    userNames: zod.alias('userNames', z.string().optional()),


Suggested change

userNames: zod.alias('userNames', z.string().optional()),

userNames: z.string().optional(),

MartinM85 · 2025-12-06T17:42:07Z

src/m365/entra/commands/m365group/m365group-user-add.ts

+    groupName: zod.alias('groupName', z.string().optional()),
+    teamId: zod.alias('teamId', z.string().uuid().optional()),
+    teamName: zod.alias('teamName', z.string().optional()),


Suggested change

groupName: zod.alias('groupName', z.string().optional()),

teamId: zod.alias('teamId', z.string().uuid().optional()),

teamName: zod.alias('teamName', z.string().optional()),

groupName: z.string().optional(),

teamId: z.string().uuid().optional(),

teamName: z.string().optional(),

MartinM85 · 2025-12-06T17:47:21Z

src/m365/entra/commands/m365group/m365group-user-add.ts

-}
-
 class EntraM365GroupUserAddCommand extends GraphCommand {
  private readonly allowedRoles: string[] = ['owner', 'member'];


Could you replace the allowedRoles with an enum similar to the GroupVisibility used in the m365 group add command?
Then we can omit the allowedRoles from refining in the getRefinedSchema and define the role option as zod.coercedEnum()

MartinM85 · 2025-12-06T17:50:57Z

src/m365/entra/commands/m365group/m365group-user-list.ts

+    groupId: zod.alias('i', z.string().uuid().optional()),
+    groupDisplayName: zod.alias('d', z.string().optional()),
+    properties: zod.alias('p', z.string().optional()),
+    role: zod.alias('r', z.string().optional())


Let's use enum for the role option.

MartinM85 · 2025-12-06T17:52:35Z

src/m365/entra/commands/m365group/m365group-user-remove.ts

+    teamId: zod.alias('teamId', z.string().uuid().optional()),
+    teamName: zod.alias('teamName', z.string().optional()),


Suggested change

teamId: zod.alias('teamId', z.string().uuid().optional()),

teamName: zod.alias('teamName', z.string().optional()),

teamId: z.string().uuid().optional(),

teamName: z.string().optional(),

MartinM85 · 2025-12-06T17:55:11Z

src/m365/entra/commands/m365group/m365group-user-set.ts

+    ids: zod.alias('ids', z.string().optional()),
+    userNames: zod.alias('userNames', z.string().optional()),
+    groupId: zod.alias('i', z.string().uuid().optional()),
+    groupName: zod.alias('groupName', z.string().optional()),
+    teamId: zod.alias('teamId', z.string().uuid().optional()),
+    teamName: zod.alias('teamName', z.string().optional()),


Suggested change

ids: zod.alias('ids', z.string().optional()),

userNames: zod.alias('userNames', z.string().optional()),

groupId: zod.alias('i', z.string().uuid().optional()),

groupName: zod.alias('groupName', z.string().optional()),

teamId: zod.alias('teamId', z.string().uuid().optional()),

teamName: zod.alias('teamName', z.string().optional()),

ids: z.string().optional(),

userNames: z.string().optional(),

groupId: zod.alias('i', z.string().uuid().optional()),

groupName: z.string().optional(),

teamId: z.string().uuid().optional(),

teamName: z.string().optional(),

MartinM85 · 2025-12-06T17:55:45Z

src/m365/entra/commands/m365group/m365group-user-set.ts

+    groupName: zod.alias('groupName', z.string().optional()),
+    teamId: zod.alias('teamId', z.string().uuid().optional()),
+    teamName: zod.alias('teamName', z.string().optional()),
+    role: zod.alias('r', z.string())


Let's use the enum for the role.

MartinM85 · 2025-12-06T17:59:36Z

src/m365/entra/commands/m365group/m365group-set.ts

+    id: zod.alias('i', z.string().uuid().optional()),
+    displayName: zod.alias('n', z.string().optional()),
+    newDisplayName: zod.alias('newDisplayName', z.string().optional()),
+    description: zod.alias('d', z.string().optional()),
+    ownerIds: zod.alias('ownerIds', z.string().optional()),
+    ownerUserNames: zod.alias('ownerUserNames', z.string().optional()),
+    memberIds: zod.alias('memberIds', z.string().optional()),
+    memberUserNames: zod.alias('memberUserNames', z.string().optional()),
+    isPrivate: zod.alias('isPrivate', z.boolean().optional()),
+    logoPath: zod.alias('l', z.string().optional()),
+    allowExternalSenders: zod.alias('allowExternalSenders', z.boolean().optional()),
+    autoSubscribeNewMembers: zod.alias('autoSubscribeNewMembers', z.boolean().optional()),
+    hideFromAddressLists: zod.alias('hideFromAddressLists', z.boolean().optional()),
+    hideFromOutlookClients: zod.alias('hideFromOutlookClients', z.boolean().optional())


Suggested change

id: zod.alias('i', z.string().uuid().optional()),

displayName: zod.alias('n', z.string().optional()),

newDisplayName: zod.alias('newDisplayName', z.string().optional()),

description: zod.alias('d', z.string().optional()),

ownerIds: zod.alias('ownerIds', z.string().optional()),

ownerUserNames: zod.alias('ownerUserNames', z.string().optional()),

memberIds: zod.alias('memberIds', z.string().optional()),

memberUserNames: zod.alias('memberUserNames', z.string().optional()),

isPrivate: zod.alias('isPrivate', z.boolean().optional()),

logoPath: zod.alias('l', z.string().optional()),

allowExternalSenders: zod.alias('allowExternalSenders', z.boolean().optional()),

autoSubscribeNewMembers: zod.alias('autoSubscribeNewMembers', z.boolean().optional()),

hideFromAddressLists: zod.alias('hideFromAddressLists', z.boolean().optional()),

hideFromOutlookClients: zod.alias('hideFromOutlookClients', z.boolean().optional())

id: zod.alias('i', z.string().uuid().optional()),

displayName: zod.alias('n', z.string().optional()),

newDisplayName: z.string().optional(),

description: zod.alias('d', z.string().optional()),

ownerIds: z.string().optional(),

ownerUserNames: z.string().optional(),

memberIds: z.string().optional(),

memberUserNames: z.string().optional(),

isPrivate: z.boolean().optional(),

logoPath: zod.alias('l', z.string().optional()),

allowExternalSenders: z.boolean().optional(),

autoSubscribeNewMembers: z.boolean().optional(),

hideFromAddressLists: z.boolean().optional(),

hideFromOutlookClients: z.boolean().optional()

MartinM85 · 2025-12-06T18:02:26Z

src/m365/entra/commands/m365group/m365group-get.spec.ts

  });

-  it('has correct name', () => {
+  it("has correct name", () => {


I would say that we prefer single quotes for the test names.

MartinM85 · 2025-12-06T18:07:12Z

src/m365/entra/commands/m365group/m365group-list.spec.ts

-import { sinonUtil } from '../../../../utils/sinonUtil.js';
-import commands from '../../commands.js';
-import command from './m365group-list.js';
+import { Group } from "@microsoft/microsoft-graph-types";


We prefer single quotes for imports.

martinlingstuyl force-pushed the zod-m365group-commands branch 3 times, most recently from 2ef5579 to f74716f Compare August 15, 2025 11:53

martinlingstuyl mentioned this pull request Aug 15, 2025

Migrate 'entra m365group add' command to Zod validation #6850

Closed

martinlingstuyl changed the title ~~Migrates some 'm365group' commands to zod~~ Migrates some 'm365group' commands to zod. Closes #6849 Aug 15, 2025

martinlingstuyl force-pushed the zod-m365group-commands branch 3 times, most recently from 914a578 to 880aec0 Compare September 10, 2025 15:00

Migrates some 'm365group' commands to zod

54b6017

martinlingstuyl force-pushed the zod-m365group-commands branch from 880aec0 to 54b6017 Compare November 28, 2025 10:57

MartinM85 self-assigned this Dec 6, 2025

MartinM85 requested changes Dec 6, 2025

View reviewed changes

MartinM85 marked this pull request as draft December 6, 2025 18:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrates some 'm365group' commands to zod. Closes #6849 #6845

Migrates some 'm365group' commands to zod. Closes #6849 #6845

Uh oh!

martinlingstuyl commented Aug 14, 2025 •

edited

Loading

Uh oh!

MartinM85 commented Nov 26, 2025

Uh oh!

MartinM85 left a comment

Uh oh!

MartinM85 Dec 6, 2025

Uh oh!

MartinM85 Dec 6, 2025

Uh oh!

MartinM85 Dec 6, 2025

Uh oh!

MartinM85 Dec 6, 2025

Uh oh!

MartinM85 Dec 6, 2025

Uh oh!

MartinM85 Dec 6, 2025

Uh oh!

MartinM85 Dec 6, 2025

Uh oh!

MartinM85 Dec 6, 2025

Uh oh!

MartinM85 Dec 6, 2025

Uh oh!

MartinM85 Dec 6, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	userNames: zod.alias('userNames', z.string().optional()),
	userNames: z.string().optional(),

		teamId: zod.alias('teamId', z.string().uuid().optional()),
		teamName: zod.alias('teamName', z.string().optional()),

Migrates some 'm365group' commands to zod. Closes #6849 #6845

Are you sure you want to change the base?

Migrates some 'm365group' commands to zod. Closes #6849 #6845

Uh oh!

Conversation

martinlingstuyl commented Aug 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MartinM85 commented Nov 26, 2025

Uh oh!

MartinM85 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

martinlingstuyl commented Aug 14, 2025 •

edited

Loading